Make sure this depends on correct sunpinyin version. Migrate to eapi5.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 18 insertions, 14 deletions

diff --git a/app-i18n/ibus-sunpinyin/ChangeLog b/app-i18n/ibus-sunpinyin/ChangeLog
index fb5eaaf5b0a2..9698c8cd37d9 100644
--- a/app-i18n/ibus-sunpinyin/ChangeLog
+++ b/app-i18n/ibus-sunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus-sunpinyin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.7 2011/04/17 09:11:23 qiaomuf Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.8 2013/01/30 13:48:47 yngwin Exp $
+
+*ibus-sunpinyin-2.0.3-r2 (30 Jan 2013)
+
+  30 Jan 2013; Ben de Groot <yngwin@gentoo.org> +ibus-sunpinyin-2.0.3-r2.ebuild,
+  -ibus-sunpinyin-2.0.3-r1.ebuild:
+  Make sure this depends on correct sunpinyin version. Migrate to eapi5.
 
   17 Apr 2011; Mu Qiao <qiaomuf@gentoo.org> -ibus-sunpinyin-2.0.3.ebuild,
   ibus-sunpinyin-2.0.3-r1.ebuild:
@@ -17,4 +23,3 @@
   20 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +ibus-sunpinyin-2.0.3.ebuild,
   +metadata.xml:
   New ebuild for ibus-sunpinyin.
-
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index fc7a1b6892c8..b95e3ba03276 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,5 +1,5 @@
 AUX ibus-sunpinyin-2.0.3-force-switch.patch 964 SHA256 5f24f965c67ecd5e0e496303d1503607c1c3492e97209138a020b834cf9f11b4 SHA512 d1fee273c326331491f414e8807fd8364e99edce7078aa3c90ce89aef78dc394e31210c13e95c25f12199f8a61cca9f3e27197b56a2d150a09732b22d3e76256 WHIRLPOOL 4ab95b08e62c0b762d34b3701a7cc3aa3c3d3a40e37434e3e75d61aa162a57d36d47ae0e4834eb424a25f6d0a700d3c7fc0be9b5852e76c1c2b33725999446fa
 DIST ibus-sunpinyin-2.0.3.tar.gz 218785 SHA256 9c15b89d683318f3b1f3475dcabf7a91ee815692b233a289bcadab3ab7f8fa3c SHA512 75620184540ca71d239f6370dda83dd791b46581b19b309e4e7924f3760072a4d58c06940360539d0ec98d88e24c61922025dbdf97bfe93eb0aba5a778651106 WHIRLPOOL 32bb79dc743ebc44c09cff5cae15ad449aa9951a87a5b2d4cef58788d61cbe4bdaa8923f1e2043243442eeec17d0455ca0b124581b2aa403a320a2da1beba368
-EBUILD ibus-sunpinyin-2.0.3-r1.ebuild 826 SHA256 a06f75d19e9ea40307a037ac10ccabd64dfece3d09316393ff9811e659863c21 SHA512 0643706c6a5d6c1b81c30d7645b6eca0eaa58f6bee6bda5f1b05df1236bf6bdeb6e2bd007e9968b9d6ef05becc24cd25010b56b0e37b353bea88bd2a12a0769c WHIRLPOOL 3e30402551b2790ffacd77ceeb74a482b080ad0129b7847e3aeaa4d9a44d0a81f71463161bb14422b99f0617b58ecbb63a623f8914d40b9cdfe653e588b14c8e
-MISC ChangeLog 723 SHA256 114c1247aa1c7e707f3f454d06de9d4b6a5aab87cfd0f8527d054d50a7f0178a SHA512 76c9c5df80c1bcd820f69a1a05ce90385c6fe7f8764d01f03925a3d9a7228adf3d4dc43a3b79c8ea3a9b52dd769d23da1b5d9b2d053daca330e194502fcd817c WHIRLPOOL 0aea90e32990390a6f1ec0c2ef0bc7502d884a76030e985c6aa3765ddbe5d6f02d1bb422a3523a4d6d2aa15c56986c3a36e68edf56852917e41a4747faab2338
+EBUILD ibus-sunpinyin-2.0.3-r2.ebuild 782 SHA256 be1962ac2a8e34571cd59fab7295f4cf031944e714027a42a311ab3873265cac SHA512 8114e609550c86ee15a02e72fbe52aeb3e19855e5eb761d45914e00a46e6e6313fbef90d7c3b32e922c514a54f96423b1af3a710fc2e1d56a23ed15df89b8bc9 WHIRLPOOL fdb94990e0dcecfc234c22f47de25ee656f5efa0f14c69b9583ac637f1ca188e2fbc191f9276be4fc8a10745c93bcfe9d6d52f810226ae9ab62a8591feed944c
+MISC ChangeLog 951 SHA256 675d69c02bd0bb135371553b0c756a45036da6a9b124e59f202a5bf47596aea3 SHA512 be973d5d61357d6fdaf7edd34e8d157fa6af2ee5f2f73bb790386c7a43ffab62cc562959e58bb11fb593779f5caf61bea05f858cbb9d9ef5f68b98b614d86f8f WHIRLPOOL 58f42cbfaa167b8ff6ad8df5022a87e009f49f56bad7007a456e12500d4c34edbc8b4f40f2d37640c18a52fad297cd154c00acf8f37ecddc0d930e6ef4c1516e
 MISC metadata.xml 324 SHA256 0753813b8db3a2f2e5ed97bb091f7b0d2e84dc58ac7e6c1f5c9f2b94faf06583 SHA512 b340f27a29ded76a3d06c78247fa8d151bd299c0a845a3b158be98189bb3d5a5ba7f19f8a3f75f77727899df6e4f48d33814fc859f18aff28634567466d92ca8 WHIRLPOOL 97e147eb4d916ac868c63274af15ce984c6e394b44f48767745bdfb18e16bbd4f86c7898d1c0cc1bf18604c6bf63f7f19bb9e6a69c8634ba49fd68ad4b880f13
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r2.ebuild
index cab1050305fe..c1776a57197c 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild,v 1.2 2011/04/17 09:11:23 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r2.ebuild,v 1.1 2013/01/30 13:48:47 yngwin Exp $
 
-EAPI="1"
+EAPI=5
 PYTHON_DEPEND="2:2.5"
 inherit eutils python scons-utils
 
@@ -16,19 +16,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus
-		app-i18n/sunpinyin"
+		~app-i18n/sunpinyin-${PV}"
 DEPEND="${RDEPEND}
 		sys-devel/gettext"
 
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" && epatch "${FILESDIR}/${P}-force-switch.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-force-switch.patch"
 }
 
 src_compile() {
-	escons --prefix="/usr" || die
+	escons --prefix="/usr"
 }
 
 src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install || die
+	escons --prefix="/usr" --install-sandbox="${D}" install
 }