Fixed --disable-*-module issue, bug #280887. Removed old versions.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 113 insertions, 201 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 446b23ef4509..400f68eaad90 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.27 2009/08/15 13:20:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.28 2009/10/02 22:31:32 matsuu Exp $
+
+*scim-bridge-0.4.16-r1 (02 Oct 2009)
+
+  02 Oct 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -scim-bridge-0.4.15-r3.ebuild, -scim-bridge-0.4.15.2.ebuild,
+  +scim-bridge-0.4.16-r1.ebuild:
+  Fixed --disable-*-module issue, bug #280887. Removed old versions.
 
   15 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
   scim-bridge-0.4.16.ebuild:
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 1612678b59c8..66162a14c9bb 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scim-bridge-0.4.14-qt4.patch 1163 RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 SHA1 d62b9e9f5f5c6b7490e0d49e8a50cc8812d36ffd SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05
 AUX scim-bridge-0.4.15-qt4-focus.patch 1974 RMD160 99dff169717446c0a38aa19eed932a0b9954bf05 SHA1 193529b5f75097a5d43c6fb675574fdfdf88a8f0 SHA256 124fc258c1f7cadabea5b9c5a7b8b3ab9b26d50910b16760d5746f58ab6b8a50
 AUX scim-bridge-0.4.15.2-gcc43.patch 375 RMD160 e46eef9e25195786680e28817b3b70aa5cd14b6b SHA1 f2f6c1ce4a7a71073977824c3b76a739740391e1 SHA256 0595a929766a9f29a0ad888696512c35caff1b9e3d91ceca29d05e3222a62a18
 AUX scim-bridge-0.4.15.2-qt4.patch 2146 RMD160 5d040ef796df0ee98e7e70befed00ba047b9c369 SHA1 a9d704adebd02f3abddaedc40cbd54ab5e7f1a83 SHA256 778a7174a08444871e82388235ee8053d3d5c8f248d1dbbddff0067c34742424
 AUX scim-bridge-0.4.16+gcc-4.4.patch 382 RMD160 4310e77e9572779d470e20f81f494b8787e75d17 SHA1 b17d1cda0104f3a5ae3ec294bfe964fb82a5fbcc SHA256 f80ca88a66de77447601270f60f31b46e32bb18058da91e726375c7757ee7719
-DIST scim-bridge-0.4.15.2.tar.gz 508097 RMD160 0c7cdfa4ee6fed8a53b9ab68dbfd519492eed557 SHA1 96c0f0b85da3d3d684e657e73842feb4dac02a72 SHA256 6822cdd31b307827bac85735c8c04b16663cdc2928455f6940d2708a51bc0b70
-DIST scim-bridge-0.4.15.tar.gz 753583 RMD160 96650d2768e8d51593b15aadc1a0786534a524f4 SHA1 7551bb9826b1b33692d110abd98dcb826ddab849 SHA256 802a65c412c44d7598397d2926ec6fe478fe6cc3c645047632a97ec54b2d8bcf
 DIST scim-bridge-0.4.16.tar.gz 508870 RMD160 37aed056fb880358b013f104f08b2e58c3de4188 SHA1 6a7a714592dbecc9a1f44794f37319bafe2bdfae SHA256 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c
 DIST scim-bridge-0.4.9.tar.gz 509254 RMD160 ad135d1de043be68d1bb3eb358687da13f7e43f7 SHA1 fb76c95d6cb45954a894de1e265aa7ababf3091e SHA256 4851ee787525700960f6d6d3644d5cb99a609c231407daaf0eb7e54657e08cea
-EBUILD scim-bridge-0.4.15-r3.ebuild 2226 RMD160 7a77f69df9f798ba83184da08d206cb214b3f2e4 SHA1 8560cad45015b5ef4fdac7983ec2685b043e585b SHA256 fc4ceba10aacbc92697b694dabe481c68f34629f4296897afb593ca1951a7988
-EBUILD scim-bridge-0.4.15.2.ebuild 2222 RMD160 3d5cc19b791874dabc32a92b7c5a94f0ca92f59a SHA1 13874b4f2b88fb7a5aff92293463b47bbb49a2ba SHA256 d4a884535cdca4ba0258fa985463793887c6baec1e041212599d65e94fac195d
+EBUILD scim-bridge-0.4.16-r1.ebuild 2336 RMD160 fea1319827a1922551010734e24f452f475d99fb SHA1 ebd62a07ecf7c82f0e82d68ee6aa87c108994c0e SHA256 655849bc53db6bb81d0a1ff2a2ce0926d753ee4e14bb9ab615587f1e97dc9f0d
 EBUILD scim-bridge-0.4.16.ebuild 2006 RMD160 6ed44e6f21dd5a97f58a379e64aa1f4b1c39dc72 SHA1 bca412526b694761d50297655847d4f14d31f9a1 SHA256 3f58bd45f1d093d225c1cddef8a476895a0095e1ab3906746018402e680cfeea
 EBUILD scim-bridge-0.4.9.ebuild 1766 RMD160 465f7ced4fa46e7a51b909bcc5db2be3a9f2cdd5 SHA1 bba097d405cbfeb450a0f2a3d88ea93f4a55a04a SHA256 b1e271734904a906fe4c0170702efdf2ea0764fc4cb5cd33ce50006d3f078260
