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

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

10 files changed, 62 insertions, 54 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
 }
diff --git a/app-i18n/scim-sunpinyin/ChangeLog b/app-i18n/scim-sunpinyin/ChangeLog
index 15a5cdc210be..0c5bdcd332b5 100644
--- a/app-i18n/scim-sunpinyin/ChangeLog
+++ b/app-i18n/scim-sunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-sunpinyin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/ChangeLog,v 1.3 2011/04/17 09:14:15 qiaomuf Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/ChangeLog,v 1.4 2013/01/30 13:51:55 yngwin Exp $
+
+*scim-sunpinyin-2.0.3-r2 (30 Jan 2013)
+
+  30 Jan 2013; Ben de Groot <yngwin@gentoo.org> +scim-sunpinyin-2.0.3-r2.ebuild,
+  -scim-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> -scim-sunpinyin-2.0.3.ebuild,
   scim-sunpinyin-2.0.3-r1.ebuild:
@@ -17,4 +23,3 @@
   20 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +scim-sunpinyin-2.0.3.ebuild,
   +metadata.xml:
   New ebuild for scim-sunpinyin.
-
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
index 4621c9f6e5b3..0795e8c4c699 100644
--- a/app-i18n/scim-sunpinyin/Manifest
+++ b/app-i18n/scim-sunpinyin/Manifest
@@ -1,5 +1,5 @@
 AUX scim-sunpinyin-2.0.3-force-switch.patch 947 SHA256 9f28889b5cd5963297b68c40441498744b48b09623f1bc5bda84dd5873eb13c1 SHA512 8a3600507534dda5854465569127a7863fcbcd318542d319e814634e8fea10f7105469717e7141f831385c5e64a910aee0d442d7eb663e0cb46e9c6b9464ca7f WHIRLPOOL 3054fc9fdbd8282ac50c3325c8f0fe3492be7d406847503e1b99ce17350acc55a97d33b71d878b59e877e2cf112e3c027196182925d24f6488698edb4204a15d
 DIST scim-sunpinyin-2.0.3.tar.gz 33072 SHA256 139feca7ccb79240b5c7eac3d41fb7015baad21b08986af1bec33b7aeb3a4e83 SHA512 f983d40972c5792a4a27fdf699cffc7f6882c84060cfe3e260cdc3f587743b0f71339ccdb7067b393f88a69b74d999fba70c4d9bc8016b9b217b3c11667a2986 WHIRLPOOL 678e4d7d71658f0dab038c8e4c911144042ebe4bb20f3746bbae3dc307926bff95365355d67422febcaabe08cc175a81a2ac611fb92ed2ddc0c31984d02a03e4
-EBUILD scim-sunpinyin-2.0.3-r1.ebuild 813 SHA256 02aa5b3c11af65d87dd780b8841fdc35caba892d6267f0e82d57ba709272b60a SHA512 ac1207d634a4467a88bc66e42a08d64e61ff813330e6fcbee5f63347b2d356634cd15eda4fd5d732a4b5a69e74499b11f2d889c8c370c5a788b0cf3ca8b005f1 WHIRLPOOL 9ed08e0bec7c25a984b86e39b25d2479c6c702de25ef0606fb70441272b088fa99b0778295d98ed695a6d4bd554109c269d5560a459806aa258bfc43cdee4992
-MISC ChangeLog 723 SHA256 863b44339bfa5e662608e960d1aeef6f60343b6a1063345b9cf054ee5c90baf0 SHA512 88cf511440fc527ea412238e6a22105364863834871acf84857d075840b50ea9e8526ffc05e5decbf71d3f9226e49f8e1fc5e2e83735a7864f068e68096c680e WHIRLPOOL 44aa37e098d44f8d8cd2424a05c0259ccdbf52b6e3aa8b7420eed5aa35b5076818ecd578af6090fb5fbc605a9d77f979d510f312553ed58cdcaff4a2187ced45
+EBUILD scim-sunpinyin-2.0.3-r2.ebuild 767 SHA256 0b431a7f62d7b2007adf7041ae9b730f7b1529cb67e3fea297e413a283f453d1 SHA512 e5aabdbbc580dcc4ce0bfda8116c677b428b4a4e8e92e781b23325c5a8c37d258524162243242ffd951983b70fbf2b3858d41d4fb138e1873d933686fea87a47 WHIRLPOOL 894d9d0a240d2f362761dd83be90f58a1a912d782fe4a189dc983dc5b5606c8333dc4d1efc71ed45d71ff5e2612790a3a6c63344735d77168d9a6942b6145b3e
+MISC ChangeLog 951 SHA256 74a9cafafea3f0b258354673de67ed307e7deb121576d347ad036d76a15fbc56 SHA512 6ec5f6295df9caf68b857b02c9c9b1f40ec0f653af1128d0476af18997e68d0207030f308c590354669ec8f071c6d59c288c55f8b100ecdb1f08c3a47ace25b1 WHIRLPOOL 2e55a37857f9d75cb206238a82be13739a45c9e88ef0643035ed395e764e482d94cdf791d7554b1bed13541527090eda6f2116f2a42368a9cd3fb544341e985d
 MISC metadata.xml 324 SHA256 0753813b8db3a2f2e5ed97bb091f7b0d2e84dc58ac7e6c1f5c9f2b94faf06583 SHA512 b340f27a29ded76a3d06c78247fa8d151bd299c0a845a3b158be98189bb3d5a5ba7f19f8a3f75f77727899df6e4f48d33814fc859f18aff28634567466d92ca8 WHIRLPOOL 97e147eb4d916ac868c63274af15ce984c6e394b44f48767745bdfb18e16bbd4f86c7898d1c0cc1bf18604c6bf63f7f19bb9e6a69c8634ba49fd68ad4b880f13
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
index c553eeecc84a..dc37a051a967 100644
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild
+++ b/app-i18n/scim-sunpinyin/scim-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/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild,v 1.2 2011/04/17 09:14:15 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild,v 1.1 2013/01/30 13:51:55 yngwin Exp $
 
