diff options
author | Mamoru Komachi <usata@gentoo.org> | 2004-09-07 13:42:41 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2004-09-07 13:42:41 +0000 |
commit | 1b6e2e2c30151dba6dfc56dea7eba83716b135bf (patch) | |
tree | 190390fc788f873172a61339937b23ba45a2eb63 /app-i18n | |
parent | closes bug 59745 - thanks ian! (diff) | |
download | historical-1b6e2e2c30151dba6dfc56dea7eba83716b135bf.tar.gz historical-1b6e2e2c30151dba6dfc56dea7eba83716b135bf.tar.bz2 historical-1b6e2e2c30151dba6dfc56dea7eba83716b135bf.zip |
Removed gtk dependency if gtk USE flag is not set. Thanks to liuspider <liuspider@yahoo.com> for the suggestion. Closing bug #62153.
Diffstat (limited to 'app-i18n')
-rw-r--r-- | app-i18n/scim/ChangeLog | 9 | ||||
-rw-r--r-- | app-i18n/scim/Manifest | 12 | ||||
-rw-r--r-- | app-i18n/scim/files/digest-scim-0.99.9 | 1 | ||||
-rw-r--r-- | app-i18n/scim/files/digest-scim-1.0.0 | 1 | ||||
-rw-r--r-- | app-i18n/scim/scim-1.0.0.ebuild (renamed from app-i18n/scim/scim-0.99.9.ebuild) | 35 |
5 files changed, 33 insertions, 25 deletions
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog index 1ee408a9a649..529a7cf4116e 100644 --- a/app-i18n/scim/ChangeLog +++ b/app-i18n/scim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-i18n/scim # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.33 2004/09/07 08:06:09 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.34 2004/09/07 13:42:41 usata Exp $ + +*scim-1.0.0 (07 Sep 2004) + + 07 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-0.99.9.ebuild, + +scim-1.0.0.ebuild: + Removed gtk dependency if gtk USE flag is not set. Thanks to liuspider + <liuspider@yahoo.com> for the suggestion. Closing bug #62153. 07 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-0.99.5.ebuild, -scim-0.99.6.ebuild, scim-0.99.8.ebuild: diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest index fc17d3fce28c..8c9934d72e3c 100644 --- a/app-i18n/scim/Manifest +++ b/app-i18n/scim/Manifest @@ -1,9 +1,9 @@ -MD5 662533a4f21a352e5f1194afd683fa98 scim-0.99.8.ebuild 2812 -MD5 f5b0471076ccc3da923492a094af4b55 scim-0.9.7.ebuild 2150 -MD5 76db8a715d62c8018e7ec06176fe7ceb ChangeLog 5408 +MD5 8e71b1109bfaf5134418d458b4663057 ChangeLog 5665 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156 -MD5 440311cd0ea70cf19d2d7eed03be7dd2 scim-0.99.9.ebuild 3138 +MD5 f5b0471076ccc3da923492a094af4b55 scim-0.9.7.ebuild 2150 +MD5 662533a4f21a352e5f1194afd683fa98 scim-0.99.8.ebuild 2812 +MD5 7b985fea17c4b2e950d71324bccd52d8 scim-1.0.0.ebuild 3008 +MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545 +MD5 ce0f75383c966331dfcad6088ec9daba files/digest-scim-1.0.0 63 MD5 da242924a42bdb73b70898a598f6ad07 files/digest-scim-0.99.8 64 -MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63 -MD5 5e0cb2b7b73e6c169c5163302ce2265f files/digest-scim-0.99.9 64 diff --git a/app-i18n/scim/files/digest-scim-0.99.9 b/app-i18n/scim/files/digest-scim-0.99.9 deleted file mode 100644 index 1098e92e9fe8..000000000000 --- a/app-i18n/scim/files/digest-scim-0.99.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 8b42fdad5258a78d838e460a054266a9 scim-0.99.9.tar.gz 2309371 diff --git a/app-i18n/scim/files/digest-scim-1.0.0 b/app-i18n/scim/files/digest-scim-1.0.0 new file mode 100644 index 000000000000..e518067ee194 --- /dev/null +++ b/app-i18n/scim/files/digest-scim-1.0.0 @@ -0,0 +1 @@ +MD5 810741700b2ea73467eb3de6b61f3330 scim-1.0.0.tar.gz 2309045 diff --git a/app-i18n/scim/scim-0.99.9.ebuild b/app-i18n/scim/scim-1.0.0.ebuild index 4ddfbfb22926..930e2aed01a4 100644 --- a/app-i18n/scim/scim-0.99.9.ebuild +++ b/app-i18n/scim/scim-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.9.ebuild,v 1.1 2004/08/30 16:28:54 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.0.ebuild,v 1.1 2004/09/07 13:42:41 usata Exp $ inherit gnome2 eutils @@ -11,17 +11,16 @@ SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~alpha ~ppc ~amd64" -IUSE="gnome" -#IUSE="gnome gtk" +IUSE="gnome gtk" RDEPEND="virtual/x11 gnome? ( >=gnome-base/gconf-1.2 >=dev-libs/libxml2-2.5 >=gnome-base/orbit-2.8 ) - >=x11-libs/gtk+-2 - >=dev-libs/atk-1 - >=x11-libs/pango-1 - >=dev-libs/glib-2 + gtk? ( >=x11-libs/gtk+-2 + >=dev-libs/atk-1 + >=x11-libs/pango-1 + >=dev-libs/glib-2 ) !app-i18n/scim-cvs !<app-i18n/scim-chinese-0.4.0" DEPEND="${RDEPEND} @@ -36,16 +35,19 @@ ELTCONF="--reverse-deps" SCROLLKEEPER_UPDATE="0" USE_DESTDIR="1" +has_gtk() { + if has_version '>=x11-libs/gtk-2' ; then + true + else + false + fi +} + src_unpack() { unpack ${A} # use scim gtk2 IM module only for chinese/japanese/korean EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.6.1-gtk2immodule.patch - # gtk USE flag - cd ${S} - #epatch ${FILESDIR}/${PN}-gtk-utils-gentoo.diff - ./bootstrap || die "bootstrap failed" - # workaround for problematic makefile sed -i -e "s:^\(scim.*LDFLAGS.*\):\1 -ldl:g" \ ${S}/src/Makefile.* || die @@ -60,7 +62,8 @@ src_unpack() { src_compile() { use gnome || G2CONF="${G2CONF} --disable-config-gconf" - #use gtk || G2CONF="${G2CONF} --disable-gtk2-immodule --disable-frontend-x11 --disable-setup-ui" + use gtk || G2CONF="${G2CONF} --disable-panel-gtk --disable-setup-ui" + has_gtk || G2CONF="${G2CONF} --disable-gtk2-immodule" gnome2_src_compile } @@ -93,12 +96,10 @@ pkg_postinst() { einfo " # emerge app-i18n/scim-m17n" einfo - #use gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules - gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules + has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules } pkg_postrm() { - #use gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules - gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules + has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules } |