Add patch to drop automagic dependencies. #417173

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 193 insertions, 3 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/Manifest b/dev-libs/m17n-lib/Manifest
index 86e87f5a1981..dc6553aa994e 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX m17n-lib-1.5.2-fribidi.patch 379 RMD160 a22882ef845506c67749c15975d5d5b089adb45b SHA1 f5db923f58f8a8d78888aa3cf8438b16407da1e0 SHA256 30dead6ce68a07679d28b61876d8a768626b18df94ef61778825f924aa5198e4
 AUX m17n-lib-1.6.2-candidates-list.patch 2751 RMD160 f02db73892be07993e8f9b1c810daab5f9d16c33 SHA1 d6c857250bfb3ef091348383a01ada465407519d SHA256 85e656b41148127849c11973b8cf32075f7bf71982c9edddde0bac5867a8dad2
 AUX m17n-lib-1.6.2-gui.patch 572 RMD160 e43260bad2cde8c22335be0be9e8d07135cbe5e5 SHA1 0f78d58ab3e3d43494e0cc3187aec56aaf3221ae SHA256 18c26fb845662ad0c6579426b60189d47c258ab7556ac40b6df18e9a16d9ade6
 AUX m17n-lib-1.6.2-parallel-make.patch 2593 RMD160 c3c5534e44a2e98145ea3d60b7f0b7b469f79ea2 SHA1 480b76142abb5bba57c26ed085f3eb870085e4ad SHA256 ecc4b0865f6cc2778209156b928138b1034e2f94cf9c9d58a4bdf2f49a8969ae
+AUX m17n-lib-1.6.3-configure.patch 3361 RMD160 97f4859b161a09664f089fed55cf1a5c90fbba4c SHA1 917a704e8de46b84c55e766552049ffa2490e378 SHA256 1bc15fa71e5226497cc2bdb161925d4c737afd82d1ab4e44345aa2cd1f5da31f
 AUX m17n-lib-1.6.3-parallel-make.patch 2637 RMD160 b241d5758673d3474642c699b0c9073be490fe0d SHA1 a23ed80ca6fe0fdd802304504896e1368276abf4 SHA256 b1b0192ab002440f57e1283cbdccdcb65136fdf0d5088cb0c7932822a16d14a6
 DIST m17n-lib-1.5.2.tar.gz 997592 RMD160 5cffe568e05db836753eab9c42c63a023ed9f6f8 SHA1 90fc951155b4dcc2b3331b78b7d516515b896014 SHA256 389cc05194e9a1f9e58b186c3fcd60d7fee2a6f627c3ea8f9c944d69983721f1
 DIST m17n-lib-1.5.3.tar.gz 998339 RMD160 40c01ca60ae9a7976edcbcfffff4c608cc402689 SHA1 80d5f10329bf7c3caf85359e568da1efa41b81b8 SHA256 8ad62dbb9643f2f3c1d85cc61a12371c364c10f0e498920491e8b54f96fe6627
@@ -14,6 +18,24 @@ EBUILD m17n-lib-1.5.3.ebuild 1159 RMD160 52e43dcbbb8099a9e268ef3b39d463492389cce
 EBUILD m17n-lib-1.5.4.ebuild 1159 RMD160 b780e64ab37e0aa5b1dbb778e08b3164b4cf1f71 SHA1 61f4c90eee9cb1e25f89ffb30bcc68c7b063271c SHA256 588942f042d25b60d5d46a8f08b75d9710ada7dd8d80390044884ef07eba34de
 EBUILD m17n-lib-1.5.5.ebuild 1166 RMD160 27fa685f305baaf87cdd22e06f0dcfd79b783511 SHA1 987e6d2a0e23ee55d23c7b2ecb051725372f3785 SHA256 a1d4dac50a61315ebb6aa5cb16c0aa281e46bdda2124070c1ab1b16690969a7c
 EBUILD m17n-lib-1.6.2.ebuild 1390 RMD160 75965949c2100316ebfadeb610ba0a636f4df501 SHA1 62ff33bd67a6d3edfa310a7ba7606abf6a2f4dd8 SHA256 67f90bb6b8b0327a3a7b00f6f67d5d74c4e856aeb6a98f5171e390001cf0a4d0
