summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/Manifest.gzbin299916 -> 299937 bytes
-rw-r--r--dev-python/PyQt4/Manifest2
-rw-r--r--dev-python/PyQt4/PyQt4-4.12.1.ebuild2
-rw-r--r--dev-python/PyQt5/Manifest2
-rw-r--r--dev-python/PyQt5/PyQt5-5.7.1.ebuild195
-rw-r--r--dev-python/PythonQt/Manifest4
-rw-r--r--dev-python/PythonQt/PythonQt-3.1-r1.ebuild88
-rw-r--r--dev-python/PythonQt/PythonQt-3.1.ebuild88
-rw-r--r--dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch301
-rw-r--r--dev-python/QtPy/Manifest6
-rw-r--r--dev-python/QtPy/QtPy-1.3.1-r1.ebuild32
-rw-r--r--dev-python/QtPy/QtPy-1.3.1.ebuild48
-rw-r--r--dev-python/QtPy/QtPy-1.4.0-r1.ebuild32
-rw-r--r--dev-python/QtPy/QtPy-1.4.0.ebuild48
-rw-r--r--dev-python/QtPy/metadata.xml2
-rw-r--r--dev-python/django_polymorphic/Manifest2
-rw-r--r--dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild28
-rw-r--r--dev-python/elasticsearch-curator/Manifest6
-rw-r--r--dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild (renamed from dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild)47
-rw-r--r--dev-python/fs/Manifest2
-rw-r--r--dev-python/fs/fs-2.0.21.ebuild44
-rw-r--r--dev-python/gnuplot-py/Manifest2
-rw-r--r--dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild4
-rw-r--r--dev-python/ipython/Manifest2
-rw-r--r--dev-python/ipython/ipython-3.2.1-r1.ebuild2
-rw-r--r--dev-python/jedi/Manifest2
-rw-r--r--dev-python/jedi/jedi-0.12.0.ebuild46
-rw-r--r--dev-python/jupyter_core/Manifest2
-rw-r--r--dev-python/jupyter_core/jupyter_core-4.4.0.ebuild7
-rw-r--r--dev-python/matplotlib/Manifest11
-rw-r--r--dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch126
-rw-r--r--dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch50
-rw-r--r--dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch54
-rw-r--r--dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch58
-rw-r--r--dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch10
-rw-r--r--dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild (renamed from dev-python/matplotlib/matplotlib-2.2.0.ebuild)9
-rw-r--r--dev-python/matplotlib/matplotlib-2.2.2.ebuild257
-rw-r--r--dev-python/matplotlib/matplotlib-9999.ebuild15
-rw-r--r--dev-python/oslo-concurrency/Manifest2
-rw-r--r--dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild56
-rw-r--r--dev-python/oslo-db/Manifest2
-rw-r--r--dev-python/oslo-db/oslo-db-4.33.1.ebuild62
-rw-r--r--dev-python/oslo-versionedobjects/Manifest2
-rw-r--r--dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild38
-rw-r--r--dev-python/pandas/Manifest13
-rw-r--r--dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch28
-rw-r--r--dev-python/pandas/metadata.xml3
-rw-r--r--dev-python/pandas/pandas-0.16.2.ebuild128
-rw-r--r--dev-python/pandas/pandas-0.17.0.ebuild137
-rw-r--r--dev-python/pandas/pandas-0.17.1.ebuild166
-rw-r--r--dev-python/pandas/pandas-0.20.1.ebuild162
-rw-r--r--dev-python/pandas/pandas-0.20.3.ebuild157
-rw-r--r--dev-python/pyqwt/Manifest2
-rw-r--r--dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild4
-rw-r--r--dev-python/python-glanceclient/Manifest4
-rw-r--r--dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild2
-rw-r--r--dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild77
-rw-r--r--dev-python/pyudev/Manifest6
-rw-r--r--dev-python/pyudev/metadata.xml2
-rw-r--r--dev-python/pyudev/pyudev-0.20.0-r1.ebuild (renamed from dev-python/pyudev/pyudev-0.20.0.ebuild)12
-rw-r--r--dev-python/pyudev/pyudev-0.21.0.ebuild7
-rw-r--r--dev-python/restkit/Manifest2
-rw-r--r--dev-python/restkit/restkit-4.2.2.ebuild4
-rw-r--r--dev-python/sip/Manifest4
-rw-r--r--dev-python/sip/sip-4.19.3.ebuild87
-rw-r--r--dev-python/sip/sip-4.19.7.ebuild112
-rw-r--r--dev-python/tooz/Manifest2
-rw-r--r--dev-python/tooz/tooz-1.60.1.ebuild39
68 files changed, 468 insertions, 2490 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 34d603f6a213..f9d692c73c1b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 93cbd3113eee..75f48e5402cf 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,5 @@
AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee
AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
-EBUILD PyQt4-4.12.1.ebuild 4725 BLAKE2B 74a04ca3df420dc17b95bc5aec8e0d874c121a053c3018ecec8b7d3df567705ec99fe23fc8c9f567ecb22b95d74e0fea4e56b745b4af4d03619e370beca11380 SHA512 19fd9c014da59750dd5e0f5ada820ab7a97fc6f394d788f1d59d0e4d236d4d5fe2a8694e731e1200cc1fbd15854cc333f6889e6f21e2cc810f258fe6f5a8e38b
+EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B e08eaefb436e0d72a647b1fab21f80caf902ca556bdafbffcc44da9c391334c5f52d0beb1338555edf6e0292fc2a7116f5185055455b91d492d58655b3205bbc SHA512 140230da20582fb01f50fee0caefb248b9086fd211f5977c381473e8cd54d9314ade5d45784c234ecbd11861f769d9f28e012ac9703db78056b2f2dc82924914
MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 33ecc5f591f6..aa304f2326a8 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="X compat dbus debug declarative designer doc examples help multimedia
opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 3b2eb38cd3b8..2d2922b9e98f 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,8 +1,6 @@
AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca1760b323b555efb48b06f8ba3213baccec676bc3984832e0775b28f0d2b2ddf0c37fa35317c237ed9af2e20469ff9ae SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f
DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
EBUILD PyQt5-5.10.1.ebuild 5681 BLAKE2B b14acb52f6f25a74333445c589af13415749a8bc60dfa50a9fa82f597b24856d0b6dbd10c061142103b85817ad4c4980d38baaf4fe7db1d5958e17631580430e SHA512 d99e76127a3445ef4ba7865213df1191bd4c967b5a7acf8389ee7d5521c95bc498e5dcd4c31478fd3f81f07ed457f81481f4bac6e978c3c5a2e190beb8e18e09
-EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900
EBUILD PyQt5-5.9.2.ebuild 5682 BLAKE2B 93851df68078e98b065a17126c72410333e4deffe3179e8977da2879ddf8fd7a613548957ad59db669b75efee515ccfab2475c3bd23c1e825325c346ccf0ff36 SHA512 25b4c7a922723a400d3050ccfb931e3594c608bf77268fcf57f33ae94112083fa9d5ea0db92746e70c6a774f9ed644a06165ddb85135d7bfe424895423bcce8e
MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.7.1.ebuild b/dev-python/PyQt5/PyQt5-5.7.1.ebuild
deleted file mode 100644
index 757f91b7a17b..000000000000
--- a/dev-python/PyQt5/PyQt5-5.7.1.ebuild
+++ /dev/null
@@ -1,195 +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 multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
- SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 x86"
-
-# TODO: QtNfc
-IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
- multimedia network opengl positioning printsupport sensors serialport sql svg
- testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( gui )
- declarative? ( gui network )
- designer? ( widgets )
- help? ( gui widgets )
- location? ( positioning )
- multimedia? ( gui network )
- opengl? ( gui widgets )
- positioning? ( gui )
- printsupport? ( gui widgets )
- sensors? ( gui )
- serialport? ( gui )
- sql? ( widgets )
- svg? ( gui widgets )
- testlib? ( gui widgets )
- webchannel? ( network )
- webengine? ( network widgets? ( webchannel ) )
- webkit? ( gui network printsupport widgets )
- websockets? ( network )
- widgets? ( gui )
- xmlpatterns? ( network )
-"
-
-QT_PV=${PV}
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- ~dev-qt/qtcore-${QT_PV}
- ~dev-qt/qtxml-${QT_PV}
- bluetooth? ( ~dev-qt/qtbluetooth-${QT_PV} )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- ~dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( ~dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- designer? ( ~dev-qt/designer-${QT_PV} )
- gui? ( ~dev-qt/qtgui-${QT_PV}[gles2=] )
- help? ( ~dev-qt/qthelp-${QT_PV} )
- location? ( ~dev-qt/qtlocation-${QT_PV} )
- multimedia? ( ~dev-qt/qtmultimedia-${QT_PV}[widgets?] )
- network? ( ~dev-qt/qtnetwork-${QT_PV} )
- opengl? ( ~dev-qt/qtopengl-${QT_PV} )
- positioning? ( ~dev-qt/qtpositioning-${QT_PV} )
- printsupport? ( ~dev-qt/qtprintsupport-${QT_PV} )
- sensors? ( ~dev-qt/qtsensors-${QT_PV} )
- serialport? ( ~dev-qt/qtserialport-${QT_PV} )
- sql? ( ~dev-qt/qtsql-${QT_PV} )
- svg? ( ~dev-qt/qtsvg-${QT_PV} )
- testlib? ( ~dev-qt/qttest-${QT_PV} )
- webchannel? ( ~dev-qt/qtwebchannel-${QT_PV} )
- webengine? ( ~dev-qt/qtwebengine-${QT_PV}[widgets?] )
- webkit? ( ~dev-qt/qtwebkit-${QT_PV}[printsupport] )
- websockets? ( ~dev-qt/qtwebsockets-${QT_PV} )
- widgets? ( ~dev-qt/qtwidgets-${QT_PV} )
- x11extras? ( ~dev-qt/qtx11extras-${QT_PV} )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-pyqt_use_enable() {
- use "$1" || return
-
- if [[ $# -eq 1 ]]; then
- echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
- else
- shift
- echo ${@/#/--enable=}
- fi
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- $(usex debug '--debug --trace' '')
- --verbose
- --confirm-license
- --qmake="$(qt5_get_bindir)"/qmake
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --sip-incdir="$(python_get_includedir)"
- --qsci-api
- --enable=QtCore
- --enable=QtXml
- $(pyqt_use_enable bluetooth)
- $(pyqt_use_enable dbus QtDBus)
- $(usex dbus '' --no-python-dbus)
- $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
- $(usex declarative '' --no-qml-plugin)
- $(pyqt_use_enable designer)
- $(usex designer '' --no-designer-plugin)
- $(pyqt_use_enable gui)
- $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
- $(pyqt_use_enable help)
- $(pyqt_use_enable location)
- $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
- $(pyqt_use_enable network)
- $(pyqt_use_enable opengl QtOpenGL)
- $(pyqt_use_enable positioning)
- $(pyqt_use_enable printsupport QtPrintSupport)
- $(pyqt_use_enable sensors)
- $(pyqt_use_enable serialport QtSerialPort)
- $(pyqt_use_enable sql)
- $(pyqt_use_enable svg)
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable webchannel QtWebChannel)
- $(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
- $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
- $(pyqt_use_enable websockets QtWebSockets)
- $(pyqt_use_enable widgets)
- $(pyqt_use_enable x11extras QtX11Extras)
- $(pyqt_use_enable xmlpatterns QtXmlPatterns)
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- eqmake5 -recursive ${PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- local tmp_root=${D%/}/tmp
- emake INSTALL_ROOT="${tmp_root}" install
-
- local bin_dir=${tmp_root}${EPREFIX}/usr/bin
- local exe
- for exe in pylupdate5 pyrcc5 pyuic5; do
- python_doexe "${bin_dir}/${exe}"
- rm "${bin_dir}/${exe}" || die
- done
-
- local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
- if python_is_python3; then
- rm -r "${uic_dir}"/port_v2 || die
- else
- rm -r "${uic_dir}"/port_v3 || die
- fi
-
- multibuild_merge_root "${tmp_root}" "${D}"
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index f512742ffd17..06acc1ace36e 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,8 +1,4 @@
-AUX PythonQt-3.1-commit-433-441.patch 15025 BLAKE2B 180a5e734a4434e0723b09dde5963cdde9eaaa8865603b33fa69dfe78468e3699e87748d92130d3b584c3791923d8b6bbec79c045cd29ca9ff8e22d10b3225de SHA512 c1cc65defa0b34df3299f6c6c2c36daa1c3e205fbbb1ee8d9a6e3a2571b58be2ea4e101a137dc867598ef289222c94f26f5142dbd2ec3fff226ddea47cf3ec59
-DIST PythonQt3.1.zip 4526699 BLAKE2B 37d79f4d12bc1e4909d08c0ba4c2b95c233aba5097898498575733f323a8d1a5079e85e35e6272d0271421cb945d8a359330ba5ac9854ebcc7b95030b6cf1ad1 SHA512 b3c208e3f909ebb15d40a6e83385f03e6196a8439e39cad4f924e7b1e774edbce83680298ab032161619d1358696a0d073028860f68540aadd8028b712ae8fc1
DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
-EBUILD PythonQt-3.1-r1.ebuild 2029 BLAKE2B 8cfa824f0661bf1a64dee441ef65d8dbdc344eb3838fc2b52ab8ede4de35c09591d214b904290465cce34382808c1dcddded91f510f490855e6d11d538a7095b SHA512 e4a9ef97155c7dd32b850023827029a8cb2caf8f505054228d4f11a1518755551192a7bf8e9a3f3dba5b306135e352669a1a2a4d2f64d6ca983dbbe2ca0fb279
-EBUILD PythonQt-3.1.ebuild 1950 BLAKE2B e32ad4eb8b768628479946403713ef91f41419c97b9951b58c1e1b5ff3c310d0b085572660c22bbf3dc1d8efcc3aedfda1f29945cc56a95d3bb40cfbb35e1c27 SHA512 fd3b6db4306fb00df4be264a8bcc37390cf5cbe549177c0739e6a7be89c22c66935123a98640a1dd8ed37ccbd51088a25633bbddc6b3d69a84c64cf8a9908555
EBUILD PythonQt-3.2.ebuild 1847 BLAKE2B cba31bddadaa3b0035d54b131c3f4e22bb0aa4e6d7202485f496c36d81e637b48343e2447f5e86eaddae3fe14b20b86d70d19a5af7469820994b664d0f4b8787 SHA512 815486fd8e171e8abc06a0e6465473e070d043b2074871c084f4584b9a21ad01981c86632d1bcaf20a0e097ef86a3f863e3b6c23d2ea347aee707e96f0e6d6cb
EBUILD PythonQt-9999.ebuild 1864 BLAKE2B 14ada5f74d25d0797dbdeaccfa12746e89b5b27031e53d78dc4ff228b26766054a91af4b0025ccb1618ba42354d06ae6d1338a399fb23374d998b1f3d1a32d76 SHA512 3120052842008e64193375e20573194b637161534ba8a9a08e3572b6c777c3240724e28619bd80b9d6fbed8ff7fc6efe14005b4c690f0197c811cce8ecc0bb46
MISC metadata.xml 971 BLAKE2B 4a9f0fd3832f83eb46ef65a18774c998daeb9544b1ac6a23a189b909c7e4168031a68d56952d9ed2b7b76fb8fc3a912e77d162cb94e73405f285bd834644fb98 SHA512 565d8517faba162fa855acef4dc659af22954796a25da9479d7ec530afee16606904b6bfba9a568e6caa8c47f3195401eefc3a9048077e73582cf7357cafce5e
diff --git a/dev-python/PythonQt/PythonQt-3.1-r1.ebuild b/dev-python/PythonQt/PythonQt-3.1-r1.ebuild
deleted file mode 100644
index efab4efcc45e..000000000000
--- a/dev-python/PythonQt/PythonQt-3.1-r1.ebuild
+++ /dev/null
@@ -1,88 +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,3_6} )
-
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +extensions webkit"
-
-RDEPEND="${PYTHON_DEPS}
- <dev-qt/qtcore-5.9:5
- <dev-qt/qtgui-5.9:5
- <dev-qt/qtwidgets-5.9:5
- extensions? (
- <dev-qt/designer-5.9:5
- <dev-qt/qtdeclarative-5.9:5[widgets]
- <dev-qt/qtmultimedia-5.9:5[widgets]
- <dev-qt/qtnetwork-5.9:5
- <dev-qt/qtopengl-5.9:5
- <dev-qt/qtprintsupport-5.9:5
- <dev-qt/qtsql-5.9:5
- <dev-qt/qtsvg-5.9:5
- <dev-qt/qtxml-5.9:5
- <dev-qt/qtxmlpatterns-5.9:5
- webkit? ( <dev-qt/qtwebkit-5.9:5 )
- )"
-DEPEND="${RDEPEND}
- <dev-qt/qtxml-5.9:5
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
-# Bring uitools back, backport other fixes from trunk
-PATCHES=( "${FILESDIR}/${P}-commit-433-441.patch" )
-
-src_prepare() {
- default
-
- if ! use extensions ; then
- sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
- fi
- if ! use webkit ; then
- # Remove webkit support if not used
- sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
- extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
- || die "sed for webkit"
- fi
-
- # Unset python version to use python-config
- sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
- || die "sed for python version"
-}
-
-src_configure() {
- eqmake5 PREFIX="${ED%/}"/usr
-}
-
-src_install() {
- einstalldocs
-
- # Includes
- insinto /usr/include/PythonQt
- doins -r src/*.h
- insinto /usr/include/PythonQt/gui
- doins -r src/gui/*.h
-
- if use extensions ; then
- insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
- doins -r extensions/PythonQt_QtAll/*.h
- fi
-
- # Libraries
- dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/PythonQt-3.1.ebuild b/dev-python/PythonQt/PythonQt-3.1.ebuild
deleted file mode 100644
index 147196f81ea7..000000000000
--- a/dev-python/PythonQt/PythonQt-3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +extensions webkit"
-
-RDEPEND="${PYTHON_DEPS}
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- extensions? (
- dev-qt/designer:5
- dev-qt/qtdeclarative:5[widgets]
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- webkit? ( dev-qt/qtwebkit:5 )
- )"
-DEPEND="${RDEPEND}
- dev-qt/qtxml:5
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
-# Bring uitools back, backport other fixes from trunk
-PATCHES=( "${FILESDIR}/${P}-commit-433-441.patch" )
-
-src_prepare() {
- default
-
- if ! use extensions ; then
- sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
- fi
- if ! use webkit ; then
- # Remove webkit support if not used
- sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
- extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
- || die "sed for webkit"
- fi
-
- # Unset python version to use python-config
- sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
- || die "sed for python version"
-}
-
-src_configure() {
- eqmake5 PREFIX="${ED%/}"/usr
-}
-
-src_install() {
- einstalldocs
-
- # Includes
- insinto /usr/include/PythonQt
- doins -r src/*.h
- insinto /usr/include/PythonQt/gui
- doins -r src/gui/*.h
-
- if use extensions ; then
- insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
- doins -r extensions/PythonQt_QtAll/*.h
- fi
-
- # Libraries
- dolib.so lib/libPythonQt*
-}
diff --git a/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch b/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
deleted file mode 100644
index 90d3cb9d2ec9..000000000000
--- a/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp
---- a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp 2016-06-09 06:46:16.000000000 -0500
-+++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp 2016-07-25 06:06:45.000000000 -0500
-@@ -45,6 +45,7 @@ void PythonQt_init_QtXmlPatterns(PyObjec
- void PythonQt_init_QtMultimedia(PyObject*);
- void PythonQt_init_QtQml(PyObject*);
- void PythonQt_init_QtQuick(PyObject*);
-+void PythonQt_init_QtUiTools(PyObject*);
-
- #ifdef PYTHONQT_WITH_WEBKIT
- void PythonQt_init_QtWebKit(PyObject*);
-@@ -67,6 +68,7 @@ namespace PythonQt_QtAll
- PythonQt_init_QtMultimedia(0);
- PythonQt_init_QtQml(0);
- PythonQt_init_QtQuick(0);
-+ PythonQt_init_QtUiTools(0);
- };
- };
-
-diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
---- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro 2016-06-09 07:00:18.000000000 -0500
-+++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro 2016-07-25 06:06:45.000000000 -0500
-@@ -21,7 +21,7 @@ SOURCES += \
-
- QT += gui svg sql network xml xmlpatterns opengl
- QT += widgets printsupport multimedia multimediawidgets
--QT += quick qml quickwidgets
-+QT += quick qml quickwidgets uitools
-
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
-@@ -34,6 +34,7 @@ include ($$PYTHONQT_GENERATED_PATH/com_t
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)
- include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)
-+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
-
- PythonQtWebKit {
- QT += webkit webkitwidgets
-diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.cpp b/generator/abstractmetalang.cpp
---- a/generator/abstractmetalang.cpp 2015-06-18 08:32:57.000000000 -0500
-+++ b/generator/abstractmetalang.cpp 2016-08-03 02:16:08.000000000 -0500
-@@ -838,14 +838,24 @@ AbstractMetaFunctionList AbstractMetaCla
- return returned;
- }
-
--bool AbstractMetaClass::hasDefaultIsNull() const
-+QString AbstractMetaClass::getDefaultNonZeroFunction() const
- {
-+ foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isEmpty")) {
-+ if (fun->actualMinimumArgumentCount()==0 && fun->isPublic()) {
-+ return "isEmpty";
-+ }
-+ }
-+ foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isValid")) {
-+ if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
-+ return "isValid";
-+ }
-+ }
- foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isNull")) {
-- if (fun->actualMinimumArgumentCount()==0) {
-- return true;
-+ if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
-+ return "isNull";
- }
- }
-- return false;
-+ return QString();
- }
-
- /*******************************************************************************
-diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.h b/generator/abstractmetalang.h
---- a/generator/abstractmetalang.h 2014-09-25 05:51:32.000000000 -0500
-+++ b/generator/abstractmetalang.h 2016-08-01 04:12:32.000000000 -0500
-@@ -800,7 +800,8 @@ public:
- void setHasCloneOperator(bool on) { m_has_clone_operator = on; }
- bool hasCloneOperator() const { return m_has_clone_operator; }
-
-- bool hasDefaultIsNull() const;
-+ QString getDefaultNonZeroFunction() const;
-+
- void addPropertySpec(QPropertySpec *spec) { m_property_specs << spec; }
- QList<QPropertySpec *> propertySpecs() const { return m_property_specs; }
-
-diff -uprNEBZ --suppress-blank-empty a/generator/merge.sh b/generator/merge.sh
---- a/generator/merge.sh 1969-12-31 18:00:00.000000000 -0600
-+++ b/generator/merge.sh 2010-03-05 16:03:37.000000000 -0600
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+
-+xsltproc -o typesystem_core.xml --stringparam source 'typesystem_core-qtscript.xml' merge.xsl typesystem_core-common.xml
-+xsltproc -o typesystem_gui.xml --stringparam source 'typesystem_gui-qtscript.xml' merge.xsl typesystem_gui-common.xml
-+xsltproc -o typesystem_opengl.xml --stringparam source 'typesystem_opengl-qtscript.xml' merge.xsl typesystem_opengl-common.xml
-+xsltproc -o typesystem_network.xml --stringparam source 'typesystem_network-qtscript.xml' merge.xsl typesystem_network-common.xml
-+xsltproc -o typesystem_xml.xml --stringparam source 'typesystem_xml-qtscript.xml' merge.xsl typesystem_xml-common.xml
-+xsltproc -o typesystem_webkit.xml --stringparam source 'typesystem_webkit-qtscript.xml' merge.xsl typesystem_webkit-common.xml
-+xsltproc -o typesystem_sql.xml --stringparam source 'typesystem_sql-qtscript.xml' merge.xsl typesystem_sql-common.xml
-+xsltproc -o typesystem_svg.xml --stringparam source 'typesystem_svg-qtscript.xml' merge.xsl typesystem_svg-common.xml
-+xsltproc -o typesystem_xmlpatterns.xml --stringparam source 'typesystem_xmlpatterns-qtscript.xml' merge.xsl typesystem_xmlpatterns-common.xml
-\ No newline at end of file
-diff -uprNEBZ --suppress-blank-empty a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
---- a/generator/setupgenerator.cpp 2016-05-03 04:25:38.000000000 -0500
-+++ b/generator/setupgenerator.cpp 2016-08-01 04:12:32.000000000 -0500
-@@ -105,7 +105,7 @@ static QStringList getOperatorCodes(cons
- r.insert("PythonQt::Type_InplaceXor");
- }
- }
-- if (cls->hasDefaultIsNull()) {
-+ if (!cls->getDefaultNonZeroFunction().isEmpty()) {
- r.insert("PythonQt::Type_NonZero");
- }
-
-diff -uprNEBZ --suppress-blank-empty a/generator/shellheadergenerator.cpp b/generator/shellheadergenerator.cpp
---- a/generator/shellheadergenerator.cpp 2016-05-10 10:01:30.000000000 -0500
-+++ b/generator/shellheadergenerator.cpp 2016-08-09 07:20:29.000000000 -0500
-@@ -267,7 +267,11 @@ void ShellHeaderGenerator::write(QTextSt
- QList<FlagsTypeEntry*> flags;
- foreach(AbstractMetaEnum* enum1, enums1) {
- // catch gadgets and enums that are not exported on QObjects...
-- if ((enum1->wasProtected() || enum1->wasPublic()) && (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration())) {
-+ // since we don't parse Q_FLAG(S), we also need to generate for Q_ENUM which might
-+ // have a missing Q_FLAG(S) declaration.
-+ if ((enum1->wasProtected() || enum1->wasPublic()) &&
-+ (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration() || enum1->typeEntry()->flags()))
-+ {
- enums << enum1;
- if (enum1->typeEntry()->flags()) {
- flags << enum1->typeEntry()->flags();
-@@ -395,8 +399,13 @@ void ShellHeaderGenerator::write(QTextSt
- if (meta_class->hasDefaultToStringFunction() || meta_class->hasToStringCapability()) {
- s << " QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl;
- }
-- if (meta_class->hasDefaultIsNull()) {
-- s << " bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->isNull(); }" << endl;
-+ QString nonZeroFunc = meta_class->getDefaultNonZeroFunction();
-+ if (!nonZeroFunc.isEmpty()) {
-+ s << " bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return ";
-+ if (nonZeroFunc != "isValid") {
-+ s << "!";
-+ }
-+ s << "obj->" << nonZeroFunc << "(); }" << endl;
- }
-
- AbstractMetaFieldList fields = meta_class->fields();
-diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_core.xml b/generator/typesystem_core.xml
---- a/generator/typesystem_core.xml 2016-05-30 07:33:59.000000000 -0500
-+++ b/generator/typesystem_core.xml 2016-06-13 04:54:38.000000000 -0500
-@@ -550,6 +550,8 @@
- <rejection class="QObject" function-name="disconnectNotify"/>
- <rejection class="QObject" function-name="registerUserData"/>
- <rejection class="QProcess" function-name="pid"/>
-+ <rejection class="QProcess" function-name="setInheritHandles"/>
-+ <rejection class="QProcess" function-name="inheritHandles"/>
- <rejection class="QRegion" function-name="cleanUp"/>
- <rejection class="QSettings" function-name="registerFormat"/>
- <rejection class="QVector" function-name="back"/>
-diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
---- a/generator/typesystem_gui.xml 2016-06-01 03:20:27.000000000 -0500
-+++ b/generator/typesystem_gui.xml 2016-06-20 04:58:59.000000000 -0500
-@@ -1307,6 +1307,17 @@ PyObject* constScanLine(QImage* image, i
- <object-type name="QWizard">
- <!-- ### Requires correct class name in meta object -->
- <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>
-+
-+ <modify-function signature="addPage(QWizardPage*)">
-+ <modify-argument index="1">
-+ <define-ownership owner="c++" />
-+ </modify-argument>
-+ </modify-function>
-+ <modify-function signature="setButton(QWizard::WizardButton, QAbstractButton*)">
-+ <modify-argument index="2">
-+ <define-ownership owner="c++" />
-+ </modify-argument>
-+ </modify-function>
- </object-type>
- <object-type name="QWizardPage">
- </object-type>
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
---- a/src/PythonQtConversion.cpp 2016-06-02 07:30:53.000000000 -0500
-+++ b/src/PythonQtConversion.cpp 2016-07-21 08:36:40.000000000 -0500
-@@ -746,9 +746,14 @@ QString PythonQtConv::PyObjGetRepresenta
- QString PythonQtConv::PyObjGetString(PyObject* val, bool strict, bool& ok) {
- QString r;
- ok = true;
-+#ifndef PY3K
-+ // in Python 3, we don't want to convert to QString, since we don't know anything about the encoding
-+ // in Python 2, we assume the default for str is latin-1
- if (val->ob_type == &PyBytes_Type) {
-- r = QString(PyBytes_AS_STRING(val));
-- } else if (PyUnicode_Check(val)) {
-+ r = QString::fromLatin1(PyBytes_AS_STRING(val));
-+ } else
-+#endif
-+ if (PyUnicode_Check(val)) {
- #ifdef PY3K
- r = QString::fromUtf8(PyUnicode_AsUTF8(val));
- #else
-@@ -976,8 +981,15 @@ QVariant PythonQtConv::PyObjToQVariant(P
- #endif
- ) {
- // no special type requested
-- if (PyBytes_Check(val) || PyUnicode_Check(val)) {
-- // NOTE: for compatibility reasons between Python 2/3 we don't use ByteArray for PyBytes_Type
-+ if (PyBytes_Check(val)) {
-+#ifdef PY3K
-+ // In Python 3, it is a ByteArray
-+ type = QVariant::ByteArray;
-+#else
-+ // In Python 2, we need to use String, since it might be a string
-+ type = QVariant::String;
-+#endif
-+ } else if (PyUnicode_Check(val)) {
- type = QVariant::String;
- } else if (val == Py_False || val == Py_True) {
- type = QVariant::Bool;
-@@ -1117,6 +1129,14 @@ QVariant PythonQtConv::PyObjToQVariant(P
- }
-
- case QVariant::ByteArray:
-+ {
-+ bool ok;
-+#ifdef PY3K
-+ v = QVariant(PyObjGetBytes(val, false, ok));
-+#else
-+ v = QVariant(PyObjGetString(val, false, ok));
-+#endif
-+ }
- case QVariant::String:
- {
- bool ok;
-@@ -1504,7 +1524,7 @@ QByteArray PythonQtConv::getCPPTypeName(
- bool PythonQtConv::isStringType(PyTypeObject* type)
- {
- #ifdef PY3K
-- return type == &PyUnicode_Type
-+ return type == &PyUnicode_Type;
- #else
- return type == &PyUnicode_Type || type == &PyString_Type;
- #endif
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQt.cpp b/src/PythonQt.cpp
---- a/src/PythonQt.cpp 2016-05-23 02:31:11.000000000 -0500
-+++ b/src/PythonQt.cpp 2016-06-20 03:26:33.000000000 -0500
-@@ -1977,6 +1977,7 @@ void PythonQtPrivate::buildDynamicMetaOb
- // Now look for slots: (this is a bug in QMetaObjectBuilder, all signals need to be added first)
- while (PyDict_Next(dict, &pos, &key, &value)) {
- if (PythonQtProperty_Check(value)) {
-+ needsMetaObject = true;
- PythonQtProperty* prop = (PythonQtProperty*)value;
- QMetaPropertyBuilder newProp = builder.addProperty(PyString_AsString(key), prop->data->cppType);
- newProp.setReadable(true);
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtSlotDecorator.cpp b/src/PythonQtSlotDecorator.cpp
---- a/src/PythonQtSlotDecorator.cpp 2016-05-19 10:22:41.000000000 -0500
-+++ b/src/PythonQtSlotDecorator.cpp 2016-07-21 08:36:40.000000000 -0500
-@@ -42,9 +42,9 @@ int PythonQtSlotDecorator_init(PyObject
- char* argName = 0;
- PyObject* argResult = 0;
-
-- static char* kwlist[] = {"name", "result", 0};
-+ static const char* kwlist[] = {"name", "result", 0};
- static PyObject* emptyTuple = PyTuple_New(0);
-- if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", kwlist, &argName, &argResult)) {
-+ if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", (char**) kwlist, &argName, &argResult)) {
- return 0;
- }
-
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.cpp b/src/PythonQtStdDecorators.cpp
---- a/src/PythonQtStdDecorators.cpp 2016-06-06 06:45:45.000000000 -0500
-+++ b/src/PythonQtStdDecorators.cpp 2016-06-20 03:26:33.000000000 -0500
-@@ -153,12 +153,12 @@ QVariant PythonQtStdDecorators::property
- return o->property(name);
- }
-
--QString PythonQtStdDecorators::tr(QObject* obj, const QByteArray& text, const QByteArray& ambig, int n)
-+QString PythonQtStdDecorators::tr(QObject* obj, const QString& text, const QString& ambig, int n)
- {
- #if( QT_VERSION >= QT_VERSION_CHECK(5,0,0) )
-- return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), n);
-+ return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), n);
- #else
-- return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), QCoreApplication::CodecForTr, n);
-+ return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), QCoreApplication::CodecForTr, n);
- #endif
- }
-
-diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.h b/src/PythonQtStdDecorators.h
---- a/src/PythonQtStdDecorators.h 2016-06-06 06:45:45.000000000 -0500
-+++ b/src/PythonQtStdDecorators.h 2016-06-20 03:26:33.000000000 -0500
-@@ -106,10 +106,10 @@ public Q_SLOTS:
- int static_Qt_qrand() { return qrand(); }
- void static_Qt_qsrand(uint a) { qsrand(a); }
-
-- QString tr(QObject* obj, const QByteArray& text, const QByteArray& ambig = QByteArray(), int n = -1);
-+ QString tr(QObject* obj, const QString& text, const QString& ambig = QString(), int n = -1);
-
-- QByteArray static_Qt_SIGNAL(const QByteArray& s) { return QByteArray("2") + s; }
-- QByteArray static_Qt_SLOT(const QByteArray& s) { return QByteArray("1") + s; }
-+ QString static_Qt_SIGNAL(const QString& s) { return QString("2") + s; }
-+ QString static_Qt_SLOT(const QString& s) { return QString("1") + s; }
-
- void static_QTimer_singleShot(int msec, PyObject* callable);
-
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 179c9769e92a..656c6771aee4 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -2,6 +2,6 @@ DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bf
DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
EBUILD QtPy-1.2.1.ebuild 944 BLAKE2B cde02e5cb515e0be44f0354ffbc802a629dba6625c17dae30c7417e9e1c6141a1a32f402e385467b0abf127d202da1b638795a7f5de936fc4f887dbaf9242b3a SHA512 c10bc35984b7db63d6dd2f5875a6d11aff9b4da13f415ad908e7351bb1a707d82565132f51ebe54d11655e3d138087c6decb5a7a39442f3edfd8ef81319433de
-EBUILD QtPy-1.3.1.ebuild 1359 BLAKE2B 3a5b50c793fa3fef2f76828a6bc847576cb73d391fc74c8f31a49fb76005d8b4b9302407596846ba92e72d7650fa255c933abb2715b16077cfc2d7e80621e595 SHA512 3f310737a2de023840906e7aad9c66c8df32b104c19d4a31b71f1d07bdb583a0e619d14875e96ff80ee8a7bdc1c044362769c3a56e8abb57d8e207191e32a71b
-EBUILD QtPy-1.4.0.ebuild 1380 BLAKE2B 14ff548f5ae0f9a2ca4bda569debf8cad1c6f2d62ef336cdfb442f19b7a5719329288aad70514c42b4660e13e192c75200770e81964fe28f3e24ef25f6824ea0 SHA512 6c1cd326adcffa66a2f1832f07df02289129da8ce6e53c9487eff41658232889dca3c513167598d5f9b945a2a88afd2cb8c14b6a208709d1158756240ed2ef4d
-MISC metadata.xml 1494 BLAKE2B 8744d5701e82a8cebbbf27394cc458e3b3906674b3388e3cf31b168019d2081b82b4a7a5466606a7ea3d423d31ae9e4372680abecdb69ae874aed81b3cd195d5 SHA512 b0ff953afb99e6ce972c8e7e58ab99c885381c0531731b8669e4a0b299d89cc6e33bcc4fc9658afd994a1f3979e0b623610a55856ead44c0a766f2fe74824ca5
+EBUILD QtPy-1.3.1-r1.ebuild 959 BLAKE2B bfec246e5c256da5777fc01244413a28802b600a371dd71826ddee440f973c6f621741325ad62c94c0322672495ffcec8616b704bc1c14ea2c58d5d46bd38792 SHA512 43cbf817d76fccc1fcde055c37918260045d060ed568b7e6594f0f40c2ee438a33afb43ca3ace169dfcb20a995c0f12c0f8c87ebfe1faddca7934faf38258d17
+EBUILD QtPy-1.4.0-r1.ebuild 980 BLAKE2B 8e44bc8639e870b349f81f0ccb5a11439e5f897645da1f0c99e6ce110ca412ec10072895c723920e2cfacc72a6015392f0020cde7c23783c8ce100536ea63f1f SHA512 fa31c3ab20096a44d6f7c367e2858757e9a66b77a7e991002104dd566e678cf9e3e753d8a52411be89bca7e3acb886f935c750743a33e7267220f689e7c28510
+MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..7987c23cfe1d
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit"
+
+RDEPEND="
+ dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+ gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+ testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ default
+
+ sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+ sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+ sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
deleted file mode 100644
index de40764e990a..000000000000
--- a/dev-python/QtPy/QtPy-1.3.1.ebuild
+++ /dev/null
@@ -1,48 +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="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
- pyqt5? (
- dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
- gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
- testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
- )
- pyside? (
- dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
- gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
- testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
- )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- default
-
- sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
- if ! use pyqt5; then
- sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
- fi
-
- if ! use pyside; then
- sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
- sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
- fi
-}
diff --git a/dev-python/QtPy/QtPy-1.4.0-r1.ebuild b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..0ec5a63afb85
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+ dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
+ gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+ testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ default
+
+ sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+ sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+ sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/QtPy/QtPy-1.4.0.ebuild b/dev-python/QtPy/QtPy-1.4.0.ebuild
deleted file mode 100644
index 67ff013c69fe..000000000000
--- a/dev-python/QtPy/QtPy-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 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="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl +pyqt5 pyside svg testlib webkit webengine"
-
-REQUIRED_USE="|| ( pyqt5 pyside ) webkit? ( pyqt5 )"
-
-RDEPEND="
- pyqt5? (
- dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?,webengine?]
- gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
- testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
- )
- pyside? (
- dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?]
- gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
- testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
- )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- default
-
- sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-
- if ! use pyqt5; then
- sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
- fi
-
- if ! use pyside; then
- sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
- sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
- fi
-}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index f7b2b130bc4a..e1b8d6e3aa72 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -18,8 +18,6 @@
<use>
<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
<flag name="gui">Build bindings for the QtGui module</flag>
- <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
- <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
<flag name="svg">Build bindings for the QtSvg module</flag>
<flag name="testlib">Build bindings for the QtTest module</flag>
<flag name="webengine">Build bindings for the QtWebEngine module</flag>
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 931b5cda5162..27b083e99bf3 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,7 +1,9 @@
DIST django-polymorphic-1.2.tar.gz 100149 BLAKE2B ac7e92e113b595009d350282504845b6ba179549f555c523446ecf8a69a6915e2eedacc35e30333ac3579581b33528d0b7d5bf8ab6a900180c7f209cd1277fd8 SHA512 71d7293b5eb49ae49801d5d3e60af7c9bcb8729237fb92016dc14800c1955cac1ae5a9029a1d37048cdfd7200e1ee38d15e13859345b1032f202ff90f75fd325
+DIST django-polymorphic-2.0.2.tar.gz 99541 BLAKE2B f785eb0d63b79521c5dd1df1dd61ef5b5b560a67337e2d647bf56bea4524129074ab9766231c516397763152ab88c15fa35ec1386fd64bb725e93cfe11418cd3 SHA512 5790526debf68ea39b2cd578d33b0a5d715e7a5f20f83108a0fb26df956ba7b3bcbb10f67608f60df13d62f86efefe0152af7d069ca404b1b92fc9fdf71ffbd0
DIST django_polymorphic-0.7.2.tar.gz 36041 BLAKE2B b878ad08b6ce85efb7801e4c7506e75fcae47f439c130c0457d65c60ae265803d4dd588061430ae64e0e51f9de4b4422f60417024ffdba25606cb66c253f12c4 SHA512 afe391f635fcde0490a4bfd64d373794134a2e56066e07236299c07669eaa8afbef6f6d1a6116061716edb95ef1db0c0e4da91a7e8516f517206499d41051250
DIST django_polymorphic-0.9.2.tar.gz 39400 BLAKE2B 5c8d5c336e31891e05c12b43f8ed87d693182d9cbce41008624d6072b84eb2fa9882356642269e36cf04eed0b326dff1b57ef5007df40984159bec2649b5c904 SHA512 db22b880e042bf70ae215c95ce2cc5bca5f8622e7554af7c9e4b15daf10f45e70b255d9db2280a5de3a0c7a07dee3eb2b8cea5552b28c24ec8c301713165d993
EBUILD django_polymorphic-0.7.2.ebuild 482 BLAKE2B 5018bfda035972850054fb659fb23f6db6821fff26e4f9627b244142251b5113517d7bd42a1ab2ccb2f6302b9724b310a4990cd38c20fb4ff8a8606b0a6eca34 SHA512 4e2dcc9a99594089ee6b96a978e7b796195bfe9761df411b8ea73c96ae6590b8328c67748dada3782945ecc15044f1d7329f5fbbd6a28e89839618c7cbdceb90
EBUILD django_polymorphic-0.9.2.ebuild 482 BLAKE2B 716a6e25787e92885537aaebc57e22fb548ec73c4cfec8566aa09f48eb16a84749dad00c02abe20a94149d2eb42269ffd890fa7349f61c7b8b16a3ecea6c37cc SHA512 e31b6b14a02a8632bf5ebb15000f9dd04d4ebc593b50d0977bfc92b92bd348533eae6393512e28bcc5d475d481fd8242733149a6d0560b913fc127afc66b0774
EBUILD django_polymorphic-1.2.ebuild 569 BLAKE2B 8fa9801c4096fef19be374a530614cd71a506c1adc90db0ceec593ec8cb10bb560520561860eca45bd88a348b7c2d18374206dc346376fb59b462b43b39c6731 SHA512 dae202af59e50445920b9ba808c9b77584e588f10bf7ba4e4960aebb829f3b18a6a8319e5a68e06154a27937650bd9180587d9d092a5fecc6f14375622dbba3f
+EBUILD django_polymorphic-2.0.2.ebuild 566 BLAKE2B bd9fee114a2ef346529fba923f572008aca0171cafcbee2f9d557d83027a3c64fca567e9bcaccc3c675dbb25c165e63d93d9b217e9cdb5216603ae6ef445d1a2 SHA512 ca999ac57b5fe8255b3d710b5fb8d236a01bdf74b31e51796b177f23b274d2adf7363bd45dc21f54e0d2a5be28e268e6997f3aff346b778b10216d7ed4f2d09c
MISC metadata.xml 304 BLAKE2B e00d35195ae0451a93db9cddb09227e3e063027176a0fcae3abc0bb0cd7f3759277772fb4ea7996c51e3354ecbf7a486a83a6f45a8ef4141801fbadbf8231828 SHA512 81aeecce6bddd294dd7d7e212af8f8d1942f88aa9cd0c89b040e7c43fdfc028ab6d86e0ce3d7a8766ccc361eb00ef1e067effd1607532a64100d085c2374a836
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
new file mode 100644
index 000000000000..198f9cd61a48
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{2,3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/django-1.11[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P//_/-}"
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 31975f122f83..4b1736289e3a 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,10 +1,10 @@
DIST elasticsearch-5.5.1.tar.gz 33476827 BLAKE2B 4f37f13fcd0a236c5da5b74c4eec5ac9ce40234059643bed69b56e93a9d5b9758ebaf0f6d50155b7338c0c203cdd7296816d6c7bc5cb0ee5455e406e586c4bf8 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd
-DIST elasticsearch-5.6.3.tar.gz 33774486 BLAKE2B 167b50e9565b1c67f0b8b31ea2b19aacbc2def62dabd84bee6e5fbd90f1a76d3d777edb17132fdae9d5b00ada1e895c7ca90566fb2675234789e1e028c448a58 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e
DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
+DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
DIST elasticsearch-curator-5.1.2.tar.gz 290616 BLAKE2B 57c02ddaf188b8dd08286e47d4eaf4e0af05d65d89139f77f5d71274c394defe491393a7043bb426fa4b260c199e92221c1e57b6d24922898e5e3b8e9e2de58b SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d
-DIST elasticsearch-curator-5.3.0.tar.gz 292274 BLAKE2B e7830db810ab1fabbbf580db5e15d7ffe11d4bb85923c0e51fd8cc0b0a640c71664198ddcb0b9a3cc1ef92f06856854295063947ddc23a857f4d4701f5528427 SHA512 23a94c0a8b78cd0f3a27af76131c267c407dbafb504a4503e8c954e69cdb527ed334fbfcda068b2f1d28479762c430f665f661f827bdf3066f5bcdd50c82dc53
DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
+DIST elasticsearch-curator-5.5.1.tar.gz 301351 BLAKE2B 1dfcf53995c203a7201e421bc9f01a840597d8c1099ae434be52ff27e47e30f509bf1c5a42d507b549f5fe8ce45cbe74614ea76c338b0ae9de1d51877c8b32fe SHA512 a0ccb35fe93cefb927020add9629d5879cb64ee41a25130150ee8c45867e210f611a5fca0a43357c6f68cbf0c3f0acf677a7f8d2b3b493f4c2815637640ed9f6
EBUILD elasticsearch-curator-5.1.2.ebuild 3228 BLAKE2B 92a193fc2278315ff7cc67188600a48d3a2ecc98968bcf011b90debd62eb3b2fa728eccaf85d476bd503eaac10e48eeed89518b9db95f299bc980a50858c5954 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205
-EBUILD elasticsearch-curator-5.3.0.ebuild 3239 BLAKE2B 9e3df9eb894671207616f4bcea397cbc17b4b4bf9791a97a78115cf859fcfaeb30658077940f717e76b2d829659b6ac125f38425b757bb198c7cf90a5b32782a SHA512 2cd0e8e3ba8a02ee22884f5e7436203cfb386d1be90e1ecb50b5b6ba60f7ef1181fe6b32ae91f2615875f7e8ad1b75f4032e1902644a046585d8d88de8614406
EBUILD elasticsearch-curator-5.4.1.ebuild 3229 BLAKE2B b43563ab3e0cde11ce7823a0dfc5ac2dfe6d3ebfe726859734153a63007a872d4b6ca74a8988aeb59cb8e502a8c479b4fb4e212b4eb711ee100f99cd8cb4741d SHA512 35f0749472eb1117d6086b2f0733f4d5c191ecc5e0270ddc6a3b03f9ab1955592d2417b1fbd29f546b231cd718049a782b2ba86aef0869d99d64702e20c5ea5a
+EBUILD elasticsearch-curator-5.5.1.ebuild 3358 BLAKE2B 7e6584f2ce49718446931ebc79f9552137d34a975101d70df3e7b6bbf849f6ce8c016464813422dae83e6839dd9ebbd0e93496e84a97bf9edbcce185c77e24fb SHA512 064a58f3ae727a9c30c356b77148856e8e42eb4059bf01a7e972747ed41041962127673a490783d10dda5644685352a35bb97ff7486278f25d680039c65d7ee4
MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
index 01cb9487818f..ac00f389bed6 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.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
@@ -6,14 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
MY_PN="curator"
-ES_VERSION="5.6.3"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+ES_VERSION="6.2.4"
inherit distutils-r1
@@ -25,13 +18,14 @@ SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
IUSE="doc test"
RDEPEND="
>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
- <dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+ <dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
>=dev-python/click-6.7[${PYTHON_USEDEP}]
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+ >=dev-python/certifi-2018.01.18[${PYTHON_USEDEP}]
>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -47,6 +41,25 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
S="${WORKDIR}/${MY_PN}-${PV}"
+python_prepare_all() {
+ # avoid downloading from net
+ sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+ # allow to use newer dev-python/elasticsearch-py
+ sed -e 's/elasticsearch==5.5.2/elasticsearch>=5.4.0/g' -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ emake -C docs -j1 man $(usex doc html "")
+}
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+#
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
python_test() {
ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
ES_PORT="25123"
@@ -91,18 +104,6 @@ python_test() {
pkill -F ${PID}
}
-python_prepare_all() {
- # avoid downloading from net
- sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- cd docs || die
- emake -j1 man $(usex doc html "")
-}
-
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
doman docs/_build/man/*
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index ffa8ce369567..8623c4ec10c8 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,5 @@
DIST fs-0.5.4.tar.gz 231333 BLAKE2B 2211aedf02a3eab809b7bfeabe346ed147465db52ef6a069ab3cea6f62e3b420d52b9a58868c3eaab55bd9a6c8c071c5c090e28e9dbfccd182385beee3e246c8 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d
+DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7799a895fd79fb5a7df898df381e82bd160ccb782e7e814b00041d3cd309860c96b4ea5dc3078e6d33430b SHA512 d16e02a6ed78a26229b12e71f6286db0243774ae13f6f3d0a6c4fb9240fe65656e4f10cb2b385342fb48d12a163ca33a0b746854ab5ee240eae0ff8f6644ed13
EBUILD fs-0.5.4.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
+EBUILD fs-2.0.21.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.0.21.ebuild b/dev-python/fs/fs-2.0.21.ebuild
new file mode 100644
index 000000000000..c657c5f97cf5
--- /dev/null
+++ b/dev-python/fs/fs-2.0.21.ebuild
@@ -0,0 +1,44 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+ https://pypi.org/project/fs/
+ https://docs.pyfilesystem.org
+ https://www.willmcgugan.com/tag/fs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/dexml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+
+# Tries to access FUSE
+RESTRICT=test
+
+python_test() {
+ nosetests --verbose || die
+}
+
+pkg_postinst() {
+ optfeature "S3 support" dev-python/boto
+ optfeature "SFTP support" dev-python/paramiko
+ optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index 94d211cba567..b2a9d496147d 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -1,4 +1,4 @@
AUX gnuplot-py-1.7-mousesupport.patch 2596 BLAKE2B f3fa9063718d6d3ce9ad847c8517f6728f7f32064cc5c13165a993aca556257e600371542f5b2bb34b868cd5a07196ffd7587b852c266229fada49b1288358f7 SHA512 5dee0dcb4b24aef830a9c65678dcb4ca1a831a7dff04723e2248219883e578cdc136b668f05ab95d13c7bbd7da47b20012e0b3d1149342bb64336325c2f1dbbd
DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
-EBUILD gnuplot-py-1.8-r1.ebuild 854 BLAKE2B 54116bdca00021f668a317fe6ace37359752345107704936ce80169178fe24828e2cfccf26c6deb9d1a61eb3d5eb4eff7e87a086b223a928e69c91f5024e8fd3 SHA512 d840d450515ec30fc55ea0d1921e25f6b829f88d191222fceae25c736458ba10a5e59b3ad78e8b50000876af49312297e2f02e07f43455086578b1be12ff74de
+EBUILD gnuplot-py-1.8-r1.ebuild 855 BLAKE2B 7f3a1d3543c386a3beabb84efe7162d0667d66410f6307422dff2e84f3e6e5b85f2dfbdf2391f9db372995bb2ced17f085af2cd54886fbb5708538d5fc5daae2 SHA512 ecaf45fed606f1f0653cdee122d930edee1a1fd208dd541dce609c07e1218eaedc2c9afc798b16c702975c016f0c3a860f6e53ca7604ea94a7f995d19ff949f1
MISC metadata.xml 903 BLAKE2B d642116ef411d7556dffe4486d5360d7dce68927ccead0e3c00261cd89be47fab812ef9fc9455489dd79251f0a16f3c2ce5c1e9b826871f35a2e09b47da61988 SHA512 a007d4c76b4c868757567a8c37d95a825a95b2d21c4a19d050834c3e36753014f2ef8d69e3b99c7eaa52d8e8a5e6ecaca5a9bc4e23079367b055af62447aca69
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
index dd6977fde737..de2582903119 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
DEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2840cf3f8725..2825d1a3ad5e 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -6,7 +6,7 @@ AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 BLAKE2B
DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617fc2ef735f5705edafd2e9bc65169302ea8f775843c7da5029bce0dccb541233a7c82faf58a676ac5079f9664734 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe
DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
-EBUILD ipython-3.2.1-r1.ebuild 5049 BLAKE2B dfa09c80e7b558bf7efe9fafda23b2555987b196844b9707ce8e8b564a6e58a8d132284d0a16eb9f9b91896b361a0e2327849cdf7c5863de04a5c726604e7d0e SHA512 687dc470606dd48fd2128c7f8d1850cedb95bc4bb18be81f72b9656a06889741cad28c10a6f13a73b069c43794299c8127a33ced778eb350f367db5399352f5b
+EBUILD ipython-3.2.1-r1.ebuild 5050 BLAKE2B 06a8e2975c74bacf44cfd810b8cca31482bb80d9042058a232cdcdc71636039106ee5331ec8f4d2b341239d0bcd82a51d84ede54dc72286b19fead536f838e5b SHA512 418f91f9da20347c1b6d3e09a9cf24f1ee46adaf9b90b0fdc3932f061484dd563b85c356aaecb9690a3f141ce422a1bb43a8caff978173afedf9139fe731f222
EBUILD ipython-5.4.1.ebuild 3660 BLAKE2B 1194832e0fa675d74a90f8e5010c8e3be03c0e163f64e118a3ef7761ae324de3ec01973b20dfd7dfce2c220c95f8bb08753e8e458d5041b6528216aec30f0aa3 SHA512 0bd84e4422af2b26c8832bf922f093d453cdd65c9b68509b52bfc1395376c29e151815852dbfc650aab1bc96ce447e46b2dfd067c6f9fc3287bc88eb82f8d73d
EBUILD ipython-6.1.0.ebuild 3392 BLAKE2B af1d71f219bafc6320f3454c9f66f4176237a51b5338184a3627a077ffc6dce123771c18bbad40dd282c9acaae0c9f2665088d0c28bfe5aa78f739137b7a38a6 SHA512 4a0a548881b1e31e8bcdaca02fac5a24df9e9c773fdba0fdd2a6d7f4ccac56d8cff5744ce49502bc943eb6610bf4b6a1e5a2715aaf21daee140b9b27845e97ec
MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
index 60fb120e0330..912566cbee2b 100644
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
REQUIRED_USE="
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 2354db4c47ad..7c7c16c03c28 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,6 +1,8 @@
AUX jedi-0.11.1-exclude-tests.patch 940 BLAKE2B 2c5540b62529a27a8beb8c3ca1b2f2c8b58e43e4116701b406ab62cd1d04ad3c0314430d33a7bdc9585647054a1820426fea270556dc1f959ac2a9da98738152 SHA512 9629d8a694f6deda3564c14234e92cf494e7c982bbab75729ffedc2c43c9167dfd23f45d47abb397bc8e1b732ed0649e290392bc2332585aa0ad312b188f6107
DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
+DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244873dfb22044aa6d080435efa976daeb80949c3fba41ca2f57feb5bfed255b3bb490e17b40b3f13dfbb31e14 SHA512 3e8280b16855cf2c891666f0fb02ac30d801279b72b5bcb64541ef7c152d9f9b165015405ee291cbccd6c9cb3c0481c24f30e6100cb4463888153021b946f16d
EBUILD jedi-0.10.2.ebuild 988 BLAKE2B 89b371ff6dd445e36936a5cf43a334a352e9480d41616d4cb0dfa0ea2b10343a6ee2744b654c5ccc020313a40a00b2c0e0ce6fdbf528bf6c82e99e3dd0b829c2 SHA512 e354c07d1f2378b94675b59476a9bab9ef7db19eff2be6fa5f86fb931fadf6c2de55f9df43203481957a42f622d75b0867389523e3d3dd7e2267c1d02797d611
EBUILD jedi-0.11.1.ebuild 1174 BLAKE2B eda6fe9d5198981721ff1594673ebdc6bed66bff3573b93014c039e77321fc36e893089d9a8e3ef2c8b7d0920e954b539537222e27ff84ffae7500e2fb89fb22 SHA512 1374a7dae2ca317118c83f9d6c39b31f08a7e699973746d7be52c79956dccbc1b0c5c0db107594dcdac4840a0bf53a6abf2a8f5a94ff74dfe6a81c08fc93776f
+EBUILD jedi-0.12.0.ebuild 1037 BLAKE2B f732261cd166006ee6560be4614198069ba25513decc8c3907de39fd871cb935aec3d9e8c655a816ad12097e4aa0880c089911722330d54e018470473f01fb2a SHA512 1527cff7992eb9e1bf4a3b87a0b6b0480098897ea272c8a00b747281917cb486fd0f9903e8c289285e35a7260746ef2aebb732cdefa4f4447fa18ee726aeb5fb
MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.12.0.ebuild b/dev-python/jedi/jedi-0.12.0.ebuild
new file mode 100644
index 000000000000..ce096b6c317f
--- /dev/null
+++ b/dev-python/jedi/jedi-0.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 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="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+# various misc failures
+RESTRICT="test"
+
+src_prepare() {
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
+ || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 0d8e02a0e1b6..da47292df054 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -7,5 +7,5 @@ EBUILD jupyter_core-4.0.6.ebuild 1145 BLAKE2B 70f2fa14bac4a7a60e2834212128f529a8
EBUILD jupyter_core-4.1.0.ebuild 1145 BLAKE2B ce196069db087f468023e2e12b4e923c02a96f7768a195d63d12b1bb6b159d2c2e57639c8833596d0aa0f8334c449af06d2eda54eaaa05335a9a52b68d7379cc SHA512 5f5127ca454f3c60a9ce41751491031335f933fc6c965e1e525854c7870f3d4afbb079e7bf97dd9821fba28af4c64f830e643d655c40c24639b6d747dcb36224
EBUILD jupyter_core-4.2.1.ebuild 1177 BLAKE2B ffacffd2891916c5f701b022c3fadc51e09eddf16c495212ee0624ff2a3b2b0ab1e094bbebc74c9c260072c33691e42943f5da524bc06eb96a124ac6bd383a6b SHA512 5364e8ee4d268f0afe1f55ec54e064f64081e2644d4a9f61ea1fbecd99206a18ff0b4fd017e7552a1304352ad0187b5e9462227e7c21f102d3342fc5cd2bcfdd
EBUILD jupyter_core-4.3.0.ebuild 1123 BLAKE2B ace3719a5e3a1dd8f41202ee71af0403f4a6c01dddc8ca59452e57d7d467f0689162610e2adc03b931caa4b0dfcf9082a9ddc36c5bc98977169df20021670e57 SHA512 73b3a1bcb6c69e820a31917672c88ab6a7aa2cac4dd24c60e69e889c9eb40270afeabe99d85b30cdc90c1391814e66fa81b55917e26f85030358622dbd6eb061
-EBUILD jupyter_core-4.4.0.ebuild 1178 BLAKE2B b301206374995b39f4890890813925ad6ca579c19907608d5c7df98b86277e81f54e268f9ff90deaeb55f84e1b66c28b772f44f50c98062f8102d80241c4033d SHA512 d26a7621ecec31a2c82d51eb0c44c8cc45aff411050a41c8b0555161c0b628c78a4f7872bd7342bc47dce79cf031c525796ac8a7f0f6e315305e46cc0e323335
+EBUILD jupyter_core-4.4.0.ebuild 1251 BLAKE2B eeeb015397ad754adf11bc1b9f9e91ef99c623850025e9c8778ceaca41e7cb4a2dfc0e2f1f526326033d20288892d99053bf007de24fbeefca1fba6949f80d17 SHA512 4f10139ffb404619dea52005fda76e5aec285b5a07760e7917ad69ee74a5323c8d0459ffb95ba84fe5cb92d15caf8effc3794697463a92e3f01b683f3c5bb573
MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index a2804624d23b..962e95ed8c62 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
@@ -18,7 +18,7 @@ IUSE="doc test"
RDEPEND="
dev-python/traitlets[${PYTHON_USEDEP}]
- "
+"
DEPEND="${RDEPEND}
!!<dev-python/jupyter-1.0.0-r1
doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
)
- "
+"
+
+# tests require installation of jupyter_core, bug #649538
+RESTRICT="test"
python_prepare_all() {
# Prevent un-needed download during build
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e4a8341efe2a..0c57ac39d1e1 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,15 +1,8 @@
-AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 BLAKE2B 2eb3148d1f5d13380afaca39a377af8f14619805684316f4dc9d8db8a518dc408277e381b8c42c554dd8c011357c7f3e516607ccae42074b413b921c1ec2f905 SHA512 06fb07f42d5a0e8c54e7f259bc0b8787a8caf25fa52c1d5a37a660c6e6df0fe6d93dc91367699d40d19b523c903c4be6a284403dc3eb93a4e68acc2e80329120
-AUX matplotlib-1.4.3-cross-compile-1.patch 1779 BLAKE2B 6d95661d0300976064cca5f21020d3642d65ecfdbc74458bcb9aa82ecef7490869be4b97110726431f52385ba967d09d28b0c7c040cc4b07997ef758c83dfc0e SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d
-AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec7bfd35c9b51644662c548279c6e05f72d1c626625525d0600c89bc4e00827b3f1de777f76ac626f51bd448a4a0478cadb8bf6810 SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824
-AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-AUX matplotlib-2.2.0-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
-DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5
DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
-EBUILD matplotlib-2.2.0.ebuild 6397 BLAKE2B 5e6a31c01fa9d822d6a1bf64d8cef33a4f3486a5882f4f7073336a6c4bda81fe10262c748cfd792b4a88325a4f08dc3b34a13633940ff1a2f6b336403fe860d8 SHA512 7f4e6b0532710db8397b623721c2280e688cabe7770ba78ea6b7d5a00d801c1e8e94f886552b75404692394a64ea128dd6eee6882e1f563faf1ad979dab7a008
-EBUILD matplotlib-2.2.2.ebuild 6392 BLAKE2B 9eefa8e49d717b89d48a8d85bae1faa5be1eeafd11113fad727dc1802cdc5db3e2ec713b5da7e3d975439e44f293d1171c6601ae226622e97c09774abdb238d2 SHA512 b172e8ea35842e74172067de9c3d8245f49223b60f4e7fe22f9dea99e8a0006f4f5692bced392bdc99791f36c14fc6eb8126bfa23a79c1352a7eebb47fc5e8ed
-EBUILD matplotlib-9999.ebuild 6397 BLAKE2B c40f0ebd9dd1f4a2180c8afedb8eff450bd3fb15d3b785551bcf6f16e64840dacad301054be1835137b097ad11507cdf16ee219de3a9c51ab950ca8a4c6565b1 SHA512 ab8117ddaccaa483b102f6c1d8d12717791539f669c6f2063cb246331983d46775a7bc78c99d9bed5e25b1387c5db07ed1aa7130c61472ee5bc36a9ffc2c047e
+EBUILD matplotlib-2.2.2-r1.ebuild 6352 BLAKE2B de15e3806c58550e61aee15cb1d3b5e8e80476c697f665b8e7479e6700c67ac7a52c029ef116e74b1813a701dc12dc2d87266391e16bbca578ffe09a3538557b SHA512 edca02a00a6bf62cf14cc2f4996d2f8652472e90d623036a9445cde8db5c2e2768070bcb743cf705b46242f9044032374105ac5a5377966d00aa4775db01888d
+EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
deleted file mode 100644
index d6b2ae860038..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-commit f98c4846dc3c15b3d24aafb973764cb9b860d935
-Author: Thomas A Caswell <tcaswell@gmail.com>
-Date: Sat Jan 10 16:10:29 2015 -0500
-
- MNT : removed deprecated method/kwargs from patheffects
-
- Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
-
- attn @pelson had to known-fail a test which was using the
- proxy renderer to verify that PathEffectRender was working
- correctly.
-
-diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
-index 13f8ce0..19e1c4a 100644
---- a/lib/matplotlib/patheffects.py
-+++ b/lib/matplotlib/patheffects.py
-@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
- import six
-
- from matplotlib.backend_bases import RendererBase
--from matplotlib.backends.backend_mixed import MixedModeRenderer
- import matplotlib.transforms as mtransforms
--import matplotlib.cbook as cbook
- from matplotlib.colors import colorConverter
- import matplotlib.patches as mpatches
-
-@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
- return transform + self._offset_trans.clear().translate(offset_x,
- offset_y)
-
-- def get_proxy_renderer(self, renderer):
-- """Return a PathEffectRenderer instance for this PathEffect."""
-- cbook.deprecated('v1.4', name='get_proxy_renderer',
-- alternative='PathEffectRenderer')
-- return PathEffectRenderer([self], renderer)
--
- def _update_gc(self, gc, new_gc_dict):
- """
- Update the given GraphicsCollection with the given
-@@ -219,9 +211,9 @@ class withStroke(Stroke):
-
- class SimplePatchShadow(AbstractPathEffect):
- """A simple shadow via a filled patch."""
-- def __init__(self, offset=(2,-2),
-- shadow_rgbFace=None, alpha=None, patch_alpha=None,
-- rho=0.3, offset_xy=None, **kwargs):
-+ def __init__(self, offset=(2, -2),
-+ shadow_rgbFace=None, alpha=None,
-+ rho=0.3, **kwargs):
- """
- Parameters
- ----------
-@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
- :meth:`AbstractPathEffect._update_gc`.
-
- """
-- if offset_xy is not None:
-- cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
-- 'Use the offset keyword instead.')
-- offset = offset_xy
- super(SimplePatchShadow, self).__init__(offset)
-
- if shadow_rgbFace is None:
- self._shadow_rgbFace = shadow_rgbFace
- else:
- self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
-- if patch_alpha is not None:
-- cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
-- 'Use the alpha keyword instead. Transform your '
-- 'patch_alpha by alpha = 1 - patch_alpha')
-- if alpha is not None:
-- raise ValueError("Both alpha and patch_alpha were set. "
-- "Just use alpha.")
-- alpha = 1 - patch_alpha
-
- if alpha is None:
- alpha = 0.3
-diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
-index 8298ceb..5af71e5 100644
---- a/lib/matplotlib/tests/test_patheffects.py
-+++ b/lib/matplotlib/tests/test_patheffects.py
-@@ -5,7 +5,8 @@ import six
-
- import numpy as np
-
--from matplotlib.testing.decorators import image_comparison, cleanup
-+from matplotlib.testing.decorators import (image_comparison, cleanup,
-+ knownfailureif)
- import matplotlib.pyplot as plt
- import matplotlib.patheffects as path_effects
-
-@@ -84,19 +85,7 @@ def test_patheffect3():
-
-
- @cleanup
--def test_PathEffect_get_proxy():
-- pe = path_effects.AbstractPathEffect()
-- fig = plt.gcf()
-- renderer = fig.canvas.get_renderer()
--
-- with mock.patch('matplotlib.cbook.deprecated') as dep:
-- proxy_renderer = pe.get_proxy_renderer(renderer)
-- assert_equal(proxy_renderer._renderer, renderer)
-- assert_equal(proxy_renderer._path_effects, [pe])
-- dep.assert_called()
--
--
--@cleanup
-+@knownfailureif(True)
- def test_PathEffect_points_to_pixels():
- fig = plt.figure(dpi=150)
- p1, = plt.plot(range(10))
-@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
- pe_renderer.points_to_pixels(15))
-
-
--def test_SimplePatchShadow_offset_xy():
-- with mock.patch('matplotlib.cbook.deprecated') as dep:
-- pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
-+def test_SimplePatchShadow_offset():
-+ pe = path_effects.SimplePatchShadow(offset=(4, 5))
- assert_equal(pe._offset, (4, 5))
-- dep.assert_called()
-
-
- @image_comparison(baseline_images=['collection'])
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
deleted file mode 100644
index 065731441311..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:36:45 -0400
-Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
-
-When cross-compiling, it is common to set the PKG_CONFIG env var to a
-custom pkg-config that knows about the target. Make sure we respect
-that just like the standard pkg-config tools suggest (pkg.m4). If it
-isn't set, we use the same default as today -- "pkg-config".
----
- setupext.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 80b2a6c..29cddf9 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -253,7 +253,8 @@ class PkgConfig(object):
- self.has_pkgconfig = False
- else:
- self.set_pkgconfig_path()
-- status, output = getstatusoutput("pkg-config --help")
-+ self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
-+ status, output = getstatusoutput("%s --help" % self.pkgconfig)
- self.has_pkgconfig = (status == 0)
- if not self.has_pkgconfig:
- print("IMPORTANT WARNING:")
-@@ -286,7 +287,7 @@ class PkgConfig(object):
-
- executable = alt_exec
- if self.has_pkgconfig:
-- executable = 'pkg-config {0}'.format(package)
-+ executable = '%s %s' % (self.pkgconfig, package)
-
- use_defaults = True
-
-@@ -330,7 +331,7 @@ class PkgConfig(object):
- return None
-
- status, output = getstatusoutput(
-- "pkg-config %s --modversion" % (package))
-+ '%s %s --modversion' % (self.pkgconfig, package))
- if status == 0:
- return output
- return None
---
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
deleted file mode 100644
index 9580c70b2ae9..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:43:17 -0400
-Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
-
-The current code always sets PKG_CONFIG_PATH to build paths in / which
-breaks cross-compiling -- things like /usr/lib are for the build system
-(e.g. x86) and not for the target (e.g. arm). Since we're adding paths
-that are already the default for pkg-config, there's no point in trying
-to be smart here. Just punt the code.
-
-This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
----
- setupext.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 29cddf9..57d80e7 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -252,7 +252,6 @@ class PkgConfig(object):
- if sys.platform == 'win32':
- self.has_pkgconfig = False
- else:
-- self.set_pkgconfig_path()
- self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
- status, output = getstatusoutput("%s --help" % self.pkgconfig)
- self.has_pkgconfig = (status == 0)
-@@ -262,20 +261,6 @@ class PkgConfig(object):
- " pkg-config is not installed.\n"
- " matplotlib may not be able to find some of its dependencies")
-
-- def set_pkgconfig_path(self):
-- pkgconfig_path = sysconfig.get_config_var('LIBDIR')
-- if pkgconfig_path is None:
-- return
--
-- pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
-- if not os.path.isdir(pkgconfig_path):
-- return
--
-- try:
-- os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
-- except KeyError:
-- os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
--
- def setup_extension(self, ext, package, default_include_dirs=[],
- default_library_dirs=[], default_libraries=[],
- alt_exec=None):
---
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
deleted file mode 100644
index 21fdf128863c..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://github.com/matplotlib/matplotlib/pull/4430
-
-From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 15 May 2015 03:49:02 -0400
-Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths
-
-The native compiler should already know the right paths to look for
-includes and libraries. Hardcoding a specific list of those paths
-breaks both cross-compiling and multilib. In the former, paths like
-/usr/include and /usr/lib are for x86 but when you want to build for
-arm, mixing them leads to bad failures. In the latter, paths like
-/usr/lib typically hold 32it libraries, but when you're building for
-64bit, you want the libs from /usr/lib64. This goes even further as
-there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
-of which are handled here.
-
-Instead, delete the code entirely and rely on the compiler being
-properly configured. If you want to use a misconfigured compiler,
-you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
-that your system needs.
----
- setupext.py | 12 +-----------
- 1 file changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/setupext.py b/setupext.py
-index 57d80e7..7473e3a 100755
---- a/setupext.py
-+++ b/setupext.py
-@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
-
- def make_extension(name, files, *args, **kwargs):
- """
-- Make a new extension. Automatically sets include_dirs and
-- library_dirs to the base directories appropriate for this
-- platform.
-+ Make a new extension.
-
- `name` is the name of the extension.
-
-@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
- `distutils.core.Extension` constructor.
- """
- ext = DelayedExtension(name, files, *args, **kwargs)
-- for dir in get_base_dirs():
-- include_dir = os.path.join(dir, 'include')
-- if os.path.exists(include_dir):
-- ext.include_dirs.append(include_dir)
-- for lib in ('lib', 'lib64'):
-- lib_dir = os.path.join(dir, lib)
-- if os.path.exists(lib_dir):
-- ext.library_dirs.append(lib_dir)
- ext.include_dirs.append('.')
-
- return ext
---
-2.4.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
deleted file mode 100644
index 7ca0c6974234..000000000000
--- a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
---- matplotlib-2.1.2.orig/doc/conf.py 2018-01-19 11:07:49.000000000 +0700
-+++ matplotlib-2.1.2/doc/conf.py 2018-01-21 20:06:44.120901546 +0700
-@@ -136,5 +136,5 @@
- }
-
--plot_gallery = 'True'
-+plot_gallery = True
-
- # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/matplotlib-2.2.0.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index d1fc0c28597f..6cf20a9bd9ec 100644
--- a/dev-python/matplotlib/matplotlib-2.2.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
REQUIRED_USE="
@@ -102,9 +102,7 @@ RDEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
dev-texlive/texlive-xetex
)
- pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
- "
+ qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
# A few C++ source files are written to srcdir.
# Other than that, the ebuild shall be fit for out-of-source build.
@@ -177,11 +175,12 @@ python_configure() {
tests = $(usex test True False)
[gui_support]
agg = True
+ pyside = False
+ pysideagg = False
qt4 = False
qt4agg = False
$(use_setup cairo)
$(use_setup gtk3)
- $(use_setup pyside)
$(use_setup qt5)
$(use_setup tk)
EOF
diff --git a/dev-python/matplotlib/matplotlib-2.2.2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2.ebuild
deleted file mode 100644
index ab5d6e06efaa..000000000000
--- a/dev-python/matplotlib/matplotlib-2.2.2.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
- doc? ( ${PY2_FLAGS} )
- excel? ( ${PY2_FLAGS} )
- gtk2? ( ${PY2_FLAGS} )
- wxwidgets? ( ${PY2_FLAGS} )
- test? (
- cairo latex qt5 tk wxwidgets
- || ( gtk2 gtk3 )
- )"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-PY2_DEPEND="
- $(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
-COMMON_DEPEND="
- dev-python/cycler[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
- dev-python/python-dateutil:0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- >=dev-python/six-1.10[${PYTHON_USEDEP}]
- media-fonts/stix-fonts
- media-libs/freetype:2
- media-libs/libpng:0
- >=media-libs/qhull-2013
- >=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
- cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
- gtk2? (
- dev-libs/glib:2=
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- dev-python/pygtk[${PY2_USEDEP}] )
- wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-# dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
- ${PY2_DEPEND}
- dev-python/versioneer[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- virtual/pkgconfig
- doc? (
- app-text/dvipng
- dev-python/colorspacious[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/mock[${PY2_USEDEP}]
- dev-python/numpydoc[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexrecommended
- media-gfx/graphviz[cairo]
- )
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- >=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- ${PY2_DEPEND}
- >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
- excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
- gtk3? (
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection] )
- latex? (
- virtual/latex-base
- app-text/ghostscript-gpl
- app-text/dvipng
- app-text/poppler[utils]
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-xetex
- )
- pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
- "
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
- unset DISPLAY # bug #278524
-}
-
-use_setup() {
- local uword="${2:-${1}}"
- if use ${1}; then
- echo "${uword} = True"
- echo "${uword}agg = True"
- else
- echo "${uword} = False"
- echo "${uword}agg = False"
- fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-# local PATCHES=(
-# "${FILESDIR}"/${P}-unbundle-pycxx.patch
-# "${FILESDIR}"/${P}-unbundle-agg.patch
-# )
-# rm -r agg24 CXX || die
-# rm -r agg24 || die
-
-# cat > lib/${PN}/externals/six.py <<-EOF
-# from __future__ import absolute_import
-# from six import *
-# EOF
-
- local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
-
- sed \
- -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
- -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
- || die "sed pyparsing failed"
-
- hprefixify setupext.py
-
- export XDG_RUNTIME_DIR="${T}/runtime-dir"
- mkdir "${XDG_RUNTIME_DIR}" || die
- chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- append-flags -fno-strict-aliasing
- append-cppflags -DNDEBUG # or get old trying to do triangulation
- tc-export PKG_CONFIG
-}
-
-python_configure() {
- mkdir -p "${BUILD_DIR}" || die
-
- # create setup.cfg (see setup.cfg.template for any changes).
-
- # common switches.
- cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
- [directories]
- basedirlist = ${EPREFIX}/usr
- [provide_packages]
- pytz = False
- dateutil = False
- [packages]
- tests = $(usex test True False)
- [gui_support]
- agg = True
- qt4 = False
- qt4agg = False
- $(use_setup cairo)
- $(use_setup gtk3)
- $(use_setup pyside)
- $(use_setup qt5)
- $(use_setup tk)
- EOF
-
- if use gtk3 && use cairo; then
- echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
- else
- echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
- fi
-
- if python_is_python3; then
- cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
- gtk = False
- gtkagg = False
- wx = False
- wxagg = False
- EOF
- else
- cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
- $(use_setup gtk2 gtk)
- $(use_setup wxwidgets wx)
- EOF
- fi
-}
-
-wrap_setup() {
- local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
- unset DISPLAY
- "$@"
-}
-
-python_compile() {
- wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
- if use doc; then
- cd doc || die
-
- # necessary for in-source build
- local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
- VARTEXFONTS="${T}"/fonts \
- emake SPHINXOPTS= O=-Dplot_formats=png:100 html
- fi
-}
-
-python_test() {
- wrap_setup distutils_install_for_testing
-
- virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
- wrap_setup distutils-r1_python_install
-
- # mpl_toolkits namespace
- python_moduleinto mpl_toolkits
- python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
-
- distutils-r1_python_install_all
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 47834984e715..98ec197ce5f7 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
KEYWORDS=""
-IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
REQUIRED_USE="
@@ -31,7 +31,7 @@ REQUIRED_USE="
gtk2? ( ${PY2_FLAGS} )
wxwidgets? ( ${PY2_FLAGS} )
test? (
- cairo fltk latex pyside qt5 qt4 tk wxwidgets
+ cairo fltk latex qt5 tk wxwidgets
|| ( gtk2 gtk3 )
)"
@@ -102,10 +102,7 @@ RDEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
dev-texlive/texlive-xetex
)
- pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
- qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
- "
+ qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
# A few C++ source files are written to srcdir.
# Other than that, the ebuild shall be fit for out-of-source build.
@@ -182,9 +179,11 @@ python_configure() {
dateutil = False
[gui_support]
agg = True
+ pyside = False
+ pysideagg = False
+ qt4 = False
+ qt4agg = False
$(use_setup cairo)
- $(use_setup pyside)
- $(use_setup qt4)
$(use_setup qt5)
$(use_setup tk)
EOF
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 9a5940b81a0b..92c313fe3afd 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,7 @@
DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
DIST oslo.concurrency-3.25.0.tar.gz 48736 BLAKE2B fe8506599d175d22c44fd52bb2c4e5f238687ba7eeb926d3f042be14e6ef8cecb3c13b010c1540c835d9bc7e587560ea391ea00b99f05553d6bfd46d2bbe3d9c SHA512 0273112cdc0a1de45ec231b672f2ed8f8fe5842dea756bc062a18247036b2fdbfbce392f3edbfbb871a2bda94412f6c82f3a634fd98a77c1df5a243babcbd4de
+DIST oslo.concurrency-3.25.1.tar.gz 49218 BLAKE2B 95fccb051ef782a0b6cd01801e9b44272a8b04ca52fd0f00f91a2aa3514885c302a3f251885f59c32303708c91331f3f59ee06ebdce4751d013559a0e7d19b16 SHA512 5c306e742c652d66209a3218ccdc1d1f957ec6fde0b0bcb9411a71e470e8c0402c4cc1a40a05094ce591942ed16b8e0a7b456d60a64e0299ef32a257b37c8388
EBUILD oslo-concurrency-3.21.1.ebuild 1949 BLAKE2B 20a0d072bbb70be623739fb50f27b9a99af0a1804510def71dd1cf4326911e260bbe597f342d8553131e58df41d9c39fa3c29e856d8093694c5e5e817787f4e0 SHA512 c02c7c184971e6fb8072529cc4b904654cb3362725aedd4da2616d80e9ab844076b77e930733f8c94d1c24d999f45de6253d8aafc1f4d0fbdd5311ace5afccd1
EBUILD oslo-concurrency-3.25.0.ebuild 1806 BLAKE2B ee6d7879914bdb38aaa0bd7c780e5e4e673d273a64d45209ddce3414fb9dc2517b42169e69e8fd6b931b988bb7fc7d4d7a7a11239b51619a2d29369c4643b67c SHA512 4b6182948b1e1aba8710e0c1a24087d60036e4d4e193193c53837b59efe2ddc8278ec14c6d432398e78ee24074ae8e8082944305af2cb9ca57381bc92cc703c9
+EBUILD oslo-concurrency-3.25.1.ebuild 1853 BLAKE2B 2dba6b4c1f0a518c06cf3b5cfb42ece9fa80a2a0e8f8549408e67ba7c5737257b734b2932b043023254d7165b22f8e58f0a208c4240d2f55fec8d45a67571a82 SHA512 aa15bb4a96f3bc5d7459c4c53989e24131a6dff6139808484d5187f3b070edefc187845d238f997150905fe911fdaa185105acfec9076a82a185030a71a2dcdd
MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
new file mode 100644
index 000000000000..535a45b3c7a0
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="library for running multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+ !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+ >=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+ >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+ >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ sed -i '/^futures/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 0cef1e99903c..e9ea842f3536 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,7 @@
DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
DIST oslo.db-4.33.0.tar.gz 167982 BLAKE2B a6bde0df966333048c59786971f9785c6272dae92b84877243f91945e5d72eb52e1a64b01b57fde5d7995aad7bf02075ca1dae7e4715f8d05a901535d98580fd SHA512 5886e60845afe89855ac6b990aa0bc2a3984cc860ef05c76ff751c2b4053112f89583b470765819c7cb3fb91d51110f53cbe6c9ddc5cfafb1d11dfe38a3c07ef
+DIST oslo.db-4.33.1.tar.gz 169088 BLAKE2B e386d8c71669569256d88e2ad654e017dfae5cfc0635fa7c7f9e41a11d7114f6f7d0e826a6855113f8e672d5e57ed8b645e8c6d3a54c30aa78d45e53894fe8bf SHA512 b627bef035c13aa32afded20ff1e5198bc94d5ce96384c7eff44992d7f5c7178bb5e9ae398c53a04be6f280f433c688ae28fa72d6c617fc7c9299bd7c6a02eff
EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
EBUILD oslo-db-4.33.0.ebuild 2051 BLAKE2B a4495e041056b92ca29c1b6370c851f8d436fe5d4c2eb02a35e0d368ac8b76cbb6d3e519b4903ca8888bd3e39bb16799f75ac0534c9c88dacbcba7bee4519757 SHA512 60a07462719a8b08f0f8b339f5f59d33ea5970f56ff17852ce18a6004461193e91ae76c88a06b97e1fec09ab604fff7bbc2c5aac2c58f0e0f59550340e0b4466
+EBUILD oslo-db-4.33.1.ebuild 2053 BLAKE2B 05b85c303e78e1d9dd5354045769188ca9540a3c1d47d980e62d312c9935d2ccc1b92292ef5328f6ca6e860d2a55d64363aa9721cfcc63b313345460dcfe166c SHA512 78d70216bd686f5aec087916d96b9e9680ab65cc3d23394b8a9f55f6abdb2fae4910ffe26903779e47542e882493abf97775d2375bc53d5ed47ba4ac8e941c5e
MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.33.1.ebuild b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
new file mode 100644
index 000000000000..15fd3d5ac288
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ || (
+ dev-python/pymysql[${PYTHON_USEDEP}]
+ dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
+ )
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 15b5015d51a8..ed75fdc218cc 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,7 @@
DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
DIST oslo.versionedobjects-1.31.2.tar.gz 148160 BLAKE2B cb63e0607f4a9447618d287e3f2c252359832a0f4c7b60a22669da25ab90ebcdb8a97f2e10f61c759cba135329eb75be644809bd424e67ff1c6d61e612c45364 SHA512 a9d31a138e2f1e399e51b509c52c10c64acd783389b596032457c0fa74c112f5f6f67944ce88c88c35623f8d2d6612c09d04009d9014d0e9efc8f65b916d4ff3
+DIST oslo.versionedobjects-1.31.3.tar.gz 148869 BLAKE2B 90ee5fce0dc51f4be1e9dbe2e4cab501e7fa1625591847c6a37dad34e570f9739317ec5e1d08ce5a90c6fde3d639852d1f0ed6e6da33119c8d805146b7dfab40 SHA512 2c131ca04b3967a98ada7052fe176faee18d0fb36d53c94c6c098d88e108c865e4a967c8300fd2781bb18741f280781e398ebdb9cbe3c8b8aba516ab7800217b
EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
EBUILD oslo-versionedobjects-1.31.2.ebuild 1364 BLAKE2B 7c6f9355d8b58cbd5b77b46472bb249780e0364b7da43be56230e749a3346709b5a387b4f9ad4c4892bfbebf8d25900950e0c77ba236d175a94109606edf3e6c SHA512 7bdb39a118b11270b5396b505dc7d955cea9bde6763c53d439f9f1239a1cd893db2365af20908a29d6af6968f961fdd571fba7bdba9ecb262e5c8184d38abf9b
+EBUILD oslo-versionedobjects-1.31.3.ebuild 1366 BLAKE2B 74d0267ed21443433dbacd7a460cb13cb9ad67b1a4600905592a2aa1317e1b05f69c339f040320d3a2b31e0d3979a6853a880160b53d4496510fe407eab74bbd SHA512 dbffa974d59763acbd708bdd9e6502dae19b150335112813748ae8aa46c1710e595c295caa91f26daa15394906cb570e261ce06a02aa25e6997e367b16770be5
MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
new file mode 100644
index 000000000000..dd2bcb40713e
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 512e26cbb6ea..405be8f6d414 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,19 +1,8 @@
-AUX pandas-0.17.0-testfix-backport.patch 1175 BLAKE2B 5e4f0e58acc731a0f8c1f88f28446f0dedfb886a1e4ccfd35ee3be9061c35362dee089a78d7f3fb404da9cb5e8663a2bf9341c7f7edfcaf65fcd5b7ef5e4063b SHA512 1b59919c6a3e3d835af3f1fac2350db596fa420a02f405a4b0de4a751c2a762606557306e4b42cf696730a0c104ef10544a4d0f82a64a6839b38ba14245f30ef
AUX pandas-0.19.1-gapi.patch 799 BLAKE2B 801d356d51de63091c6167677957349c3334105786a220252a6fad50e0242a67106fdb321f402e7d99b65c0ab8a0c5d312b98757100bef7cc02f7f43bc50fab9 SHA512 b1a4e7c5f480efadfaf70caaa3293cb3f16ebf36c4705597a22ecc06de7e5b2379ddb4061279d669d2c66d3ef149a74f300ec1127bd441ad1b9288cb9233c781
AUX pandas-0.19.1-seqf.patch 14381 BLAKE2B 8acb677579d429a7d82712477f8e8202561198938f56cc08c38dc3766a695a69fd3d25a25c4fa165c3f3d02a16a46acea092194e3e71f23ec22a8b2aca5f1e13 SHA512 b5675c89e087d47b94cfb036047b396d5a94b74bc03e95c92d5152bfc5598feddba88a781b6a11e533c46ba638aa50f0814d383c20d95f4e091deaee480b6d3e
-DIST pandas-0.16.2.tar.gz 4931751 BLAKE2B 5ffd1df908580d966f782a7b371c7798b65ae7caacda3d8591c8de770e2f9008a3d026d9cb7f80ae857db3c24c41c0d21b8586862c39ec1b20f6e02c28e1a79f SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b
-DIST pandas-0.17.0.tar.gz 6508621 BLAKE2B 226bf513c4fc7261331114832880da71f7b881e906d6739a81bc7c6bb048f3eeecc9806aa65c7eed246ea4df16c380595bd432ab7c25b9964ca8b879a7f705cf SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b
-DIST pandas-0.17.1.tar.gz 6674479 BLAKE2B 0d61f0a603f758aaef6c2eddf6d70307255679b2ef0b599e81b3a4c0e67ebd7584b1f3d436e34d02264b9c17317508f40c5186fd874b4a362efa6edf68eef900 SHA512 9d9f9064585b1f3551625e0c8f4eedaaa1253790c2a5cb28e58e70eb805cc18f9770d793aa748cbd76798488ff60efdd01eb4b21daf5ad8f1dc4d9c050487234
DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
-DIST pandas-0.20.1.tar.gz 10307434 BLAKE2B f8490a4a7f5c165753df274a0dea81552efc90a0cbf78d9e1fbeb6d0bc26e8ffaf3dbdf796a3abfb29d01332004af2adfbd9946c69d905f309cc730613de8123 SHA512 d477a815914c825efd6430f7eb19f3f9115c1c4ab03000ca6d4f64023f7b5f53eff512792fea2d8b33c7febb3667fc3a3de55f11eeb453f285cae40e6b473707
-DIST pandas-0.20.3.tar.gz 10402185 BLAKE2B a2c8d8f0007d481ccb897d2e9be106319cd3b7c0edf397fb99e7c6f43511c218ff5e7a7f099fcf23406f7e3ea691272e75c0f130cce991ccf159df7223d26584 SHA512 891c7e04d075f96fadf3775e903472e279eaeaa4509eb0da81a74261a3ed86ff309de0b5a2c100ee93dd968fed1df6d7e426ca78785b2b36785fe7679218fdc5
DIST pandas-0.23.0rc2.tar.gz 12542694 BLAKE2B 7c6383d32430fec89b7d5cbb1f8eef0f2201ba85d5865118fa035b6ad4c852b5f4e691f98f0cf3ac5c1283720025f8500c43414d0931af5211972208428537bd SHA512 3df13f74dbcac00baffd39c732751d4e7bd16adf529b60b05b2373651d86e0aba37d6f3a4339df170e9ab3d89ee03fc18827dd3728ff972bcdfe3a0604bff59d
-EBUILD pandas-0.16.2.ebuild 3830 BLAKE2B a4feceede6288ca9d86177cd316168013d4a1d85bfab47de686a8435e4aa422c98ea156468da22010a61fae309fe1049902766f3a83d5e7db6483e8eaf9b3080 SHA512 b6e18279292c1772e5d9527e5f4baf520d07f30ee45e3604946cdc2b1731f881519815c229bdda41b2a02740c04f3d70fce6210bac094fb55c23fc5364970808
-EBUILD pandas-0.17.0.ebuild 3983 BLAKE2B a9875a252348369ff718878dd2ae06d703742d1ba1dafa1538a456b1ccf231a99f6b774c745035e9a4c23df7e7679674da50db55c2b4c0fad03de659d1ab75d4 SHA512 6a70c8b7045218f70ade388bde921c0f48c70344623d3ccaa4c0c7dd0ed35198da14e5faa28d1b16ed3a3ff88e174e662c53c2bb5cd6186464e8b718c97d84c7
-EBUILD pandas-0.17.1.ebuild 5955 BLAKE2B d6a2126678d1c93d16346c7a83425810eb11853a95a6391dfc8b67577708485c7906ec18c1d50b641061e559061bcaa2f5c562ba6532b39b068b8e15aa356013 SHA512 7fd34871cdf5178536c45416c2fcb39d76e3fa3355cee9ce39e44a228da6cb929980e52727683ece946328d0acd7f8a9072f60e1d696d9f00fea7b07f187f941
EBUILD pandas-0.19.1.ebuild 5913 BLAKE2B 994e9ea3397d2dacb0a01ad17c8285cae39a898c5615b42598f0a85745a74b4c01a2968da343a969160f18658fdae8cc6e6f0288f7254189d6233a4e16b21923 SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714
-EBUILD pandas-0.20.1.ebuild 5846 BLAKE2B b6abf38026c04a904b40d130c039c4395fd0bbd51aeb584a72428a26afddccb90198e6e02469eaa3942f6f76b95bdd6e9b53f433cfd5fd7715de9729ea35fb41 SHA512 9bb42445edb8f4dc62df830e30b8ea2e0856bf214f0621d7cbecebd2adc142bc2a4031e162e9ff93daf5f600d9e405386a32dca515fa6433f91e962c8ae00c37
-EBUILD pandas-0.20.3.ebuild 5759 BLAKE2B 59d904b1b8ca18a0baf2f58340a0b24cf1e99bee4a40a51530ec9fc79eac2fa093a05aedcb7f0e268d06a1828a013736679d26594ba443e1ad763d69c062f29b SHA512 fe6f54a082a50d4ab3edb16c9b2f11cae1440027b06e35b539133b76584c9ae615fa9f72a70328df26de7012c67d250574e47ec0b443eb84e480792b6743846b
EBUILD pandas-0.23.0_rc2.ebuild 5867 BLAKE2B 1f646f93b08f31f65bb61479fb09b3cf1005dd21dbbe859c332de535f2540f22bc53180e23bbdb66870a0675ca527f37343b3a5f9aabde9ae1c953775bf9a76e SHA512 922c5dcff6e238a018781f2b289149fe004b72371411dc0f3191565c9a590e7fe5f3e372ca8e524c4745e26789e68d5029e7ff96de23f1ee274aaf4c6e2fe828
EBUILD pandas-9999.ebuild 5824 BLAKE2B adee94b3e8a50e86a21ef64b75650ae372d7b9d9be888519fdf4769e6fe3d6e4425e5c325685f820b8d7599addc39e260d6b138080b40f9e275586dae9a3a096 SHA512 043c913888f3290c2bc651de252ac73d8ea9c9061a72781f747d291f46a3f8dd4b760ef2449f61b5249a79293dcad6ca389b11608e0431c6324c9e1adde1a189
-MISC metadata.xml 1077 BLAKE2B e9bfcfb9fc1baf813931a3cd0829136cdeb0a52a3a34a0d0ba28fbad6d4c3ebee24f1e5624d5242541fd14f4c435830b68ea30eab03d796e497116bdff732c77 SHA512 60b23a75873ded48dd01a36dae62f45f1cf5d044b88b125bda249fd6cf558ddef42d6677218053ed9d73de31da54f1f85bd1f64eab9b377f1a8b51fe1c510308
+MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
deleted file mode 100644
index c83319256f22..000000000000
--- a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- pandas/tests/test_categorical.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py
-old mode 100755
-new mode 100644
-index e97010e..1d14323
---- a/pandas/tests/test_categorical.py
-+++ b/pandas/tests/test_categorical.py
-@@ -86,12 +86,14 @@ class TestCategorical(tm.TestCase):
- factor = Categorical.from_array(arr, ordered=False)
- self.assertFalse(factor.ordered)
-
-- # this however will raise as cannot be sorted
-- # but fixed in newer versions of numpy
-- if LooseVersion(np.__version__) < "1.10":
-+ if compat.PY3:
- self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True))
- else:
-- Categorical.from_array(arr, ordered=True)
-+ # this however will raise as cannot be sorted (on PY3 or older numpies)
-+ if LooseVersion(np.__version__) < "1.10":
-+ self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True))
-+ else:
-+ Categorical.from_array(arr, ordered=True)
-
- def test_is_equal_dtype(self):
-
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index 2633bf05b9c0..2afb9b3d5636 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -14,9 +14,6 @@
</longdescription>
<use>
<flag name="full-support">Pull all packages to give pandas full support</flag>
- <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag>
- <flag name="html">Enable HTML i/o via <pkg>dev-python/beautifulsoup</pkg></flag>
- <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag>
</use>
<upstream>
<remote-id type="pypi">pandas</remote-id>
diff --git a/dev-python/pandas/pandas-0.16.2.ebuild b/dev-python/pandas/pandas-0.16.2.ebuild
deleted file mode 100644
index 7b2da1706956..000000000000
--- a/dev-python/pandas/pandas-0.16.2.ebuild
+++ /dev/null
@@ -1,128 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc excel html test R"
-
-EXTRA_DEPEND="
- >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
- dev-python/openpyxl[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- "
-CDEPEND="
- >dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
- doc? (
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- dev-python/openpyxl[${PYTHON_USEDEP}]
- >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
- dev-python/xlrd[$(python_gen_usedep 'python2_7')]
- dev-python/xlwt[$(python_gen_usedep 'python2_7')]
- x11-misc/xclip
- )
- test? (
- ${EXTRA_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xsel
- )"
-# dev-python/statsmodels invokes a circular dep
-# hence rm from doc? ( ), again
-RDEPEND="${CDEPEND}
- >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
- dev-python/bottleneck[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pytables[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- excel? (
- dev-python/xlrd[$(python_gen_usedep 'python2_7')]
- dev-python/xlwt[$(python_gen_usedep 'python2_7')]
- || (
- dev-python/xlsxwriter[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- )
- )
- html? (
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- || (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}] )
- )
- R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- # Prevent un-needed download during build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # To build docs the need be located in $BUILD_DIR,
- # else PYTHONPATH points to unusable modules.
- if use doc; then
- cd "${BUILD_DIR}"/lib || die
- cp -ar "${S}"/doc . && cd doc || die
- LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
- fi
-}
-
-python_test() {
- local test_pandas='not network and not disabled'
- [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
- pushd "${BUILD_DIR}"/lib > /dev/null
- VIRTUALX_COMMAND="nosetests"
- PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
- virtualmake --verbosity=3 -A "${test_pandas}" pandas
- popd > /dev/null
-}
-
-python_install_all() {
- if use doc; then
- dodoc -r "${BUILD_DIR}"/lib/doc/build/html
- einfo "An initial build of docs is absent of references to statsmodels"
- einfo "due to circular dependency. To have them included, emerge"
- einfo "statsmodels next and re-emerge pandas with USE doc"
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- local x
- elog "Please install"
- for x in ${EXTRA_DEPEND}; do
- optfeature "additional functionality" "${x%%[*}"
- done
-}
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
deleted file mode 100644
index 22a63f27a32a..000000000000
--- a/dev-python/pandas/pandas-0.17.0.ebuild
+++ /dev/null
@@ -1,137 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc excel html test R"
-
-EXTRA_DEPEND="
- >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
- dev-python/openpyxl[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- "
-CDEPEND="
- >dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
- doc? (
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- x11-misc/xclip
- )
- test? (
- ${EXTRA_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xsel
- )"
-# dev-python/statsmodels invokes a circular dep
-# hence rm from doc? ( ), again
-RDEPEND="${CDEPEND}
- >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
- dev-python/bottleneck[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pytables[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- excel? (
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- || (
- dev-python/xlsxwriter[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- )
- )
- html? (
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- || (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}] )
- )
- R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-testfix-backport.patch
-)
-
-python_prepare_all() {
- # Prevent un-needed download during build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
- # https://github.com/pydata/pandas/issues/11299
- sed \
- -e 's:testOdArray:disable:g' \
- -i pandas/io/tests/test_json/test_ujson.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # To build docs the need be located in $BUILD_DIR,
- # else PYTHONPATH points to unusable modules.
- if use doc; then
- cd "${BUILD_DIR}"/lib || die
- cp -ar "${S}"/doc . && cd doc || die
- LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
- fi
-}
-
-python_test() {
- local test_pandas='not network and not disabled'
- [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
- VIRTUALX_COMMAND="nosetests"
- PYTHONPATH=. MPLCONFIGDIR=. \
- virtualmake --verbosity=3 -A "${test_pandas}" pandas
- popd > /dev/null
-}
-
-python_install_all() {
- if use doc; then
- dodoc -r "${BUILD_DIR}"/lib/doc/build/html
- einfo "An initial build of docs is absent of references to statsmodels"
- einfo "due to circular dependency. To have them included, emerge"
- einfo "statsmodels next and re-emerge pandas with USE doc"
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- local x
- elog "Please install"
- for x in ${EXTRA_DEPEND}; do
- optfeature "additional functionality" "${x%%[*}"
- done
-}
diff --git a/dev-python/pandas/pandas-0.17.1.ebuild b/dev-python/pandas/pandas-0.17.1.ebuild
deleted file mode 100644
index 8ddf16d1d5b1..000000000000
--- a/dev-python/pandas/pandas-0.17.1.ebuild
+++ /dev/null
@@ -1,166 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
- >dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- !<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
- !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
- dev-python/bottleneck[${PYTHON_USEDEP}]
- >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/blosc[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
- || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
- >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
- dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
- dev-python/rpy[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- X? (
- || (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- dev-python/pygtk[$(python_gen_usedep python2_7)]
- )
- || (
- x11-misc/xclip
- x11-misc/xsel
- )
- )
- "
-
-DEPEND="${MINIMAL_DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
- doc? (
- ${VIRTUALX_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- x11-misc/xclip
- )
- test? (
- ${VIRTUALX_DEPEND}
- ${RECOMMENDED_DEPEND}
- ${OPTIONAL_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xsel
- )"
-# dev-python/statsmodels invokes a circular dep
-# hence rm from doc? ( ), again
-RDEPEND="
- ${MINIMAL_DEPEND}
- !minimal? ( ${RECOMMENDED_DEPEND} )
- full-support? ( ${OPTIONAL_DEPEND} )"
-
-_PATCHES=(
- "${FILESDIR}"/${P}-testfix-backport.patch
-)
-
-python_prepare_all() {
- # Prevent un-needed download during build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
-
- # https://github.com/pydata/pandas/issues/11299
- sed \
- -e 's:testOdArray:disable:g' \
- -i pandas/io/tests/test_json/test_ujson.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # To build docs the need be located in $BUILD_DIR,
- # else PYTHONPATH points to unusable modules.
- if use doc; then
- VIRTUALX_COMMAND="${EPYTHON}"
- cd "${BUILD_DIR}"/lib || die
- cp -ar "${S}"/doc . && cd doc || die
- LANG=C PYTHONPATH=. virtualmake make.py html || die
- fi
-}
-
-python_test() {
- local test_pandas='not network and not disabled'
- [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
- VIRTUALX_COMMAND="nosetests"
- PYTHONPATH=. MPLCONFIGDIR=. \
- virtualmake --verbosity=3 -A "${test_pandas}" pandas
- popd > /dev/null
-}
-
-python_install_all() {
- if use doc; then
- dodoc -r "${BUILD_DIR}"/lib/doc/build/html
- einfo "An initial build of docs is absent of references to statsmodels"
- einfo "due to circular dependency. To have them included, emerge"
- einfo "statsmodels next and re-emerge pandas with USE doc"
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
- optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
- optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
- optfeature "for msgpack compression using blosc" dev-python/blosc
- optfeature "necessary for Amazon S3 access" dev-python/boto
- optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
- optfeature "Template engine for conditional HTML formatting" dev-python/jinja
- optfeature "Plotting support" dev-python/matplotlib
- optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
- optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
- optfeature "R I/O support" dev-python/rpy
- optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
- optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
- optfeature "miscellaneous statistical functions" sci-libs/scipy
- optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-0.20.1.ebuild b/dev-python/pandas/pandas-0.20.1.ebuild
deleted file mode 100644
index 9e3b7f8bd657..000000000000
--- a/dev-python/pandas/pandas-0.20.1.ebuild
+++ /dev/null
@@ -1,162 +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="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
- >dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- !<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
- !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
- dev-python/bottleneck[${PYTHON_USEDEP}]
- >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/blosc[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
- || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
- >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
- dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
- dev-python/rpy[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- X? (
- || (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- dev-python/pygtk[$(python_gen_usedep python2_7)]
- )
- || (
- x11-misc/xclip
- x11-misc/xsel
- )
- )
- "
-
-DEPEND="${MINIMAL_DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cython-0.23[${PYTHON_USEDEP}]
- doc? (
- ${VIRTUALX_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- x11-misc/xclip
- )
- test? (
- ${VIRTUALX_DEPEND}
- ${RECOMMENDED_DEPEND}
- ${OPTIONAL_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xsel
- )"
-# dev-python/statsmodels invokes a circular dep
-# hence rm from doc? ( ), again
-RDEPEND="
- ${MINIMAL_DEPEND}
- !minimal? ( ${RECOMMENDED_DEPEND} )
- full-support? ( ${OPTIONAL_DEPEND} )"
-
-python_prepare_all() {
- # Prevent un-needed download during build
- sed \
- -e "/^ 'sphinx.ext.intersphinx',/d" \
- -i doc/source/conf.py || die
-
- # https://github.com/pydata/pandas/issues/11299
- sed \
- -e 's:testOdArray:disable:g' \
- -i pandas/tests/io/json/test_ujson.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # To build docs the need be located in $BUILD_DIR,
- # else PYTHONPATH points to unusable modules.
- if use doc; then
- cd "${BUILD_DIR}"/lib || die
- cp -ar "${S}"/doc . && cd doc || die
- LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
- fi
-}
-
-python_test() {
- local test_pandas='not network and not disabled'
- [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
- PYTHONPATH=. MPLCONFIGDIR=. \
- virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
- popd > /dev/null
-}
-
-python_install_all() {
- if use doc; then
- dodoc -r "${BUILD_DIR}"/lib/doc/build/html
- einfo "An initial build of docs is absent of references to statsmodels"
- einfo "due to circular dependency. To have them included, emerge"
- einfo "statsmodels next and re-emerge pandas with USE doc"
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
- optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
- optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
- optfeature "for msgpack compression using blosc" dev-python/blosc
- optfeature "necessary for Amazon S3 access" dev-python/boto
- optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
- optfeature "Template engine for conditional HTML formatting" dev-python/jinja
- optfeature "Plotting support" dev-python/matplotlib
- optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
- optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
- optfeature "R I/O support" dev-python/rpy
- optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
- optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
- optfeature "miscellaneous statistical functions" sci-libs/scipy
- optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-0.20.3.ebuild b/dev-python/pandas/pandas-0.20.3.ebuild
deleted file mode 100644
index a28647857c1c..000000000000
--- a/dev-python/pandas/pandas-0.20.3.ebuild
+++ /dev/null
@@ -1,157 +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="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 eutils flag-o-matic virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="http://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc -minimal full-support test X"
-
-MINIMAL_DEPEND="
- >dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- !<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
- !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
-RECOMMENDED_DEPEND="
- dev-python/bottleneck[${PYTHON_USEDEP}]
- >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
-OPTIONAL_DEPEND="
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/blosc[${PYTHON_USEDEP}]
- dev-python/boto[${PYTHON_USEDEP}]
- >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
- || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
- >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
- dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
- dev-python/rpy[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
- dev-python/xarray[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- X? (
- || (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- dev-python/pygtk[$(python_gen_usedep python2_7)]
- )
- || (
- x11-misc/xclip
- x11-misc/xsel
- )
- )
- "
-
-DEPEND="${MINIMAL_DEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cython-0.23[${PYTHON_USEDEP}]
- doc? (
- ${VIRTUALX_DEPEND}
- app-text/pandoc
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
- >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
- dev-python/xlrd[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- x11-misc/xclip
- )
- test? (
- ${VIRTUALX_DEPEND}
- ${RECOMMENDED_DEPEND}
- ${OPTIONAL_DEPEND}
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pymysql[${PYTHON_USEDEP}]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xsel
- )"
-# dev-python/statsmodels invokes a circular dep
-# hence rm from doc? ( ), again
-RDEPEND="
- ${MINIMAL_DEPEND}
- !minimal? ( ${RECOMMENDED_DEPEND} )
- full-support? ( ${OPTIONAL_DEPEND} )"
-
-python_prepare_all() {
- # Prevent un-needed download during build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" \
- -i doc/source/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # To build docs the need be located in $BUILD_DIR,
- # else PYTHONPATH points to unusable modules.
- if use doc; then
- cd "${BUILD_DIR}"/lib || die
- cp -ar "${S}"/doc . && cd doc || die
- LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
- fi
-}
-
-python_test() {
- local test_pandas='not network and not disabled'
- [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
- PYTHONPATH=. MPLCONFIGDIR=. \
- virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
- popd > /dev/null
-}
-
-python_install_all() {
- if use doc; then
- dodoc -r "${BUILD_DIR}"/lib/doc/build/html
- einfo "An initial build of docs is absent of references to statsmodels"
- einfo "due to circular dependency. To have them included, emerge"
- einfo "statsmodels next and re-emerge pandas with USE doc"
- fi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
- optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
- optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
- optfeature "for msgpack compression using blosc" dev-python/blosc
- optfeature "necessary for Amazon S3 access" dev-python/boto
- optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
- optfeature "Template engine for conditional HTML formatting" dev-python/jinja
- optfeature "Plotting support" dev-python/matplotlib
- optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
- optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
- optfeature "R I/O support" dev-python/rpy
- optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
- optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
- optfeature "miscellaneous statistical functions" sci-libs/scipy
- optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
index 91d6c2f3520f..aa148d242a23 100644
--- a/dev-python/pyqwt/Manifest
+++ b/dev-python/pyqwt/Manifest
@@ -1,3 +1,3 @@
DIST PyQwt-5.2.0.tar.gz 2670893 BLAKE2B bcd0e0c427abcc5713c3c7af8e3cb39511708b7219af99de0bf31c47117f7e5a3a9e45a1ae19ed6b5bd81d279c2332117ebfa5aee689d873320967f4c4164e54 SHA512 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265
-EBUILD pyqwt-5.2.0-r2.ebuild 1907 BLAKE2B 36b818daf38ac2a56f14ca36f8a90b545f5c3ccd544d2f68aaa318f5868dfc485c37a964fb4be44023e74a5114206e38ea235862caa2b00a91a90b478c390434 SHA512 a3c7827ac631b06c11cd8f17aa5b2f0cd15f05569c4b323fa8bc848f0f1b662025a7778a75824e6ce613fcee28b8a89a0a08b41128a3b9684b223c0273de7caf
+EBUILD pyqwt-5.2.0-r2.ebuild 1908 BLAKE2B ad606e22fb8f7a84857f6efa8a68902fbc51fc546c453000aee52096708893788107ce1a580cf4f4e4528802202e1393a5ff75e1d9ea175bf61c1d54978c1215 SHA512 dbb4f839326ebe507a3fd40837a2ad19052e70f5a8c6964c1d07bf99cfd7435d31c6bd8f8b5770f057d8010b724e2055aa53cec515d74c43c09d60f9d78e2f57
MISC metadata.xml 662 BLAKE2B 62958f01cf277a49926891023f0fd5a693fe6197b4be0ce57d24006bf62239f01fa76281a13e7589f7b3d5addc9143fce46fab0f8018f03f2f5a9d59131a00a5 SHA512 dd9c021d0b2bc9b51d1952643bd7ca475786914fc1ddf125212cfb2450cf1fb930491e47cd0182521a10f975f30770d109f5bdf5c53ae8648257b2a485119fb4
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
index cd1fb2e2c252..5f7e7a760269 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r2.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=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
SLOT="5"
LICENSE="GPL-2"
-KEYWORDS="amd64 arm ia64 x86"
+KEYWORDS="amd64 ~arm ia64 x86"
IUSE="debug doc examples svg"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 95932a493685..593ef5579357 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,7 +1,5 @@
DIST python-glanceclient-2.10.0.tar.gz 180299 BLAKE2B 0d97626361ad7fc2c688f5da6af6d49bf6e078f715560b4ac93725f8ea6df895e7eed0e44bf69399c973978af22ebaef3d371ae19026cff7fb2bd896c8be30d2 SHA512 9132493559d7a7b6de62e5ec1bdcd7a2dcf408c00bb0cfaccb6e11829975d468bfe68feabd71fdf8cc0d28a2c5c549945816aa14c9469314ffafd3d39b9c2da6
DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
-DIST python-glanceclient-2.9.1.tar.gz 175836 BLAKE2B f559bff0b4ae1d1782bb06f9bb8b0188d9e78b83afb52a07245f8d9694bfe88e52718d3279f8b2b7d32acdd3cc86d507154bc9bcf716206696144345f4766249 SHA512 0dae48a5673ed779c0a4136896f5e74dcde489a5dfee55295f65d4b74dbe4680b1669570d0fe5011ca5282d0b6057ebc9261e5a06cff0b09fe41fa88529c3947
-EBUILD python-glanceclient-2.10.0.ebuild 2443 BLAKE2B 7e026fa4c173c8b9cd715e340a6550495b7a3fd155cd838006fe3c2edbf325c24390ac28aa968cb7d7e90859ace3c31cd99f6344c5f0ed83152b7e380a539118 SHA512 e497a697a28fc431a4586bc6373c71fff102f65bec5a3b0e6d07fcd83b04124079a8b5f5e0ce9d714e4fdbf52df80ae83d676cfdfe4aca401dd0e7b3b26dc93a
+EBUILD python-glanceclient-2.10.0.ebuild 2441 BLAKE2B 42a7436e9cc23de10ea276ee0c46ad4c8f86a767a5f8e406a57b444cfbf4e3019afdec95a4f154265adecac0b33bf6f142d15897a83e297fb853ab555ea6cb37 SHA512 b1cfb4b3ecb7f4baf5cc355a20e1417eb82e1f742f9d88ef908f816e53f34e8a88a5c75ddbdd8bd1116b9dd1cb7b45a2ea9bfa5e4e53f218f3cd8c3ef9559404
EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
-EBUILD python-glanceclient-2.9.1.ebuild 2441 BLAKE2B 50a79c1fce26ab8cb144944fff87afd00f8b83f63748bf01cac0ab84dc425acd9148ba0e5577fdaaf48dc430d92a9852073a9935d045b12166397100e54cedc6 SHA512 3b785c8b08d165b61ce665f3e41655afc9025c5fa8f58a297b4f7b673be82b366ab5146bb158a7bd6e412240f60584c8c66500faf9d291ef0715d9bc1befdcac
MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
index bffb4cc4e44e..ad9d27f9c42a 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
REQUIRED_USE="test? ( doc )"
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
deleted file mode 100644
index ff874e295b73..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 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="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
- !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
- >=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
- >=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
- >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
- <dev-python/warlock-2[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
-python_test() {
- testr init
- testr run || die "testsuite failed under python2.7"
- flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index a5096943500f..e1dd2def7baf 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,6 +1,6 @@
AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
-EBUILD pyudev-0.20.0.ebuild 1678 BLAKE2B 9f4f5d0d8ffeb355df6fa24cce248c72131a34cfe4fd1d985f6c29b4ec3ab65757f13811e6522a0c82e707799428aaf646b354cb801275be15f6211ded5f4284 SHA512 7f715c572b3ddd83513092598b2e51db117bc47ce3917d92060fd6833156a74b4d499760e7ec27b4933ab58e1ca90894d6c6478e3d7d94235863b5131123f155
-EBUILD pyudev-0.21.0.ebuild 1542 BLAKE2B 2cd0edcb79396452d7d5498c7e45c15fa2daf8f0d7a1195f77fae3e7edd5998168a316b9b3ac41aa8d16a07bc450c3f32b9cba535fec75b49aa0198627e4615a SHA512 32d7f8aa6525a12d8d49028f968e555de112604d205460af3e31cdee7362d2734a722197a4f2eccbfddfd6f671a9f4a37d6a37dc1f418395862987317b28d62e
-MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
+EBUILD pyudev-0.20.0-r1.ebuild 1498 BLAKE2B ec887ed44b71a5e44d3a80780cc9f2cec7492dcfa727b69f5476485bc15ebff9def00e75cd0628b74118340ec3d82cbb2a23fd28e8269f9485da5bead7c84a36 SHA512 31295a078dd2b54f54c53eb65e919641cdd5dabb5f031f02ef6f47829c074e59e79e7e24e1cb8b51991463fe372802adfeb6469e4c6e15e96b29068cbd0711c3
+EBUILD pyudev-0.21.0.ebuild 1489 BLAKE2B 0cf74bb67cf5daa50575870b58ee1a9da43088a11005df2fd03280417bd3723874b68d4d3df2bd50bc5cbcbd6d3c92c91e014d8cb7a6b4a77b5c81a02264925d SHA512 d244247c8be059ce48af9043070d2a7318311e6f884d2d90ba127811784af4af53e94c4513470f62c7565dd6402b1eff905a159971cfbbc353bb87dcd7c35bf4
+MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index f42881a0924b..9c052c908df4 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -11,9 +11,7 @@
</longdescription>
<use>
<flag name="pygobject">Install PyGobject bindings</flag>
- <flag name="qt4">Install PyQt4 bindings</flag>
<flag name="qt5">Install PyQt5 bindings</flag>
- <flag name="pyside">Install PySide bindings</flag>
</use>
<upstream>
<remote-id type="pypi">pyudev</remote-id>
diff --git a/dev-python/pyudev/pyudev-0.20.0.ebuild b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
index 381aee136f94..1bc6bf6e811a 100644
--- a/dev-python/pyudev/pyudev-0.20.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.20.0-r1.ebuild
@@ -14,13 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="pygobject qt4 pyside test"
+IUSE="pygobject test"
-RDEPEND="virtual/udev
+RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
- pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
- qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
- pyside? ( dev-python/pyside[$(python_gen_usedep '!(python3_3)')] )"
+ virtual/udev
+ pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
@@ -36,8 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
)
-REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )
- pyside? ( || ( $(python_gen_useflags '!(python3_3)') ) )"
+REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
python_prepare_all() {
if use test; then
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 5c776f99aa59..03d8a9597aa7 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -13,14 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 arm ~arm64 ~mips ~x86"
-IUSE="pygobject qt5 pyside test"
+IUSE="pygobject qt5 test"
REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
-RDEPEND="virtual/udev
+RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
+ virtual/udev
pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
- pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )"
+"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index daf595042f88..8bcea676196b 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,4 +1,4 @@
AUX setup.patch 843 BLAKE2B 80626eb7317e42fc828493d98afb330873040bd0bf3a33c4c4ef225a4f57bea078e3440172509a5442868c565eeaf675c82c47d514bb4a915881d8aec2456a4b SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387
DIST restkit-4.2.2.tar.gz 1275904 BLAKE2B 4ebfc3ad91265954c28712e4beadcb25a467fe7af8c68bb655016ddb20877ca63275136605400c59b462825526a59f69d69d4b687641816b4704b62623498734 SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b
-EBUILD restkit-4.2.2.ebuild 1302 BLAKE2B f3d11f766b54a5736d489fddd556b3eebc7fa9726f9ca4b6755bcbdd8c03fb8d8050c0a7a2507eb1c115bbb6db628ba3e12db7effd0c5790cc0099b7908d5a86 SHA512 83822a9eae558476d2f9eb46c125df75d0ffda07638b9d4b54e4fc8c88186f3fc9f03b04727fb283b31aac8f177266e7ee46593747e6874da591733c403813f8
+EBUILD restkit-4.2.2.ebuild 1303 BLAKE2B f9a2b32813959020ad6d9de32f5215e88cf58d7438d8088f7518999812c21c392d2cba171ebe545c9334292030c6e7101757367a4cba4e63201d5b0901b96526 SHA512 d8672a91230d14fa00199df7ed08a887521a02f46a5e210c3bc86c37e4df49ea2fcc8fe9f4a1970472a9316f89eeff6122032369bf6fa427d9d06112963ce0dd
MISC metadata.xml 520 BLAKE2B a4f0485d0276279a820836969654d31173c08f1fb840892a5760cc484f8156bcc88ff2ee371aa1154883be957d9b62dc9ddc6cf242ec02b4e9cc9cfb45c99449 SHA512 6e5652c44b93cb00a07485b337e4be168e0728ee49485692bb6b3cdc5725f78191ca891059197f3665a9f1ac1f65074843b7a2fa7cfc4ef0d92d52033f685acb
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 0302d85a8b47..044ce7bfa2a4 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~s390 ~sh x86"
IUSE="+cli doc examples test"
PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 431be5c20b23..97e9a41a1033 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,5 @@
AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
-DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c23982c6e1fcd3f8b2998ee360f1ac42683fbd0e3a371cb044a682c326e00e907db0961aebc70bfb6b583ad2bc7 SHA512 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.3.ebuild 2121 BLAKE2B 697bf3c96b0de9bfbdce8dfffdaa3fb9e598714c98f0478767c8644990bc578ae5d1a2de1883df4d0b9ece9a9fce131080ec37f69f67b6b40b84dadb52e9468b SHA512 53029646c58a07a557095817d08aec6122ee7fd840e6c865da5cca77e302fdad3f1142f79c300bbf6d62d3b2a1f710ed04f8920c0a220015b6e032534f31bf98
-EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
deleted file mode 100644
index 38c05afc2964..000000000000
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
- # Sub-slot sanity check
- local sub_slot=${SLOT#*/}
- local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
- if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
- eerror
- eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- default
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --incdir="$(python_get_includedir)"
- $(usex debug --debug '')
- AR="$(tc-getAR) cqs"
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CFLAGS_RELEASE=
- CXX="$(tc-getCXX)"
- CXXFLAGS="${CXXFLAGS}"
- CXXFLAGS_RELEASE=
- LINK="$(tc-getCXX)"
- LINK_SHLIB="$(tc-getCXX)"
- LFLAGS="${LDFLAGS}"
- LFLAGS_RELEASE=
- RANLIB=
- STRIP=
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake DESTDIR="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.7.ebuild b/dev-python/sip/sip-4.19.7.ebuild
deleted file mode 100644
index 08a8e8d93775..000000000000
--- a/dev-python/sip/sip-4.19.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
- inherit mercurial
- EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
- MY_P=${P/_pre/.dev}
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
- S=${WORKDIR}/${MY_P}
-else
- SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
- DEPEND+="
- sys-devel/bison
- sys-devel/flex
- doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
- REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
- if [[ ${PV} == *9999 ]]; then
- python_setup 'python2*'
- "${PYTHON}" build.py prepare || die
- if use doc; then
- "${PYTHON}" build.py doc || die
- fi
- fi
-
- # Sub-slot sanity check
- local sub_slot=${SLOT#*/}
- local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
- if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
- eerror
- eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
- eerror "Please update SLOT variable as follows:"
- eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- default
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --incdir="$(python_get_includedir)"
- $(usex debug --debug '')
- AR="$(tc-getAR) cqs"
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CFLAGS_RELEASE=
- CXX="$(tc-getCXX)"
- CXXFLAGS="${CXXFLAGS}"
- CXXFLAGS_RELEASE=
- LINK="$(tc-getCXX)"
- LINK_SHLIB="$(tc-getCXX)"
- LFLAGS="${LDFLAGS}"
- LFLAGS_RELEASE=
- RANLIB=
- STRIP=
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake DESTDIR="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-}
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 2ffbbe11830b..a2c472bb4ecf 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,5 +1,7 @@
DIST tooz-1.58.0.tar.gz 81688 BLAKE2B 06e282850c549261a312d5381ac9004d13c96a90b10b3f682f2edbe3df5a1b4516a2e618d40d4625242fc18408bb38de56d1c9a58a998b843dd5c98f3d89917c SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd
DIST tooz-1.60.0.tar.gz 85364 BLAKE2B 7c1f8cca02830accd5c72d09333f027a02d79944402affc80bb645c11a5a6ecbf94dc8acb62a1d1e98773458763a289134fe8603291e32b25dac507c68571a7d SHA512 610b7d30ce68954a687237c02d5529e93c1babe79bcf16de3674ae3c1d395202738a01dea91f8ffcb184717d884f777300152f54e6f971a4a42fc8bd500ad982
+DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
EBUILD tooz-1.58.0-r1.ebuild 1263 BLAKE2B ca34f0ecbf42876e1a4a862abb48dd2aa7881ea64f3d3dee11a9746b17b9ace9da37001b63df9b3463ea0e1fe3d6f751d824a527d4be178d0c18f57da4798eb7 SHA512 a6f2d3710582f9de384c2e95f8dab9ad91a8233db536b32a21e94ff4e0655966048ea8394a32daf5d20b4d755ad6ddae8c0e778bb69e6c9a429c64bca0f7e1be
EBUILD tooz-1.60.0-r1.ebuild 1262 BLAKE2B 9b4f3eef111a70bad4d4a953453f9efaab941735b0dab0dcede7bf93ab596c62adf4b338e85c0f2f5a23a46268a59f3ec615f299d01538175c24ca76edfc7b34 SHA512 fc6fe0d66d328ad283b56233f7bf2432d29b10b2123ce26e855fb0e44042c89ae3158488b8334952d395cc6018b578998a74a48ff8abe931f9b861b666720a78
+EBUILD tooz-1.60.1.ebuild 1264 BLAKE2B 3e6be13bf6fe8ca059def056bd0f6a353580b516bfd2ad218eb6d3ae0a59e0f07f9ecdabf11f4f54e78814c04be231ca50914342afb8f82fff453000e2a58577 SHA512 0e68d141b012e69de7c732f87a9da91cc06ad42e10821ed01d0cd83576396df93cd1579d39190a542e19f4593042154c5d43da24ed228624b815ccf45f44e700
MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
new file mode 100644
index 000000000000..1d97d2da6418
--- /dev/null
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="http://docs.openstack.org/developer/tooz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ >=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ # allow useage of renamed msgpack
+ sed -i '/^msgpack/d' requirements.txt || die
+ distutils-r1_python_prepare_all
+}