gentoo resync : 14.04.2018

4 files changed, 2 insertions, 182 deletions

diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index d2a824833670..5df119a2c39c 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,3 @@
-DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
-EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
-EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
-EBUILD qscintilla-python-2.10.3.ebuild 1529 BLAKE2B 2d9f2f49f270fa85db001841a045471d6e3ceb6b00e663727b0f81ae780e918ac07dbe69ae87b9e5c1438e9c2ca97afb6d7896a0bf0179e3fc42c8f8e1359984 SHA512 f915fc244b2af8288f451cc45dc23a42533f4c66c8f9efe42bc9c4a37e66d07fb5b52598086aaaae807a7fc13928f38ae2fb403851cc9fa1ef31e93d30e30dfe
+EBUILD qscintilla-python-2.10.3.ebuild 1528 BLAKE2B 29f01e825027fb0c7e7a130ae9b2474c920a69bbeb7662a0a08cdedd308ec8eba446762a4a7dd9508417338feee6f798f33a50a2ccdfb76fe217a3b51a6d2202 SHA512 4822e5bd19abcd917e6bda804f08318ccd60bbc55f7b191865d24590c73768ea059aa91f985f14ba72dd2e436c01e11e22342948b010e102f785c1b3142f1e94
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
deleted file mode 100644
index 5700b8401f01..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.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=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( qt4 qt5 )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
-	qt4? (
-		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
-		local my_qt_ver=4
-		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
-			my_qt_ver=5
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt${my_qt_ver}
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake${my_qt_ver} -recursive
-	}
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
deleted file mode 100644
index ddaeac5786b7..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.2.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=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( qt4 qt5 )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
-	qt4? (
-		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
-		local my_qt_ver=4
-		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
-			my_qt_ver=5
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt${my_qt_ver}
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake${my_qt_ver} -recursive
-	}
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
index aeec457cb344..f683ef80e872 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"