gentoo resync : 27.03.2018

4 files changed, 31 insertions, 89 deletions

diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 85e71f44cd81..35b36ad9d0fa 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,7 +1,5 @@
-DIST eric6-17.09.tar.gz 18914614 BLAKE2B 9be00468b88a46dedb3075f28f7863e31ca8dad8cd783219bef50c644c8d6dfd3558654c8377cec2f7dd1818a3647ae19ca5028c9939c2e0095df83ce9aa5889 SHA512 73631ff1faef01b51a640af13dbb3adabebc63280f15b5e594e1fcbfb799a40a8e7ecb7395c52c6878b1fa232d7c00fb531a24be9f89a3592602aeb10520737d
-DIST eric6-17.11.tar.gz 18984264 BLAKE2B 974443ae81195c8bd56d7240f4143c5316c5192ca3bb528a97c777de2407677d9bb5fbc7099812db6c9f766e8d2a3dedc53a0a75841c6b4958cd4fd6f444f5e4 SHA512 e95941805d44f01de67d5f256f822a829bd224841a7f2b0bd245e7388b96a5eb94ab34004720c05a355fbeeb30ed4a521e07ea7069441fe6a90c13ff8cf853f8
 DIST eric6-17.12.tar.gz 19035763 BLAKE2B e19195ef0b36ce216dc4f21ec221da4002a20ee3e3e300b80045d31d8793df299c2224f41f562fb59a0f8a65ead4f616df89a905905918dd1ae396d55d77fdc3 SHA512 7144c1fad76eb0f3ccdd2a29fb3fc369ad35d28dfbae1e6b75855b85218df34afa715f3a2df37bd6163e2f3a23a2a9a7f528cfe54f1bc21486ab81da6a69a697
-EBUILD eric-17.09.ebuild 1698 BLAKE2B a7ac48e345d809970e657b4767546d99a0eddbc6e724f60f719aded37e195c8e1d4c32805bcce9941125850f5c1c253c562ceccb03a4226413e2fb2af719bc88 SHA512 b63ecc2febb62d6275b9b8623d1290043a04f346ca8cb4ba901a2b945f1dc0c2f71863de3481831873187a4c79b725c0aa4f1b09c2e9e1ce3c11a6adb7121b21
-EBUILD eric-17.11.ebuild 1682 BLAKE2B 977577a41c48eb61a076ae654ba2dcae231a00f3f7a0bee6702206ddaae13385da806b9573c059b8f3933d8d3cc68dc051cb438d4a4cea11bee1fb760f1fef89 SHA512 e195e9ed5e8f177a1b8e465a761935e873248723300577b8ddd97e2a875ee0fe9e00781f5dcc011c463597e096ffffcc9595bceeba0aa15d87e3434c416541c9
-EBUILD eric-17.12.ebuild 1909 BLAKE2B fb202adc255b06439102de715e2c9b5ce287547080e411e5a4c0988d9f21fd84b9e7fe13294def845c5646d7933a432fcc03b5b799301eebe22d75ee9f00c955 SHA512 a9d86dc7b50075b4e4ffdcb0e9640b6e5d5415bc27e2f4296f333773803b0a3c8b901f60102269b644f58647e7bc51356f714acf921325751172949dc41e46d3
+DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
+EBUILD eric-17.12-r1.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
+EBUILD eric-18.03.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-17.09.ebuild b/dev-util/eric/eric-17.09.ebuild
deleted file mode 100644
index 5dfde4d00d11..000000000000
--- a/dev-util/eric/eric-17.09.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit python-single-r1
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-LICENSE="GPL-3"
-SLOT="6"
-
-MY_P=${PN}${SLOT}-${PV}
-SRC_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${PV}/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.5.1[${PYTHON_USEDEP},gui,help,network,printsupport,sql,svg,webkit]
-	>=dev-python/qscintilla-python-2.8[qt5,${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-	!dev-util/eric:4
-	!dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(changelog README.rst THANKS)
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-
-	# Fix desktop files (bug 458092)
-	sed -i -re '/^Categories=/s:(Python|QtWeb):X-&:g' eric/eric6{,_{,web}browser}.desktop || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
diff --git a/dev-util/eric/eric-17.12.ebuild b/dev-util/eric/eric-17.12-r1.ebuild
index 1f4209d6daa1..270355f4d0c8 100644
--- a/dev-util/eric/eric-17.12.ebuild
+++ b/dev-util/eric/eric-17.12-r1.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
@@ -20,13 +20,13 @@ IUSE=""
 DEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},gui,network,printsupport,sql,svg,widgets]
-	>=dev-python/qscintilla-python-2.9.4-r1[${PYTHON_USEDEP},qt5]
+	>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP},help,webkit]
-		dev-python/PyQt5[${PYTHON_USEDEP},help,webengine]
+		dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}]
+		dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}]
 	)
 	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
 	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
@@ -69,8 +69,7 @@ pkg_postinst(){
 	xdg_desktop_database_update
 
 	if ! has_version dev-python/enchant; then
-		elog "You might want to install dev-python/pyenchant"
-		elog "for spell checking."
+		elog "You might want to install dev-python/pyenchant for spell checking."
 	fi
 }
 
diff --git a/dev-util/eric/eric-17.11.ebuild b/dev-util/eric/eric-18.03.ebuild
index 16a7d18251b5..270355f4d0c8 100644
--- a/dev-util/eric/eric-17.11.ebuild
+++ b/dev-util/eric/eric-18.03.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+MY_P=${PN}6-${PV}
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="sqlite,xml"
-
-inherit python-single-r1
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
 HOMEPAGE="https://eric-ide.python-projects.org/"
+SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="6"
-
-MY_P=${PN}${SLOT}-${PV}
-SRC_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${PV}/${MY_P}.tar.gz"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},gui,network,printsupport,sql,svg,widgets]
-	>=dev-python/qscintilla-python-2.9.4-r1[${PYTHON_USEDEP},qt5]
+	>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP},help,webkit]
-		dev-python/PyQt5[${PYTHON_USEDEP},help,webengine]
+		dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}]
+		dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}]
 	)
 	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
 	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
@@ -39,7 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S=${WORKDIR}/${MY_P}
 
-DOCS=(changelog README.rst THANKS)
+DOCS=( changelog README.rst THANKS )
 
 src_prepare() {
 	default
@@ -65,3 +64,15 @@ src_install() {
 	python_optimize
 	einstalldocs
 }
+
+pkg_postinst(){
+	xdg_desktop_database_update
+
+	if ! has_version dev-python/enchant; then
+		elog "You might want to install dev-python/pyenchant for spell checking."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}