From 698748426474baf959f7657d3449d51d018723f8 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Fri, 2 Oct 2009 22:31:32 +0000 Subject: Fixed --disable-*-module issue, bug #280887. Removed old versions. (Portage version: 2.1.6.13/cvs/Linux x86_64) --- app-i18n/scim-bridge/ChangeLog | 9 +- app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild | 92 ------------------- app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild | 93 ------------------- app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild | 103 ++++++++++++++++++++++ 4 files changed, 111 insertions(+), 186 deletions(-) delete mode 100644 app-i18n/scim-bridge/scim-bridge-0.4.15-r3.ebuild delete mode 100644 app-i18n/scim-bridge/scim-bridge-0.4.15.2.ebuild create mode 100644 app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild (limited to 'app-i18n') 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 + -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 scim-bridge-0.4.16.ebuild: 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 +} -- cgit v1.2.3-65-gdbad