gentoo resync : 06.05.2018

5 files changed, 42 insertions, 25 deletions

diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index f4f508a46868..f4367ad25205 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -1,5 +1,6 @@
-AUX ftgl-2.1.3_rc5-gentoo.patch 1687 BLAKE2B 08301939a5488dbda9801ced7780dc21bc11da8632b04cce24fd86feb00a071d00a2d225794137bb272e7cb15633cb9e2715906c67347c4ad4a6810455a4172f SHA512 0e4977bf23cf92680ef3b08fff33ee857ef3e91e76a0f2251cba1c44e6597fc16f3cc4d4e90d4aee1596348ebc85c5ffb8ea7f7eb162e4f15307f40fd0b71652
-AUX ftgl-2.1.3_rc5-underlink.patch 349 BLAKE2B 7b6dcd4175a08390a85366e2d8dbe31948c571bacc9ce9fb901c32a71329c997c53f961b51fd2e67577ee49597077abf60dfd8eee8d7001b07cc8917a1747fd1 SHA512 aa7a33577a7096e68b47d6e623f99511b54d277ed334e0a2aff6e69e3d915f575e943a556aa22c5f4fe5d884eb6b4425f2b0ecb0aea95f9a36799ad65c1b7399
+AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af130a6263312f5c48deb24f08db723422cb148b0d0d4a250b461604a7cc5e32270e3dc2050a2230487d2a92674386c8f636d7c0e1f SHA512 81d7ce2043e86bd451d07f97e8686fd90527994154410eb9519d18c77b97b9311c062332fe4f6e1acbb566810d961f87626f5a56ab7843ff4e2eb3d66f3be7d4
+AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
+AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
-EBUILD ftgl-2.1.3_rc5.ebuild 1147 BLAKE2B 1eceae95b6c723e2e6ed81f5889e91f3edb12e14bc99417f4c366e4d6dd2068ca62f1cb74516ad77d49ff7cdc67c6b41949c97003027f5e6a4475ee7a720dea1 SHA512 9d0d05385c320296ee6ef9f369da873b770cc7dce96805b9f016531b6aae62b0a39dd3f909deda3f105e3a3d9bc8da2540fb1b3952339d32626e01096e241740
+EBUILD ftgl-2.1.3_rc5.ebuild 1250 BLAKE2B 6208b2113961830c37440d0e91b2c052ad954714d53376e4c71af8606c88252c5e8423e0b332dcf0e4e8f85cc8e54f0454c0c42ad30f9b59147ea36949d5f3e5 SHA512 b56923e3d3f4b856f9f0387e1290d2c8e95d72b2b2de718430d5760b384bef3099b918de021c16d8c2ec112d25f0cd1969404b5b08d535f88f707cb9b2e7b3a4
 MISC metadata.xml 327 BLAKE2B 84a08c3564faec441b2c375d60326a01d2a60ec1a5390b1e4a8a7e317e85d7da7bc181dba11b84a5d387e32231a73ec9308466fa914d5b90cdbe12e255ba931b SHA512 d5fb9210e27a2e5687f6a223885f6f5ea023c0da51e594c12fb3b07521f3fd882bcc19829d0ccbfaebcfe7e4e15df897c70eabb2fab0d29f8f4b45dbfe710d56
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..89cc4c00c413
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- ftgl-2.1.3~rc5/configure.ac
++++ ftgl-2.1.3~rc5/configure.ac
+@@ -41,7 +41,7 @@
+ 
+ AC_PATH_X
+ 
+-AC_CHECK_FT2([9.0.3],[],
++PKG_CHECK_MODULES(FT2, freetype2 >= 9.0.3,,
+              [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+ 
+ AC_PATH_XTRA
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
index 945c8742c644..885051a01d46 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.ac.old    2008-11-21 14:41:15.000000000 +0100
-+++ configure.ac        2008-11-21 14:44:19.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -50,8 +50,7 @@
  FTGL_CHECK_GLUT
  FTGL_CHECK_FONT
@@ -31,8 +31,8 @@
  if test "x${LATEX}" != "xno"; then
    AC_MSG_CHECKING(for a4.sty and a4wide.sty)
    if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then
---- Makefile.am.old	2008-11-24 22:35:16.000000000 +0100
-+++ Makefile.am	2008-11-24 22:36:32.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -24,16 +24,6 @@
  	m4 \
  	$(NULL)
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
index 30bfba04c7d4..ae152ff85718 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
@@ -1,5 +1,5 @@
---- demo/Makefile.am.old	2011-05-20 11:13:18.822445466 +0200
-+++ demo/Makefile.am	2011-05-20 11:13:28.271042994 +0200
+--- a/demo/Makefile.am
++++ b/demo/Makefile.am
 @@ -17,7 +17,7 @@
      $(NULL)
  c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 3e89417da633..068c13cabe6e 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic autotools
+EAPI=6
+inherit autotools flag-o-matic
 
-MY_PV=${PV/_/-}
-MY_PV2=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-MY_P2=${PN}-${MY_PV2}
+MY_PV="${PV/_/-}"
+MY_PV2="${PV/_/~}"
+MY_P="${PN}-${MY_PV}"
+MY_P2="${PN}-${MY_PV2}"
 
 DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
 HOMEPAGE="http://ftgl.sourceforge.net/"
@@ -22,14 +22,19 @@ DEPEND=">=media-libs/freetype-2.0.9
 	virtual/opengl
 	virtual/glu
 	media-libs/freeglut"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P2}
+S="${WORKDIR}/${MY_P2}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+	default
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
 }
@@ -40,8 +45,8 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt" \
-		default
-	rm -rf "${D}"/usr/share/doc/ftgl || die
-	prune_libtool_files
+	local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt)
+	default
+	rm -r "${ED%/}"/usr/share/doc/ftgl || die
+	find "${ED}" -name '*.la' -delete || die
 }