-EAPI="1"
+EAPI=5
 inherit eutils scons-utils
 
 DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
@@ -15,19 +15,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-i18n/scim
-		app-i18n/sunpinyin
-		x11-libs/gtk+:2 "
+	~app-i18n/sunpinyin-2.0.3
+	x11-libs/gtk+:2 "
 RDEPEND="${DEPEND}"
 
-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
 }
diff --git a/app-i18n/xsunpinyin/ChangeLog b/app-i18n/xsunpinyin/ChangeLog
index ceed632cb3d5..2f3c71873f9d 100644
--- a/app-i18n/xsunpinyin/ChangeLog
+++ b/app-i18n/xsunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/xsunpinyin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/ChangeLog,v 1.5 2011/04/17 09:07:13 qiaomuf Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/ChangeLog,v 1.6 2013/01/30 13:54:48 yngwin Exp $
+
+*xsunpinyin-2.0.3-r3 (30 Jan 2013)
+
+  30 Jan 2013; Ben de Groot <yngwin@gentoo.org> +xsunpinyin-2.0.3-r3.ebuild,
+  -xsunpinyin-2.0.3-r2.ebuild, metadata.xml:
+  Make sure this depends on correct sunpinyin version. Migrate to eapi5.
 
   17 Apr 2011; Mu Qiao <qiaomuf@gentoo.org> -xsunpinyin-2.0.3-r1.ebuild,
   xsunpinyin-2.0.3-r2.ebuild:
@@ -25,4 +31,3 @@
   20 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +xsunpinyin-2.0.3.ebuild,
   +metadata.xml:
   New ebuild for xsunpinyin.
-
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
index 083e2e7cddd9..ec3aca70cc9c 100644
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@@ -1,5 +1,5 @@
 AUX xsunpinyin-2.0.3-force-switch.patch 1328 SHA256 a3fb573d2d742a4cef7041fb3f0df49ebd0ca13ca58bf07a0125c64763789c5e SHA512 fcc2110c2b1e0b4dda4995688e360bee7f0e26582bb212875e41e22b208168d0a18d5a2a1a4cdf93935a43bef11bdb0a6fd45a9506675165c1a2a1aeedd2ad5e WHIRLPOOL be6884d58c59e10e2ffab1de28cca5b9a7b5927d4c6509ef32c2273a1603987fb29cc10d585021b052f704e856f620091e2e67ba6345ff2e9a697ea7953387e5
 DIST xsunpinyin-2.0.3.tar.gz 128835 SHA256 dde96d846ff51038566318c0927bb50388f76e4f4bcbd3d844bc7fac08b31b10 SHA512 71bc1677d545ecbd8572c9ba1877d091a2a58154eb326623ed240701f98a70ec29245e98d684a30aad46445e6c461359663ba3778e7f5c42469f0bea6e2bc419 WHIRLPOOL c2097e3ce913bf5894be5048ccbc48f5c0361bf82f4c6694cec4e9ff4d5fa46fa027dd2dcd42abec92bf389055a02e3e25d8746b1564f4aa0478d19ede8698b1
