old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

7 files changed, 9 insertions, 329 deletions

diff --git a/app-i18n/ibus-pinyin/ChangeLog b/app-i18n/ibus-pinyin/ChangeLog
index 3d3a652be288..cd82679f7f46 100644
--- a/app-i18n/ibus-pinyin/ChangeLog
+++ b/app-i18n/ibus-pinyin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-pinyin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.37 2011/07/17 06:23:11 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.38 2012/03/11 08:50:54 ssuominen Exp $
+
+  11 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -ibus-pinyin-1.2.0.20090915.ebuild, -ibus-pinyin-1.3.10.ebuild,
+  -ibus-pinyin-1.3.11.ebuild, -ibus-pinyin-1.3.99.20110217.ebuild,
+  -files/ibus-pinyin-1.3.99.20110217-m_instance.patch,
+  -ibus-pinyin-1.3.99.20110520.ebuild:
+  old
 
 *ibus-pinyin-1.3.99.20110706 (17 Jul 2011)
 
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.3.99.20110217-m_instance.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.3.99.20110217-m_instance.patch
deleted file mode 100644
index 8e07665188eb..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.3.99.20110217-m_instance.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/PYConfig.cc b/src/PYConfig.cc
-index b932931..7b1653a 100644
---- a/src/PYConfig.cc
-+++ b/src/PYConfig.cc
-@@ -312,7 +312,7 @@ PinyinConfig::PinyinConfig (Bus & bus)
- void
- PinyinConfig::init (Bus & bus)
- {
--    if (m_instance == NULL) {
-+    if (m_instance.get () == NULL) {
-         m_instance.reset (new PinyinConfig (bus));
-         m_instance->readDefaultValues ();
-     }
-@@ -435,7 +435,7 @@ BopomofoConfig::BopomofoConfig (Bus & bus)
- void
- BopomofoConfig::init (Bus & bus)
- {
--    if (m_instance == NULL) {
-+    if (m_instance.get () == NULL) {
-         m_instance.reset (new BopomofoConfig (bus));
-         m_instance->readDefaultValues ();
-     }
-diff --git a/src/PYDatabase.cc b/src/PYDatabase.cc
-index d6810ce..b92b4df 100644
---- a/src/PYDatabase.cc
-+++ b/src/PYDatabase.cc
-@@ -718,7 +718,7 @@ Database::remove (const Phrase & phrase)
- void
- Database::init (void)
- {
--    if (m_instance == NULL) {
-+    if (m_instance.get () == NULL) {
-         m_instance.reset (new Database ());
-     }
- }
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild
deleted file mode 100644
index a20217d61860..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild
+++ /dev/null
@@ -1,51 +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-pinyin/ibus-pinyin-1.2.0.20090915.ebuild,v 1.6 2011/04/16 22:16:01 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-inherit eutils python
-
-PYDB_TAR="pinyin-database-0.1.10.6.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.1.0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/engine
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.10.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.10.ebuild
deleted file mode 100644
index 58da39aed572..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.10.ebuild
+++ /dev/null
@@ -1,56 +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-pinyin/ibus-pinyin-1.3.10.ebuild,v 1.2 2011/04/16 22:16:01 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-inherit python
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.3
-	>=dev-libs/boost-1.39
-	sys-apps/util-linux
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) --enable-db-open-phrase
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.11.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.11.ebuild
deleted file mode 100644
index fc50408bf9d6..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.11.ebuild
+++ /dev/null
@@ -1,56 +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-pinyin/ibus-pinyin-1.3.11.ebuild,v 1.4 2011/04/16 22:16:01 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-inherit python
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.3
-	>=dev-libs/boost-1.39
-	sys-apps/util-linux
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) --enable-db-open-phrase
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110217.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110217.ebuild
deleted file mode 100644
index d2647d1137cb..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110217.ebuild
+++ /dev/null
@@ -1,61 +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-pinyin/ibus-pinyin-1.3.99.20110217.ebuild,v 1.1 2011/05/07 15:06:09 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-inherit python eutils
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost nls"
-
-RDEPEND=">=app-i18n/ibus-1.3.99
-	boost? (
-		>=dev-libs/boost-1.39
-		!=dev-libs/boost-1.46.1
-	)
-	sys-apps/util-linux
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-
-	epatch "${FILESDIR}"/${PN}-1.3.99.20110217-m_instance.patch
-}
-
-src_configure() {
-	econf $(use_enable nls) $(use_enable boost) --enable-db-open-phrase
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110520.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110520.ebuild
deleted file mode 100644
index 5323d1d07a0b..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110520.ebuild
+++ /dev/null
@@ -1,68 +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-pinyin/ibus-pinyin-1.3.99.20110520.ebuild,v 1.1 2011/06/06 16:25:13 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-inherit python eutils
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua nls opencc"
-
-RDEPEND=">=app-i18n/ibus-1.3.99
-	sys-apps/util-linux
-	boost? (
-		>=dev-libs/boost-1.39
-		!=dev-libs/boost-1.46.1
-	)
-	lua? ( >=dev-lang/lua-5.1 )
-	nls? ( virtual/libintl )
-	opencc? ( app-i18n/opencc )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable nls) \
-		$(use_enable opencc) \
-		--enable-db-open-phrase
-		#--disable-db-android \
-		#--disable-english-input-mode \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}