9 files changed, 24 insertions, 98 deletions
diff --git a/app-i18n/ibus-sunpinyin/ChangeLog b/app-i18n/ibus-sunpinyin/ChangeLog
index 7dff558bf42b..fb5eaaf5b0a2 100644
--- a/app-i18n/ibus-sunpinyin/ChangeLog
+++ b/app-i18n/ibus-sunpinyin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2011/02/26 08:15:58 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.7 2011/04/17 09:11:23 qiaomuf Exp $
+
+  17 Apr 2011; Mu Qiao <qiaomuf@gentoo.org> -ibus-sunpinyin-2.0.3.ebuild,
+  ibus-sunpinyin-2.0.3-r1.ebuild:
+  Fix bug #363759, remove old version
 
 *ibus-sunpinyin-2.0.3-r1 (26 Feb 2011)
 
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
index 7ff6ff5d6acf..cab1050305fe 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/02/26 08:15:58 qiaomuf Exp $
+# $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 $
 
 EAPI="1"
 PYTHON_DEPEND="2:2.5"
@@ -26,9 +26,9 @@ src_unpack() {
 }
 
 src_compile() {
-	escons --prefix="/usr"
+	escons --prefix="/usr" || die
 }
 
 src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
+	escons --prefix="/usr" --install-sandbox="${D}" install || die
 }
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3.ebuild
deleted file mode 100644
index 81a711d3aa5e..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.2 2011/02/20 06:52:10 qiaomuf Exp $
-
-EAPI="1"
-PYTHON_DEPEND="2:2.5"
-inherit python scons-utils
-
-DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
-HOMEPAGE="http://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-i18n/ibus
-		app-i18n/sunpinyin"
-DEPEND="${RDEPEND}
-		sys-devel/gettext"
-
-src_compile() {
-	escons --prefix="/usr"
-}
-
-src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/scim-sunpinyin/ChangeLog b/app-i18n/scim-sunpinyin/ChangeLog
index 6b138e7bbc57..15a5cdc210be 100644
--- a/app-i18n/scim-sunpinyin/ChangeLog
+++ b/app-i18n/scim-sunpinyin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.2 2011/02/26 08:21:36 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/ChangeLog,v 1.3 2011/04/17 09:14:15 qiaomuf Exp $
+
+  17 Apr 2011; Mu Qiao <qiaomuf@gentoo.org> -scim-sunpinyin-2.0.3.ebuild,
+  scim-sunpinyin-2.0.3-r1.ebuild:
+  Fix bug #363759, remove old version
 
 *scim-sunpinyin-2.0.3-r1 (26 Feb 2011)
 
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild
index 6bb9213ce0ad..c553eeecc84a 100644
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/02/26 08:21:36 qiaomuf Exp $
+# $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 $
 
 EAPI="1"
 inherit eutils scons-utils
@@ -25,9 +25,9 @@ src_unpack() {
 }
 
 src_compile() {
-	escons --prefix="/usr"
+	escons --prefix="/usr" || die
 }
 
 src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
+	escons --prefix="/usr" --install-sandbox="${D}" install || die
 }
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3.ebuild
deleted file mode 100644
index 2bf7999b3b90..000000000000
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.2 2011/02/20 06:52:33 qiaomuf Exp $
-
-EAPI="1"
-inherit scons-utils
-
-DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
-HOMEPAGE="http://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/scim
-		app-i18n/sunpinyin
-		x11-libs/gtk+:2 "
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	escons --prefix="/usr"
-}
-
-src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xsunpinyin/ChangeLog b/app-i18n/xsunpinyin/ChangeLog
index 049e0ba87640..ceed632cb3d5 100644
--- a/app-i18n/xsunpinyin/ChangeLog
+++ b/app-i18n/xsunpinyin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2011/02/26 08:24:47 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/ChangeLog,v 1.5 2011/04/17 09:07:13 qiaomuf Exp $
+
+  17 Apr 2011; Mu Qiao <qiaomuf@gentoo.org> -xsunpinyin-2.0.3-r1.ebuild,
+  xsunpinyin-2.0.3-r2.ebuild:
+  Fix bug #363759, remove old version
 
 *xsunpinyin-2.0.3-r2 (26 Feb 2011)
 
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r1.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r1.ebuild
deleted file mode 100644
index 2026dfefba07..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/02/23 06:18:24 qiaomuf Exp $
-
-EAPI="1"
-inherit flag-o-matic scons-utils
-
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
-HOMEPAGE="http://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/sunpinyin
-		x11-libs/gtk+:2
-		x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-ldflags -Wl,--export-dynamic
-	escons --prefix="/usr"
-}
-
-src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
index 1c6c5645f538..54204af17fa9 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/02/26 08:24:46 qiaomuf Exp $
+# $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 $
 
 EAPI="1"
 inherit eutils scons-utils
@@ -25,9 +25,9 @@ src_unpack() {
 }
 
 src_compile() {
-	escons --prefix="/usr"
+	escons --prefix="/usr" || die
 }
 
 src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
+	escons --prefix="/usr" --install-sandbox="${D}" install || die
 }