gentoo resync : 30.06.2018

3 files changed, 43 insertions, 12 deletions

diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 9a8e0411822a..6585b5d109dc 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -7,10 +7,11 @@ AUX clanlib-0.8.1-ndebug.patch 866 BLAKE2B db4f813d62220d283f1d4d43eef69ec406978
 AUX clanlib-2.3.7-autotools.patch 1602 BLAKE2B 054f64c02211799e964ab4b05700375fce18eec039144fc310e111607ee86df1954a815bb96e37eede3fc72ce2bc99961ff2e70c1306406ebf26a3329acd18b6 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa
 AUX clanlib-2.3.7-doc.patch 506 BLAKE2B 0ea958bd60b2b005919caaaabdf7643c1e3b3cfd62b168dae4370826b328111d6d0bb86a708f19c04fc6778b7db76f86ebb130d48cf96d47e8b5be67040f5f24 SHA512 df75223e466799bde70b07e8ea6f3724792dcd5fe96e417dad47b27d44a3d87b6b7157035f388a48ecce9985473a9e1d84a24de1c8f58247eb952fce457ceccb
 AUX clanlib-4.0.0-fix-build-system.patch 622 BLAKE2B 4dd50ea87fb7dc2dccf2f5db5b1e00941ead76313b847b6e6e574b85f8a9ac0b884fbd5b5548125e886f1a405efc1087c978317e9a935c0f0e1ac0dae2da1e76 SHA512 bda813264f552eff8cc7cea45ec4ea29517a8590066c4b435942e97ea7d68e8d2f21bebf83141b04f1fcc84e936bb3a7ad354b644184dd56b746ab3bfeff9e19
+AUX clanlib-4.0.0-freetype_pkgconfig.patch 1243 BLAKE2B 1ffe267b206dd5f17a30883e8b7602b37f12da0477f02d767db74fbb755befac07d0fbf697d212d59ac5786bd6955c03a4834f3aad885ccffa3b6830fd1bd1c9 SHA512 b6cc46f4e339d7f415c96baf7c7f9e24968d6e5961d438566e1bb111042f3aad3d434e8e6dd02128444db19259f3d81cb373a21513df0eb2d9d87975c49fc87d
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
 EBUILD clanlib-0.8.1.ebuild 2072 BLAKE2B 5958dd9e7654163edb82fab6072895cf5a2b2f14476599495239ae8d5c2458198ac084619c2704bcdafedf6497fd9cffc036c53c8d1552074a786226a5e299cb SHA512 8a95e0dba71b4f46080c5dffce02353dc792be4bc6a3991bd16422b1530207b0d70422fd258aa5a36ca674f829429f50d95c991607142fcd1b2bdbdccc65a17e
 EBUILD clanlib-2.3.7.ebuild 2150 BLAKE2B f20d5f06c5ef8adb1f68bde558cc9f114f678f14ebf7397565e37aaf26d9734f822fa874bd877de092aed352ed34fac9865f81db39d56e8427a845770a2db823 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57
-EBUILD clanlib-4.0.0.ebuild 1476 BLAKE2B f6394727d2f86de8680b31b13ab6a0fde106d8881815831727f3ca96126ace6249847ec5902d49a8791c573abe147176149dd13b785f1fb20d95a59634d81882 SHA512 ea1285fabb1db6cbf41f3f92e948b9627d832e53c7ef3de7dae23c42a790d85b0f06f1860da98b9e7367809148fead5c5a70928ea007451cbcb46ddb461aca12
+EBUILD clanlib-4.0.0.ebuild 1567 BLAKE2B 050e1c8a108dd5ac8ad39caed85e05be9bfea7b21b6e763f9b6e9fdecf940a780de970f94e2c7c480411c5e37d336a0be4f6db8f842f2271d873b281a1c6a11f SHA512 012b62b2ad5ee8a8ff87befccbf33f18186f81bdb0b202606f68a50d22ee978f51cfcdff4ed7119be101de0ae8a7e40202a8e007571616068240fbc502db8d0a
 MISC metadata.xml 3096 BLAKE2B a800d15375b63fd801b1941937815e34197ff8c598f7d6f539a0bb50205e182434506ccf44a9677527a9edd4c9470d3b7d344830d21d7c20386a1998f123fdf8 SHA512 7973a8121a9ae268d6572c9ae980f2b81650e159cfcbee7895097d906637159e4e3470fb7dadb1f58c4928d377860c73978b38c8bb03c44f8dc73d715d9139bd
diff --git a/dev-games/clanlib/clanlib-4.0.0.ebuild b/dev-games/clanlib/clanlib-4.0.0.ebuild
index 310134a70f44..cc7115a38348 100644
--- a/dev-games/clanlib/clanlib-4.0.0.ebuild
+++ b/dev-games/clanlib/clanlib-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,10 +37,11 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 	)"
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.0-fix-build-system.patch
+	"${FILESDIR}"/${PN}-4.0.0-freetype_pkgconfig.patch #658424
 )
 
 src_prepare() {
@@ -49,15 +50,17 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable opengl clanGL) \
-		$(use_enable opengl clanUI) \
-		$(use_enable X clanDisplay) \
-		$(use_enable sound clanSound) \
-		$(use_enable ipv6 getaddr) \
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanUI)
+		$(use_enable X clanDisplay)
+		$(use_enable sound clanSound)
+		$(use_enable ipv6 getaddr)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -72,5 +75,5 @@ src_install() {
 	use examples && dodoc -r Examples Resources
 
 	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..34759a8d89d9
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-4.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,27 @@
+From af16d8a344b9bafc9131508fecfcdbfdc53cf100 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 25 Jun 2018 15:14:31 +0200
+Subject: [PATCH] Use pkg-config to find freetype.
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b9def916..c97e959f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -307,7 +307,7 @@ echo ""
+ if test "$enable_clanDisplay" != "no"; then
+ 	echo "Checking for clanDisplay stuff"
+ 	echo "=============================="
+-	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`])
++	CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Unix/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net )  (Try libfreetype6-dev or better) ], [`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`])
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, has_linux_joystick=yes)
+-- 
+2.18.0
+