gentoo resync 08.09.2018

5 files changed, 75 insertions, 29 deletions

diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index 805c3af49e3d..27575277844b 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,4 +1,6 @@
-AUX cangjie-1.2-cython-022.patch 1161 BLAKE2B c43eff943bfb3ee9b4756dd48cbfef2da96a374463b7a143ac13dafba1e9e30ed58501b1c46de9b0033baa43cb0b70b257b48ff9b741503bc10d0ee302544da2 SHA512 5aec7c8128ef2be30449550385a41949a69b0316bf4e6c7695143d67c5d2b07d261dd7c8a17b5e3eabc2e041beea995fdf81d1e413123f9f0f2f735e33c66d78
+AUX cangjie-1.2-cython-0.22.patch 1056 BLAKE2B d528edfc39765ce5bf89ef5778dbc600cb80b07ace3e8766dc865b2e43cd9860df6144de9ff864fd0c48e9528516ba86918638f527cdc6a86de5ec5a941345ac SHA512 d06d5d19914ce829ac8cf2e461bcffe404b3e639ae37b6eaa81825ece9fb0e55b8ba2b316d18c80149b34cebff75368ac62eed58dcf6345affc71d798e267ce5
 DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
-EBUILD cangjie-1.2-r1.ebuild 1095 BLAKE2B ca72537781966c856d7aabd35b2c8ef5369a093cb58efec43c23987002bba420a051938736a146102c44b17c33b3e6d4f354f45f945712397fa6401f6fbf64a1 SHA512 05eed5385a68209fa6806c107ebcf12ecf8e518ae59c95fa9caaa8f8a9acc2d663e0c0fdb92b2d7ce69a0da178f962e1d497aa65da4354d7a0b510ac3157858a
-MISC metadata.xml 328 BLAKE2B ac2110ee2150d0791b218960dc2a2b1bfcd197b65a074a92a3ea28cb97627a2f5da1fce1d5964a832a9d1ea8c1b855b00ddd909513cc3fdb34431d42b514b791 SHA512 01cf68954ebb7509850bf93f85ca780b3ca8bc21b6941bcf7908ee3f6bfc29c357e0d3edf06b89368d5de32583579dfb86a761b4b8253fc70a197658fc733b34
+DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
+EBUILD cangjie-1.2-r1.ebuild 1041 BLAKE2B 360e9169a5d8568de290e37df371ab69b80f02f6c03602f16fd1d8490793d471a0420f14f76fe0215ea22953f6ca72b65f3894ed9a9aad7f6896efdc11cf6e3f SHA512 373fd5862b4fd3d9f944e2071a2970b0aa12b7794b212083eba721af805eac72a8a00276cf144aab50b4ac2a0139875cc2077fe172471e240564506bb3bd3e81
+EBUILD cangjie-1.3.ebuild 993 BLAKE2B 0fc92c6ac27b053cc644562bc30fde5902ff59a0cff3929dfc1f7128c740f13d8e66c6e9767464bbd85fcab68820dcd75a0835b66d7e5fb8e3d56a2a52cbfea6 SHA512 2738c8b51d1ba7bd1648ece305f529a0dbcb72e4655e16402c89555b7480d53d6b6f4423b60b5ede5da2dac3eb11b19edee99eabbbb5346d3e7e741d59fddf47
+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
index d3daf09ed18c..9e6a424c171f 100644
--- a/dev-python/cangjie/cangjie-1.2-r1.ebuild
+++ b/dev-python/cangjie/cangjie-1.2-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI="6"
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit autotools python-r1
 
-DESCRIPTION="The Python bindings to libcangjie"
-HOMEPAGE="http://cangjians.github.io"
-SRC_URI="https://github.com/Cangjians/pycangjie/releases/download/v${PV}/cangjie-${PV}.tar.xz"
+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"
@@ -17,15 +16,13 @@ KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="
-	app-i18n/libcangjie
-	${PYTHON_DEPS}"
-DEPEND="
-	${RDEPEND}
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/libcangjie"
+DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-cython-022.patch" )
+PATCHES=( "${FILESDIR}"/${P}-cython-0.22.patch )
 
 src_prepare() {
 	default
@@ -33,10 +30,10 @@ src_prepare() {
 }
 
 src_configure() {
-	myeconf() {
-		ECONF_SOURCE="${S}" econf PYTHON="${PYTHON}"
+	python_configure() {
+		ECONF_SOURCE="${S}" econf
 	}
-	python_foreach_impl run_in_build_dir myeconf
+	python_foreach_impl run_in_build_dir python_configure
 }
 
 src_compile() {
@@ -51,6 +48,5 @@ src_install() {
 	python_foreach_impl run_in_build_dir default
 	einstalldocs
 
-	# package only installs python modules
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
new file mode 100644
index 000000000000..08b958d139c4
--- /dev/null
+++ b/dev-python/cangjie/cangjie-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_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"
+
+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/files/cangjie-1.2-cython-022.patch b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
index ac2695c9e139..a681726d98ef 100644
--- a/dev-python/cangjie/files/cangjie-1.2-cython-022.patch
+++ b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6762b97..c0cc699 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -47,19 +47,19 @@ pkgpyexecdir = $(pyexecdir)/cangjie
+@@ -47,19 +47,19 @@
  
  src/cangjie/_core.c: src/cangjie/_core.pyx src/cangjie/_core.pxd
  	$(MKDIR_P) src/cangjie
diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
index f725cd5af33c..5249303a03c1 100644
--- a/dev-python/cangjie/metadata.xml
+++ b/dev-python/cangjie/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Cangjians/pycangjie</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Cangjians/pycangjie</remote-id>
+	</upstream>
 </pkgmetadata>