[patch] m17n-lib-1.6.3.ebuild.patch

m17n-lib-1.6.3.ebuild.patch (text/plain), 2.22 KB, created by Naohiro Aota on 2012-05-27 18:06:13 UTC

Index: m17n-lib-1.6.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild,v
retrieving revision 1.2
diff -u -r1.2 m17n-lib-1.6.3.ebuild
--- m17n-lib-1.6.3.ebuild	4 May 2012 18:35:44 -0000	1.2
+++ m17n-lib-1.6.3.ebuild	27 May 2012 18:04:17 -0000
@@ -13,25 +13,28 @@
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-#IUSE="anthy gd ispell"
-IUSE="gd X"
+IUSE="anthy athena anthy bidi fontconfig freetype gd ispell libotf libxml2 X xft"
 
 RDEPEND="
+	anthy? ( app-i18n/anthy )
+	ispell? ( app-text/ispell )
+	libxml2? ( dev-libs/libxml2 )
 	X? (
-		x11-libs/libXaw
-		x11-libs/libXft
-		x11-libs/libX11
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		freetype? ( >=media-libs/freetype-2.1 )
 		gd? ( media-libs/gd[png] )
-		dev-libs/fribidi
-		>=media-libs/freetype-2.1
-		media-libs/fontconfig
-		>=dev-libs/libotf-0.9.4
+		libotf? ( >=dev-libs/libotf-0.9.4 )
+		xft? ( x11-libs/libXft )
+		x11-libs/libX11
 	)
-	dev-libs/libxml2
 	~dev-db/m17n-db-${PV}"
+# athena? ( x11-libs/libXaw )
+# athena shoud be enabled to build m17n-edit properly when X is enabled.
+
 # linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-# anthy? ( app-i18n/anthy )
-# ispell? ( app-text/ispell )
+#
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -39,18 +42,23 @@
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.2-gui.patch \
-		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch
+		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
+		"${FILESDIR}"/${PN}-1.6.3-configure.patch
 
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=
+	local myconf="$(use_with anthy) $(use_with ispell) $(use_with libxml2)"
 
 	if use X; then
-		myconf+=" --enable-gui $(use_with gd)"
+		myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+$(use_with fontconfig) $(use_with freetype) $(use_with gd) $(use_with libotf)
+$(use_with xft)"
 	else
-		myconf+=" --disable-gui --without-gd"
+		myconf+=" --without-x --disable-gui --without-athena --without-friidi
+--without-fontconfig --without-freetype --without-gd --without-libotf
+--without-xft"
 	fi
 
 	econf ${myconf} || die