Add patch to drop automagic dependencies. #417173

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 169 insertions, 1 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index a50b6785707d..9981b4fb50be 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/m17n-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.55 2012/05/04 18:35:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.56 2012/07/01 01:25:44 naota Exp $
+
+*m17n-lib-1.6.3-r1 (01 Jul 2012)
+
+  01 Jul 2012; Naohiro Aota <naota@gentoo.org>
+  +files/m17n-lib-1.6.3-configure.patch, +m17n-lib-1.6.3-r1.ebuild,
+  metadata.xml:
+  Add patch to drop automagic dependencies. #417173
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> m17n-lib-1.5.2.ebuild,
   m17n-lib-1.5.3.ebuild, m17n-lib-1.5.4.ebuild, m17n-lib-1.5.5.ebuild,
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch
new file mode 100644
index 000000000000..024dea6fea42
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch
@@ -0,0 +1,82 @@
+diff --git a/configure.ac b/configure.ac
+index 2e58d68..49b812a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
+   X11_LD_FLAGS="-lXt -lX11"
+   M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
+ 
+-  if test "x$HAVE_XAW" = "xyes"; then
++  AC_ARG_WITH(athena, 
++	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
++  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
+     AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
+ 	      [Define to 1 if you have the Xaw header files.])
+     XAW_LD_FLAGS="-lXaw -lXmu"
+@@ -149,7 +151,9 @@ else
+ fi
+ AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
+ AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
+-if test "x$HAVE_FRIBIDI" = "xyes"; then
++AC_ARG_WITH(fribidi, 
++	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
++if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
+   AC_DEFINE(HAVE_FRIBIDI, 1, 
+ 	    [Define to 1 if you have Fribidi library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
+@@ -202,8 +206,10 @@ fi
+ AC_SUBST(OTF_LD_FLAGS)
+ 
+ dnl Check for Freetype2 usability.
++AC_ARG_WITH(freetype,
++	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
+ AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
++if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+   FREETYPE_INC=`freetype-config --cflags`
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no,
+ #else
+ Version too old.  Compiling this line should fail.
+ #endif])
+-if test "x$HAVE_XFT2" = "xyes"; then
++AC_ARG_WITH(xft,
++	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
++if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
+   AC_DEFINE(HAVE_XFT2, 1,
+ 	    [Define to 1 if you have Xft2 library and header file.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
+@@ -330,7 +338,9 @@ else
+ fi
+ AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
+ AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
+-if test "x$HAVE_XML2" = "xyes"; then
++AC_ARG_WITH(libxml2, 
++	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
++if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
+   AC_DEFINE(HAVE_XML2, 1,
+ 	    [Define to 1 if you have libxml2 library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
+@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS)
+ dnl Check for Anthy usability.
+ 
+ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
+-if test "x$HAVE_ANTHY" = "xyes"; then
++AC_ARG_WITH(anthy, 
++	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
++if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
+   AC_DEFINE(HAVE_ANTHY, 1,
+ 	   [Define to 1 if you have Anthy library and header file])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
+@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS)
+ 
+ dnl Check for Ispell usability.
+ AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
+-if test "x$HAVE_ISPELL" = "xyes"; then
++AC_ARG_WITH(ispell, 
++	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
++if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
+   AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
+   M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..28d945193315
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild,v 1.1 2012/07/01 01:25:44 naota Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="http://www.m17n.org/m17n-lib/"
+SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="anthy athena anthy bidi fontconfig gd spell libotf libxml2 X xft"
+
+RDEPEND="
+	anthy? ( app-i18n/anthy )
+	spell? ( app-text/ispell )
+	libxml2? ( dev-libs/libxml2 )
+	X? (
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		gd? ( media-libs/gd[png] )
+		libotf? ( >=dev-libs/libotf-0.9.4 )
+		xft? (
+			>=media-libs/freetype-2.1
+			x11-libs/libXft )
+		x11-libs/libX11
+	)
+	~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 ) )
+#
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.2-gui.patch \
+		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
+		"${FILESDIR}"/${PN}-1.6.3-configure.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
+
+	if use X; then
+		myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
+$(use_with xft)"
+	else
+		myconf+=" --without-x --disable-gui --without-athena --without-friidi
+--without-fontconfig --without-freetype --without-gd --without-libotf
+--without-xft"
+	fi
+
+	econf ${myconf} || die
+}
+
+src_install() {
+	# bug #363239
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index aedfbc44e579..8c2cd4b2c2ab 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -7,9 +7,15 @@
       Builds the Graphical User Interface API and utilities for the
       package.
     </flag>
+    <flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg>
+    input method.</flag>
+    <flag name='athena'>Enable the MIT Athena widget set
+    (<pkg>x11-libs/libXaw</pkg>)</flag>
     <flag name='gd'>
       Build API and utilities based on <pkg>media-libs/gd</pkg>. This
       flag is only meaningful if the X USE flag is also enabled.
     </flag>
+    <flag name='libotf'>Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
+    <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
   </use>
 </pkgmetadata>