commit: da37447a27e961ef6bde9e773ae002e28e6285e0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 28 20:21:21 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 28 21:36:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da37447a
sci-electronics/qelectrotech: 0.80 version bump Closes: https://bugs.gentoo.org/746647 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-electronics/qelectrotech/Manifest | 1 + .../files/qelectrotech-0.80-fix-paths.patch | 50 ++++++++++++++++++++++ .../files/qelectrotech-0.80-nomancompress.patch | 10 +++++ ...rotech-9999.ebuild => qelectrotech-0.80.ebuild} | 22 ++++++++-- .../qelectrotech/qelectrotech-9999.ebuild | 22 ++++++++-- 5 files changed, 97 insertions(+), 8 deletions(-) diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest index 23a90bc85d6..88b1688f9cd 100644 --- a/sci-electronics/qelectrotech/Manifest +++ b/sci-electronics/qelectrotech/Manifest @@ -1 +1,2 @@ DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd +DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53 diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch new file mode 100644 index 00000000000..30ef9b6089b --- /dev/null +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch @@ -0,0 +1,50 @@ +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100 ++++ b/qelectrotech.pro 2021-02-28 21:12:15.934876464 +0100 +@@ -5,21 +5,21 @@ + # Chemins utilises pour la compilation et l'installation de QET + unix { + # Chemins UNIX +- COMPIL_PREFIX = '/usr/local/' +- INSTALL_PREFIX = '/usr/local/' ++ COMPIL_PREFIX = '/usr/' ++ INSTALL_PREFIX = '/usr/' + QET_BINARY_PATH = 'bin/' + QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/' + QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/' + QET_LANG_PATH = 'share/qelectrotech/lang/' + QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' + QET_LICENSE_PATH = 'doc/qelectrotech/' +- QET_MIME_XML_PATH = '../share/mime/application/' +- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' +- QET_MIME_PACKAGE_PATH = '../share/mime/packages/' ++ QET_MIME_XML_PATH = 'share/mime/application/' ++ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/' ++ QET_MIME_PACKAGE_PATH = 'share/mime/packages/' + QET_DESKTOP_PATH = 'share/applications/' + QET_ICONS_PATH = 'share/icons/hicolor/' +- QET_MAN_PATH = 'man/' +- QET_APPDATA_PATH = 'share/appdata' ++ QET_MAN_PATH = 'share/man/' ++ QET_APPDATA_PATH = 'share/metainfo' + } + win32 { + # Chemins Windows +@@ -252,9 +252,6 @@ + examples.path = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH}) + examples.files = examples/* + +-copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH}) +-copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog +- + mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH}) + mime_xml.files = misc/x-qet-*.xml + +@@ -284,7 +281,7 @@ + man.extra = sh man/compress_man_pages.sh + + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE +-INSTALLS += target elements tbt lang copyright ++INSTALLS += target elements tbt lang + # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel + unix { + INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch new file mode 100644 index 00000000000..9e63a451289 --- /dev/null +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch @@ -0,0 +1,10 @@ +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100 ++++ b/qelectrotech.pro 2021-02-28 21:41:02.221285171 +0100 +@@ -278,7 +278,6 @@ + + man.path = $$join(INSTALL_PREFIX,,,$${QET_MAN_PATH}) + man.files = man/files/* +-man.extra = sh man/compress_man_pages.sh + + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE + INSTALLS += target elements tbt lang diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild similarity index 66% copy from sci-electronics/qelectrotech/qelectrotech-9999.ebuild copy to sci-electronics/qelectrotech/qelectrotech-0.80.ebuild index ac7b517d39f..135799c10be 100644 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2020 Gentoo Authors +# Copyright 2001-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/"; inherit git-r3 else - MY_P=${PN}-${PV%0}-src - SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"; + MY_P=qet-${PV/%0/.0} + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}"/${MY_P} fi @@ -23,9 +23,11 @@ SLOT="0" IUSE="doc" BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) " RDEPEND=" + dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -42,7 +44,19 @@ DEPEND="${RDEPEND}" DOCS=( CREDIT ChangeLog README ) -PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-paths.patch" + "${FILESDIR}/${P}-nomancompress.patch" +) + +src_prepare() { + xdg_src_prepare + + if [[ ${PV} != *9999* ]]; then + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die + fi +} src_configure() { eqmake5 ${PN}.pro diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild index ac7b517d39f..17b3beea624 100644 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2020 Gentoo Authors +# Copyright 2001-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/"; inherit git-r3 else - MY_P=${PN}-${PV%0}-src - SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"; + MY_P=qet-${PV/%0/.0} + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}"/${MY_P} fi @@ -23,9 +23,11 @@ SLOT="0" IUSE="doc" BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) " RDEPEND=" + dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -42,7 +44,19 @@ DEPEND="${RDEPEND}" DOCS=( CREDIT ChangeLog README ) -PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.80-fix-paths.patch" + "${FILESDIR}/${PN}-0.80-nomancompress.patch" +) + +src_prepare() { + xdg_src_prepare + + if [[ ${PV} != *9999* ]]; then + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die + fi +} src_configure() { eqmake5 ${PN}.pro
