gentoo resync : 04.05.2018

4 files changed, 69 insertions, 16 deletions

diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 25222db745fb..3346352cd627 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,4 +1,5 @@
-AUX sdl-ttf-2.0.11-underlink.patch 316 BLAKE2B 51bc3af2b6e21855a31d227ea2a43d1dc1253e261cfca097ce64d2fc648dba20e775d830196d918481973efa12e0548e905b326a5444e1754c59492b8231fae1 SHA512 9421cd6ce0502400bab1a87404a2378b79cdd8ce15644aea0978b85395693a422596175feccc119b0de8d83df2095a5accb74c80ad7b0dfee62d0536b8787030
+AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
+AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1143 BLAKE2B 0fa50efde52beb4811468e1987f7d0b6b536cb0aa213e7b7b9e4b730ac9c8fd039a0cd4b761414e15f1528829e0baf986dbe2aaf62f106f8674fc63137a809ff SHA512 f4337f15d96fb7a7a5605707f43ab336576bf170da910700889e64f6079a155d8e16bb3c6b8db69b635b92d5f5d6934c23e333b35bb4c8cc86d0ce503335bfd7
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1256 BLAKE2B 70921da3d9c1ad8d25ec3984d68b08770c6d0e7687c7c617a197382c77d97c447eb801396702b2cb10299188dce4a599c9310757fbcd505335c2955848a5d17d SHA512 0a8097f81f62b6c83fd39f0d4b73b51384fcc391a4d2704157ea018201018bfa17b432d663c48b7987f9a9d879fa6753cc7c6f4fa6b7e0e42f2178b1ee3087d5
 MISC metadata.xml 487 BLAKE2B 95ce74adcba0d3325dbcbf132d27ec7e09a56bb5043d44ced349f0a8318f7a7ba6a3f77cf164292af4f789c4c058b6825a733338245d9434f689ce3c84060565 SHA512 8da59a1be8aa7ca22c2f8b14e4c4fd288a9bc4b508157bb38b0cbb8f1f5f7dce3904861e419b8a6b40a0b895e8866c53b677c1467c0531b9615d70806bdee360
diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..02b06356190e
--- /dev/null
+++ b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/654758
+
+--- SDL_ttf-2.0.11/configure.in
++++ SDL_ttf-2.0.11/configure.in
+@@ -64,6 +64,7 @@
+ 	;;
+ esac
+ 
++PKG_PROG_PKG_CONFIG
+ 
+ dnl Check for iconv (character conversion library; see iconv.m4)
+ dnl This isn't available on many systems
+@@ -94,6 +95,17 @@
+ dnl
+ dnl Get the cflags and libraries from the freetype-config script
+ dnl
++PKG_CHECK_MODULES(
++	FREETYPE2,
++	freetype2,
++	[
++		ft_found=yes
++		CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++		LIBS="$LIBS $FREETYPE2_LIBS"
++	],
++	ft_found=no
++)
++
+ AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is 
+ installed (optional)],
+             freetype_prefix="$withval", freetype_prefix="")
+@@ -101,6 +113,7 @@
+ where FREETYPE is installed (optional)],
+             freetype_exec_prefix="$withval", freetype_exec_prefix="")
+ 
++if test "x$ft_found" != "xyes" ; then
+ if test x$freetype_exec_prefix != x ; then
+      freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
+      if test x${FREETYPE_CONFIG+set} != xset ; then
+@@ -123,6 +136,7 @@
+     CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
+     LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
+ fi
++fi
+ 
+ dnl Check for SDL
+ SDL_VERSION=1.2.4
diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
index 136589ec7f13..7bd3a3993bb1 100644
--- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
+++ b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.am.old	2011-05-17 17:17:18.972003301 +0200
-+++ Makefile.am	2011-05-17 17:18:38.281983708 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -33,6 +33,7 @@
  	-release $(LT_RELEASE)	\
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 2f74af334950..e72a1d47b822 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=6
+inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="library that allows you to use TrueType fonts in SDL applications"
@@ -22,23 +22,29 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--disable-dependency-tracking
+		$(use_enable static-libs static)
 		$(use_with X x)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	dodoc CHANGES README
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
 }