gentoo resync : 04.08.2018

6 files changed, 56 insertions, 76 deletions

diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index 9f395f1ece7c..0fb6c9d60f14 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-rime-0.9.9.tar.gz 23912 BLAKE2B 894f4858e59e95792a713d6f05a64ec150381edd308c622c26cca806e8f990811f4218b13729ce5731959c2a289453b253f9b292a6400a3f53d681ebcffaac64 SHA512 b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7
-DIST ibus-rime-1.1.tar.gz 23418 BLAKE2B ae4abe0ab134c0ce3ac70da378c22d068bb329da22a8166ab60d5f0a316a88d937a241fb877f255d2be7847672ab20d9c7e11fa6724ff74f32e7e70350a2b475 SHA512 2510f9019045013f85af5b8401286b338b739fa0e908a3e30e1d59971a43c32212f388d367b51942292e236859feb1a70d7e7b8deb17eafd8b4f878cc7ba018f
 DIST ibus-rime-1.2.tar.gz 33396 BLAKE2B 39930ea31d40e622cd69d6f5a218729f460161dd9681e49bc35a1eb9b3875b6f5acbdaf36f7cf8200440bc27ed84a2f23ec1578b19a1fe6abbbc54c7078be11c SHA512 e1851781a6d069a79d04890b5b0aa2a706e611c08df3fcb99f883eeedd4dc4eefcac207f35b5cf1d856a41f0153ec3fbb040b4e6f610727384baa19b52a64155
-EBUILD ibus-rime-0.9.9.ebuild 633 BLAKE2B 2fb7f403c1ba22c284929ccbcbe7c71763efa08919bafcc64ca98e17757e4587e74a44c226e960fd2cb2f672331b8ce353f72fd1030585caf4ef6bb0a307da1f SHA512 460a3fe3cf16d743c0885504b3ad336533411d96cddad8e85925657710a936991dbe553609d82d131ee823516d106f6f4280dedae5d5d6c92b31fb4ed3fb6572
-EBUILD ibus-rime-1.1.ebuild 633 BLAKE2B 6afff9fd68329df81dd398d9d03e734cfbcb8bb226e18e13138656e3d0b8b8f82d17c184b8bea31a5d5530de5d56020832bbb20859ebe3c7db4c41bea13f634b SHA512 8fc8b74448abbb8a48a89e45fa8d1b5410105c15a3f771e5547fa95601c2b27125a1fd36691e8a2bdaf5c8356d5fe207dfef4bcab0a7b747274820c9a127049d
-EBUILD ibus-rime-1.2.ebuild 629 BLAKE2B 5b9123bb0c138f58ae83586e1b12c23eaff94bd68dc2afe8b17a40974266e6247f76008bdb91abf5e76f2b81185ccbd7cfe9a5616bdc4475ac99389ac62bcc35 SHA512 a9a177c70a874fcf27ca593f691aa87fd8cc21f0bf05bf52dd4479d86a280d5ab2ea65f250361613d0823a10895bac552877ad0e3cda32cac972ecb6e976d663
-MISC metadata.xml 601 BLAKE2B 95ae811151d2cd561bdeb0792404fb43a1c80b1be1c065e2ffbe797943bdfde926c56fed576bfde69bdba6aed29bc849a8c127ac6157b77311aec48fa623e01b SHA512 b99f85bda84da0fe35cda523709d24cea8065b72c57de666a615dcb0acec3b2745b6c06eb53a2cd63bdbc77c8abda232e9020b02965e6dde0f24211361efc34b
+DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da061a3e8154232809ff29d766b630dcd06723bb0a8e18ebd089a640b7ab6787f8c70a6405dfa82472c1abfe5d4e SHA512 f0991184805bfe19931e297779179661f98bdfea952e310b2d8618550002cfa5bb08df05d1c5e31b535ad9959a919fdc98fa771a90d4d82b9c50e2f592cb7dfd
+EBUILD ibus-rime-1.2.ebuild 751 BLAKE2B 397cb33ae08e88ff287fa03c93f72347f0915a9095ab4cb75ed7c85213db495873401cbd451a42ef53f105c3e022cba3a02b955b54bb2e5ecc17ace192aea287 SHA512 5a03dcf39d8aa3dfc40161b7dfca3151bcd0d286e9e750daba67224f155ae1906652ef77c887242916bdcec789bc26d12a092d5734a71d99203e1fa032a86eb7
+EBUILD ibus-rime-1.3.0.ebuild 751 BLAKE2B 9dfc7269ad374741783c4cdbe10140ce953f1b5568ca55ba50b2d546240579b4b2290e4a686311aa10be2b435c749fc7fbb0882931d8ad2e39f6e59e705e4c75 SHA512 07b8bb40726a3f92a3684e41ad5c8a3ed6986dc0d2875e6b95a5b7a2bda268f288592bc7f0fa68b4e401553b3e0e0a71ff078c89bbd239df50c6993b6e00dfe2
+MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317
diff --git a/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild b/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
deleted file mode 100644
index 78e4ecd1c83a..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-0.9.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
-	app-i18n/librime
-	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
-	app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.1.ebuild b/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
deleted file mode 100644
index c0a98b4c36a0..000000000000
--- a/app-i18n/ibus-rime/ibus-rime-1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
-SRC_URI="https://rimeime.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="app-i18n/ibus
-	app-i18n/librime
-	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
-	app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
-}
diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
index 81810d970e6a..46087ce10e52 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
-HOMEPAGE="http://rime.im/"
+DESCRIPTION="Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
 SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -12,17 +12,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="app-i18n/ibus
+CDEPEND="app-i18n/ibus
 	app-i18n/librime
 	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
+DEPEND="${CDEPEND}
+	dev-util/cmake
+	virtual/pkgconfig"
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+	sed -i \
+		-e "/^libexecdir/s:/lib:/libexec:" \
+		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+		-e "s/ make/ \$(MAKE)/" \
+		Makefile
+	sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+
+	default
 }
diff --git a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
new file mode 100644
index 000000000000..8bea4e437097
--- /dev/null
+++ b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Rime Input Method Engine for IBus"
+HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
+SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="app-i18n/ibus
+	app-i18n/librime
+	x11-libs/libnotify"
+RDEPEND="${CDEPEND}
+	app-i18n/rime-data"
+DEPEND="${CDEPEND}
+	dev-util/cmake
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/^libexecdir/s:/lib:/libexec:" \
+		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+		-e "s/ make/ \$(MAKE)/" \
+		Makefile
+	sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+
+	default
+}
diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml
index f0aced69ea0e..def212007923 100644
--- a/app-i18n/ibus-rime/metadata.xml
+++ b/app-i18n/ibus-rime/metadata.xml
@@ -14,7 +14,6 @@
       <email>chen.sst@gmail.com</email>
       <name>Gong Chen</name>
     </maintainer>
-    <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
-    <remote-id type="google-code">rimeime</remote-id>
+    <remote-id type="github">rime/ibus-rime</remote-id>
   </upstream>
 </pkgmetadata>