Version bumped to 20110217.

Add boost USE flag.
Add a patch to fix compilation error when disabling boost.

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

5 files changed, 62 insertions, 20 deletions

diff --git a/app-i18n/ibus-pinyin/ChangeLog b/app-i18n/ibus-pinyin/ChangeLog
index e98f92f533c9..67c69b1ea9f8 100644
--- a/app-i18n/ibus-pinyin/ChangeLog
+++ b/app-i18n/ibus-pinyin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2011/05/06 12:48:27 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.34 2011/05/07 15:06:09 naota Exp $
+
+*ibus-pinyin-1.3.99.20110217 (07 May 2011)
+
+  07 May 2011; Naohiro Aota <naota@gentoo.org>
+  -ibus-pinyin-1.3.99.20101029.ebuild, +ibus-pinyin-1.3.99.20110217.ebuild,
+  +files/ibus-pinyin-1.3.99.20110217-m_instance.patch, metadata.xml:
+  Version bumped; Add boost support; Fix compilation error when disableing
+  boost
 
   06 May 2011; <naota@gentoo.org> ibus-pinyin-1.3.99.20101029.ebuild:
   Fix dependency
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 98dea290d9ec..ccae0e04bbf7 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ibus-pinyin-1.3.99.20110217-m_instance.patch 1017 RMD160 5d9a90adfd655649bab4cb4929a36481a5a29cc9 SHA1 77eb88692896b339ed521ee03c5af9a445a44507 SHA256 ae79e7a9b85a6295e8261c1c770d3874fe58529b2e35a4bb1cacc4dc9f3c318b
 DIST ibus-pinyin-1.2.0.20090915.tar.gz 279759 RMD160 14921d01679012dbc33a668f7887ecf6a47929c9 SHA1 cf8ce69fa1b9ce7a934497d100306007e282b1a3 SHA256 b38b5a72c3917e727b63f3f8f8e7ba9af6dda61a65caf15e61e8a908465b553b
 DIST ibus-pinyin-1.3.10.tar.gz 1659697 RMD160 454dd4d4d47604d51c330df66446515cf08ef7da SHA1 4a2144ddd2d217119cb83e5911767fbaf213d310 SHA256 d135fb776166324fcc13b4c973a0fc23e040eb06eb34a47f08c7a7d22aa82469
 DIST ibus-pinyin-1.3.11.tar.gz 1659622 RMD160 89f0945b55ffc8ec31972e4098fa5416e6224e33 SHA1 2999f28c208ec119c40c5b5eafcfbb8a78bba706 SHA256 3b778777eef1c47150675ed74a572776f0aa27f5a19b681200b71741f08b722a
-DIST ibus-pinyin-1.3.99.20101029.tar.gz 1662737 RMD160 e3d20a35cb2ee4a4527aeacf97b5f2a419f1b629 SHA1 ee6031764abe51f41369b9d3efde466cb5bcf543 SHA256 a736c9fc645fe7906e37e76cb468fe76b7765b1b5baf67063d77367c3d418fcd
+DIST ibus-pinyin-1.3.99.20110217.tar.gz 1668525 RMD160 e382517b07622b6ab091122b827e0b17442f2742 SHA1 a3ba8ede2ff02d94b2d8b78c23d906774770edf7 SHA256 788b5fb792006888df3f0d6a377e0a93aebbef4055b38c2053edd5690f1956c7
 DIST pinyin-database-0.1.10.6.tar.bz2 12008671 RMD160 2120f59575763848a0e77a829477ffb536fcfabc SHA1 84f505d46282cba1dabc058fe0c1e443d0a20e96 SHA256 f96c0adfd890b1ec5be534a147481900b96ba827910e140f1c76c679632f15fe
 DIST pinyin-database-1.2.99.tar.bz2 9977983 RMD160 1679567f31c20a235577f02175df38e16a05e7de SHA1 e38a148a772e9909facda66b2d579e17b94cccbe SHA256 32c7d07b9f41e1dfc0f9008f54eca8e6cb367e7f2b19ac94c49754442694c321
 EBUILD ibus-pinyin-1.2.0.20090915.ebuild 1182 RMD160 1d836acc3d06d8fd739f894bf47ad07a72a698e4 SHA1 e0694443d0c88f27e21e3f6d67404e8a5b38f410 SHA256 a830441e47051440ad639be2e76cc5dd6169b829e11d984cd2ada999ddb11360
 EBUILD ibus-pinyin-1.3.10.ebuild 1295 RMD160 875ad111e00bf38c6d1516ded8eb5d0d8c8d2ac0 SHA1 98d5f5877de59ac135c9a7d759f8076251654166 SHA256 c55490fd0581b42d9b0bda33325ec039a3470edb4d94db6417d3b981fb6b26a3
 EBUILD ibus-pinyin-1.3.11.ebuild 1293 RMD160 03926e9ac1b00ee7604ebd824e86abe4c9714c67 SHA1 500c329c11a98557d490584880adca6294468f61 SHA256 c111c24d0e8058d18d4b0248fbeee6f8dd9ed231f701941cf1e55672ec467e46
