gentoo resync : 01.12.2017

3 files changed, 2 insertions, 102 deletions

diff --git a/dev-python/ginga/Manifest b/dev-python/ginga/Manifest
index b2dbeb377c6a..34067ff6f6f1 100644
--- a/dev-python/ginga/Manifest
+++ b/dev-python/ginga/Manifest
@@ -1,6 +1,4 @@
 AUX ginga-no-roboto.patch 597 BLAKE2B f3e688971c9d3920be0813a3815f36a8c766194b8116d1fe1f1a4aa986d5f5ee69aac13edcb961638d65d4f7bcd2e906ddff3402e95fbaa41dd6473a52b18f60 SHA512 e4e03b31ef61b3c71f5a049d23e721634d5c54646abf35d13df05423f2f215ff50aa7c867077bdb0216e2e8482e5a2bd75d24c505fcb09cb4ce96ac21d327c0d
-DIST ginga-2.6.4.tar.gz 19971195 SHA256 25d3435af454135c3539108ab41d4a55169e939739e0a947f12643dce16aa16e SHA512 79c471ee3fefb6dc03c90538147b8fa8606b37b7747712f9a69163870e6ae460d259f0ea08388a07163ea8b588676d0208fcdd51577d04cfc334aacbd0c01599 WHIRLPOOL 7ab2c47015446aae322f5a167a4054f40e601f2d0ace9b164a87bf4cf1f084765d7cc05592a69847010fee20b780e47a4532defcd5acfbdf6ba74568dd6dbc52
 DIST ginga-2.6.5.tar.gz 19969984 SHA256 0a8000a2e872d10fd05368cf3fa9d48d67c9191877998d764cd681f3f88b0e25 SHA512 66c55662a8ce1fe683cdf6a83511f39146fadf10d1fedabd6d6c5c46662a3abd2496bd1f0200612a84bdad246f960990e242bccee7a8a13e3aaf88a4884ceb80 WHIRLPOOL 76284b1ada78ff60bfb7e350f71ed1d6e81f73704757574864a64fb437d80fd1ab011fa50daadd231dae75dc3d22efb76d48f14678538e7949a7f56a6f44412e
-EBUILD ginga-2.6.4.ebuild 2374 BLAKE2B 729b474e702f9dd857e4ff7b1b086c0baa8d6a0c733818ca7e375d582730921fdb90c8159d57c7bc9bb6d16b1560a4da57d3d0856d1a938c47dba32cf77b67a4 SHA512 aa59af7de073aff58f64322fe267aef777cb57eb90f9cdc703b09641a493c16332dca948eb56735de899c64963d9268f1740fbefc69e297fc8737593605f3ee6
-EBUILD ginga-2.6.5.ebuild 2156 BLAKE2B 236b8c7431ed8e9df36041e34d4ca09dc063c70adcf4b6fdb76ed5893352f8dc1789886c2f7ad8c242b0b4267f87819ef382ce7d76ed6ef2e70592672c3ceb40 SHA512 07b85cab2aead0c4d34130977cd741dadcdd9e137c7503fcf3d7643c93e9b16bb5462fab272fb1b58bf3da2dd3444389ab5a1e4414262568d614686898833890
+EBUILD ginga-2.6.5.ebuild 1989 BLAKE2B f271965692f4acf712eff58eb3212d29c26fbec35d8d66c75daab2d4485cd82a0cbcdf5182f5463fb063076391dbfd2ba5fbadf2a7bd630294d3db89b96053bd SHA512 6190fe210a7f5a31067f92ea877a09f65a9261a58fdc97480766a1e395ca57782922d04ff1bc0df12a81bf6046239877ce30bc2ad028430dc37bd130310e53bc
 MISC metadata.xml 849 BLAKE2B fc93ade01d6eef46d4e72f2031d96523fdf12bec759525fa7e750d60d4eb6e619253678c58821dbad6510a18f68827dfd19e8b3334f7c5e0c1e5aba283575f17 SHA512 50343b22bb87eb298d17182553ddbbec417198e65f6c86177760e3fdc1c117f2e40dce6b539831d6dc85f820efa13b0b4e739dc40222c7ad2f318c81b78a2d33
diff --git a/dev-python/ginga/ginga-2.6.4.ebuild b/dev-python/ginga/ginga-2.6.4.ebuild
deleted file mode 100644
index 69fd1a42bc64..000000000000
--- a/dev-python/ginga/ginga-2.6.4.ebuild
+++ /dev/null
@@ -1,91 +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_5,3_6} )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1 eutils fdo-mime virtualx
-
-DESCRIPTION="Astronomical image toolkit for Python"
-HOMEPAGE="https://ejeschke.github.io/ginga"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples gtk qt4 qt5 test tk"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	media-fonts/roboto
-	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
-	qt4? ( || (
-		   dev-python/pyside[${PYTHON_USEDEP},help,X]
-		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
-		  )
-		  dev-python/QtPy[${PYTHON_USEDEP},gui]
-	   )
-	qt5? (
-		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
-		 dev-python/QtPy[${PYTHON_USEDEP},gui]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-	   dev-python/QtPy[${PYTHON_USEDEP},gui]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-no-roboto.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	rm -r "${ED%/}"/usr/lib*/*/*/ginga/examples || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r ginga/examples
-	fi
-	domenu ginga.desktop
-}
-
-pkg_postinst() {
-	optfeature "Pick, Cuts, Histogram, LineProfile" \
-			   dev-python/matplotlib sci-libs/scipy
-	optfeature "Online help browser" dev-qt/qtwebkit
-	optfeature "To save a movie" media-video/mplayer
-	optfeature "Speeds up rotation and some transformations" \
-			   dev-python/numexpr dev-python/opencv dev-python/pyopencl
-	optfeature "Aids in identifying files when opening them" \
-			   dev-python/filemagic
-	optfeature "Useful for various RGB file manipulations" dev-python/pillow
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-python/ginga/ginga-2.6.5.ebuild b/dev-python/ginga/ginga-2.6.5.ebuild
index e08f9fa4c1f2..296a6bb9c94e 100644
--- a/dev-python/ginga/ginga-2.6.5.ebuild
+++ b/dev-python/ginga/ginga-2.6.5.ebuild
@@ -15,24 +15,17 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples gtk qt4 qt5 test tk"
+IUSE="examples gtk qt5 test tk"
 
 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	media-fonts/roboto
 	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
-	qt4? ( || (
-		   dev-python/pyside[${PYTHON_USEDEP},help,X]
-		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
-		  )
-		  dev-python/QtPy[${PYTHON_USEDEP},gui]
-	   )
 	qt5? (
 		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
 		 dev-python/QtPy[${PYTHON_USEDEP},gui]
 	)
 "
-
 DEPEND="${RDEPEND}
 	dev-python/astropy-helpers[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]