Fixed qt dependency, bug #217164.

Fixed doxygen dependency, bug #221641.
(Portage version: 2.1.5_rc6)

5 files changed, 21 insertions, 166 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index f3bcd3831f0f..af306bd879d7 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.18 2008/02/24 15:39:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.19 2008/06/14 05:11:31 matsuu Exp $
+
+*scim-bridge-0.4.15-r1 (14 Jun 2008)
+
+  14 Jun 2008; MATSUU Takuto <matsuu@gentoo.org> scim-bridge-0.4.9.ebuild,
+  -scim-bridge-0.4.13-r1.ebuild, -scim-bridge-0.4.14.ebuild,
+  -scim-bridge-0.4.15.ebuild, +scim-bridge-0.4.15-r1.ebuild:
+  Fixed qt dependency, bug #217164. Fixed doxygen dependency, bug #221641.
+  Removed old versions.
 
 *scim-bridge-0.4.15 (24 Feb 2008)
 
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.13-r1.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.13-r1.ebuild
deleted file mode 100644
index 5def5cffd9ec..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.13-r1.ebuild
+++ /dev/null
@@ -1,73 +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.13-r1.ebuild,v 1.2 2008/01/10 16:53:42 matsuu Exp $
-
-inherit eutils qt3 qt4
-
-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"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		$(qt_min_version 3.3.4)
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		$(qt4_min_version 4.0.0)
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	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_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.14.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild
deleted file mode 100644
index 6ab1fe457c25..000000000000
--- a/app-i18n/scim-bridge/scim-bridge-0.4.14.ebuild
+++ /dev/null
@@ -1,83 +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.14.ebuild,v 1.1 2008/01/27 16:35:05 matsuu Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit autotools eutils qt3 qt4
-
-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"
-
-RDEPEND=">=app-i18n/scim-1.4.6
-	gtk? (
-		>=x11-libs/gtk+-2.2
-		>=x11-libs/pango-1.1
-	)
-	qt3? (
-		$(qt_min_version 3.3.4)
-		>=x11-libs/pango-1.1
-	)
-	qt4? (
-		$(qt4_min_version 4.0.0)
-		>=x11-libs/pango-1.1
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	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}"/${P}-qt4.patch
-	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.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild
index c465eafd03fb..0667b6ea9a0d 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.15.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild
@@ -1,11 +1,12 @@
 # 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.ebuild,v 1.1 2008/02/24 15:39:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.15-r1.ebuild,v 1.1 2008/06/14 05:11:31 matsuu Exp $
 
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
+EAPI="1"
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
-inherit autotools eutils qt3 qt4
+inherit autotools eutils qt3
 
 DESCRIPTION="Yet another IM-client of SCIM"
 HOMEPAGE="http://www.scim-im.org/projects/scim_bridge"
@@ -26,7 +27,8 @@ RDEPEND=">=app-i18n/scim-1.4.6
 		>=x11-libs/pango-1.1
 	)
 	qt4? (
-		$(qt4_min_version 4.0.0)
+		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
+			>=x11-libs/qt-4.0:4 )
 		>=x11-libs/pango-1.1
 	)"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild
index ecba8c33257f..635f1c636db9 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.9.ebuild,v 1.4 2007/01/22 19:09:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.9.ebuild,v 1.5 2008/06/14 05:11:31 matsuu Exp $
 
 inherit eutils qt3
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 sparc ~x86"
 IUSE="doc gtk qt3"
 
-DEPEND=">=app-i18n/scim-1.4.0
+RDEPEND=">=app-i18n/scim-1.4.0
 	gtk? (
 		>=x11-libs/gtk+-2.2
 		>=x11-libs/pango-1.1
@@ -21,7 +21,8 @@ DEPEND=">=app-i18n/scim-1.4.0
 	qt3? (
 		$(qt_min_version 3.3.4)
 		>=x11-libs/pango-1.1
-	)
+	)"
+DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 get_gtk_confdir() {