+EBUILD m17n-lib-1.6.3-r1.ebuild 1917 RMD160 845a532bbb4a2a8ef923d1051abc03560cf0f2b2 SHA1 44911e4d772add1eebeeb57312c09fac7519ef94 SHA256 94f80ceb147b24cb89a26ec513c10397e60566b27b206a679558e1e85dd98eca
 EBUILD m17n-lib-1.6.3.ebuild 1359 RMD160 3196542a9b91b8928ed477f003b17fc862a352a8 SHA1 2fe9bc4fa824182d4c6e4fbbe8202737cf618e20 SHA256 4263db98d08074836318dafec1a84c1cf870a5a85c8e85aa3b0d5da65365ce86
-MISC ChangeLog 7090 RMD160 0165819a53dbe1005595a4d87f9adda3a5bfac5b SHA1 79bc24c89ccf799245073420a9b08fc20198923a SHA256 dc42701217312e65dc6501d7834e6f1a0eb02108bdcc41e9e282b2220725ea3f
-MISC metadata.xml 458 RMD160 f237e0ef14015f6ddd309814e5622be786dac5f1 SHA1 14094744a539d39b3b8755f4e0deadfbf2ec20f2 SHA256 918c16fe3a7ec4c207a8b2ae8b9ccf3dd82e3c62e776625dd0a497637fbe1cf0
+MISC ChangeLog 7307 RMD160 f5aa9401e3af2167198cd33db17d64d36ad6c976 SHA1 23df771b7fd4737857641131ccfb448ab556b530 SHA256 a2966872dfbd0a33f941dc502d49822ef03500533840d59a03e0ac6d975e3c2a
+MISC metadata.xml 812 RMD160 a07dddbba7b3b200d13bf350735a77d3f3d9429f SHA1 cf9db345030c36289e0d7c2681d65f5df4f3877e SHA256 739298b645579c8f0c9bbd2acf27d1c882605bb3bdd544f3d66550bb6148fff6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP76cXAAoJEDYO1FT4VRUU1R4QAIkO2FzWlClIhZhzxtllF70b
+i4d4bSbGE4vemWSKfxUvinkIsPPvEqwiDXUbbhndPCy85HyXxR+gK2o5vZnmhSlP
+/lEp+noYOWh5E3W7x2uTijNHe/xFDxeex5PLRQISzGEf/jeOv+rDhtnRoQW4ozq6
+dtTfWoCaxV9YCm5rJrLViUindv+jGC586JkleHvXOsoQch5h7s9eLU+Gvay4/DUq
+WwVEVxgCyPjXRMjQYYS59xB6/n5fuRrTyU0UQt8rtX8xVc9Bg0Z7QqeqQDb/fCJ6
+0nDPSkLcLWEBGzX2/cnCrpB0vt1lRZzvqC+fSTDBxMbtEnPN3IOJpmSsa5IH/GHQ
+YroW+UmPFnXSr+8BrX00Gsl2o2FFvW+eITu5BPyrlcDayG0AfLlUXUh5gFXciicw
+mirdDQk3o+gHsJniJKrQlm3Bpw/uwha2DycBJeD/F+a0dhp1LL9hNDq7SPvt3JBh
+6thakz6E6YAHyCMM2b+Qg9udIhjK28Mfm/MnHWzPaFGDDzYvgSPycocLbj1XJh++
+AsUwK0sVVVxCwFdE87ee/tfIyeQbB/E+LNxQd62JxXhHORbAjmVwFYpxG3JUUy41
+QQlZTRVbcRECSOQuDF/RiG2x5g/guVe84WOYtADQMTJHDc3x78RKoo+S3e7ZKrnA
+3NBJNeYu7KsILWBeTsoU
+=3eoq
+-----END PGP SIGNATURE-----
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>