gentoo resync : 08.05.2018

4 files changed, 91 insertions, 5 deletions

diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index dd97c4c08878..8cf853cd6708 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -1,4 +1,7 @@
-AUX libotf-0.9.13-build.patch 670 BLAKE2B d39224c6fd3bd5a9fc68b7be77e04b4524e92bb1cbe1b5fc485a8e5ffcc4f8c3b12f90e22e6e5fc86d71fd7ebb8ed2c230a91e3318554678a8a1b1b6c4d83bf5 SHA512 48e514ca560f1f6572e1a4cba799cedbdeae1dfd80bfb076e2a8bebe582ccf80c22edfa217edd2ec44bb49627c05149e309f287ec90788fbc99fbc0b56f3aba1
+AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b5f08b7141bb918a81077606fe2860641b00fb562cd26457ab01285385fb4d71c7753715bf7371add9c0cb89366 SHA512 9a0fb4c4cd3c096d4f0a8910de63d594e8ae471543a65e62bcff102d98e25d1b8714eccb91570c8f778dc83659ac8e5e9a1fa3c8e7479153c58d41972661d56d
+AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
+DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
 EBUILD libotf-0.9.13.ebuild 873 BLAKE2B 21874f9206497a12df2dcfff03b453b6a61dc01800e9d698b25cc6a5e3b40c5c5250c7053ab0f0a4707731273002b2de426129d4bdc318333274951ed2aac12f SHA512 15a9d71a286614d0c523635e4bd92dd0596982ec95b8edd3a48bab957b996758422d5915231e8d725f34a4f14ef3174c5800d8baa626a72e1e5867326997ad17
+EBUILD libotf-0.9.16.ebuild 992 BLAKE2B 492e71c2e8391b0570a80405b482c4085ef3effafc2b2bf6557270dd182e369948f512a3ad4a492c13b43333f02ba7bec390dec0b6db84009f379c4ccd4c5d4c SHA512 715e2cc98a04b36ad57af8744f7481151767977b3be260c6ecf07135df5b115c9e285124f6447edfba9a46df7206c73788f2fb92d4818f2832c2eb3f18794336
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/files/libotf-0.9.13-build.patch b/dev-libs/libotf/files/libotf-0.9.13-build.patch
index 519722f43371..41fcb834f3d4 100644
--- a/dev-libs/libotf/files/libotf-0.9.13-build.patch
+++ b/dev-libs/libotf/files/libotf-0.9.13-build.patch
@@ -1,5 +1,5 @@
---- example/Makefile.am
-+++ example/Makefile.am
+--- a/example/Makefile.am
++++ b/example/Makefile.am
 @@ -37,8 +37,7 @@
  otfdump_LDADD = ${CommonLDADD}
  
@@ -10,8 +10,8 @@
  
  otftobdf_SOURCE = otftobdf.c
  otftobdf_LDADD = ${CommonLDADD}
---- libotf.pc.in
-+++ libotf.pc.in
+--- a/libotf.pc.in
++++ b/libotf.pc.in
 @@ -7,5 +7,6 @@
  Description: OpenType font library
  Version: @PACKAGE_VERSION@
diff --git a/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch b/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..a57e92e1b1c2
--- /dev/null
+++ b/dev-libs/libotf/files/libotf-0.9.16-freetype_pkgconfig.patch
@@ -0,0 +1,33 @@
+--- libotf-0.9.16/configure.ac
++++ libotf-0.9.16/configure.ac
+@@ -48,23 +48,24 @@
+ AC_FUNC_ALLOCA
+ AC_FUNC_MALLOC
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Check for Freetype2 usability.
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++PKG_CHECK_MODULES(FREETYPE, freetype2, [
++  FREETYPE_INC="$FREETYPE_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+   			      HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+-    FREETYPE_LD_FLAGS=`freetype-config --libs`;
++    FREETYPE_LD_FLAGS="$FREETYPE_LIBS"
+     LIBS="$LIBS $FREETYPE_LD_FLAGS"
+     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+     			   		     HAVE_FREETYPE=no)
+   fi
+-fi
++])
+ 
+ if test "x$HAVE_FREETYPE" != "xyes" ; then
+-  echo "Freetype library wan't found in your system!"
++  echo "Freetype library not found in your system!"
+   exit 1
+ fi
+ AC_SUBST(FREETYPE_INC)
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
new file mode 100644
index 000000000000..1fdded3749e9
--- /dev/null
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Library for handling OpenType fonts (OTF)"
+HOMEPAGE="http://www.nongnu.org/m17n/"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs X"
+
+RDEPEND=">=media-libs/freetype-2.4.9
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-libs/libICE
+		x11-libs/libXmu
+		x11-proto/xproto
+	)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.13-build.patch
+	"${FILESDIR}"/${PN}-0.9.16-freetype_pkgconfig.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_X11_Xaw_Command_h=$(usex X)
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}