diff options
40 files changed, 26 insertions, 1330 deletions
diff --git a/dev-lang/jimtcl/Manifest b/dev-lang/jimtcl/Manifest index 289c3d0ca693..c09ee68f127a 100644 --- a/dev-lang/jimtcl/Manifest +++ b/dev-lang/jimtcl/Manifest @@ -1,5 +1 @@ -DIST jimtcl-0.70_pre20110317.tar.gz 691917 BLAKE2B bfa844adb5356e46b72eb7af5d4754e96588dbf69f93efb8e7fea477d9fce325425275d4e8c5a86614c7aa3e62c5246545de16c0a3710a3aee42dcb7257f5084 SHA512 138000c97bf7f8c0c5d81cd98861684d382579ace0cb1f7b96f71dde721ca627bf4d7beeed2bc8528077da26353a41ee9bcdbabd44bd732082c42ad6c7f91c65 -DIST jimtcl-0.73.zip 2286098 BLAKE2B cff47c4a812ae02c2f8cbdfdb2f59d68ee1d8b325c7c21ae59c1a0c2e221b78ddc646dbabc473d3204b70967fbdd03adc50a57d8316c90854d10cf723815824a SHA512 9d99eff13292ed1db95ca673be88b14c87e9ce1e28d3fab0b08e0ca0473765fa2e8e305fd5f67768d94ae47cc3e0bc3d0cec8ba4a54ad3d5c1359ee8e2d36f81 -DIST jimtcl-0.74.zip 2304607 BLAKE2B 7c2d9e3969105efb3fcbf1ed6651df041de4de5a8a480de70796503c6c768a996dbb8e2245fca6fed67720baf7b940df90fc3508663086bce0ef91104db2955e SHA512 6c7a1d45c15ac533aa35adaf5099712ca4ef456280121610a6621d5abb94505e93b165d36bb8ae4c27733118e2590774051c716f4c6bcb9bddca4d937d770a7b -DIST jimtcl-0.75.zip 2319459 BLAKE2B 484c844ffbe972ac99d564c8a6ebb9f034c069d23f714c2f0bbb9b085969075a3bd0e37ff6f11e68783a1eb9c77c122805382ef3a511895c6ae24e79e0c8ee4f SHA512 f2ba7a3e97de0c49813594e8238fdbb4db426f0974e3441312bccc773984304bf5621d45a117f9e7bec1d2120b8797102a2ec38caf329fd3b42ba708e66fd84a DIST jimtcl-0.76.zip 2326715 BLAKE2B 50ea032cf46d2edeeecde1dc3b4deffcbd09b5dd3a6880963608b3f20616bf162fafc4ec2869bfe5de90231c4c9a29fb04710bd299cc5e8728ff20a86e46f32d SHA512 50763ea897fb5393083749cdd9e57a3f3d2d6dbebc40ee6371b1b86ebfc2f515e9775cd2acd6627f0f81b54bd72cd8c74be5aa9d0dbefc7c16372887e07f6ea4 diff --git a/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild b/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild deleted file mode 100644 index fe34db13742e..000000000000 --- a/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.berlios.de/" -SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs" - -src_configure() { - ! use static-libs && myconf=--with-jim-shared - econf ${myconf} \ - --with-jim-ext=nvp -} - -src_compile() { - emake all docs || die -} - -src_install() { - dobin jimsh || die "dobin failed" - use static-libs && { - dolib.a libjim.a || die "dolib failed" - } || { - dolib.so libjim.so || die "dolib failed" - } - insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-nvp.h jim-signal.h - doins jim-win32compat.h jim-eventloop.h jim-config.h - dodoc AUTHORS README TODO || die "dodoc failed" - dohtml Tcl.html || die "dohtml failed" -} diff --git a/dev-lang/jimtcl/jimtcl-0.73.ebuild b/dev-lang/jimtcl/jimtcl-0.73.ebuild deleted file mode 100644 index cb1758884343..000000000000 --- a/dev-lang/jimtcl/jimtcl-0.73.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.tcl.tk" -SRC_URI="https://github.com/msteveb/jimtcl/zipball/0.73 -> ${P}.zip" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 m68k s390 sh x86" -IUSE="doc static-libs" -DEPEND="doc? ( app-text/asciidoc ) - app-arch/unzip" - -GIT_HASH="5b8ea68" -S="${WORKDIR}"/msteveb-${PN}-${GIT_HASH} - -src_configure() { - ! use static-libs && myconf=--with-jim-shared - econf ${myconf} -} - -src_compile() { - emake all - use doc && emake docs -} - -src_install() { - dobin jimsh - use static-libs && { - dolib.a libjim.a - } || { - dolib.so libjim.so - } - insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h - doins jim-win32compat.h jim-eventloop.h jim-config.h - dodoc AUTHORS README TODO - use doc && dohtml Tcl.html -} diff --git a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild deleted file mode 100644 index bba26a59e81f..000000000000 --- a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib - -DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.tcl.tk" -SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86" -IUSE="doc static-libs" -DEPEND="doc? ( app-text/asciidoc ) - app-arch/unzip" - -GIT_HASH="9a3562c" -S="${WORKDIR}"/msteveb-${PN}-${GIT_HASH} - -src_configure() { - ! use static-libs && myconf=--with-jim-shared - econf ${myconf} -} - -src_compile() { - emake all - use doc && emake docs -} - -src_install() { - dobin jimsh - - if use static-libs; then - dolib.a libjim.a - else - dolib.so libjim.so.${PV} - dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so - fi - - insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h - doins jim-win32compat.h jim-eventloop.h jim-config.h - dodoc AUTHORS README TODO - use doc && dohtml Tcl.html -} diff --git a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild deleted file mode 100644 index 3c79869f318e..000000000000 --- a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multiprocessing eutils - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" - inherit git-r3 -else - inherit vcs-snapshot - SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip" - KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86" -fi - -DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.tcl.tk/" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="doc? ( app-text/asciidoc ) - app-arch/unzip" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - else - default - cd "${WORKDIR}"/msteveb-jimtcl-* - S=${PWD} - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch -} - -src_configure() { - multijob_init - CCACHE=None multijob_child_init econf --with-jim-shared - if use static-libs ; then - # The build does not support doing both simultaneously. - mkdir static-libs - cd static-libs - CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf - fi - multijob_finish -} - -src_compile() { - # Must build static-libs first. - use static-libs && emake -C static-libs libjim.a - emake all - use doc && emake docs -} - -src_install() { - dobin jimsh - use static-libs && dolib.a static-libs/libjim.a - ln -sf libjim.so.* libjim.so - dolib.so libjim.so* - insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ - jim-win32compat.h jim-eventloop.h jim-config.h - dodoc AUTHORS README TODO - use doc && dohtml Tcl.html -} diff --git a/dev-lang/jimtcl/jimtcl-0.75.ebuild b/dev-lang/jimtcl/jimtcl-0.75.ebuild deleted file mode 100644 index 86af1bb8fb99..000000000000 --- a/dev-lang/jimtcl/jimtcl-0.75.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit multilib - -DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.tcl.tk" -SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86" -IUSE="doc static-libs" -DEPEND="doc? ( app-text/asciidoc ) - app-arch/unzip" - -GIT_HASH="cffd1a5" -S="${WORKDIR}"/msteveb-${PN}-${GIT_HASH} - -src_configure() { - ! use static-libs && myconf=--with-jim-shared - econf ${myconf} -} - -src_compile() { - emake all - use doc && emake docs -} - -src_install() { - dobin jimsh - - if use static-libs; then - dolib.a libjim.a - else - dolib.so libjim.so.${PV} - dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so - fi - - insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h - doins jim-win32compat.h jim-eventloop.h jim-config.h - dodoc AUTHORS README TODO - use doc && dohtml Tcl.html -} diff --git a/dev-lang/jimtcl/jimtcl-0.76.ebuild b/dev-lang/jimtcl/jimtcl-0.76.ebuild index 3d5515b2e63d..0c0461946919 100644 --- a/dev-lang/jimtcl/jimtcl-0.76.ebuild +++ b/dev-lang/jimtcl/jimtcl-0.76.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit multiprocessing eutils +inherit eutils if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" @@ -30,7 +30,7 @@ src_unpack() { git-2_src_unpack else default - cd "${WORKDIR}"/msteveb-jimtcl-* + cd "${WORKDIR}"/msteveb-jimtcl-* || die S=${PWD} fi } @@ -40,15 +40,13 @@ src_prepare() { } src_configure() { - multijob_init - CCACHE=None multijob_child_init econf --with-jim-shared + CCACHE=None econf --with-jim-shared if use static-libs ; then # The build does not support doing both simultaneously. - mkdir static-libs - cd static-libs - CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf + mkdir static-libs || die + cd static-libs || die + CCACHE=None ECONF_SOURCE=${S} econf fi - multijob_finish } src_compile() { @@ -61,7 +59,7 @@ src_compile() { src_install() { dobin jimsh use static-libs && dolib.a static-libs/libjim.a - ln -sf libjim.so.* libjim.so + ln -sf libjim.so.* libjim.so || die dolib.so libjim.so* insinto /usr/include doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ diff --git a/dev-lang/jimtcl/jimtcl-9999.ebuild b/dev-lang/jimtcl/jimtcl-9999.ebuild index 3c79869f318e..64b38756f800 100644 --- a/dev-lang/jimtcl/jimtcl-9999.ebuild +++ b/dev-lang/jimtcl/jimtcl-9999.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit multiprocessing eutils +inherit eutils if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" @@ -30,7 +30,7 @@ src_unpack() { git-2_src_unpack else default - cd "${WORKDIR}"/msteveb-jimtcl-* + cd "${WORKDIR}"/msteveb-jimtcl-* || die S=${PWD} fi } @@ -40,15 +40,13 @@ src_prepare() { } src_configure() { - multijob_init - CCACHE=None multijob_child_init econf --with-jim-shared + CCACHE=None econf --with-jim-shared if use static-libs ; then # The build does not support doing both simultaneously. - mkdir static-libs - cd static-libs - CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf + mkdir static-libs || die + cd static-libs || die + CCACHE=None ECONF_SOURCE=${S} econf fi - multijob_finish } src_compile() { @@ -61,7 +59,7 @@ src_compile() { src_install() { dobin jimsh use static-libs && dolib.a static-libs/libjim.a - ln -sf libjim.so.* libjim.so + ln -sf libjim.so.* libjim.so || die dolib.so libjim.so* insinto /usr/include doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 62d8831008b3..90034b1c86ab 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,2 @@ DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc -DIST gjs-1.48.6.tar.xz 596964 BLAKE2B 8065075ba66a139a76486df24d9c528959d821b4695ee84b5213d4e6b35bdd052c898112b7fb21981c59c24ea9e15bc79258b6d07457df930e94bcba798e262a SHA512 29d70bbee722bbb58eb95acf1409d5e34930d11ebd9525f3b7d0050a13b72eb50e357df7c2bb9bc2ba147dcfdbc2dfb1f1f7b710347473d05cd484006b6ea256 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd diff --git a/dev-libs/gjs/gjs-1.48.6.ebuild b/dev-libs/gjs/gjs-1.48.6.ebuild deleted file mode 100644 index 782d4047a2a2..000000000000 --- a/dev-libs/gjs/gjs-1.48.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 pax-utils virtualx - -DESCRIPTION="Javascript bindings for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" - -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" -SLOT="0" -IUSE="+cairo examples gtk test" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - >=dev-libs/glib-2.52.1 - >=dev-libs/gobject-introspection-1.52.1:= - - sys-libs/readline:0 - dev-lang/spidermonkey:38 - virtual/libffi - cairo? ( x11-libs/cairo[X] ) - gtk? ( >=x11-libs/gtk+-3.20:3 ) -" -DEPEND="${RDEPEND} - gnome-base/gnome-common - sys-devel/gettext - virtual/pkgconfig - test? ( sys-apps/dbus ) -" - -PATCHES=( - # Disable unittest failing without pt_BR locale, upstream bug #???? - "${FILESDIR}"/${PV}-disable-unittest.patch -) - -src_configure() { - # FIXME: add systemtap/dtrace support, like in glib:2 - # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason - # XXX: Do NOT enable coverage, completely useless for portage installs - gnome2_src_configure \ - --disable-systemtap \ - --disable-dtrace \ - --disable-code-coverage \ - $(use_with cairo cairo) \ - $(use_with gtk) \ - $(use_with test dbus-tests) \ - $(use_with test xvfb-tests) -} - -src_test() { - virtx emake check -} - -src_install() { - # installation sometimes fails in parallel, bug #??? - gnome2_src_install -j1 - - if use examples; then - insinto /usr/share/doc/"${PF}"/examples - doins "${S}"/examples/* - fi - - # Required for gjs-console to run correctly on PaX systems - pax-mark mr "${ED}/usr/bin/gjs-console" -} diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild index a1e72ae1d191..cf678c8db0cf 100644 --- a/dev-libs/gjs/gjs-1.48.7.ebuild +++ b/dev-libs/gjs/gjs-1.48.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ RDEPEND=" >=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= - sys-libs/readline:0 + sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest index 9a1509936a0b..293df830a510 100644 --- a/dev-python/idna/Manifest +++ b/dev-python/idna/Manifest @@ -1,3 +1,2 @@ -DIST idna-2.0.tar.gz 135150 BLAKE2B 84cf12e2889532a5c175659a927695cfa7280a64dea394cc67004c03c8089d339979e4da391edf3214978d474d0188688b5eb9a96f65651b476301961b9aa5ff SHA512 005f88e954f13ace584ced510752da58d1cb16ebfbeee10aeef5bec57b3c61a3a5d7ce0bb50deba6dc90b412607727bf94a95a785e91d6528cd8633961c142dc DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640d2c9d9b7ea05985f9eceac122bb9e5b30b2f22648506580202a187f95513fe5ab0af6632917335f2eda0 SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835 DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2 diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild deleted file mode 100644 index 0237b10e618b..000000000000 --- a/dev-python/idna/idna-2.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Internationalized Domain Names in Applications (IDNA)" -HOMEPAGE="https://github.com/kjd/idna" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - esetup.py test -} diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest index d34758a74b3e..38d18b9e8f3b 100644 --- a/dev-python/imapclient/Manifest +++ b/dev-python/imapclient/Manifest @@ -1,2 +1 @@ -DIST IMAPClient-0.12.tar.gz 100698 BLAKE2B d5a9ce4285d468ac827c4f33b140317cbff45e28b503e601e2755463957d3eca0144e54f6f59b9564bd1d530d77f791714bd4a72fc44da7e4aace34970bac5a0 SHA512 bd7d3e3911ff5ef1cc4a66f20e261955851562e76228f941d35f16a4680678be6a3741d520cc3133925a2dba9e8b6b5b988d7a740ff8abb63c14db1cf962acda DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f diff --git a/dev-python/imapclient/imapclient-0.12.ebuild b/dev-python/imapclient/imapclient-0.12.ebuild deleted file mode 100644 index 8c024c439d83..000000000000 --- a/dev-python/imapclient/imapclient-0.12.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4} pypy ) - -inherit distutils-r1 - -MY_PN="IMAPClient" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library" -HOMEPAGE="http://imapclient.freshfoo.com/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc examples test" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )" - -S=${WORKDIR}/${MY_P} - -python_prepare_all() { - # use system setuptools - sed -i '/use_setuptools/d' setup.py || die - - # drop explicit mock version test dep - sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die - - # use system six library. patch proven less preferable to use of sed (< maintenance) - # but a copy of the working hunks from prior version works fine for now. - rm imapclient/six.py || die - epatch "${FILESDIR}"/0.12-tests.patch - sed -e 's:from .six:from six:g' \ - -e 's:from . import six:import six:g' \ - -i ${PN}/*.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install - # don't install examples and tests in module dir - rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die -} - -python_install_all() { -# local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS ) - use doc && local HTML_DOCS=( doc/html/. ) - distutils-r1_python_install_all - use examples && dodoc -r ${PN}/examples -} diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest index 23473281ad95..fc7e30213c50 100644 --- a/dev-python/ioflo/Manifest +++ b/dev-python/ioflo/Manifest @@ -1,4 +1,2 @@ DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991 -DIST ioflo-1.6.7.tar.gz 823994 BLAKE2B 2af10922799a834dfe2fbf7e68a3babdf0934afafd5c3dab5d4b3e60b4ee21db9f933516cd48965c336d36f0f8404b2da5dabdd49070998d8b14e52422ec3483 SHA512 256ded683e65896160546145ac9993f3221170584a70ef21fab3230b7d2300d9562a1bc7d1f8911e5e930340b119fa88cc5d2f9717899bde0ee69501a3ba6a57 -DIST ioflo-1.7.0.tar.gz 827128 BLAKE2B 52f3d0faa47d71ca442f55121f5cff97b70deb2e258d6af9dc61a2bae57d32ab765ad21ac5d97a11cae141e43065d87f7d7f6eb3cac5678dea3eae6248d0d956 SHA512 b7f3ba0511ed5f2cf8031aa11a660ccee8eef0674c8df17ec09ff32268b5c9d34dd2d79956ddf24ab2fcbf4fe8fc7bb5e521f9636f013b7ed6365960b4cabe48 DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f diff --git a/dev-python/ioflo/ioflo-1.6.7.ebuild b/dev-python/ioflo/ioflo-1.6.7.ebuild deleted file mode 100644 index 6bc509dcef22..000000000000 --- a/dev-python/ioflo/ioflo-1.6.7.ebuild +++ /dev/null @@ -1,19 +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,3_5,3_6}) -inherit distutils-r1 - -DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework" -HOMEPAGE="https://github.com/ioflo/ioflo/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]" diff --git a/dev-python/ioflo/ioflo-1.7.0.ebuild b/dev-python/ioflo/ioflo-1.7.0.ebuild deleted file mode 100644 index 6bc509dcef22..000000000000 --- a/dev-python/ioflo/ioflo-1.7.0.ebuild +++ /dev/null @@ -1,19 +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,3_5,3_6}) -inherit distutils-r1 - -DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework" -HOMEPAGE="https://github.com/ioflo/ioflo/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]" diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest index 0e264692bb66..62536c8dda34 100644 --- a/dev-python/ipdb/Manifest +++ b/dev-python/ipdb/Manifest @@ -1,3 +1 @@ -DIST ipdb-0.10.1.tar.gz 8595 BLAKE2B ec45fb7233506fb100f5c6ca7b4587dfa552afe2ed92825ade90860ff4a6f785a1bfdb6bcc4d81e08a69f80160ddc301d7c7366b376aad49bb34fa89c2eb676d SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2 -DIST ipdb-0.10.2.tar.gz 8827 BLAKE2B dded5f0b7fa7fefb5f9089626d5be27cca405a796e684fbabb85527854c302739004713b09d0281efd8855585699c02175eda47ec877a1bf749bbea12d884742 SHA512 5bae921cf7eb8beefd26a0b3ed0969b3435d86bbff7289dd874d0a011c63c36c50683a2a15191c3d6f5ddc1d41d4ae812bbdd831c972cfbbc54258085765acbd DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3 diff --git a/dev-python/ipdb/ipdb-0.10.1.ebuild b/dev-python/ipdb/ipdb-0.10.1.ebuild deleted file mode 100644 index be794f5033ce..000000000000 --- a/dev-python/ipdb/ipdb-0.10.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="IPython-enabled pdb" -HOMEPAGE="https://pypi.python.org/pypi/ipdb" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7) - " - -DOCS=( HISTORY.txt ) - -python_test() { - esetup.py test -} diff --git a/dev-python/ipdb/ipdb-0.10.2.ebuild b/dev-python/ipdb/ipdb-0.10.2.ebuild deleted file mode 100644 index dfa3021163fc..000000000000 --- a/dev-python/ipdb/ipdb-0.10.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="IPython-enabled pdb" -HOMEPAGE="https://pypi.python.org/pypi/ipdb" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86" -IUSE="" - -RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7) - " - -DOCS=( HISTORY.txt ) - -python_test() { - esetup.py test -} diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest index 7d56c49b11fd..6289707afdf5 100644 --- a/dev-python/ipython/Manifest +++ b/dev-python/ipython/Manifest @@ -1,4 +1,3 @@ DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617fc2ef735f5705edafd2e9bc65169302ea8f775843c7da5029bce0dccb541233a7c82faf58a676ac5079f9664734 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe -DIST ipython-5.3.0.tar.gz 4967956 BLAKE2B e4e3722b831f8908276ea55452f53daca4e5acda9c5f49d73517cf9d8f9def83722071c0d521c87b51e9347dae28feef38656abd716843b75e29aa6a5e4850b1 SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild deleted file mode 100644 index d20428e2e2c8..000000000000 --- a/dev-python/ipython/ipython-5.3.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE='readline,sqlite,threads(+)' - -inherit distutils-r1 eutils - -DESCRIPTION="Advanced interactive shell for Python" -HOMEPAGE="http://ipython.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples matplotlib mongodb notebook nbconvert qt5 +smp test wxwidgets" - -REQUIRED_USE=" - test? ( doc matplotlib mongodb notebook nbconvert qt5 wxwidgets ) - doc? ( mongodb )" - -CDEPEND=" - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pickleshare[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/simplegeneric[${PYTHON_USEDEP}] - >=dev-python/jedi-0.10.0[${PYTHON_USEDEP}] - >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}] - matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] ) - wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )" - -RDEPEND="${CDEPEND} - virtual/python-pathlib[${PYTHON_USEDEP}] - nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )" -DEPEND="${CDEPEND} - >=dev-python/setuptools-18.5[${PYTHON_USEDEP}] - $(python_gen_cond_dep \ - 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep \ - 'dev-python/typing[${PYTHON_USEDEP}]' 'python2*') - test? ( - app-text/dvipng - dev-python/jinja[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*') - >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*') - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3[${PYTHON_USEDEP}] - dev-python/testpath[${PYTHON_USEDEP}] - >=www-servers/tornado-4.0[${PYTHON_USEDEP}] - x11-base/xorg-server[xvfb] - ) - doc? ( - dev-python/cython[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' 'python2*') - >=dev-python/jsonschema-2.0[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=www-servers/tornado-4.0[${PYTHON_USEDEP}] - )" - -PDEPEND=" - notebook? ( - dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - ) - qt5? ( dev-python/qtconsole ) - smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch ) - -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - # Remove out of date insource files - rm IPython/extensions/cythonmagic.py || die - rm IPython/extensions/rmagic.py || die - - # Prevent un-needed download during build - if use doc; then - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html_noapi - HTML_DOCS=( docs/build/html/. ) - fi -} - -python_test() { - distutils_install_for_testing - - pushd "${TEST_DIR}" >/dev/null || die - "${EPYTHON}" -m IPython.testing.iptestcontroller --all || die - popd >/dev/null || die -} - -python_install() { - distutils-r1_python_install - - # Create ipythonX.Y symlinks. - # TODO: - # 1. do we want them for pypy? No. pypy has no numpy - # 2. handle it in the eclass instead (use _python_ln_rel). - # With pypy not an option the dosym becomes unconditional - dosym ../lib/python-exec/${EPYTHON}/ipython \ - /usr/bin/ipython${EPYTHON#python} -} - -python_install_all() { - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} - -pkg_postinst() { - optfeature "sympyprinting" dev-python/sympy - optfeature "cythonmagic" dev-python/cython - optfeature "%lprun magic command" dev-python/line_profiler - optfeature "%mprun magic command" dev-python/memory_profiler - - if use nbconvert; then - if ! has_version app-text/pandoc ; then - einfo "Node.js will be used to convert notebooks to other formats" - einfo "like HTML. Support for that is still experimental. If you" - einfo "encounter any problems, please use app-text/pandoc instead." - fi - fi -} diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest index 262ebe2880a1..139a1719fb17 100644 --- a/dev-python/jingo/Manifest +++ b/dev-python/jingo/Manifest @@ -1,2 +1 @@ -DIST jingo-0.7.tar.gz 9365 BLAKE2B c384719f789598a38c5acd662be581344ed96d1030920dcbde78c8a57523f336b0ad060f798bc628ed2d22d8001b7b0e75621149a73d743583e69531dcd08df3 SHA512 7358c20371d761ad147aaa2991056d1789d6a80d645741d816c38369abc469911ca6a1ab4324e7b1243832605fd80cdb3df89610106d2a850f634f1595da254d DIST jingo-0.9.0.tar.gz 10536 BLAKE2B b7cf8cf544c44dc74d750f85e5abf43a0d58bbb13a814610b7dd970995ec8e2c4b94d6b46f20be7031a1755fa47e9c28aa98f17d08bacdb967373924302c7739 SHA512 ec064df61639a96dcd0f0b8383d93a650928035e8744f600bd55e42e2ca4b2436db9cff3d75780d2803e9a326fa17308c424c693e14553c9b9a3b45e4132989a diff --git a/dev-python/jingo/jingo-0.7.ebuild b/dev-python/jingo/jingo-0.7.ebuild deleted file mode 100644 index 52c0324c275a..000000000000 --- a/dev-python/jingo/jingo-0.7.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="An adapter for using Jinja2 templates with Django" -HOMEPAGE="https://github.com/jbalogh/jingo/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest index d97b961e2bbc..3c0413ac2b68 100644 --- a/dev-python/jinja/Manifest +++ b/dev-python/jinja/Manifest @@ -1,4 +1,2 @@ -DIST Jinja2-2.8.tar.gz 357055 BLAKE2B dff1f706ccae2e63a973195d77ded0c59bd8042ba5e8e269031ed97c090eea1a69572a866f6fb9c8afbd7a0e2ab3e414786c6b7d0153da558bbad38e2847d5ce SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121 -DIST jinja-2.9.6.tar.gz 487185 BLAKE2B 32f11030cec4fc085c6b866e0409a7b04f008720fc13e619f168e5fb5b4eee340beea7761c42940fcbe24a032548866ddf7938d7c06a6e38e6e898bc334af94c SHA512 934e253d9d621fd6d19302ea5e73b571a806c0e31e10ac29b54700ad6649fabf321b00cdc513bb3fb551ee28e83de7f163ce9ef88d232a6c178f4ee5dc2e69b5 diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild deleted file mode 100644 index 2c30af4afbf0..000000000000 --- a/dev-python/jinja/jinja-2.8.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit eutils distutils-r1 - -MY_PN=Jinja2 -MY_P=${MY_PN}-${PV} - -DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python" -HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris" -IUSE="doc examples" - -RDEPEND=" - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - !dev-python/jinja:compat" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -# XXX: handle Babel better? - -S=${WORKDIR}/${MY_P} - -wrap_opts() { - local mydistutilsargs=() - - if [[ ${EPYTHON} == python* ]]; then - mydistutilargs+=( --with-debugsupport ) - fi - - "${@}" -} - -python_compile() { - wrap_opts distutils-r1_python_compile - if [[ ${EPYTHON} == python3.2 ]]; then - 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die - fi -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - esetup.py test -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles/syntax - doins ext/Vim/* -} - -pkg_postinst() { - if ! has_version dev-python/Babel; then - elog "For i18n support, please emerge dev-python/Babel." - fi -} diff --git a/dev-python/jinja/jinja-2.9.6.ebuild b/dev-python/jinja/jinja-2.9.6.ebuild deleted file mode 100644 index 35747dfc21a7..000000000000 --- a/dev-python/jinja/jinja-2.9.6.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit eutils distutils-r1 - -DESCRIPTION="A full-featured template engine for Python" -HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2" - -# pypi tarball is missing tests -SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - !dev-python/jinja:compat" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/pytest[${PYTHON_USEDEP}] )" - -# XXX: handle Babel better? - -wrap_opts() { - local mydistutilsargs=() - - if [[ ${EPYTHON} == python* ]]; then - mydistutilargs+=( --with-debugsupport ) - fi - - "${@}" -} - -python_compile() { - wrap_opts distutils-r1_python_compile -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - py.test || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto examples - dodoc -r examples/. - fi - - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles/syntax - doins ext/Vim/* -} - -pkg_postinst() { - if ! has_version dev-python/Babel; then - elog "For i18n support, please emerge dev-python/Babel." - fi -} diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest index 6c7ba0c230b4..443cec1755fd 100644 --- a/dev-python/jmespath/Manifest +++ b/dev-python/jmespath/Manifest @@ -1,3 +1 @@ -DIST jmespath-0.9.0.tar.gz 20855 BLAKE2B ad3707f70c37a2ecdaa60448e1e0a092da21a3a72aecb7f66fb0e57f942618d45c6dd133b11eead48d74e9057ed14e85d72ba87707ab3838957db964b860aca4 SHA512 c3a707bde5e529554638255a6a6dcf49591ec7573e28d84d34b3c1b8f84d13289ab054818f88b72ac8aee0f1af6ae830cb661f027e90efe9fb9edb4dcf5128c9 -DIST jmespath-0.9.2.tar.gz 22773 BLAKE2B 69cc25f8efa48d1ec53d1704bb2933f53b72d50f286e89e1c5d64c790f2013f5d8d419d97392fec8b9a76935475d08582c6266acd2d9779f388debbba2cd5fec SHA512 8363c234955d35d292ef27630a98d13c68e9f22d19892c44c68796eaa9c12d0a11921cfdbf9b517b2956b82943ae0b9dafc9a4b756bf0f15c4c6b1e3fe4efe1f DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7 diff --git a/dev-python/jmespath/jmespath-0.9.0.ebuild b/dev-python/jmespath/jmespath-0.9.0.ebuild deleted file mode 100644 index 574ec8202263..000000000000 --- a/dev-python/jmespath/jmespath-0.9.0.ebuild +++ /dev/null @@ -1,26 +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,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="JSON Matching Expressions" -HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" -RDEPEND="" - -python_test() { - nosetests || die -} diff --git a/dev-python/jmespath/jmespath-0.9.2.ebuild b/dev-python/jmespath/jmespath-0.9.2.ebuild deleted file mode 100644 index 2280da921034..000000000000 --- a/dev-python/jmespath/jmespath-0.9.2.ebuild +++ /dev/null @@ -1,26 +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,3_5,3_6} pypy{,3} ) - -inherit distutils-r1 - -DESCRIPTION="JSON Matching Expressions" -HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" -RDEPEND="" - -python_test() { - nosetests || die -} diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest index 300c8d17911f..bdcc515118b2 100644 --- a/dev-python/jsonrpclib/Manifest +++ b/dev-python/jsonrpclib/Manifest @@ -1,3 +1,2 @@ -DIST jsonrpclib-0.1.7.tar.gz 16980 BLAKE2B 76052a094d45cd483df8b4e12e657d43aca222f2baf6f89c733c0eac0c9b52db13b23be89d5e729153ed21988b04c4545f3e5dfd0f8bf1dbe4dd03b439cb0f1e SHA512 caa315879faac986c14a15cd87591ea2823405f2ea0731962c37147378f77bcfd260c6e7900bc128392332b27e2c0ae23cab9cb6150adb39924f9a369405b2ec DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71 diff --git a/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild deleted file mode 100644 index 0f9b2831c048..000000000000 --- a/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git" - inherit git-r3 -else - SRC_URI="https://github.com/joshmarshall/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~mips ~x86" -fi - -DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)" -HOMEPAGE="https://github.com/joshmarshall/jsonrpclib" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/simplejson" diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest index c7212d93e676..76a1ab84809c 100644 --- a/dev-python/keyrings_alt/Manifest +++ b/dev-python/keyrings_alt/Manifest @@ -1,2 +1 @@ -DIST keyrings.alt-2.2.tar.gz 26121 BLAKE2B 7b8967d15341e3fd0cc4a7b288688bcd3fb87d4f1a8ea34b70d23d0521794a2e5aa74829bf998d92ae4af3137e8f4e4654c8edc39b77612e61e9945538ee0428 SHA512 28d29c1f3f0a9612baa61d4506f0ac0782105a0c04ca2d9be63bd3106c82c2478487a42f2d5396d2f5e5d7205ae4f2d43221dba6ce6587e6e807d597984c833b DIST keyrings.alt-2.3.tar.gz 26170 BLAKE2B 5459bfbde787b82021c04394ec475a406805a97cf3ac5691aaa654790800b155291500946f29eb12cd0ae33061c0b38ca65c5733ca144e75e9047381d86ee2d9 SHA512 593194f0b3e64ebab9950b1ee674e43afecf6410110e7c683cdccaa121eaaff864ef07763363c0b0ac25b94e913d6ba2e1bb1ebb428ba14e81e3c29335b81807 diff --git a/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild deleted file mode 100644 index d7f475cf58a7..000000000000 --- a/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild +++ /dev/null @@ -1,49 +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,5,6}} pypy ) - -inherit distutils-r1 - -MY_PN="${PN/_/.}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Alternate keyring implementations" -HOMEPAGE="https://github.com/jaraco/keyrings.alt http://pypi.python.org/pypi/keyrings.alt" -SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/fs-0.5[${PYTHON_USEDEP}] - <dev-python/fs-2[${PYTHON_USEDEP}] - dev-python/gdata[$(python_gen_usedep 'python2*')] - dev-python/keyczar[$(python_gen_usedep 'python2*')] - dev-python/pycrypto[$(python_gen_usedep 'python*')] - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - )" - -S=${WORKDIR}/${MY_P} - -# Multiple failures -RESTRICT=test - -python_prepare_all() { - sed \ - -e "s:find_packages():find_packages(exclude=['tests']):g" \ - -i setup.py || die - distutils-r1_python_prepare_all -} - -python_test() { - py.test -v -v || die -} diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest index da2cdfb47790..a69dcd6877c2 100644 --- a/dev-python/kombu/Manifest +++ b/dev-python/kombu/Manifest @@ -1,3 +1,2 @@ DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712 -DIST kombu-4.0.2.tar.gz 418051 BLAKE2B 28328692519188fa67eda545ee06f56edc681ea5bebbed73cfabf812e0b544dd8f8cb8416cc930587e3f7658bb4b2701bfb0c8eb2005b3a3a9b506e9252a424c SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861 diff --git a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch deleted file mode 100644 index fa3e545c6273..000000000000 --- a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Tue, 21 Feb 2017 11:52:18 -0600 -Subject: [PATCH] Don't modify dict size while iterating over it (#676) - -This fixes https://github.com/celery/kombu/issues/675. ---- - kombu/messaging.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kombu/messaging.py b/kombu/messaging.py -index 03e7e15..e1800b5 100644 ---- a/kombu/messaging.py -+++ b/kombu/messaging.py -@@ -397,7 +397,8 @@ def revive(self, channel): - """Revive consumer after connection loss.""" - self._active_tags.clear() - channel = self.channel = maybe_channel(channel) -- for qname, queue in items(self._queues): -+ # modify dict size while iterating over it is not allowed -+ for qname, queue in list(items(self._queues)): - # name may have changed after declare - self._queues.pop(qname, None) - queue = self._queues[queue.name] = queue(self.channel) diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild deleted file mode 100644 index b5d030da5273..000000000000 --- a/dev-python/kombu/kombu-4.0.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit distutils-r1 - -DESCRIPTION="AMQP Messaging Framework for Python" -HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples msgpack sqs test" - -# couchdb backend support possible via dev-python/couchdb-python -# ditto dev-python/kazoo(>=1.3.1) -RDEPEND=" - >=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}] - dev-python/pyro:4[${PYTHON_USEDEP}] - sqs? ( >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] ) - msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" -# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 -DEPEND="${RDEPEND} - >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] - test? ( - >=dev-python/case-1.5.2[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/couchdb-python[${PYTHON_USEDEP}] - >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )" - -# kazoo is optional for tests. -# Refrain for now, no established demand for it from users - -# Req'd for test phase -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-dict-iter.patch - ) - -python_prepare_all() { - # AttributeError: test_Etcd instance has no attribute 'patch' - rm t/unit/transport/test_etcd.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - # Doc build misses and skips only content re librabbitmq which is not in portage - if use doc; then - emake -C docs html || die "kombu docs failed installation" - fi -} - -python_test() { - esetup.py test -} - -python_install_all() { - if use examples; then - docompress -x "/usr/share/doc/${PF}/examples" - docinto examples - dodoc -r examples/. - fi - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass index b6e92976f73e..3e8b2f9d2540 100644 --- a/eclass/multiprocessing.eclass +++ b/eclass/multiprocessing.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multiprocessing.eclass @@ -7,51 +7,25 @@ # @AUTHOR: # Brian Harring <ferringb@gentoo.org> # Mike Frysinger <vapier@gentoo.org> -# @BLURB: parallelization with bash (wtf?) +# @BLURB: multiprocessing helper functions # @DESCRIPTION: -# The multiprocessing eclass contains a suite of functions that allow ebuilds -# to quickly run things in parallel using shell code. +# The multiprocessing eclass contains a suite of utility functions +# that could be helpful to controlling parallel multiple job execution. +# The most common use is processing MAKEOPTS in order to obtain job +# count. # -# It has two modes: pre-fork and post-fork. If you don't want to dive into any -# more nuts & bolts, just use the pre-fork mode. For main threads that mostly -# spawn children and then wait for them to finish, use the pre-fork mode. For -# main threads that do a bit of processing themselves, use the post-fork mode. -# You may mix & match them for longer computation loops. # @EXAMPLE: # # @CODE -# # First initialize things: -# multijob_init -# -# # Then hash a bunch of files in parallel: -# for n in {0..20} ; do -# multijob_child_init md5sum data.${n} > data.${n} -# done -# -# # Then wait for all the children to finish: -# multijob_finish +# src_compile() { +# # custom build system that does not support most of MAKEOPTS +# ./mybs -j$(makeopts_jobs) +# } # @CODE if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then _MULTIPROCESSING_ECLASS=1 -# @FUNCTION: bashpid -# @DESCRIPTION: -# Return the process id of the current sub shell. This is to support bash -# versions older than 4.0 that lack $BASHPID support natively. Simply do: -# echo ${BASHPID:-$(bashpid)} -# -# Note: Using this func in any other way than the one above is not supported. -bashpid() { - # Running bashpid plainly will return incorrect results. This func must - # be run in a subshell of the current subshell to get the right pid. - # i.e. This will show the wrong value: - # bashpid - # But this will show the right value: - # (bashpid) - sh -c 'echo ${PPID}' -} - # @FUNCTION: get_nproc # @USAGE: [${fallback:-1}] # @DESCRIPTION: @@ -126,188 +100,4 @@ makeopts_loadavg() { echo ${lavg:-${2:-999}} } -# @FUNCTION: multijob_init -# @USAGE: [${MAKEOPTS}] -# @DESCRIPTION: -# Setup the environment for executing code in parallel. -# You must call this before any other multijob function. -multijob_init() { - # When something goes wrong, try to wait for all the children so we - # don't leave any zombies around. - has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait " - - # Setup a pipe for children to write their pids to when they finish. - # We have to allocate two fd's because POSIX has undefined behavior - # when using one single fd for both read and write. #487056 - # However, opening an fd for read or write only will block until the - # opposite end is opened as well. Thus we open the first fd for both - # read and write to not block ourselve, but use it for reading only. - # The second fd really is opened for write only, as Cygwin supports - # just one single read fd per FIFO. #583962 - local pipe="${T}/multijob.pipe" - mkfifo -m 600 "${pipe}" - redirect_alloc_fd mj_read_fd "${pipe}" - redirect_alloc_fd mj_write_fd "${pipe}" '>' - rm -f "${pipe}" - - # See how many children we can fork based on the user's settings. - mj_max_jobs=$(makeopts_jobs "$@") - mj_num_jobs=0 -} - -# @FUNCTION: multijob_child_init -# @USAGE: [--pre|--post] [command to run in background] -# @DESCRIPTION: -# This function has two forms. You can use it to execute a simple command -# in the background (and it takes care of everything else), or you must -# call this first thing in your forked child process. -# -# The --pre/--post options allow you to select the child generation mode. -# -# @CODE -# # 1st form: pass the command line as arguments: -# multijob_child_init ls /dev -# # Or if you want to use pre/post fork modes: -# multijob_child_init --pre ls /dev -# multijob_child_init --post ls /dev -# -# # 2nd form: execute multiple stuff in the background (post fork): -# ( -# multijob_child_init -# out=`ls` -# if echo "${out}" | grep foo ; then -# echo "YEAH" -# fi -# ) & -# multijob_post_fork -# -# # 2nd form: execute multiple stuff in the background (pre fork): -# multijob_pre_fork -# ( -# multijob_child_init -# out=`ls` -# if echo "${out}" | grep foo ; then -# echo "YEAH" -# fi -# ) & -# @CODE -multijob_child_init() { - local mode="pre" - case $1 in - --pre) mode="pre" ; shift ;; - --post) mode="post"; shift ;; - esac - - if [[ $# -eq 0 ]] ; then - trap 'echo ${BASHPID:-$(bashpid)} $? >&'${mj_write_fd} EXIT - trap 'exit 1' INT TERM - else - local ret - [[ ${mode} == "pre" ]] && { multijob_pre_fork; ret=$?; } - ( multijob_child_init ; "$@" ) & - [[ ${mode} == "post" ]] && { multijob_post_fork; ret=$?; } - return ${ret} - fi -} - -# @FUNCTION: _multijob_fork -# @INTERNAL -# @DESCRIPTION: -# Do the actual book keeping. -_multijob_fork() { - [[ $# -eq 1 ]] || die "incorrect number of arguments" - - local ret=0 - [[ $1 == "post" ]] && : $(( ++mj_num_jobs )) - if [[ ${mj_num_jobs} -ge ${mj_max_jobs} ]] ; then - multijob_finish_one - ret=$? - fi - [[ $1 == "pre" ]] && : $(( ++mj_num_jobs )) - return ${ret} -} - -# @FUNCTION: multijob_pre_fork -# @DESCRIPTION: -# You must call this in the parent process before forking a child process. -# If the parallel limit has been hit, it will wait for one child to finish -# and return its exit status. -multijob_pre_fork() { _multijob_fork pre "$@" ; } - -# @FUNCTION: multijob_post_fork -# @DESCRIPTION: -# You must call this in the parent process after forking a child process. -# If the parallel limit has been hit, it will wait for one child to finish -# and return its exit status. -multijob_post_fork() { _multijob_fork post "$@" ; } - -# @FUNCTION: multijob_finish_one -# @DESCRIPTION: -# Wait for a single process to exit and return its exit code. -multijob_finish_one() { - [[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments" - - local pid ret - read -r -u ${mj_read_fd} pid ret || die - : $(( --mj_num_jobs )) - return ${ret} -} - -# @FUNCTION: multijob_finish -# @DESCRIPTION: -# Wait for all pending processes to exit and return the bitwise or -# of all their exit codes. -multijob_finish() { - local ret=0 - while [[ ${mj_num_jobs} -gt 0 ]] ; do - multijob_finish_one - : $(( ret |= $? )) - done - # Let bash clean up its internal child tracking state. - wait - - # Do this after reaping all the children. - [[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments" - - # No need to hook anymore. - EBUILD_DEATH_HOOKS=${EBUILD_DEATH_HOOKS/ wait / } - - return ${ret} -} - -# @FUNCTION: redirect_alloc_fd -# @USAGE: <var> <file> [redirection] -# @DESCRIPTION: -# Find a free fd and redirect the specified file via it. Store the new -# fd in the specified variable. Useful for the cases where we don't care -# about the exact fd #. -redirect_alloc_fd() { - local var=$1 file=$2 redir=${3:-"<>"} - - # Make sure /dev/fd is sane on Linux hosts. #479656 - if [[ ! -L /dev/fd && ${CBUILD} == *linux* ]] ; then - eerror "You're missing a /dev/fd symlink to /proc/self/fd." - eerror "Please fix the symlink and check your boot scripts (udev/etc...)." - die "/dev/fd is broken" - fi - - if [[ $(( (BASH_VERSINFO[0] << 8) + BASH_VERSINFO[1] )) -ge $(( (4 << 8) + 1 )) ]] ; then - # Newer bash provides this functionality. - eval "exec {${var}}${redir}'${file}'" - else - # Need to provide the functionality ourselves. - local fd=10 - while :; do - # Make sure the fd isn't open. It could be a char device, - # or a symlink (possibly broken) to something else. - if [[ ! -e /dev/fd/${fd} ]] && [[ ! -L /dev/fd/${fd} ]] ; then - eval "exec ${fd}${redir}'${file}'" && break - fi - [[ ${fd} -gt 1024 ]] && die 'could not locate a free temp fd !?' - : $(( ++fd )) - done - : $(( ${var} = fd )) - fi -} - fi diff --git a/eclass/tests/multiprocessing.sh b/eclass/tests/multiprocessing.sh deleted file mode 100755 index 1ceb7f7fa7b2..000000000000 --- a/eclass/tests/multiprocessing.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -source tests-common.sh - -inherit multiprocessing - -tbegin "simple" -MAKEOPTS="-j1" multijob_init -multijob_child_init ls -d / >/dev/null || die "fail!" -multijob_finish -tend $? - -tbegin "less simple" -multijob_init -j3 -multijob_child_init true || die "fail!" -multijob_child_init false || die "fail!" -multijob_child_init true || die "fail!" -multijob_finish -tend $(( $? == 1 ? 0 : 1 )) - -tbegin "less less simple" -multijob_init -j1 -multijob_child_init true || die "fail!" -multijob_child_init false || die "fail!" -multijob_child_init true && die "fail!" -multijob_finish -tend $? - -tbegin "less less less simple" -multijob_init -j10 -multijob_child_init true || die "fail!" -multijob_finish_one || die "fail!" -multijob_child_init false || die "fail!" -multijob_finish_one && die "fail!" -multijob_child_init true || die "fail!" -multijob_finish_one || die "fail!" -multijob_finish -tend $? - -texit |