summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-09-15 12:41:47 +0000
committerNaohiro Aota <naota@gentoo.org>2012-09-15 12:41:47 +0000
commit69399169b2e407a1bf373e1c03835c9316b64fed (patch)
treeba29d6ff3f1a5757340b898d0eb64cf6f6dca249 /app-i18n/scim
parentx86 stable, see bug 433383 (diff)
downloadgentoo-2-69399169b2e407a1bf373e1c03835c9316b64fed.tar.gz
gentoo-2-69399169b2e407a1bf373e1c03835c9316b64fed.tar.bz2
gentoo-2-69399169b2e407a1bf373e1c03835c9316b64fed.zip
Add USE=gtk3 and add configure option to specify gtk version. #434740
(Portage version: 2.1.11.16/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/scim')
-rw-r--r--app-i18n/scim/ChangeLog5
-rw-r--r--app-i18n/scim/metadata.xml3
-rw-r--r--app-i18n/scim/scim-1.4.14.ebuild15
3 files changed, 19 insertions, 4 deletions
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 2f8ac90dab59..e7d9cec927fd 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-i18n/scim
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.159 2012/08/19 03:15:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.160 2012/09/15 12:41:47 naota Exp $
+
+ 15 Sep 2012; <naota@gentoo.org> metadata.xml, scim-1.4.14.ebuild:
+ Add USE=gtk3 and add configure option to specify gtk version. #434740
19 Aug 2012; Naohiro Aota <naota@gentoo.org> scim-1.4.14.ebuild:
Fix build failure with USE=doc
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
index 2d5852c16c60..2e3d5763f483 100644
--- a/app-i18n/scim/metadata.xml
+++ b/app-i18n/scim/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
+<use>
+ <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+</use>
</pkgmetadata>
diff --git a/app-i18n/scim/scim-1.4.14.ebuild b/app-i18n/scim/scim-1.4.14.ebuild
index 75c4f01a4d12..e624ef3eb6ed 100644
--- a/app-i18n/scim/scim-1.4.14.ebuild
+++ b/app-i18n/scim/scim-1.4.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.2 2012/08/19 03:15:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.3 2012/09/15 12:41:47 naota Exp $
EAPI="4"
inherit eutils flag-o-matic multilib gnome2-utils autotools-utils
@@ -12,11 +12,12 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+IUSE="doc gtk3"
RDEPEND="x11-libs/libX11
dev-libs/glib:2
- x11-libs/gtk+:2
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
>=dev-libs/atk-1
>=x11-libs/pango-1
!app-i18n/scim-cvs"
@@ -37,11 +38,19 @@ DOCS=(
)
src_configure() {
+ local gtk_version
+ if use gtk3; then
+ gtk_version="--with-gtk-version=3"
+ else
+ gtk_version="--with-gtk-version=2"
+ fi
+
# bug #83625
filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
local myeconfargs=(
$(use_with doc doxygen)
--enable-ld-version-script
+ $gtk_version
)
autotools-utils_src_configure
}