gentoo resync : 25.08.2020

4 files changed, 9 insertions, 83 deletions

diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index cf45feca817c..f17004982230 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,6 +1,3 @@
-AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600cb80b07ace3e8766dc865b2e43cd9860df6144de9ff864fd0c48e9528516ba86918638f527cdc6a86de5ec5a941345ac SHA512 d06d5d19914ce829ac8cf2e461bcffe404b3e639ae37b6eaa81825ece9fb0e55b8ba2b316d18c80149b34cebff75368ac62eed58dcf6345affc71d798e267ce5
-DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
-EBUILD cangjie-1.2-r1.ebuild 1028 BLAKE2B d5dc641c6637456b638ede69a88308de34e672b7306911b04a2228f82653fa92cc3e70612ff455792eb02bf55351bd530af271d17ca24202e5ece3ac57960fbf SHA512 376074f3131591a3ce7b5c2cc39b33c50db20dfdb8286e598626db7352923ee0d6b7b49726db34413435695ccb352dbcbd232f01d0dfada60bf745b69e305773
-EBUILD cangjie-1.3.ebuild 984 BLAKE2B b8ba71fb202c2dff403be8ceb934aa24e67ed380b9a7b9e272cda5d833ede9778800fd02ea264af824ecb20a7f59b245ccca747f824938205a4b187b1fd97413 SHA512 be0d41d7ff9c5fe75ade77ef9462e6187cc39e8411fc8f40963d0d628677175eae92aace8b06769fbbaca035bbc659518344bb35aca189070f98b12819ec7fd1
+EBUILD cangjie-1.3-r1.ebuild 1051 BLAKE2B 15cc1821f26edf61b15981b57e660db827e56f1fce629d7281524d89a698b4c6b16a734cebd526931801a657e36dd4333b851e7e678080e77f745c0b85fedd59 SHA512 e539a11e9bfa9d90bc2008ae68b9d259110d6c93de62749cd19bcd8df2206b1642b7681a9c87ee8c4e50fccb92d62d0411f2b21044cf2cee1f893c7699b92d54
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.2-r1.ebuild b/dev-python/cangjie/cangjie-1.2-r1.ebuild
deleted file mode 100644
index d41c713ced22..000000000000
--- a/dev-python/cangjie/cangjie-1.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Python wrapper for libcangjie"
-HOMEPAGE="http://cangjians.github.io/"
-SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/libcangjie"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-cython-0.22.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_configure() {
-		ECONF_SOURCE="${S}" econf
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild
index 61b243fd4fdf..646ccfa41771 100644
--- a/dev-python/cangjie/cangjie-1.3.ebuild
+++ b/dev-python/cangjie/cangjie-1.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools python-r1
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/libcangjie"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -43,7 +43,11 @@ src_test() {
 }
 
 src_install() {
-	python_foreach_impl run_in_build_dir default
+	python_install() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir python_install
 	einstalldocs
 
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
deleted file mode 100644
index a681726d98ef..000000000000
--- a/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -47,19 +47,19 @@
- 
- src/cangjie/_core.c: src/cangjie/_core.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/_core.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/_core.pyx
- 
- src/cangjie/errors.c: src/cangjie/errors.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/errors.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/errors.pyx
- 
- src/cangjie/filters.c: src/cangjie/filters.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/filters.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/filters.pyx
- 
- src/cangjie/versions.c: src/cangjie/versions.pyx src/cangjie/_core.pxd
- 	$(MKDIR_P) src/cangjie
--	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/versions.pyx
-+	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/versions.pyx