Version bumped to 20110217.

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

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

4 files changed, 57 insertions, 6 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/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>