gentoo resync : 18.11.2019

3 files changed, 59 insertions, 80 deletions

diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index b80115170400..fe24643e6319 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,5 @@
-DIST eric6-17.12.tar.gz 19035763 BLAKE2B e19195ef0b36ce216dc4f21ec221da4002a20ee3e3e300b80045d31d8793df299c2224f41f562fb59a0f8a65ead4f616df89a905905918dd1ae396d55d77fdc3 SHA512 7144c1fad76eb0f3ccdd2a29fb3fc369ad35d28dfbae1e6b75855b85218df34afa715f3a2df37bd6163e2f3a23a2a9a7f528cfe54f1bc21486ab81da6a69a697
 DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-EBUILD eric-17.12-r1.ebuild 1894 BLAKE2B 535be218a5702cb02b155039cf596f36e77dc3643a3696ecdd083d95bcde8341dc0ee4eeafeb7bb990de5c5dfd1e7292e8a96cc68e7f15c567d2a09112a3346f SHA512 b890f91befb946fb0ab92fffe5332ab2dd2f8caaf52de5780bb2012827ee5755389e7c6c37c8994f3ead414b3a4d002616f04829adc504649792728ceff3dce6
+DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
 EBUILD eric-18.03.ebuild 1894 BLAKE2B 535be218a5702cb02b155039cf596f36e77dc3643a3696ecdd083d95bcde8341dc0ee4eeafeb7bb990de5c5dfd1e7292e8a96cc68e7f15c567d2a09112a3346f SHA512 b890f91befb946fb0ab92fffe5332ab2dd2f8caaf52de5780bb2012827ee5755389e7c6c37c8994f3ead414b3a4d002616f04829adc504649792728ceff3dce6
+EBUILD eric-19.11.ebuild 1383 BLAKE2B 3108f60a541f90310cd597afb417862c74b1ea3697f5337a86319eb9bbde062d59a2d40931252ad1506e8d5d75decd6cbfc641aec8ab5fd0055928a0c5cf1789 SHA512 612e2d694c94392449307e4b5c441fce74fe196486961bd5d4b7294badfd506f801c6467addf18fbaebacc7e2c484b09600d68397628de91cf92b04d5df2f1db
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-17.12-r1.ebuild b/dev-util/eric/eric-17.12-r1.ebuild
deleted file mode 100644
index e4789912cf9c..000000000000
--- a/dev-util/eric/eric-17.12-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="sqlite,xml"
-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"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=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[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}]
-	>=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
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	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
-}
diff --git a/dev-util/eric/eric-19.11.ebuild b/dev-util/eric/eric-19.11.ebuild
new file mode 100644
index 000000000000..637b427d81f1
--- /dev/null
+++ b/dev-util/eric/eric-19.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="sqlite,xml"
+inherit python-single-r1 xdg
+
+MY_P=${PN}6-${PV}
+
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
+
+src_prepare() {
+	default
+
+	# Delete internal copies of dev-python/chardet and dev-python/pygments
+	rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
+}
+
+src_install() {
+	yes n | "${PYTHON}" install.py \
+		-b "${EPREFIX}/usr/bin" \
+		-d "$(python_get_sitedir)" \
+		-i "${D}" \
+		-c \
+		-z \
+		|| die
+
+	python_optimize
+	einstalldocs
+}