[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: f227ad64069ef5cf566a2620aa7297368a80e355 Author: Arthur Zamarin gentoo org> AuthorDate: Thu May 23 15:56:17 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu May 23 15:56:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f227ad64 sci-calculators/units: Stabilize 2.23 ppc64, #932528 Signed-off-by: Arthur Zamarin gentoo.org> sci-calculators/units/units-2.23.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.23.ebuild b/sci-calculators/units/units-2.23.ebuild index 84782630af07..7c5d0d63d337 100644 --- a/sci-calculators/units/units-2.23.ebuild +++ b/sci-calculators/units/units-2.23.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: aa267ace26e67f5ce92a317871c080312587569a Author: Arthur Zamarin gentoo org> AuthorDate: Thu May 23 15:56:16 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu May 23 15:56:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa267ace sci-calculators/units: Stabilize 2.23 amd64, #932528 Signed-off-by: Arthur Zamarin gentoo.org> sci-calculators/units/units-2.23.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.23.ebuild b/sci-calculators/units/units-2.23.ebuild index 4d4fecb58392..6dfa58eca321 100644 --- a/sci-calculators/units/units-2.23.ebuild +++ b/sci-calculators/units/units-2.23.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: b6fbdc354fc4d30a29f3a171b25840acf9b62b0f Author: Arthur Zamarin gentoo org> AuthorDate: Thu May 23 15:56:16 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu May 23 15:56:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6fbdc35 sci-calculators/units: Stabilize 2.23 x86, #932528 Signed-off-by: Arthur Zamarin gentoo.org> sci-calculators/units/units-2.23.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.23.ebuild b/sci-calculators/units/units-2.23.ebuild index 6dfa58eca321..84782630af07 100644 --- a/sci-calculators/units/units-2.23.ebuild +++ b/sci-calculators/units/units-2.23.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: a29b90354124cbb1cd6aa12eed77303845cea348 Author: Viorel Munteanu gentoo org> AuthorDate: Sun Apr 21 07:54:14 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Sun Apr 21 08:26:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29b9035 sci-calculators/units: add 2.23 Closes: https://bugs.gentoo.org/929996 Closes: https://bugs.gentoo.org/929755 Closes: https://bugs.gentoo.org/881639 Signed-off-by: Viorel Munteanu gentoo.org> sci-calculators/units/Manifest | 1 + sci-calculators/units/metadata.xml | 20 ++- sci-calculators/units/units-2.23.ebuild | 59 + 3 files changed, 72 insertions(+), 8 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 62a5de36de3f..2f123aa654f9 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1 +1,2 @@ DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 +DIST units-2.23.tar.gz 1423494 BLAKE2B 9a835ec3862b7c09149d5726084fb3068acb9d01b3a8234647cd47805a559b75131046bfe407152dec9f2e06c6c3315686dd0db0694d2c5ef0173e6ee64ce378 SHA512 628aac3a560ed728f1aba91841f9fccc0b145375a0b8953b98ac00c71bcc7f647377d16c6ba7b59e987a6e7a74b44038a62f2576f757a43d7564be469be81ee8 diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml index 0f742b8f2221..09b6ba2b5614 100644 --- a/sci-calculators/units/metadata.xml +++ b/sci-calculators/units/metadata.xml @@ -1,11 +1,15 @@ - + https://www.gentoo.org/dtd/metadata.dtd;> - - -Install the units_cur python script that updates currencies - - -units - + + cea...@gentoo.org + Viorel Munteanu + + + Install the units_cur python script that updates currencies + + + units + mailto:adri...@gnu.org + diff --git a/sci-calculators/units/units-2.23.ebuild b/sci-calculators/units/units-2.23.ebuild new file mode 100644 index ..4d4fecb58392 --- /dev/null +++ b/sci-calculators/units/units-2.23.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units-cur" +REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units-cur? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.20-readerror.patch +) + +DOCS=( NEWS README ) + +src_configure() { + local myconf=( + --sharedstatedir="${EPREFIX}"/var/lib + ac_cv_path_PYTHON=no + ) + + econf "${myconf[@]}" +} + +src_compile() { + emake ${PN} +} + +src_install() { + default + + if use units-cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_foreach_impl python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 24fb3a38c6083faf407a306ed8687dde67d23ae1 Author: Sam James gentoo org> AuthorDate: Wed Jul 19 19:59:00 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 19 19:59:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24fb3a38 sci-calculators/units: disable py3.9 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild index bd5a5772419c..4fd1ba750a36 100644 --- a/sci-calculators/units/units-2.21-r1.ebuild +++ b/sci-calculators/units/units-2.21-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 8185d9ea701065777933176ad9c0c87bbbd5d382 Author: Sam James gentoo org> AuthorDate: Wed Jul 19 19:58:42 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jul 19 19:58:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8185d9ea sci-calculators/units: stabilize 2.21-r1 for x86 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild index 3a90d34023f8..bd5a5772419c 100644 --- a/sci-calculators/units/units-2.21-r1.ebuild +++ b/sci-calculators/units/units-2.21-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 186f04a96ca7d6ee4950f63bb04b4a078593c1bd Author: Michał Górny gentoo org> AuthorDate: Sat Dec 31 14:58:15 2022 + Commit: Michał Górny gentoo org> CommitDate: Sat Dec 31 15:04:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186f04a9 sci-calculators/units: Remove obsolete dev-python/future dep The current version of the package does not use dev-python/future. Closes: https://bugs.gentoo.org/888299 Signed-off-by: Michał Górny gentoo.org> sci-calculators/units/{units-2.21.ebuild => units-2.21-r1.ebuild} | 1 - 1 file changed, 1 deletion(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21-r1.ebuild similarity index 96% rename from sci-calculators/units/units-2.21.ebuild rename to sci-calculators/units/units-2.21-r1.ebuild index 0c1c7e86fb23..e87fc75a74bc 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21-r1.ebuild @@ -21,7 +21,6 @@ RDEPEND=" units-cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') )
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: defb80ea05f70fa7f2d85e8b7065b1935750994f Author: Sam James gentoo org> AuthorDate: Tue Oct 18 01:46:58 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 18 02:17:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=defb80ea sci-calculators/units: add savannah upstream metadata Signed-off-by: Sam James gentoo.org> sci-calculators/units/metadata.xml | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml index 895650dbdb7f..0f742b8f2221 100644 --- a/sci-calculators/units/metadata.xml +++ b/sci-calculators/units/metadata.xml @@ -1,8 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - -Install the units_cur python script that updates currencies - + + +Install the units_cur python script that updates currencies + + +units +
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: e57d3523e6a8274d6281578cad32ebea2a911dd6 Author: Sam James gentoo org> AuthorDate: Mon May 30 21:52:01 2022 + Commit: Sam James gentoo org> CommitDate: Mon May 30 22:53:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57d3523 sci-calculators/units: update EAPI 7 -> 8 Closes: https://bugs.gentoo.org/846224 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild index 27e2401c7804..0c1c7e86fb23 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
commit: 6bcb78c4c5267464584160e4a53c623e2442f66b Author: Sam James gentoo org> AuthorDate: Fri Feb 12 13:49:31 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 13:49:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bcb78c4 sci-calculators/units: cleanup old Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sci-calculators/units/Manifest | 1 - sci-calculators/units/files/units-2.20-WIN32.patch | 24 - sci-calculators/units/units-2.20.ebuild| 60 -- 3 files changed, 85 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 551e57acabc..62a5de36de3 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1 @@ -DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch deleted file mode 100644 index fbe7599831c..000 --- a/sci-calculators/units/files/units-2.20-WIN32.patch +++ /dev/null @@ -1,24 +0,0 @@ a/units.c -+++ b/units.c -@@ -4087,7 +4087,9 @@ - checkcwd (char *file) - { - FILE *fp; -+#ifdef _WIN32 - char *p; -+#endif - - fp = fopen(file, "r"); - if (fp){ -@@ -4630,7 +4630,10 @@ - printversion() - { - int exists; -- char *unitsfile, *localemap; -+ char *unitsfile; -+#ifdef _WIN32 -+ char *localemap; -+#endif - - if (flags.verbose == 0) { - printf("GNU Units version %s\n", VERSION); diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild deleted file mode 100644 index f63f622a041..000 --- a/sci-calculators/units/units-2.20.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units-cur? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.17-network-sandbox.patch - "${FILESDIR}"/${PN}-2.20-WIN32.patch - "${FILESDIR}"/${PN}-2.20-readerror.patch -) -DOCS=( - ChangeLog NEWS README -) - -src_configure() { - econf \ - --sharedstatedir="${EPREFIX}"/var/lib \ - ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - default - - if use units-cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_foreach_impl python_doscript units_cur - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: ef7cd70c3f2f9480c896566475e2ad538ed26fbc Author: Sam James gentoo org> AuthorDate: Fri Feb 12 13:46:05 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 12 13:46:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7cd70c sci-calculators/units: Stabilize 2.21 ppc, #768792 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild index ae73b29cd0e..27e2401c780 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 4ccaa7728a4ae5d303ecbd6ad017418fa7ee6195 Author: Sam James gentoo org> AuthorDate: Fri Feb 5 12:30:58 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 5 12:30:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccaa772 sci-calculators/units: Stabilize 2.21 x86, #768792 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild index 338ac221acc..ae73b29cd0e 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: ef687380171b772898e3a8446074ee6074d91dd0 Author: Sam James gentoo org> AuthorDate: Fri Feb 5 10:40:26 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 5 10:40:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef687380 sci-calculators/units: Stabilize 2.21 amd64, #768792 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild index 5701ad7ce9a..338ac221acc 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: c1a0ac7408bc4378357e5a1cf2c2bc4637e7 Author: Sam James gentoo org> AuthorDate: Fri Feb 5 06:36:02 2021 + Commit: Sam James gentoo org> CommitDate: Fri Feb 5 06:36:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a0ac22 sci-calculators/units: Stabilize 2.21 ppc64, #768792 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild index b076d9c868b..5701ad7ce9a 100644 --- a/sci-calculators/units/units-2.21.ebuild +++ b/sci-calculators/units/units-2.21.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 1b854ed34aaf7b803763f4c5b5c9cba75b0a6bc0 Author: Sam James gentoo org> AuthorDate: Thu Jan 7 18:58:02 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jan 7 18:58:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b854ed3 sci-calculators/units: cleanup old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.19-r1.ebuild | 66 -- 2 files changed, 67 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 258e6b73ae9..551e57acabc 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,2 @@ -DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild deleted file mode 100644 index 9463f1bd5b2..000 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units-cur? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - ') - ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.17-network-sandbox.patch -) -DOCS=( - ChangeLog NEWS README -) - -pkg_setup() { - use units-cur && python-single-r1_pkg_setup -} - -src_configure() { - econf \ - --sharedstatedir="${EPREFIX}"/var/lib \ - ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - default - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units-cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: c46d75f70248d2cc8eea1076cc941e5ac6b6f8d2 Author: Sam James gentoo org> AuthorDate: Thu Jan 7 18:57:01 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jan 7 18:57:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46d75f7 sci-calculators/units: Stabilize 2.20 ppc64, #763360 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index f6a0648167e..185a3134701 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 946e40324bf153464c01c45d2a6ecac7814ca8fc Author: Sam James gentoo org> AuthorDate: Thu Jan 7 10:08:04 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jan 7 10:09:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946e4032 sci-calculators/units: Stabilize 2.20 ppc, #763360 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index d2149fcbc5a..f6a0648167e 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 034f79993b2345f562d0c832661f29f3b4d594e0 Author: Sam James gentoo org> AuthorDate: Sat Jan 2 22:43:16 2021 + Commit: Sam James gentoo org> CommitDate: Sat Jan 2 22:43:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034f7999 sci-calculators/units: Stabilize 2.19-r1 ppc64, #762868 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.19-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index 0065f1b1105..9463f1bd5b2 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 88f5b9b0dda31f4ab009885f7cd8c70ba8d006e7 Author: Sam James gentoo org> AuthorDate: Sat Jan 2 22:07:27 2021 + Commit: Sam James gentoo org> CommitDate: Sat Jan 2 22:07:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f5b9b0 sci-calculators/units: Stabilize 2.19-r1 ppc, #762868 Signed-off-by: Sam James gentoo.org> sci-calculators/units/units-2.19-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index 755e4b2d6df..0065f1b1105 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: ba4fe3d5841688ae7cc2aa26f931e74893481aaa Author: Michał Górny gentoo org> AuthorDate: Fri Jan 1 13:06:36 2021 + Commit: Michał Górny gentoo org> CommitDate: Fri Jan 1 13:09:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4fe3d5 sci-calculators/units: Remove old (py3.6) Signed-off-by: Michał Górny gentoo.org> sci-calculators/units/Manifest | 2 - sci-calculators/units/units-2.16-r1.ebuild | 60 --- sci-calculators/units/units-2.18.ebuild| 65 -- 3 files changed, 127 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index a40be723533..258e6b73ae9 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,5 +1,3 @@ -DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 -DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild deleted file mode 100644 index 1ad5ab191b3..000 --- a/sci-calculators/units/units-2.16-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit eutils python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units-cur? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - ') - ) -" -DEPEND=" - ${RDEPEND} -" - -pkg_setup() { - use units-cur && python-single-r1_pkg_setup -} - -src_configure() { - econf ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc ChangeLog NEWS README - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units-cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur - fi -} diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild deleted file mode 100644 index ba5ed4ef521..000 --- a/sci-calculators/units/units-2.18.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit eutils python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: f9668b4fe4c289875bb573d5ce0bb057faca6f28 Author: Sam James gentoo org> AuthorDate: Fri Jan 1 04:32:34 2021 + Commit: Sam James gentoo org> CommitDate: Fri Jan 1 04:32:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9668b4f sci-calculators/units: bump to 2.21 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.21.ebuild | 58 + 2 files changed, 59 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index ba47bcea8d7..a40be723533 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -2,3 +2,4 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d +DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild new file mode 100644 index 000..f62e7185316 --- /dev/null +++ b/sci-calculators/units/units-2.21.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +inherit python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units-cur" +REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units-cur? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.17-network-sandbox.patch + "${FILESDIR}"/${PN}-2.20-readerror.patch +) + +DOCS=( ChangeLog NEWS README ) + +src_configure() { + econf \ + --sharedstatedir="${EPREFIX}"/var/lib \ + ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + default + + if use units-cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_foreach_impl python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: d1d3eef2eccc25444da4f05b1cae90dccf402b80 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Oct 4 12:07:17 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Oct 4 12:07:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d3eef2 sci-calculators/units: Fix unwanted double hyphen in USE flag name Package-Manager: Portage-3.0.8, Repoman-3.0.1 Fixes: 249a76e82566d2597d8a5f5c1445f49bce6e54e4 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/metadata.xml | 2 +- sci-calculators/units/units-2.16-r1.ebuild | 10 +- sci-calculators/units/units-2.18.ebuild| 10 +- sci-calculators/units/units-2.19-r1.ebuild | 10 +- sci-calculators/units/units-2.20.ebuild| 8 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml index f0a40a93849..b411ce91602 100644 --- a/sci-calculators/units/metadata.xml +++ b/sci-calculators/units/metadata.xml @@ -6,6 +6,6 @@ Jeroen Roovers -Install the units_cur python script that updates currencies +Install the units_cur python script that updates currencies diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild index b6e116cc86e..6bea3362ca4 100644 --- a/sci-calculators/units/units-2.16-r1.ebuild +++ b/sci-calculators/units/units-2.16-r1.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units--cur" -REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units-cur" +REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units--cur? ( + units-cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/future[${PYTHON_MULTI_USEDEP}] @@ -30,7 +30,7 @@ DEPEND=" " pkg_setup() { - use units--cur && python-single-r1_pkg_setup + use units-cur && python-single-r1_pkg_setup } src_configure() { @@ -49,7 +49,7 @@ src_install() { # we're intentionally delaying this since 'make install' would # get confused if we shove 'units_cur' there, and there is no real # need to add more complexity for it - if use units--cur; then + if use units-cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index b110fbdd91b..8f8ba8b7c38 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units--cur" -REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units-cur" +REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units--cur? ( + units-cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/future[${PYTHON_MULTI_USEDEP}] @@ -33,7 +33,7 @@ PATCHES=( ) pkg_setup() { - use units--cur && python-single-r1_pkg_setup + use units-cur && python-single-r1_pkg_setup } src_configure() { @@ -54,7 +54,7 @@ src_install() { # we're intentionally delaying this since 'make install' would # get confused if we shove 'units_cur' there, and there is no real # need to add more complexity for it - if use units--cur; then + if use units-cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index 08fba4f5f9b..b68b04a87f9 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units--cur" -REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units-cur" +REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units--cur? ( + units-cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/future[${PYTHON_MULTI_USEDEP}] @@ -36,7 +36,7 @@ DOCS=( ) pkg_setup() { - use units--cur && python-single-r1_pkg_setup + use units-cur && python-single-r1_pkg_setup } src_configure() { @@ -55,7
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: b112577cfda77a051d906dadccaeb7ef67fe5559 Author: David Seifert gentoo org> AuthorDate: Sat Oct 3 21:47:39 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Oct 3 21:47:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b112577c sci-calculators/units: [QA] Do not use EROOT in src_configure * EROOT is not defined in src_* phases. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: David Seifert gentoo.org> sci-calculators/units/units-2.18.ebuild| 2 +- sci-calculators/units/units-2.19-r1.ebuild | 2 +- sci-calculators/units/units-2.20.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index 119605f9309..b110fbdd91b 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -38,7 +38,7 @@ pkg_setup() { src_configure() { econf \ - --sharedstatedir="${EROOT}/var/lib" \ + --sharedstatedir="${EPREFIX}"/var/lib \ ac_cv_path_PYTHON=no } diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index b6062ea69bb..08fba4f5f9b 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -41,7 +41,7 @@ pkg_setup() { src_configure() { econf \ - --sharedstatedir="${EROOT}/var/lib" \ + --sharedstatedir="${EPREFIX}"/var/lib \ ac_cv_path_PYTHON=no } diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index 512e983f4b3..a601e8f3fc0 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -39,7 +39,7 @@ DOCS=( src_configure() { econf \ - --sharedstatedir="${EROOT}/var/lib" \ + --sharedstatedir="${EPREFIX}"/var/lib \ ac_cv_path_PYTHON=no }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7f6f7fb99b9e5d1b6b80fe8de9a6394f81c45220 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 1 12:07:17 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 1 12:07:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6f7fb9 sci-calculators/units: Add python3_9 support Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index 5576c8c4c5c..512e983f4b3 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit python-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 6f064ca76e278f87f80c33cc3ae31dc4829cbe4d Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 1 08:38:15 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 1 08:38:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f064ca7 sci-calculators/units: Install for multiple python implementations Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.20.ebuild | 16 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index 2e744c5f60c..5576c8c4c5c 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 +inherit python-r1 DESCRIPTION="Unit conversion program" HOMEPAGE="https://www.gnu.org/software/units/units.html; @@ -20,8 +20,8 @@ RDEPEND=" units--cur? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/future[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ') ) " @@ -37,10 +37,6 @@ DOCS=( ChangeLog NEWS README ) -pkg_setup() { - use units--cur && python-single-r1_pkg_setup -} - src_configure() { econf \ --sharedstatedir="${EROOT}/var/lib" \ @@ -54,15 +50,11 @@ src_compile() { src_install() { default - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it if use units--cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur + python_foreach_impl python_doscript units_cur fi }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
commit: 164ff1b9911d4fbc62980e2d6bdf65399d1619fa Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 1 07:22:24 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 1 08:05:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164ff1b9 sci-calculators/units: Version 2.20 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/Manifest | 1 + sci-calculators/units/files/units-2.20-WIN32.patch | 24 .../units/files/units-2.20-readerror.patch | 11 sci-calculators/units/units-2.20.ebuild| 68 ++ 4 files changed, 104 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 0265ac77011..ba47bcea8d7 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,4 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 +DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch new file mode 100644 index 000..fbe7599831c --- /dev/null +++ b/sci-calculators/units/files/units-2.20-WIN32.patch @@ -0,0 +1,24 @@ +--- a/units.c b/units.c +@@ -4087,7 +4087,9 @@ + checkcwd (char *file) + { + FILE *fp; ++#ifdef _WIN32 + char *p; ++#endif + + fp = fopen(file, "r"); + if (fp){ +@@ -4630,7 +4630,10 @@ + printversion() + { + int exists; +- char *unitsfile, *localemap; ++ char *unitsfile; ++#ifdef _WIN32 ++ char *localemap; ++#endif + + if (flags.verbose == 0) { + printf("GNU Units version %s\n", VERSION); diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch new file mode 100644 index 000..ccb12c68153 --- /dev/null +++ b/sci-calculators/units/files/units-2.20-readerror.patch @@ -0,0 +1,11 @@ +--- a/units.c b/units.c +@@ -761,7 +761,7 @@ + } + + +-#define readerror (goterr=1) && errfile && fprintf ++#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0) + + #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \ +progname, file, linenum diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild new file mode 100644 index 000..2e744c5f60c --- /dev/null +++ b/sci-calculators/units/units-2.20.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units--cur" +REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units--cur? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-2.17-network-sandbox.patch + "${FILESDIR}"/${PN}-2.20-WIN32.patch + "${FILESDIR}"/${PN}-2.20-readerror.patch +) +DOCS=( + ChangeLog NEWS README +) + +pkg_setup() { + use units--cur && python-single-r1_pkg_setup +} + +src_configure() { + econf \ + --sharedstatedir="${EROOT}/var/lib" \ + ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + default + +
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: cc1a7aa7c2816f99d3025575af1cb39578fa7700 Author: neeshy tfwno gf> AuthorDate: Wed Mar 25 19:36:52 2020 + Commit: Craig Andrews gentoo org> CommitDate: Sun Apr 19 02:35:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc1a7aa7 sci-calculators/units: add python3_8 target Signed-off-by: Nima Sadeghi tfwno.gf> Signed-off-by: Craig Andrews gentoo.org> sci-calculators/units/units-2.19-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index 13c2f13963c..b6062ea69bb 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-single-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: e281ee1c995c2e2bd469509800591eff28492993 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 12:06:14 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 12:12:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e281ee1c sci-calculators/units: Remove py2 Signed-off-by: Michał Górny gentoo.org> sci-calculators/units/units-2.16-r1.ebuild | 2 +- sci-calculators/units/units-2.18.ebuild| 2 +- sci-calculators/units/units-2.19-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild index 42721017753..b6e116cc86e 100644 --- a/sci-calculators/units/units-2.16-r1.ebuild +++ b/sci-calculators/units/units-2.16-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit eutils python-single-r1 DESCRIPTION="Unit conversion program" diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index 04c2763a1eb..119605f9309 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit eutils python-single-r1 DESCRIPTION="Unit conversion program" diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild index 244e15307d8..13c2f13963c 100644 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit python-single-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: af12cc19d24dfb9c07473ee2a0ef28c20388922a Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 17:57:45 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:35:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af12cc19 sci-calculators/units: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> sci-calculators/units/{units-2.16.ebuild => units-2.16-r1.ebuild} | 6 -- sci-calculators/units/units-2.18.ebuild | 6 -- sci-calculators/units/{units-2.19.ebuild => units-2.19-r1.ebuild} | 6 -- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16-r1.ebuild similarity index 90% rename from sci-calculators/units/units-2.16.ebuild rename to sci-calculators/units/units-2.16-r1.ebuild index 9a722304b0b..42721017753 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16-r1.ebuild @@ -19,8 +19,10 @@ RDEPEND=" sys-libs/readline:= units--cur? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') ) " DEPEND=" diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index ab70dde6bd9..04c2763a1eb 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -19,8 +19,10 @@ RDEPEND=" sys-libs/readline:= units--cur? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') ) " DEPEND=" diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19-r1.ebuild similarity index 91% rename from sci-calculators/units/units-2.19.ebuild rename to sci-calculators/units/units-2.19-r1.ebuild index 33e0d415997..244e15307d8 100644 --- a/sci-calculators/units/units-2.19.ebuild +++ b/sci-calculators/units/units-2.19-r1.ebuild @@ -19,8 +19,10 @@ RDEPEND=" sys-libs/readline:= units--cur? ( ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + dev-python/requests[${PYTHON_MULTI_USEDEP}] + ') ) " DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: e2f6ba98ed4deb75fd5958ff0833e8f7b64a8a53 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Dec 16 07:29:40 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Dec 16 07:34:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f6ba98 sci-calculators/units: Stable for amd64 hppa x86 too Package-Manager: Portage-2.3.82, Repoman-2.3.20 RepoMan-Options: --ignore-arches Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.19.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild index 5bbc862db24..4f5a29527eb 100644 --- a/sci-calculators/units/units-2.19.ebuild +++ b/sci-calculators/units/units-2.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units--cur" REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 249a76e82566d2597d8a5f5c1445f49bce6e54e4 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 10 07:49:39 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 10 07:55:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249a76e8 sci-calculators/units: USE flag 'units_cur' uses reserved underscore character Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/metadata.xml | 2 +- sci-calculators/units/units-2.16.ebuild | 10 +- sci-calculators/units/units-2.18.ebuild | 10 +- sci-calculators/units/units-2.19.ebuild | 17 + 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml index 9aa83b1ef40..f0a40a93849 100644 --- a/sci-calculators/units/metadata.xml +++ b/sci-calculators/units/metadata.xml @@ -6,6 +6,6 @@ Jeroen Roovers -Install the units_cur python script that updates currencies +Install the units_cur python script that updates currencies diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index 0d30fa56ad0..f72ff8ee12f 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units--cur" +REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units_cur? ( + units--cur? ( ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] @@ -28,7 +28,7 @@ DEPEND=" " pkg_setup() { - use units_cur && python-single-r1_pkg_setup + use units--cur && python-single-r1_pkg_setup } src_configure() { @@ -47,7 +47,7 @@ src_install() { # we're intentionally delaying this since 'make install' would # get confused if we shove 'units_cur' there, and there is no real # need to add more complexity for it - if use units_cur; then + if use units--cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index 4d61f6f6676..3df5a8826c2 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units--cur" +REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units_cur? ( + units--cur? ( ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] @@ -31,7 +31,7 @@ PATCHES=( ) pkg_setup() { - use units_cur && python-single-r1_pkg_setup + use units--cur && python-single-r1_pkg_setup } src_configure() { @@ -52,7 +52,7 @@ src_install() { # we're intentionally delaying this since 'make install' would # get confused if we shove 'units_cur' there, and there is no real # need to add more complexity for it - if use units_cur; then + if use units--cur; then sed \ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild index 9e35768509d..5bbc862db24 100644 --- a/sci-calculators/units/units-2.19.ebuild +++ b/sci-calculators/units/units-2.19.ebuild @@ -12,12 +12,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+units--cur" +REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= - units_cur? ( + units--cur? ( ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] @@ -29,9 +29,12 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.17-network-sandbox.patch ) +DOCS=( + ChangeLog NEWS README +) pkg_setup() { - use units_cur && python-single-r1_pkg_setup + use units--cur && python-single-r1_pkg_setup } src_configure() { @@ -45,14 +48,12
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 0bfb6da5565ee724cd302285a18cb5b0c70ee302 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jun 1 05:55:38 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jun 1 05:55:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfb6da5 sci-calculators/units: Old Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.17.ebuild | 63 - 2 files changed, 64 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 30ecd40c9cc..0265ac77011 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,4 +1,3 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 -DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild deleted file mode 100644 index 4d61f6f6676..000 --- a/sci-calculators/units/units-2.17.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -inherit eutils python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units_cur? ( - ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.17-network-sandbox.patch -) - -pkg_setup() { - use units_cur && python-single-r1_pkg_setup -} - -src_configure() { - econf \ - --sharedstatedir="${EROOT}/var/lib" \ - ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc ChangeLog NEWS README - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units_cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 920756e75355a707846aa6239387380502c50364 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Jun 1 05:55:08 2019 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Jun 1 05:55:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920756e7 sci-calculators/units: Version 2.19 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.19.ebuild | 63 + 2 files changed, 64 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 70c3768c4b7..30ecd40c9cc 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,4 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 +DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild new file mode 100644 index 000..9e35768509d --- /dev/null +++ b/sci-calculators/units/units-2.19.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +inherit python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" +REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units_cur? ( + ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-2.17-network-sandbox.patch +) + +pkg_setup() { + use units_cur && python-single-r1_pkg_setup +} + +src_configure() { + econf \ + --sharedstatedir="${EROOT}/var/lib" \ + ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog NEWS README + + # we're intentionally delaying this since 'make install' would + # get confused if we shove 'units_cur' there, and there is no real + # need to add more complexity for it + if use units_cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_fix_shebang units_cur + python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 6a13ee167c0a04ce671ce2117005c1544053224b Author: Jeroen Roovers gentoo org> AuthorDate: Fri Nov 23 11:10:19 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Nov 23 12:57:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a13ee16 sci-calculators/units: Stable for AMD64 HPPA x86 too. Package-Manager: Portage-2.3.52, Repoman-2.3.12 RepoMan-Options: --ignore-arches Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.18.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild index fa2bb6214cc..6229de34513 100644 --- a/sci-calculators/units/units-2.18.ebuild +++ b/sci-calculators/units/units-2.18.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7c38dff9ea38d789e49d9f745367e286f69da15a Author: Jeroen Roovers gentoo org> AuthorDate: Sun Oct 21 19:20:55 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Oct 21 19:21:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c38dff9 sci-calculators/units: Version 2.18 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.18.ebuild | 63 + 2 files changed, 64 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 1839e593f0d..70c3768c4b7 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1,3 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b +DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7 diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild new file mode 100644 index 000..fa2bb6214cc --- /dev/null +++ b/sci-calculators/units/units-2.18.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +inherit eutils python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" +REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units_cur? ( + ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-2.17-network-sandbox.patch +) + +pkg_setup() { + use units_cur && python-single-r1_pkg_setup +} + +src_configure() { + econf \ + --sharedstatedir="${EROOT}/var/lib" \ + ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog NEWS README + + # we're intentionally delaying this since 'make install' would + # get confused if we shove 'units_cur' there, and there is no real + # need to add more complexity for it + if use units_cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_fix_shebang units_cur + python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 3e76c71ec34346a5a5e6b1099c79410b0606fe9a Author: Jeroen Roovers gentoo org> AuthorDate: Sun Oct 7 17:09:45 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Oct 7 17:13:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e76c71e sci-calculators/units: Stable for AMD64 HPPA x86 too. Package-Manager: Portage-2.3.50, Repoman-2.3.11 RepoMan-Options: --ignore-arches Signed-off-by: Jeroen Roovers gentoo.org> sci-calculators/units/units-2.17.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild index 01fbb74ef39..6229de34513 100644 --- a/sci-calculators/units/units-2.17.ebuild +++ b/sci-calculators/units/units-2.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
commit: fd82bd40312ded4b7de57786920fe72d3a0ae7fa Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jun 26 19:20:30 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Jun 26 19:21:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd82bd40 sci-calculators/units: Version 2.17. Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-calculators/units/Manifest | 1 + .../units/files/units-2.17-network-sandbox.patch | 11 sci-calculators/units/units-2.17.ebuild| 63 ++ 3 files changed, 75 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 54718b48ff6..1839e593f0d 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1 +1,2 @@ DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 +DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b diff --git a/sci-calculators/units/files/units-2.17-network-sandbox.patch b/sci-calculators/units/files/units-2.17-network-sandbox.patch new file mode 100644 index 000..e457610e430 --- /dev/null +++ b/sci-calculators/units/files/units-2.17-network-sandbox.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in b/Makefile.in +@@ -107,7 +107,7 @@ + -e "s@/usr/bin/python@$(PYTHON)@" \ + $(srcdir)/units_cur > units_cur_inst + +-install-support: definitions.units units_cur_inst currency-units-update ++install-support: definitions.units units_cur_inst + $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@ + $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units + -rm -f $(DESTDIR)@UDAT@currency.units diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild new file mode 100644 index 000..01fbb74ef39 --- /dev/null +++ b/sci-calculators/units/units-2.17.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +inherit eutils python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" +REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units_cur? ( + ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-2.17-network-sandbox.patch +) + +pkg_setup() { + use units_cur && python-single-r1_pkg_setup +} + +src_configure() { + econf \ + --sharedstatedir="${EROOT}/var/lib" \ + ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog NEWS README + + # we're intentionally delaying this since 'make install' would + # get confused if we shove 'units_cur' there, and there is no real + # need to add more complexity for it + if use units_cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_fix_shebang units_cur + python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 5b9a11bd350341c22287b263249b02ad8efbf7fe Author: Jeroen Roovers gentoo org> AuthorDate: Sun Mar 18 06:41:37 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Mar 18 06:41:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9a11bd sci-calculators/units: Old. Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.14-r1.ebuild | 50 -- 2 files changed, 51 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index fe2bbb0dfa1..54718b48ff6 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1 @@ -DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild deleted file mode 100644 index 45559228bae..000 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE="xml" -inherit eutils python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - )" -DEPEND=${RDEPEND} - -pkg_setup() { - use units_cur && python-single-r1_pkg_setup -} - -src_configure() { - econf ac_cv_path_PYTHON=no -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc ChangeLog NEWS README - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units_cur; then - local pyver - python_is_python3 && pyver=3 || pyver=2 - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - "units_cur${pyver}" > units_cur || die - python_doscript units_cur - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: cfe24db6418e121ea302e198f552e5ccb2c400d1 Author: Matt Turner gentoo org> AuthorDate: Sat Mar 17 22:11:42 2018 + Commit: Matt Turner gentoo org> CommitDate: Sat Mar 17 22:11:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe24db6 sci-calculators/units-2.16: ppc64 stable, bug 636620 sci-calculators/units/units-2.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index 46d7765d394..e075436da22 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 747c730db811b4eb09dfa3de8efc46dfafba4204 Author: Matt Turner gentoo org> AuthorDate: Sat Mar 17 22:11:40 2018 + Commit: Matt Turner gentoo org> CommitDate: Sat Mar 17 22:11:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747c730d sci-calculators/units-2.16: ppc stable, bug 636620 sci-calculators/units/units-2.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index 3e6a4b5d25f..46d7765d394 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 76530f13319601606b21d3005e289117daf118eb Author: Tobias Klausmann gentoo org> AuthorDate: Fri Mar 2 15:59:05 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Fri Mar 2 15:59:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76530f13 sci-calculators/units-2.16-r0: alpha stable Gentoo-Bug: http://bugs.gentoo.org/636620 sci-calculators/units/units-2.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index aff2577e279..3e6a4b5d25f 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: ca42392c35c030db88c181bc0b1b1d8419d635f4 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Dec 20 02:29:31 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Dec 20 02:30:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca42392c sci-calculators/units: Add dependency on dev-python/requests. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-calculators/units/units-2.16.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index d8776e7e89c..aff2577e279 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -20,6 +20,7 @@ RDEPEND=" units_cur? ( ${PYTHON_DEPS} dev-python/future[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ) " DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 6130445e2b2dc1397ff5178a9f45c1081844933b Author: Jeroen Roovers gentoo org> AuthorDate: Wed Dec 20 02:23:09 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Dec 20 02:23:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6130445e sci-calculators/units: Add support for python 3.6. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-calculators/units/units-2.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index 2258f3aafd5..d8776e7e89c 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit eutils python-single-r1 DESCRIPTION="Unit conversion program"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7d7cd43c696ca6672e964627a0e4a907fd047e9a Author: Jeroen Roovers gentoo org> AuthorDate: Tue Dec 19 10:39:24 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Dec 19 10:39:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7cd43c sci-calculators/units: Old. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.15.ebuild | 57 - 2 files changed, 58 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 51e3fbc0c98..fe2bbb0dfa1 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,2 @@ DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 -DIST units-2.15.tar.gz 1178099 BLAKE2B 4f7f7412e21b163302c03d0aa3963acb6cd7fc8e197ce39380ae6cf46d2f1520a73dc3003162831bec5ef2b9fcaaa3ce9b375cab75db353dbef46ae4ba32edb1 SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 diff --git a/sci-calculators/units/units-2.15.ebuild b/sci-calculators/units/units-2.15.ebuild deleted file mode 100644 index 052a0fabba9..000 --- a/sci-calculators/units/units-2.15.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit eutils python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units_cur? ( - ${PYTHON_DEPS} - dev-python/future[${PYTHON_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} -" - -pkg_setup() { - use units_cur && python-single-r1_pkg_setup -} - -src_configure() { - econf ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc ChangeLog NEWS README - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units_cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 59a4b18157f6f261c86c99b87facb8fc091a14cf Author: Jeroen Roovers gentoo org> AuthorDate: Sun Nov 26 20:51:21 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Nov 26 20:51:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a4b181 sci-calculators/units: Stable for AMD64 HPPA too. Package-Manager: Portage-2.3.16, Repoman-2.3.6 RepoMan-Options: --ignore-arches sci-calculators/units/Manifest | 6 +++--- sci-calculators/units/units-2.16.ebuild | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 57f84dcc73b..51e3fbc0c98 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,3 @@ -DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821 -DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95 -DIST units-2.16.tar.gz 1178197 SHA256 dcf3f78482a13b150fc6bf0f8d611510816a3424bc2b26229b85b1cadeb81686 SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 WHIRLPOOL c3d483e9f1b9343716f3a1c041e4bf9cb4f75c088664c14dde96ec9cbed2add9bec1f448d1f0a9767c7e0d66e9eac6c306b2afe614d05dc845b5b213a162af5d +DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 +DIST units-2.15.tar.gz 1178099 BLAKE2B 4f7f7412e21b163302c03d0aa3963acb6cd7fc8e197ce39380ae6cf46d2f1520a73dc3003162831bec5ef2b9fcaaa3ce9b375cab75db353dbef46ae4ba32edb1 SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f +DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild index 464c0c2fbaf..2258f3aafd5 100644 --- a/sci-calculators/units/units-2.16.ebuild +++ b/sci-calculators/units/units-2.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 34dfafc5204a4c15ccb7f36d3de2567f4b3aac29 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Nov 1 19:57:12 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Nov 1 19:57:33 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34dfafc5 sci-calculators/units: Version bump. Package-Manager: Portage-2.3.13, Repoman-2.3.4 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.16.ebuild | 57 + 2 files changed, 58 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 92f6ef4bd8c..57f84dcc73b 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1,3 @@ DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821 DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95 +DIST units-2.16.tar.gz 1178197 SHA256 dcf3f78482a13b150fc6bf0f8d611510816a3424bc2b26229b85b1cadeb81686 SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091 WHIRLPOOL c3d483e9f1b9343716f3a1c041e4bf9cb4f75c088664c14dde96ec9cbed2add9bec1f448d1f0a9767c7e0d66e9eac6c306b2afe614d05dc845b5b213a162af5d diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild new file mode 100644 index 000..052a0fabba9 --- /dev/null +++ b/sci-calculators/units/units-2.16.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +inherit eutils python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" +REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + sys-libs/readline:= + units_cur? ( + ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" + +pkg_setup() { + use units_cur && python-single-r1_pkg_setup +} + +src_configure() { + econf ac_cv_path_PYTHON=no +} + +src_compile() { + emake ${PN} +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog NEWS README + + # we're intentionally delaying this since 'make install' would + # get confused if we shove 'units_cur' there, and there is no real + # need to add more complexity for it + if use units_cur; then + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die + python_fix_shebang units_cur + python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: d32e73d14ee13c1ecb7595df9dca339ef74d6cfa Author: Jeroen Roovers gentoo org> AuthorDate: Fri Oct 27 00:14:59 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Oct 27 00:14:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32e73d1 sci-calculators/units: Put arcane command in correct ebuild (bug #635324). Package-Manager: Portage-2.3.12, Repoman-2.3.4 sci-calculators/units/units-2.14-r1.ebuild | 1 - sci-calculators/units/units-2.15.ebuild| 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index 2269d863f54..45559228bae 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -45,7 +45,6 @@ src_install() { python_is_python3 && pyver=3 || pyver=2 sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ "units_cur${pyver}" > units_cur || die - python_fix_shebang python_doscript units_cur fi } diff --git a/sci-calculators/units/units-2.15.ebuild b/sci-calculators/units/units-2.15.ebuild index 4d87f5164ed..052a0fabba9 100644 --- a/sci-calculators/units/units-2.15.ebuild +++ b/sci-calculators/units/units-2.15.ebuild @@ -51,6 +51,7 @@ src_install() { -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ -e 's|^#!|&/usr/bin/python|g' \ units_cur_inst > units_cur || die + python_fix_shebang units_cur python_doscript units_cur fi }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: cba707ea3f9ccb11c68eb14f1e43b1bc3a3798ea Author: Jeroen Roovers gentoo org> AuthorDate: Tue Oct 24 13:15:18 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Oct 24 13:15:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba707ea sci-calculators/units: Version bump. Package-Manager: Portage-2.3.12, Repoman-2.3.3 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.14-r1.ebuild | 1 + .../{units-2.14-r1.ebuild => units-2.15.ebuild}| 24 ++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index f8eb7ff1385..92f6ef4bd8c 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1 +1,2 @@ DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821 +DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95 diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index 45559228bae..2269d863f54 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -45,6 +45,7 @@ src_install() { python_is_python3 && pyver=3 || pyver=2 sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ "units_cur${pyver}" > units_cur || die + python_fix_shebang python_doscript units_cur fi } diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.15.ebuild similarity index 73% copy from sci-calculators/units/units-2.14-r1.ebuild copy to sci-calculators/units/units-2.15.ebuild index 45559228bae..4d87f5164ed 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.15.ebuild @@ -3,7 +3,6 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE="xml" inherit eutils python-single-r1 DESCRIPTION="Unit conversion program" @@ -12,17 +11,20 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/readline:= units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] ${PYTHON_DEPS} - )" -DEPEND=${RDEPEND} + dev-python/future[${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" pkg_setup() { use units_cur && python-single-r1_pkg_setup @@ -32,6 +34,10 @@ src_configure() { econf ac_cv_path_PYTHON=no } +src_compile() { + emake ${PN} +} + src_install() { emake DESTDIR="${D}" install @@ -41,10 +47,10 @@ src_install() { # get confused if we shove 'units_cur' there, and there is no real # need to add more complexity for it if use units_cur; then - local pyver - python_is_python3 && pyver=3 || pyver=2 - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - "units_cur${pyver}" > units_cur || die + sed \ + -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + -e 's|^#!|&/usr/bin/python|g' \ + units_cur_inst > units_cur || die python_doscript units_cur fi }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 08682bea062423bdeba2d713b16b716ec2169e46 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 5 20:28:15 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 5 20:28:15 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08682bea sci-calculators/units: Old. Package-Manager: Portage-2.3.11, Repoman-2.3.3 sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.13.ebuild | 55 --- sci-calculators/units/units-2.14.ebuild | 57 - 3 files changed, 113 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 1f8d6e12133..f8eb7ff1385 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1 @@ -DIST units-2.13.tar.gz 1170233 SHA256 0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab SHA512 39b380480ab6f48e56a7f122bb66f53ec49667f5ae3479a128536c58d29b1a1bfe281374f06911e8f713fe21459f57d13974c3629180b22968761cad15b10de2 WHIRLPOOL f1a4f85483e2cc9b4d2112a8ed36f51de7efc09b0ab6da926282d474615441f0196697d459cadb13aed1e5fa586261f7c45af2cc980be04b0fc810c57a7acb3e DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821 diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild deleted file mode 100644 index 50f5c4487c7..000 --- a/sci-calculators/units/units-2.13.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - )" -DEPEND=${RDEPEND} - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} -} - -src_prepare() { - use units_cur && python_foreach_impl units_cur_prepare -} - -src_compile() { - emake HAVE_PYTHON=no -} - -units_cur_install() { - python_newexe units_cur-${EPYTHON} units_cur -} - -src_install() { - emake DESTDIR="${D}" HAVE_PYTHON=no install - - dodoc ChangeLog NEWS README - - use units_cur && python_foreach_impl units_cur_install -} diff --git a/sci-calculators/units/units-2.14.ebuild b/sci-calculators/units/units-2.14.ebuild deleted file mode 100644 index 8050ca85d33..000 --- a/sci-calculators/units/units-2.14.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" -REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - )" -DEPEND=${RDEPEND} - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} -} - -src_prepare() { - default - - use units_cur && python_foreach_impl units_cur_prepare -} - -src_compile() { - emake HAVE_PYTHON=no -} - -units_cur_install() { - python_newexe units_cur-${EPYTHON} units_cur -} - -src_install() { - emake DESTDIR="${D}" HAVE_PYTHON=no install - - dodoc ChangeLog NEWS README - - use units_cur && python_foreach_impl
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 8abd3bf562afd8ae9046de5eaf9c46a7ac764f3e Author: Matt Turner gentoo org> AuthorDate: Wed Oct 4 03:48:17 2017 + Commit: Matt Turner gentoo org> CommitDate: Wed Oct 4 03:48:17 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8abd3bf5 sci-calculators/units-2.14-r1: alpha stable, bug 625086 sci-calculators/units/units-2.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index 2dded4614f9..45559228bae 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 216774826de6e75800375f64ec837327b329d165 Author: Matt Turner gentoo org> AuthorDate: Sun Oct 1 19:10:57 2017 + Commit: Matt Turner gentoo org> CommitDate: Sun Oct 1 19:10:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21677482 sci-calculators/units-2.14-r1: ppc stable, bug 625086 sci-calculators/units/units-2.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index 89d0cc43573..bfa3ce23b32 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 5d107998295c7bd1df5c8218c573084f0596bc21 Author: Matt Turner gentoo org> AuthorDate: Sun Oct 1 19:11:01 2017 + Commit: Matt Turner gentoo org> CommitDate: Sun Oct 1 19:11:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d107998 sci-calculators/units-2.14-r1: ppc64 stable, bug 625086 sci-calculators/units/units-2.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index bfa3ce23b32..2dded4614f9 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 555962b7e29fe854f36b89870ba49cb9e5c3068b Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 24 10:16:56 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 24 19:20:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555962b7 sci-calculators/units: Stable for HPPA too. Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --ignore-arches sci-calculators/units/units-2.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index 18776691bb0..89d0cc43573 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: d8b00e8398d52838472663d8fd54f36cb2dae8c1 Author: Michael Palimaka gentoo org> AuthorDate: Sun Sep 24 09:53:14 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Sep 24 09:53:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b00e83 sci-calculators/units: stabilise 2.14-r1 for amd64/x86 Bug: https://bugs.gentoo.org/625086 Package-Manager: Portage-2.3.8, Repoman-2.3.3 sci-calculators/units/units-2.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild index e49ef8fd68e..18776691bb0 100644 --- a/sci-calculators/units/units-2.14-r1.ebuild +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7a4e8ad7f60179f71b4e1684cfb31997cbd96dae Author: Michał Górny gentoo org> AuthorDate: Tue Mar 21 20:18:27 2017 + Commit: Michał Górny gentoo org> CommitDate: Tue Mar 21 22:03:39 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4e8ad7 sci-calculators/units: Fix shebang, convert to python-single-r1 Convert the ebuild to python-single-r1 to make it simpler (there is really no need to use multi-impl for scripts). Correct the dependencies, add missing REQUIRED_USE. Use python_is_python3 instead of some horrible extglob logic. Disable Python at configure time instead of forcing it off for make calls. Fix shebang on installed script. sci-calculators/units/units-2.14-r1.ebuild | 51 ++ 1 file changed, 51 insertions(+) diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild new file mode 100644 index 000..7050f31710f --- /dev/null +++ b/sci-calculators/units/units-2.14-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_REQ_USE="xml" +inherit eutils python-single-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" + +RDEPEND=" + sys-libs/readline:= + units_cur? ( + dev-python/unidecode[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + )" +DEPEND=${RDEPEND} + +REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use units_cur && python-single-r1_pkg_setup +} + +src_configure() { + econf ac_cv_path_PYTHON=no +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc ChangeLog NEWS README + + # we're intentionally delaying this since 'make install' would + # get confused if we shove 'units_cur' there, and there is no real + # need to add more complexity for it + if use units_cur; then + local pyver + python_is_python3 && pyver=3 || pyver=2 + sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ + "units_cur${pyver}" > units_cur || die + python_doscript units_cur + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: a26f8ee494fa998e654c4ddd7fc56b052e212cf0 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Mar 11 05:30:52 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Mar 11 05:30:52 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26f8ee4 sci-calculators/units: Version bump. Package-Manager: Portage-2.3.4, Repoman-2.3.2 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.14.ebuild | 62 + 2 files changed, 63 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index fd62456fe8e..1f8d6e12133 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1 +1,2 @@ DIST units-2.13.tar.gz 1170233 SHA256 0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab SHA512 39b380480ab6f48e56a7f122bb66f53ec49667f5ae3479a128536c58d29b1a1bfe281374f06911e8f713fe21459f57d13974c3629180b22968761cad15b10de2 WHIRLPOOL f1a4f85483e2cc9b4d2112a8ed36f51de7efc09b0ab6da926282d474615441f0196697d459cadb13aed1e5fa586261f7c45af2cc980be04b0fc810c57a7acb3e +DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821 diff --git a/sci-calculators/units/units-2.14.ebuild b/sci-calculators/units/units-2.14.ebuild new file mode 100644 index 000..907add86851 --- /dev/null +++ b/sci-calculators/units/units-2.14.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4} ) +PYTHON_REQ_USE="xml" +inherit eutils python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" + +DEPEND=" + sys-libs/readline:= + units_cur? ( + dev-lang/python-exec:2 + ) +" +RDEPEND=" + ${DEPEND} + units_cur? ( + dev-python/unidecode[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) +" + +units_cur_prepare() { + local UNITS_PYTHON_MAJOR + UNITS_PYTHON_MAJOR=$( + UNITS_PYTHON_MAJOR=${EPYTHON/.*} + shopt -s extglob + echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} + ) + sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} +} + +src_prepare() { + default + + use units_cur && python_foreach_impl units_cur_prepare +} + +src_compile() { + emake HAVE_PYTHON=no +} + +units_cur_install() { + python_newexe units_cur-${EPYTHON} units_cur +} + +src_install() { + emake DESTDIR="${D}" HAVE_PYTHON=no install + + dodoc ChangeLog NEWS README + + use units_cur && python_foreach_impl units_cur_install +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 9d36fb1f08fda6a9b69ffbb357ee67c482559f8d Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 1 22:48:31 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Feb 1 22:48:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d36fb1f sci-calculators/units: Old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-calculators/units/Manifest | 1 - sci-calculators/units/units-2.12.ebuild | 61 - 2 files changed, 62 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 9b34f6f..fd62456 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1 @@ -DIST units-2.12.tar.gz 875884 SHA256 7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac WHIRLPOOL 179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05 DIST units-2.13.tar.gz 1170233 SHA256 0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab SHA512 39b380480ab6f48e56a7f122bb66f53ec49667f5ae3479a128536c58d29b1a1bfe281374f06911e8f713fe21459f57d13974c3629180b22968761cad15b10de2 WHIRLPOOL f1a4f85483e2cc9b4d2112a8ed36f51de7efc09b0ab6da926282d474615441f0196697d459cadb13aed1e5fa586261f7c45af2cc980be04b0fc810c57a7acb3e diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild deleted file mode 100644 index 46a30ad.. --- a/sci-calculators/units/units-2.12.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" - -DEPEND=" - sys-libs/readline:= - units_cur? ( - dev-lang/python-exec:2 - ) -" -RDEPEND=" - ${DEPEND} - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) -" - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} -} - -src_prepare() { - use units_cur && python_foreach_impl units_cur_prepare -} - -src_compile() { - emake HAVE_PYTHON=no -} - -units_cur_install() { - python_newexe units_cur-${EPYTHON} units_cur -} - -src_install() { - emake DESTDIR="${D}" HAVE_PYTHON=no install - - dodoc ChangeLog NEWS README - - use units_cur && python_foreach_impl units_cur_install -}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 69dd1c103b51d9c14c2b97804d9ef87fd7155674 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 26 10:59:18 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 26 11:00:39 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dd1c10 sci-calculators/units: ppc stable wrt bug #606796 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild index 58158ce..5c0fc45 100644 --- a/sci-calculators/units/units-2.13.ebuild +++ b/sci-calculators/units/units-2.13.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: f0f7fc283fe09d220bc23b9d94e79a350a78ac6c Author: Tobias Klausmann gentoo org> AuthorDate: Wed Jan 25 13:25:48 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Jan 25 13:26:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f7fc28 sci-calculators/units-2.13-r0: stable on alpha Gentoo-Bug: 606796 sci-calculators/units/units-2.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild index 8de9072..58158ce 100644 --- a/sci-calculators/units/units-2.13.ebuild +++ b/sci-calculators/units/units-2.13.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 182781a021a827d0a05077e580068e8eba47ae00 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jan 22 19:25:30 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Jan 22 19:25:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182781a0 sci-calculators/units: Stable for HPPA PPC64 (bug #606796). Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --ignore-arches sci-calculators/units/units-2.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild index acea8dc..8de9072 100644 --- a/sci-calculators/units/units-2.13.ebuild +++ b/sci-calculators/units/units-2.13.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: e014231d6882fff7f0db57a75259c2a79c68e2c2 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jan 22 15:00:42 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jan 22 15:00:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e014231d sci-calculators/units: x86 stable wrt bug #606796 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild index 4c0af46..eb17c87 100644 --- a/sci-calculators/units/units-2.13.ebuild +++ b/sci-calculators/units/units-2.13.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: df1de71bc71f266e35c0a3acf705be664e552228 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jan 22 14:53:12 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jan 22 14:53:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df1de71b sci-calculators/units: amd64 stable wrt bug #606796 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.13.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild index 0d8be05..4c0af46 100644 --- a/sci-calculators/units/units-2.13.ebuild +++ b/sci-calculators/units/units-2.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
commit: 4ac04f05a9419958e65ab6d6e7756d2f809a2ac2 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Sep 5 04:43:40 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Sep 5 04:43:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac04f05 sci-calculators/units: Drop unsupported patch. Package-Manager: portage-2.3.0 .../units/files/units-2.13-fix-python.patch| 144 - sci-calculators/units/units-2.13-r1.ebuild | 52 2 files changed, 196 deletions(-) diff --git a/sci-calculators/units/files/units-2.13-fix-python.patch b/sci-calculators/units/files/units-2.13-fix-python.patch deleted file mode 100644 index 5278890.. --- a/sci-calculators/units/files/units-2.13-fix-python.patch +++ /dev/null @@ -1,144 +0,0 @@ -* Unify the two python codebases, making the installation less cumbersome -* Remove the broken python handling in Autoconf and the Makefile - a/units_cur3 -+++ b/units_cur3 -@@ -16,6 +16,12 @@ - # Added test for non-unicode strings to prevent a runtime warning - # - -+# py2.7 shims -+from __future__ import unicode_literals -+from builtins import map, str, range -+from future.standard_library import install_aliases -+install_aliases() -+ - import sys - import urllib.request, urllib.parse, urllib.error - import os a/configure.ac -+++ b/configure.ac -@@ -155,18 +155,6 @@ - fi - fi - -- --AC_PATH_PROG(PYTHON, python, no) -- --if test $PYTHON = no; then -- HAVE_PYTHON=no -- echo 'Units will work without python but the currency update' -- echo 'script, units_cur, will not be installed' -- PYTHON='' --else -- HAVE_PYTHON=yes --fi -- - dnl Check for path search option - AC_ARG_ENABLE([relocation], - AC_HELP_STRING([--enable-relocation], a/Makefile.in -+++ b/Makefile.in -@@ -79,14 +79,14 @@ - DISTFILES = README ChangeLog units.info units.txt getopt1.c units.dvi \ -Makefile.in units.c getopt.c getopt.h definitions.units units.texinfo \ -configure.ac configure strfunc.c COPYING install-sh \ -- units.man NEWS texi2man INSTALL units.pdf units_cur2 units_cur3 \ -+ units.man NEWS texi2man INSTALL units.pdf \ -parse.tab.c parse.y units.h locale_map.txt fdl-1.3.texi currency.units \ -unitsfile.ico unitsprog.ico units.rc icon_ms.png \ -Makefile.OS2 makeobjs.cmd README.OS2 \ -UnitsMKS.texinfo UnitsMKS.pdf setvcvars.sh \ -UnitsWin.texinfo UnitsWin.pdf winmkdirs.bat Makefile.Win - --all: units@EXEEXT@ units.1 units.info units_cur_inst -+all: units@EXEEXT@ units.1 units.info - - units.@OBJEXT@: units.c units.h - -@@ -98,47 +98,11 @@ - units@EXEEXT@: $(OBJECTS) @MKS_RES@ - $(CC) $(CFLAGS) $(LDFLAGS) -o units@EXEEXT@ $(OBJECTS) @MKS_RES@ $(LIBS) - --units_cur: units_cur2 units_cur3 -- @if test $(HAVE_PYTHON) = no; then \ --$(MAKE) units_cur_dummy; \ -- else \ --version=`$(PYTHON) --version 2>&1`; \ --if echo $$version | grep 'Python 2' >/dev/null; then \ -- cp $(srcdir)/units_cur2 units_cur; \ -- echo Creating units_cur for Python 2; \ --elif echo $$version | grep 'Python 3'>/dev/null; then \ -- cp $(srcdir)/units_cur3 units_cur; \ -- echo Creating units_cur for Python 3; \ --else \ -- echo Unrecognized Python version: $$version; \ -- echo Unable to create correct units_cur; \ -- exit 1; \ --fi; \ -- fi -- --units_cur_dummy: -- echo '\#!/bin/sh' > units_cur -- echo 'echo Units_cur requires python, which was not found when units was configured' >> units_cur -- chmod +x units_cur -- --units_cur3: units_cur2 -- -mkdir python3_tempdir -- 2to3 --no-diffs -n -o python3_tempdir -w units_cur2 -- mv python3_tempdir/units_cur2 units_cur3 -- rm -rf python3_tempdir -- --units_cur_inst: units_cur -- sed -e "s@outfile = 'currency.units'@outfile='@UDAT@currency.units'@"\ ---e "s@/usr/bin/python@$(PYTHON)@" \ -- units_cur > units_cur_inst -- --install-support: definitions.units currency.units units_cur_inst -+install-support: definitions.units currency.units - $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) - $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units - $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units - $(INSTALL_DATA) $(srcdir)/locale_map.txt $(DESTDIR)@UDAT@locale_map.txt -- if test $(HAVE_PYTHON) = yes; then \ --$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`;fi - if test $(HAVE_MKS) = yes; then make install-mks; fi - - -@@ -209,14 +173,13 @@ - $(DESTDIR)@UDAT@locale_map.txt \ - $(DESTDIR)@u...@unitsfile.ico \ - $(DESTDIR)@u...@unitsprog.ico \ -- $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` - -rmdir $(DESTDIR)@UDAT@ - @if test -f
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 000d301be46a1df5da1f07b49823176c1ff8980b Author: Jeroen Roovers gentoo org> AuthorDate: Mon Sep 5 04:26:19 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Sep 5 04:26:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000d301b sci-calculators/units: Fix whitespace. Package-Manager: portage-2.3.0 sci-calculators/units/units-2.13-r1.ebuild | 16 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sci-calculators/units/units-2.13-r1.ebuild b/sci-calculators/units/units-2.13-r1.ebuild index 33bb1a7..588585b 100644 --- a/sci-calculators/units/units-2.13-r1.ebuild +++ b/sci-calculators/units/units-2.13-r1.ebuild @@ -25,14 +25,21 @@ RDEPEND=" ${PYTHON_DEPS} dev-python/unidecode[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND}" + ) +" +DEPEND=" + ${RDEPEND} +" -PATCHES=( "${FILESDIR}/${P}-fix-python.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-fix-python.patch +) src_prepare() { default - sed -e "/^outfile/s|'.*'|'${EPREFIX}/usr/share/units/currency.units'|g" \ + + sed \ + -e "/^outfile/s|'.*'|'${EPREFIX}/usr/share/units/currency.units'|g" \ -i units_cur3 || die eautoreconf @@ -40,5 +47,6 @@ src_prepare() { src_install() { default + use units_cur && python_foreach_impl python_newscript units_cur{3,} }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/files/, sci-calculators/units/
commit: 213c494e788511c8e47b6449302324b1fbdb028b Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 18:45:49 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 18:57:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213c494e sci-calculators/units: Add py3.5 support * EAPI=6 * Unify py2/3 codebases, making installation easier * Fix python handling in broken build system Package-Manager: portage-2.3.0 .../units/files/units-2.13-fix-python.patch| 144 + sci-calculators/units/units-2.13-r1.ebuild | 44 +++ 2 files changed, 188 insertions(+) diff --git a/sci-calculators/units/files/units-2.13-fix-python.patch b/sci-calculators/units/files/units-2.13-fix-python.patch new file mode 100644 index ..5278890 --- /dev/null +++ b/sci-calculators/units/files/units-2.13-fix-python.patch @@ -0,0 +1,144 @@ +* Unify the two python codebases, making the installation less cumbersome +* Remove the broken python handling in Autoconf and the Makefile + +--- a/units_cur3 b/units_cur3 +@@ -16,6 +16,12 @@ + # Added test for non-unicode strings to prevent a runtime warning + # + ++# py2.7 shims ++from __future__ import unicode_literals ++from builtins import map, str, range ++from future.standard_library import install_aliases ++install_aliases() ++ + import sys + import urllib.request, urllib.parse, urllib.error + import os +--- a/configure.ac b/configure.ac +@@ -155,18 +155,6 @@ + fi + fi + +- +-AC_PATH_PROG(PYTHON, python, no) +- +-if test $PYTHON = no; then +- HAVE_PYTHON=no +- echo 'Units will work without python but the currency update' +- echo 'script, units_cur, will not be installed' +- PYTHON='' +-else +- HAVE_PYTHON=yes +-fi +- + dnl Check for path search option + AC_ARG_ENABLE([relocation], + AC_HELP_STRING([--enable-relocation], +--- a/Makefile.in b/Makefile.in +@@ -79,14 +79,14 @@ + DISTFILES = README ChangeLog units.info units.txt getopt1.c units.dvi \ +Makefile.in units.c getopt.c getopt.h definitions.units units.texinfo \ +configure.ac configure strfunc.c COPYING install-sh \ +- units.man NEWS texi2man INSTALL units.pdf units_cur2 units_cur3 \ ++ units.man NEWS texi2man INSTALL units.pdf \ +parse.tab.c parse.y units.h locale_map.txt fdl-1.3.texi currency.units \ +unitsfile.ico unitsprog.ico units.rc icon_ms.png \ +Makefile.OS2 makeobjs.cmd README.OS2 \ +UnitsMKS.texinfo UnitsMKS.pdf setvcvars.sh \ +UnitsWin.texinfo UnitsWin.pdf winmkdirs.bat Makefile.Win + +-all: units@EXEEXT@ units.1 units.info units_cur_inst ++all: units@EXEEXT@ units.1 units.info + + units.@OBJEXT@: units.c units.h + +@@ -98,47 +98,11 @@ + units@EXEEXT@: $(OBJECTS) @MKS_RES@ + $(CC) $(CFLAGS) $(LDFLAGS) -o units@EXEEXT@ $(OBJECTS) @MKS_RES@ $(LIBS) + +-units_cur: units_cur2 units_cur3 +- @if test $(HAVE_PYTHON) = no; then \ +-$(MAKE) units_cur_dummy; \ +- else \ +-version=`$(PYTHON) --version 2>&1`; \ +-if echo $$version | grep 'Python 2' >/dev/null; then \ +- cp $(srcdir)/units_cur2 units_cur; \ +- echo Creating units_cur for Python 2; \ +-elif echo $$version | grep 'Python 3'>/dev/null; then \ +- cp $(srcdir)/units_cur3 units_cur; \ +- echo Creating units_cur for Python 3; \ +-else \ +- echo Unrecognized Python version: $$version; \ +- echo Unable to create correct units_cur; \ +- exit 1; \ +-fi; \ +- fi +- +-units_cur_dummy: +- echo '\#!/bin/sh' > units_cur +- echo 'echo Units_cur requires python, which was not found when units was configured' >> units_cur +- chmod +x units_cur +- +-units_cur3: units_cur2 +- -mkdir python3_tempdir +- 2to3 --no-diffs -n -o python3_tempdir -w units_cur2 +- mv python3_tempdir/units_cur2 units_cur3 +- rm -rf python3_tempdir +- +-units_cur_inst: units_cur +- sed -e "s@outfile = 'currency.units'@outfile='@UDAT@currency.units'@"\ +--e "s@/usr/bin/python@$(PYTHON)@" \ +- units_cur > units_cur_inst +- +-install-support: definitions.units currency.units units_cur_inst ++install-support: definitions.units currency.units + $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) + $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units + $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units + $(INSTALL_DATA) $(srcdir)/locale_map.txt $(DESTDIR)@UDAT@locale_map.txt +- if test $(HAVE_PYTHON) = yes; then \ +-$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`;fi + if test $(HAVE_MKS) = yes; then make install-mks; fi + + +@@ -209,14 +173,13 @@ + $(DESTDIR)@UDAT@locale_map.txt \ + $(DESTDIR)@u...@unitsfile.ico \ + $(DESTDIR)@u...@unitsprog.ico \ +-
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: f54ff3c0552d602113d152e895929ea0b103a0e5 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jun 21 20:31:28 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Jun 21 20:35:57 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54ff3c0 sci-calculators/units: Version bump. Package-Manager: portage-2.3.0_rc1 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.13.ebuild | 61 + 2 files changed, 62 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index a499ad5..9b34f6f 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1 +1,2 @@ DIST units-2.12.tar.gz 875884 SHA256 7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac WHIRLPOOL 179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05 +DIST units-2.13.tar.gz 1170233 SHA256 0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab SHA512 39b380480ab6f48e56a7f122bb66f53ec49667f5ae3479a128536c58d29b1a1bfe281374f06911e8f713fe21459f57d13974c3629180b22968761cad15b10de2 WHIRLPOOL f1a4f85483e2cc9b4d2112a8ed36f51de7efc09b0ab6da926282d474615441f0196697d459cadb13aed1e5fa586261f7c45af2cc980be04b0fc810c57a7acb3e diff --git a/sci-calculators/units/units-2.13.ebuild b/sci-calculators/units/units-2.13.ebuild new file mode 100644 index 000..1726de6 --- /dev/null +++ b/sci-calculators/units/units-2.13.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" +inherit eutils python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" + +DEPEND=" + sys-libs/readline:= + units_cur? ( + dev-lang/python-exec:2 + ) +" +RDEPEND=" + ${DEPEND} + units_cur? ( + dev-python/unidecode[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) +" + +units_cur_prepare() { + local UNITS_PYTHON_MAJOR + UNITS_PYTHON_MAJOR=$( + UNITS_PYTHON_MAJOR=${EPYTHON/.*} + shopt -s extglob + echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} + ) + sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} +} + +src_prepare() { + use units_cur && python_foreach_impl units_cur_prepare +} + +src_compile() { + emake HAVE_PYTHON=no +} + +units_cur_install() { + python_newexe units_cur-${EPYTHON} units_cur +} + +src_install() { + emake DESTDIR="${D}" HAVE_PYTHON=no install + + dodoc ChangeLog NEWS README + + use units_cur && python_foreach_impl units_cur_install +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 09dcb51dfc9346d8eacda1d22ac67649d4afadbb Author: Jeroen Roovers gentoo org> AuthorDate: Sun May 8 09:13:37 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun May 8 09:13:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09dcb51d sci-calculators/units: Old. Package-Manager: portage-2.2.28 sci-calculators/units/Manifest | 2 -- sci-calculators/units/units-2.11.ebuild | 61 sci-calculators/units/units-2.11n.ebuild | 61 3 files changed, 124 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index f5d9e28..a499ad5 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1 @@ -DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 -DIST units-2.11n.tar.gz 875888 SHA256 8995af70b64c0ef21f75876e03ea19c637c08586e216142fe1ff2c69c3a08041 SHA512 aaafa9d1fcfe15262b4cf85cfd696803c4bc5ab8b3b5550493ed6ce36bce122e2ea5c0b8624746925d0783552655e4b4e445f5695ecf546605d3be9a6c822ba9 WHIRLPOOL 5b8b6b5a61a082874f5d10b48c0603bf0a8dc748d43c93db52f9c20205e0faad64dff78466f557dc0a1859f182d8bb8fe61e029ea53d9c2efa20d8741808258b DIST units-2.12.tar.gz 875884 SHA256 7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac WHIRLPOOL 179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05 diff --git a/sci-calculators/units/units-2.11.ebuild b/sci-calculators/units/units-2.11.ebuild deleted file mode 100644 index e3aff1e..000 --- a/sci-calculators/units/units-2.11.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" - -DEPEND=" - >=sys-libs/readline-4.1-r2 - units_cur? ( - dev-lang/python-exec:2 - ) -" -RDEPEND=" - ${DEPEND} - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) -" - -DOCS=( ChangeLog NEWS README ) - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} -} - -src_prepare() { - use units_cur && python_foreach_impl units_cur_prepare -} - -src_compile() { - emake HAVE_PYTHON=no -} - -units_cur_install() { - python_newexe units_cur-${EPYTHON} units_cur -} - -src_install() { - emake DESTDIR="${D}" HAVE_PYTHON=no install - - use units_cur && python_foreach_impl units_cur_install -} diff --git a/sci-calculators/units/units-2.11n.ebuild b/sci-calculators/units/units-2.11n.ebuild deleted file mode 100644 index becd0fe..000 --- a/sci-calculators/units/units-2.11n.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" - -DEPEND=" - sys-libs/readline:= - units_cur? ( - dev-lang/python-exec:2 - ) -" -RDEPEND=" - ${DEPEND} - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) -" - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 587c541709b4628339490d93c93a5b5a7c41a563 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jan 10 10:34:36 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jan 10 10:34:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587c5417 sci-calculators/units: alpha stable wrt bug #567166 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="alpha" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index 8ae4d5d..5a5b426 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 6082a5d747c2cb88a833575b481c94180d0234e2 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Jan 9 06:43:49 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Jan 9 06:43:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6082a5d7 sci-calculators/units: sparc stable wrt bug #567166 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index 7778e93..8ae4d5d 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 95db17e1eb4bebfa5ab4bd26fd2814b2fc7867d8 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Dec 7 11:39:43 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Dec 7 11:40:19 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95db17e1 sci-calculators/units: ppc stable wrt bug #567166 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index e422505..7778e93 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 68e9ddba694499fb3b730e8baf577f049314a1eb Author: Jeroen Roovers gentoo org> AuthorDate: Fri Dec 4 05:33:26 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Dec 4 05:33:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e9ddba sci-calculators/units: Stable for HPPA (bug #567166). Package-Manager: portage-2.2.26 RepoMan-Options: --ignore-arches sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index 99d7d76..b81a760 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 8f37e58d2ea4359c28b1a7b506ce0b8e13870a5c Author: Jeroen Roovers gentoo org> AuthorDate: Fri Dec 4 05:37:07 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Dec 4 05:37:07 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f37e58d sci-calculators/units: Stable for PPC64 too. Package-Manager: portage-2.2.26 RepoMan-Options: --ignore-arches sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index b81a760..e422505 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: d31893a125a89fd1d2b0ba1f2c2f7cd975799cf5 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Dec 3 13:28:13 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Dec 3 13:28:13 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31893a1 sci-calculators/units: x86 stable wrt bug #567166 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index 8373506..99d7d76 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7e2eb4631c1c668e20563ac6ff3094a870e0f104 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Dec 1 11:20:44 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Dec 1 11:20:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2eb463 sci-calculators/units: amd64 stable wrt bug #567166 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" sci-calculators/units/units-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.12.ebuild b/sci-calculators/units/units-2.12.ebuild index fe3f2b0..8373506 100644 --- a/sci-calculators/units/units-2.12.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 2f12a5e45542dacd193881c0f18e3b17693bcdba Author: Jeroen Roovers gentoo org> AuthorDate: Sat Oct 17 11:00:55 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Oct 17 11:07:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f12a5e4 sci-calculators/units: Version bump. Package-Manager: portage-2.2.23 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.11n.ebuild | 61 2 files changed, 62 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index d4145e0..ee85a03 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,4 @@ DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914 DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0 +DIST units-2.11n.tar.gz 875888 SHA256 8995af70b64c0ef21f75876e03ea19c637c08586e216142fe1ff2c69c3a08041 SHA512 aaafa9d1fcfe15262b4cf85cfd696803c4bc5ab8b3b5550493ed6ce36bce122e2ea5c0b8624746925d0783552655e4b4e445f5695ecf546605d3be9a6c822ba9 WHIRLPOOL 5b8b6b5a61a082874f5d10b48c0603bf0a8dc748d43c93db52f9c20205e0faad64dff78466f557dc0a1859f182d8bb8fe61e029ea53d9c2efa20d8741808258b diff --git a/sci-calculators/units/units-2.11n.ebuild b/sci-calculators/units/units-2.11n.ebuild new file mode 100644 index 000..b08c085 --- /dev/null +++ b/sci-calculators/units/units-2.11n.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" +inherit eutils python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" + +DEPEND=" + >=sys-libs/readline-4.1-r2 + units_cur? ( + dev-lang/python-exec:2 + ) +" +RDEPEND=" + ${DEPEND} + units_cur? ( + dev-python/unidecode[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) +" + +units_cur_prepare() { + local UNITS_PYTHON_MAJOR + UNITS_PYTHON_MAJOR=$( + UNITS_PYTHON_MAJOR=${EPYTHON/.*} + shopt -s extglob + echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} + ) + sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} +} + +src_prepare() { + use units_cur && python_foreach_impl units_cur_prepare +} + +src_compile() { + emake HAVE_PYTHON=no +} + +units_cur_install() { + python_newexe units_cur-${EPYTHON} units_cur +} + +src_install() { + emake DESTDIR="${D}" HAVE_PYTHON=no install + + dodoc ChangeLog NEWS README + + use units_cur && python_foreach_impl units_cur_install +}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 026eef47dcf8466b41898c6ed8ced85cd001c1a9 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Oct 17 11:04:30 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Oct 17 11:07:35 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026eef47 sci-calculators/units: Fix sys-libs/readline SLOT. Package-Manager: portage-2.2.23 sci-calculators/units/units-2.11n.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-calculators/units/units-2.11n.ebuild b/sci-calculators/units/units-2.11n.ebuild index b08c085..becd0fe 100644 --- a/sci-calculators/units/units-2.11n.ebuild +++ b/sci-calculators/units/units-2.11n.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units_cur" DEPEND=" - >=sys-libs/readline-4.1-r2 + sys-libs/readline:= units_cur? ( dev-lang/python-exec:2 )
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 249e1ca7979ae7fe786e53f9373a2a3086a905e0 Author: Jeroen Roovers gentoo org> AuthorDate: Sat Oct 17 11:35:22 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Sat Oct 17 11:36:08 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249e1ca7 sci-calculators/units: Version bump. Package-Manager: portage-2.2.23 sci-calculators/units/Manifest | 3 +- sci-calculators/units/units-2.11f.ebuild | 61 -- .../{units-2.11d.ebuild => units-2.12.ebuild} | 4 +- 3 files changed, 3 insertions(+), 65 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index ee85a03..f5d9e28 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,4 +1,3 @@ DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 -DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914 -DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0 DIST units-2.11n.tar.gz 875888 SHA256 8995af70b64c0ef21f75876e03ea19c637c08586e216142fe1ff2c69c3a08041 SHA512 aaafa9d1fcfe15262b4cf85cfd696803c4bc5ab8b3b5550493ed6ce36bce122e2ea5c0b8624746925d0783552655e4b4e445f5695ecf546605d3be9a6c822ba9 WHIRLPOOL 5b8b6b5a61a082874f5d10b48c0603bf0a8dc748d43c93db52f9c20205e0faad64dff78466f557dc0a1859f182d8bb8fe61e029ea53d9c2efa20d8741808258b +DIST units-2.12.tar.gz 875884 SHA256 7868ea5118f1fe8e9f9f7256ecc7f1ee0dd7027ba9f32cc739184af1ed94bbcb SHA512 90065c03ecc2cb821b8a8c5bd2c6b577ea35aef7c26de83d066b216f5aa9cf071f0fcb57edff24f83b538690a98a57c1a8677a8e06d8a4a8286c84cd02a336ac WHIRLPOOL 179155bc8b97ed2c7f27c5e640bcb7d1d5820dc554f3ea66f411f27af856c79709e4694c4981c8da58a9f3d0c4dd5cca087fbf1c85ef3ed7d4783f61b75f8d05 diff --git a/sci-calculators/units/units-2.11f.ebuild b/sci-calculators/units/units-2.11f.ebuild deleted file mode 100644 index b08c085..000 --- a/sci-calculators/units/units-2.11f.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="xml" -inherit eutils python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html; -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+units_cur" - -DEPEND=" - >=sys-libs/readline-4.1-r2 - units_cur? ( - dev-lang/python-exec:2 - ) -" -RDEPEND=" - ${DEPEND} - units_cur? ( - dev-python/unidecode[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) -" - -units_cur_prepare() { - local UNITS_PYTHON_MAJOR - UNITS_PYTHON_MAJOR=$( - UNITS_PYTHON_MAJOR=${EPYTHON/.*} - shopt -s extglob - echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} - ) - sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} -} - -src_prepare() { - use units_cur && python_foreach_impl units_cur_prepare -} - -src_compile() { - emake HAVE_PYTHON=no -} - -units_cur_install() { - python_newexe units_cur-${EPYTHON} units_cur -} - -src_install() { - emake DESTDIR="${D}" HAVE_PYTHON=no install - - dodoc ChangeLog NEWS README - - use units_cur && python_foreach_impl units_cur_install -} diff --git a/sci-calculators/units/units-2.11d.ebuild b/sci-calculators/units/units-2.12.ebuild similarity index 94% rename from sci-calculators/units/units-2.11d.ebuild rename to sci-calculators/units/units-2.12.ebuild index b08c085..fe3f2b0 100644 --- a/sci-calculators/units/units-2.11d.ebuild +++ b/sci-calculators/units/units-2.12.ebuild @@ -9,7 +9,7 @@ inherit eutils python-r1 DESCRIPTION="Unit conversion program" HOMEPAGE="https://www.gnu.org/software/units/units.html;
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: e0dffdf1b090042d9c6cd8b0dab3c0d0a7b24074 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Oct 6 04:59:21 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Oct 6 04:59:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dffdf1 sci-calculators/units: Version bump. Package-Manager: portage-2.2.22 sci-calculators/units/Manifest | 2 +- sci-calculators/units/{units-2.11a.ebuild => units-2.11f.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index e5365a6..d4145e0 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,3 +1,3 @@ DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 -DIST units-2.11a.tar.gz 865120 SHA256 cdc1ef5adf0701f9bf0f9e3c890cd832554e5bf3f078dab852e5a6783e525b8b SHA512 d942194b73a4d920d711bdcf07481aefff8fc1403f47ca73c1c0fd9837cb7c385a45f326d9537ba1aa77283c4f812be346a1b5ac15ca1e508c268857cc9d78db WHIRLPOOL 72efc473f9105796bdbdc92e2e355a0a2c8ede0ae5febbc017a112b6524e6ad9081a581cc22666ed4e7e74a87bf1b8d45e3a262df53358cbe32107edbe4b6230 DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914 +DIST units-2.11f.tar.gz 874405 SHA256 ec01319a468f6f34bc65e312fa706e3a88ac1a34f7ddee24b4b751b810e95ea3 SHA512 25dc834d60845c835fbf9392d44c80fbc14c92cfa1dfbb0dd40fe3c21404aab4859d98be718a13fcf3a1857b8c1fe58c71691c4ff2bb309185a2f15e19497a17 WHIRLPOOL b718a8dae4111e9f89cc557f2544c069dfde212338146a8ccdca9c3b0ab0c5f6f91b4febfabdac0ff42bd5cc8d0788dca946656368820188557c6f47d63502b0 diff --git a/sci-calculators/units/units-2.11a.ebuild b/sci-calculators/units/units-2.11f.ebuild similarity index 97% rename from sci-calculators/units/units-2.11a.ebuild rename to sci-calculators/units/units-2.11f.ebuild index f22adad..b08c085 100644 --- a/sci-calculators/units/units-2.11a.ebuild +++ b/sci-calculators/units/units-2.11f.ebuild @@ -30,8 +30,6 @@ RDEPEND=" ) " -DOCS=( ChangeLog NEWS README ) - units_cur_prepare() { local UNITS_PYTHON_MAJOR UNITS_PYTHON_MAJOR=$( @@ -57,5 +55,7 @@ units_cur_install() { src_install() { emake DESTDIR="${D}" HAVE_PYTHON=no install + dodoc ChangeLog NEWS README + use units_cur && python_foreach_impl units_cur_install }
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/
commit: 7d8bfc3874266ea9f4cae31c0ffa7a501b89c081 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Sep 16 03:25:33 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed Sep 16 03:26:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8bfc38 sci-calculators/units: Version bump. Package-Manager: portage-2.2.20.1 sci-calculators/units/Manifest | 1 + sci-calculators/units/units-2.11d.ebuild | 61 2 files changed, 62 insertions(+) diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 4acd6be..e5365a6 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,2 +1,3 @@ DIST units-2.11.tar.gz 861772 SHA256 53b6daf2a03d9a060449944b0a6c1aca0d18a84d1d9a93098e4a8920181f5abe SHA512 83e062a0daf9541454cdcaa4efe03bf9f03afdcfdbe2013d5e913a53e1b5e37ef846a3129185898ad2d25e3ea632533f8eb8d89681c855b19a3998aca6e733ce WHIRLPOOL 4c405e0a81af2b02d05156225c26573631ddb02d323d160b0850fcfda52b4a84a36f3ddbfdc732aa8a9dc06c8fc59a41141f985d6025ea6cb18b87749b78d500 DIST units-2.11a.tar.gz 865120 SHA256 cdc1ef5adf0701f9bf0f9e3c890cd832554e5bf3f078dab852e5a6783e525b8b SHA512 d942194b73a4d920d711bdcf07481aefff8fc1403f47ca73c1c0fd9837cb7c385a45f326d9537ba1aa77283c4f812be346a1b5ac15ca1e508c268857cc9d78db WHIRLPOOL 72efc473f9105796bdbdc92e2e355a0a2c8ede0ae5febbc017a112b6524e6ad9081a581cc22666ed4e7e74a87bf1b8d45e3a262df53358cbe32107edbe4b6230 +DIST units-2.11d.tar.gz 868580 SHA256 f1ba31658de19fa4ab3ecf791a08c590dc4f6dd5903c771bb9d678ba68ac785b SHA512 6e0dac8ae8830d0ab914e6e367f9473ac8c860cde9d189d05a8ade047037d21884a66e07733e8decc4d95325dcfb5a7110e4552b4b47c72b746cdc248354c1e5 WHIRLPOOL a54a33f50a0976d180e889485600de5354c94302dbe4b83aaff732efe9d473a07295d447b6d1df9fef766c35cb9571c947c4f12a23f8c21f8665ddb365078914 diff --git a/sci-calculators/units/units-2.11d.ebuild b/sci-calculators/units/units-2.11d.ebuild new file mode 100644 index 000..b08c085 --- /dev/null +++ b/sci-calculators/units/units-2.11d.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" +inherit eutils python-r1 + +DESCRIPTION="Unit conversion program" +HOMEPAGE="https://www.gnu.org/software/units/units.html; +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="FDL-1.3 GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+units_cur" + +DEPEND=" + >=sys-libs/readline-4.1-r2 + units_cur? ( + dev-lang/python-exec:2 + ) +" +RDEPEND=" + ${DEPEND} + units_cur? ( + dev-python/unidecode[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) +" + +units_cur_prepare() { + local UNITS_PYTHON_MAJOR + UNITS_PYTHON_MAJOR=$( + UNITS_PYTHON_MAJOR=${EPYTHON/.*} + shopt -s extglob + echo ${UNITS_PYTHON_MAJOR/*([[:alpha:]])} + ) + sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" units_cur${UNITS_PYTHON_MAJOR} > units_cur-${EPYTHON} +} + +src_prepare() { + use units_cur && python_foreach_impl units_cur_prepare +} + +src_compile() { + emake HAVE_PYTHON=no +} + +units_cur_install() { + python_newexe units_cur-${EPYTHON} units_cur +} + +src_install() { + emake DESTDIR="${D}" HAVE_PYTHON=no install + + dodoc ChangeLog NEWS README + + use units_cur && python_foreach_impl units_cur_install +}