gentoo resync : 29.08.2018

9 files changed, 173 insertions, 46 deletions

diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index a67ff6e9ceb2..6630591be66e 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,8 +1,11 @@
-AUX m17n-lib-1.7.0-no-freetype.patch 1181 BLAKE2B ce58fa83e9e9b123541ccc9aa1336b62018eb1201996eecd7c936e475aee80f8d989b07449cf345706c1bc9510e0add938e9cb821ae1383359e1e7c8ca8766a4 SHA512 dc94d2637c65242a3b53d8a0121e3502e9b389514961146c62cb1a28859e0726fb3abb21f530d829984cc37546cba443f520e6bfd6d02f7f5f23be7597db29eb
-AUX m17n-lib-configure.patch 3290 BLAKE2B 8b82158404739bd9f976f01d600e4f820c981f6cc128662250eaf3df4e8138d8f2a25c2ee8b244154894207d8a813ff6287a805f3983b50979078cda3aba01f4 SHA512 01a5ef3f1efb1dd81cc569a797be6fab45247df92c9fb95ed72da44637bf0eedc310198b487c30a1727bd38f39e5868cf4921a61f4a130d459c17516976ea7dc
-AUX m17n-lib-gui.patch 365 BLAKE2B 0efcef5e8be1f794f2fadb193aed03371c334226225cf2c53df81c54ad0d26e1d367c7d7e9f04365f415b61a428662fcbcae2cfe70e75e71df076f4ff8145400 SHA512 792900e167d8ed47a006dd48f8cb0b0b58e239f1ab56751131de15179b917c5ec8251d00932dc5d0d2fec8c51b2532606e958e90c943f6360a3442a02b76f445
+AUX m17n-lib-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43
+AUX m17n-lib-freetype.patch 1181 BLAKE2B ce58fa83e9e9b123541ccc9aa1336b62018eb1201996eecd7c936e475aee80f8d989b07449cf345706c1bc9510e0add938e9cb821ae1383359e1e7c8ca8766a4 SHA512 dc94d2637c65242a3b53d8a0121e3502e9b389514961146c62cb1a28859e0726fb3abb21f530d829984cc37546cba443f520e6bfd6d02f7f5f23be7597db29eb
+AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eaecdabde0ab5f02b491e0d86ed855689eeb92f536e420a75111d937fdb0941bc419c9d15ef4baf1e0a4f678bb81 SHA512 b03680b185dccf063ef01ce85bb1d252bd984a77e94e314e76482747af4ecd4f90c3b7dd03b5da88e1d75654526b22368c70c80df398044baa39bc80f5936ba3
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
+AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7
-EBUILD m17n-lib-1.7.0.ebuild 1797 BLAKE2B 6ba7262da1e21d675d2b458cd791b9cfd7273436c5bc04110f4fb8d3e81fee2c38a960ec2f9a32708e0fb580dbd95f306a5406747fdee1df0ba85c01cf14462d SHA512 9b0bf74495f2ccb2c3c50f1ff44f2716149fd961a9c7536cb1d46229576b26abe3ed7c21e2ee6ca26b8c139336ca852c39a52ffeb1fceb5ffd07317f3e51679d
-MISC metadata.xml 873 BLAKE2B b273eacca314fca66e3b779dbc02401d36030747c3068c9e70799500dfdd6a5ea8e5e04f259bf4e284278ec633ad625abae6b1559e757857ba585caeffe6128d SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291
+DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
+EBUILD m17n-lib-1.7.0.ebuild 1757 BLAKE2B 4c7890f2bc2a5240c87f174cd0366b0f5ff93eda8d4881fd4022c2b3683674a4766bc337d775d8ca507a2a5713776d8ed13aa426c0b53c1ebdafc13fa4c1cec8 SHA512 97e1c3ad3b83e52efa29feefc4c888d635b4092bab5b8a55a93e18593edbefcd6f76f16822f730d6caba05e2166375bf22a320b5aadf93580767ac1e69ac25ad
+EBUILD m17n-lib-1.8.0.ebuild 1840 BLAKE2B 0d84d47d4322331569a9d1be081980f64e975e5b8e0d835cd313a3c1aaf7a723631967e9d898961f8709161c5222869e8b8454bf5d01c314bfcf81129e99c1b5 SHA512 f385a0b6f80f0cd8f688f61a119101b4d4d6619291051aa4c47b313a439e80fcab039142c2b4da8f2b2ebc5fd5f66d92408fea86064250496d6e70db3fbd83d1
+MISC metadata.xml 810 BLAKE2B a17dd171386fee0a400c07e5dc5008855e68d15a048380714c35355551fa40aaaf6e0dc8fb4b28f7a89553c9482cbf40b7b13117506aac007cf8e6901dda4acb SHA512 d5530380b5ad05c6dbdeffebf310bd45985301b62b2ab11757727551522bc45c3b00d0e751503d8ead750155fb857125b73f14210df6fd3a2f85af48638f0f88
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 00ba09493f3d..04ffc7749a5b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,6 +1,17 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
+@@ -97,8 +97,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++AC_ARG_WITH(gui,
++	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
+@@ -125,7 +125,9 @@
    X11_LD_FLAGS="-lXt -lX11"
    M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
  
@@ -11,7 +22,7 @@
      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
+@@ -149,7 +151,9 @@
  fi
  AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
  AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
@@ -22,7 +33,7 @@
    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
+@@ -202,8 +206,10 @@
  AC_SUBST(OTF_LD_FLAGS)
  
  dnl Check for Freetype2 usability.
@@ -34,7 +45,7 @@
    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,
+@@ -255,7 +261,9 @@
  #else
  Version too old.  Compiling this line should fail.
  #endif])
@@ -45,7 +56,7 @@
    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
+@@ -330,7 +338,9 @@
  fi
  AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
  AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
@@ -56,7 +67,7 @@
    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)