-EBUILD ibus-pinyin-1.3.99.20101029.ebuild 1304 RMD160 3c2460b210db8f0c126b57ef9d1ce952207337cb SHA1 8d3aebff2cd92ad57150e789678693d428c0acce SHA256 8fe641f6fb6bb40c649840333e764e359d23bc5041b2774c83e96f32c7970aac
-MISC ChangeLog 5957 RMD160 d2a94e959e3a09f22b10b00f89759869b279280d SHA1 aaa37af6c764b11c41ce6cf933af7b1f094dd50b SHA256 a886c85b384aa97f3e538794b90ea5d319d551b39e1f618a1c50c07ec4c167e1
-MISC metadata.xml 280 RMD160 2f693f9dba5c4abf24696fdf45b288284a6d2212 SHA1 776f22067d69b18b25b856bc939389b2a4f3f84d SHA256 04e7f95210b314c01f71ee1743dc709bebb501bb43ad052a268833fe7177f4b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3D7jAACgkQGpDnPLSHuMB3dQCg3AxB18wK+xSzWMR4jefDtBtX
-UwAAoLrUnRcYzvmodzxdrR7lOHyRDGja
-=qi7R
------END PGP SIGNATURE-----
+EBUILD ibus-pinyin-1.3.99.20110217.ebuild 1439 RMD160 6a1966d5bed787a1c8667b21966872d7b18933c7 SHA1 eb697a635f06245860ea98893d13b6884d7ba87d SHA256 e816071fbac303c9c9d7f35a7dfc6aac2e330149daf00662cf5bd7e7080de8ac
+MISC ChangeLog 6277 RMD160 d2ca19f73c499902613e4ed75dfce873d6dab9a4 SHA1 85d25c601bf2c16f1241f5de924d2318974b9e3d SHA256 b9c78f981c0bd519c40d380acee4a7ded9ac544c48815fd19a4b7f273fef6d83
+MISC metadata.xml 362 RMD160 e5bbb6d9750207ed9128a3588376c7cbbd87a854 SHA1 961a823b1e2362ec8545e38d4ea3382370fcb306 SHA256 1a07551b2df24792ceae5779f584531cbd68d92094af04819d002510792c92a3
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
new file mode 100644
index 000000000000..8e07665188eb
--- /dev/null
+++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.3.99.20110217-m_instance.patch
@@ -0,0 +1,35 @@
+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.3.99.20101029.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110217.ebuild
index 2692237d8629..d2647d1137cb 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20101029.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.99.20110217.ebuild
@@ -1,11 +1,11 @@
 # 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.20101029.ebuild,v 1.3 2011/05/06 12:48:27 naota Exp $
+# $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
+inherit python eutils
 
 PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
 DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
@@ -16,10 +16,13 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls"
+IUSE="boost nls"
 
 RDEPEND=">=app-i18n/ibus-1.3.99
-	>=dev-libs/boost-1.39
+	boost? (
+		>=dev-libs/boost-1.39
+		!=dev-libs/boost-1.46.1
+	)
 	sys-apps/util-linux
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -35,10 +38,12 @@ 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) --enable-db-open-phrase
+	econf $(use_enable nls) $(use_enable boost) --enable-db-open-phrase
 }
 
 src_install() {
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index f8124fad6a0b..c206b3b67015 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -5,5 +5,8 @@
 <longdescription lang="en">
 PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 </longdescription>
+<use>
+  <flag name="boost">Compile against dev-libs/boost libraries</flag>
+</use>
 </pkgmetadata>