-EBUILD xsunpinyin-2.0.3-r2.ebuild 795 SHA256 1bedefb8452b9fb0990f708bf1ea5e2d35fe40fb0dfa75068576cf00515e187a SHA512 f7287eb1716d8b027ea603d948af2343383cf966aeb684765af14ab7f32247a95ea1ee947360970acdec2c755cfdd6e48df32494a7a8b349d6d083a472d21ed4 WHIRLPOOL 42b59020ef1ddcd2e39e716bcab076c1d30306cf0e175c167dd6690601e5a596f2298f34d1843f42bab6d82f8a6525e6738df06c1b1ac614ab14a4c3f225c679
-MISC ChangeLog 947 SHA256 a6111dc32c4318245f83225a0dda50c869f5d4384e4b8453dbf1e4b29539214a SHA512 f4133c38bed910ce2f8d419c06965f4615aa08fb511fe485163414c0fdb9fec5ca51fd396ade8327b7621268bbbe145eabbd1e3b402648f1743821ee2ad61499 WHIRLPOOL 3f767c816eb0fa5a292609925777c22febb9b880538c1ee1469ccaf2657dc967bd5eb78befda54665dc663ddf16f03be9b39c564627b5bdb9ab2a203d5eae777
-MISC metadata.xml 324 SHA256 0753813b8db3a2f2e5ed97bb091f7b0d2e84dc58ac7e6c1f5c9f2b94faf06583 SHA512 b340f27a29ded76a3d06c78247fa8d151bd299c0a845a3b158be98189bb3d5a5ba7f19f8a3f75f77727899df6e4f48d33814fc859f18aff28634567466d92ca8 WHIRLPOOL 97e147eb4d916ac868c63274af15ce984c6e394b44f48767745bdfb18e16bbd4f86c7898d1c0cc1bf18604c6bf63f7f19bb9e6a69c8634ba49fd68ad4b880f13
+EBUILD xsunpinyin-2.0.3-r3.ebuild 749 SHA256 9371ec6517cb66f81ddb3843702cc1e5eeb39d62943a9ec567d0db0eccfe9d8a SHA512 b7cdae761d848fe461ab4ef8163542a1377065eff8ec4956737770c47adc815785fb4b3ba35457832f5b058a4bb9b3c536a999577b8c2da0bd43976d2a5aa76f WHIRLPOOL 1a802372dc246095698b791e9c3486e9366472a632696788cd8711efad6a95e01a6ad225e16c03db80afd1e1c670f6d794c7969f8b76c5d72e0cc60ce802d4cd
+MISC ChangeLog 1177 SHA256 583b5290f34785911bd3d34b9caa9368e753634d217753673849e29be9c67d33 SHA512 630fa66d02ebbdc269cd739db40af18359234ea7fb3df493d8bc9492ec6a231cee1f9aeeedba612577897cfc78315f9117b53cdb72dfd5bb7f5f779491383ff0 WHIRLPOOL d5a0d1708b6697cb66f2f97375031dfd281221c1a0139a6b12d0f0f4f21a12feb7e14a0387355f6a5753b1009f8bab1945f07a72e4737ceec2fd3f55ad2c1c27
+MISC metadata.xml 241 SHA256 97aaa5d95fd431ea817b425efddf01e0c6b0e94c321c4bf0f7b4a115241f3252 SHA512 f80c4a581950904a2e051fa5e50ab6cc558990e0d832f7ed32adc1aef32c42cd726c2c62eccb9a1c765644fcc3f71554914946a842d296d1a4ce8da8d0b91e06 WHIRLPOOL 1405bbc1a15098e5e503be74514b14c48f870f28cdc6889e050383c80bd7f9aa5f3f6b585e804db87f137c992b337896fcf95d1c96cf64f4168bf4a336581aac
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
index 4ed6ced45985..adc59fd218e2 100644
--- a/app-i18n/xsunpinyin/metadata.xml
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<maintainer>
-		<email>qiaomuf@gentoo.org</email>
-		<name>Mu Qiao</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">sunpinyin</remote-id>
-	</upstream>
+  <herd>cjk</herd>
+  <upstream>
+    <remote-id type="google-code">sunpinyin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
index 54204af17fa9..fe307be83cc9 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.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/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild,v 1.2 2011/04/17 09:07:13 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild,v 1.1 2013/01/30 13:54:48 yngwin Exp $
 
-EAPI="1"
+EAPI=5
 inherit eutils scons-utils
 
 DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
@@ -14,20 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-i18n/sunpinyin
-		x11-libs/gtk+:2
-		x11-libs/libX11"
+DEPEND="~app-i18n/sunpinyin-2.0.3
+	x11-libs/gtk+:2
+	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-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
 }