+@@ -344,7 +354,9 @@
  dnl Check for Anthy usability.
  
  PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
@@ -67,7 +78,7 @@
    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)
+@@ -355,7 +367,9 @@
  
  dnl Check for Ispell usability.
  AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch
index 59b040c4335b..59b040c4335b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch
diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
new file mode 100644
index 000000000000..203f836bf942
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,21 +210,20 @@
+ 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$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++if test "x$with_freetype" != "xno"; then
++  PKG_CHECK_MODULES([FT2], [freetype2])
+   save_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
++  CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
+   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+   			      HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+     save_LIBS="$LIBS"
+-    LIBS="$LIBS `freetype-config --libs`"
++    LIBS="$LIBS $FT2_LIBS"
+     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+     			   		     HAVE_FREETYPE=no)
+     LIBS="$save_LIBS"
+     if test "x$HAVE_FREETYPE" = "xyes"; then
+-      FREETYPE_LD_FLAGS=`freetype-config --libs`
++      FREETYPE_LD_FLAGS=$FT2_LIBS
+       AC_DEFINE(HAVE_FREETYPE, 1, 
+ 		[Define to 1 if you have FreeType library and header file.])
+       M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch
deleted file mode 100644
index b60d81bbc221..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-gui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,8 +97,8 @@
- 
- dnl Checks which levels of APIs should be compiled.
- 
--AC_ARG_ENABLE(gui,
--	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
-+AC_ARG_WITH(gui,
-+	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
- 
- AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
- 
diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
new file mode 100644
index 000000000000..aabe12e586d8
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,6 @@
+ M17N_EXT_LIBS=
+ 
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
+ 
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
+@@ -318,6 +317,8 @@
+ 
+ fi
+ 
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
++
+ dnl Check for libxml2 usability.
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index a6cd8d7426e9..b5dcd1285ee7 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -35,10 +35,9 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
-	"${FILESDIR}"/${PN}-gui.patch
+	"${FILESDIR}"/${PN}-freetype.patch
 	"${FILESDIR}"/${PN}-ispell.patch
 	"${FILESDIR}"/${PN}-parallel-make.patch
-	"${FILESDIR}"/${PN}-1.7.0-no-freetype.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
new file mode 100644
index 000000000000..767f8eabe5f1
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
+
+RDEPEND="~dev-db/m17n-db-${PV}
+	X? (
+		x11-libs/libX11
+		athena? ( x11-libs/libXaw )
+		bidi? ( dev-libs/fribidi )
+		fontconfig? ( media-libs/fontconfig )
+		gd? ( media-libs/gd[png] )
+		libotf? ( dev-libs/libotf )
+		xft? (
+			media-libs/freetype
+			x11-libs/libXft
+		)
+	)
+	anthy? ( app-i18n/anthy )
+	libxml2? ( dev-libs/libxml2 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-freetype.patch
+	"${FILESDIR}"/${PN}-ftconfig.patch
+	"${FILESDIR}"/${PN}-ispell.patch
+	"${FILESDIR}"/${PN}-parallel-make.patch
+	"${FILESDIR}"/${PN}-pkg-config.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	# workaround for parallel install
+	sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with anthy)
+		$(use_with libxml2)
+		$(use_with spell ispell)
+	)
+	if use X; then
+		myconf+=(
+			$(use_with athena)
+			$(use_with bidi fribidi)
+			$(use_with fontconfig)
+			$(use_with xft freetype)
+			$(use_with gd)
+			--with-gui
+			$(use_with libotf)
+			--with-x
+			$(use_with xft)
+		)
+	else
+		myconf+=(
+			--without-athena
+			--without-fontconfig
+			--without-freetype
+			--without-fribidi
+			--without-gd
+			--without-gui
+			--without-libotf
+			--without-x
+			--without-xft
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 0c2995cb954a..75b918da5084 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="X">Build the Graphical User Interface API and utilities</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>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="X">Build the Graphical User Interface API and utilities</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>