-MISC ChangeLog 4634 RMD160 a1da016da6dd4fc9870d663f92e7a12f29f6c4e2 SHA1 75ec5660b54c2d26d1af5e9b86a3a323a431d7d2 SHA256 cbcfd768ca07188936864a5e242e4cdb146be5472e21e2c92d1660d07a0c481a
+MISC ChangeLog 4883 RMD160 903d8e63ca31b74cd6de64cf931c9495ab26154f SHA1 8c8fa853619dc1054257fa0d92a78f11c0738b6f SHA256 1e84ae78bb186eb3d246e4d2889541bfe51047eeed69ba2ac541a715c32f952f
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqGtjcACgkQcxLzpIGCsLTOagCbBNnsBpPaxvaZ+pO+0tUZgklu
-SlgAni098qenP0KYn0krwzLqIg+Pu66t
-=OBuW
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild
deleted file mode 100644
index 5e10ca95efc0..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild,v 1.1 2008/11/02 09:31:21 matsuu Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit autotools eutils qt3
-
-DESCRIPTION="Yet another IM-client of SCIM"
-HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3 qt4"
-
-RESTRICT="test"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		x11-libs/qt:3
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-			=x11-libs/qt-4.3*:4 )
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	doc? ( app-doc/doxygen )"
-
-get_gtk_confdir() {
-	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.4.14-qt4.patch"
-	# bug #242848
-	epatch "${FILESDIR}/${P}-qt4-focus.patch"
-	# bug #241954
-	intltoolize --force
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable gtk gtk2-immodule) \
-		$(use_enable qt3 qt3-immodule) \
-		$(use_enable qt4 qt4-immodule) \
-		$(use_enable doc documents) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog
-	elog "If you would like to use ${PN} as default instead of scim, set"
-	elog " $ export GTK_IM_MODULE=scim-bridge"
-	elog " $ export QT_IM_MODULE=scim-bridge"
-	elog
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild
deleted file mode 100644
index bc0177e38809..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild,v 1.1 2009/01/25 06:19:07 matsuu Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit autotools eutils qt3
-
-DESCRIPTION="Yet another IM-client of SCIM"
-HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="doc gtk qt3 qt4"
-
-RESTRICT="test"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		x11-libs/qt:3
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-			=x11-libs/qt-4.3*:4 )
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${P%.*}"
-
-get_gtk_confdir() {
-	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-pkg_setup() {
-	if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
-		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-qt4.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	# bug #241954
-	intltoolize --force
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable gtk gtk2-immodule) \
-		$(use_enable qt3 qt3-immodule) \
-		$(use_enable qt4 qt4-immodule) \
-		$(use_enable doc documents) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	elog
-	elog "If you would like to use ${PN} as default instead of scim, set"
-	elog " $ export GTK_IM_MODULE=scim-bridge"
-	elog " $ export QT_IM_MODULE=scim-bridge"
-	elog
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
new file mode 100644
index 000000000000..708126bc99d3
--- /dev/null
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild,v 1.1 2009/10/02 22:31:32 matsuu Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib qt3
+
+DESCRIPTION="Yet another IM-client of SCIM"
+HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="doc gtk qt3 qt4"
+
+RESTRICT="test"
+
+RDEPEND=">=app-i18n/scim-1.4.6
+	gtk? (
+		>=x11-libs/gtk+-2.2
+		>=x11-libs/pango-1.1
+	)
+	qt3? (
+		|| (
+			>=x11-libs/qt-3.3:3[immqt-bc]
+			>=x11-libs/qt-3.3:3[immqt]
+		)
+		>=x11-libs/pango-1.1
+	)
+	qt4? (
+		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+			=x11-libs/qt-4.3*:4 )
+		>=x11-libs/pango-1.1
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( app-doc/doxygen )"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		/usr/bin/gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
+	epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
+	epatch "${FILESDIR}/${P}+gcc-4.4.patch"
+
+	# bug #241954
+	intltoolize --force
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable doc documents)"
+	# '--disable-*-immodule' are b0rked, bug #280887
+
+	if use gtk ; then
+		myconf="${myconf} --enable-gtk2-immodule=yes"
+	else
+		myconf="${myconf} --enable-gtk2-immodule=no"
+	fi
+
+	if use qt3 ; then
+		myconf="${myconf} --enable-qt3-immodule=yes"
+	else
+		myconf="${myconf} --enable-qt3-immodule=no"
+	fi
+
+	if use qt4 ; then
+		myconf="${myconf} --enable-qt4-immodule=yes"
+	else
+		myconf="${myconf} --enable-qt4-immodule=no"
+	fi
+
+	econf ${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_postinst() {
+	elog
+	elog "If you would like to use ${PN} as default instead of scim, set"
+	elog " $ export GTK_IM_MODULE=scim-bridge"
+	elog " $ export QT_IM_MODULE=scim-bridge"
+	elog
+	use gtk && update_gtk_immodules
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+}