gentoo resync : 11.05.2018

3 files changed, 68 insertions, 8 deletions

diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 916c0934e34e..4233714fa08d 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,4 @@
+AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1747 BLAKE2B 0b638c7884cac5684e85070342e24ffc310645372290b50c3e7c92b536db1c64d2cc2642e353ca88dbd2ebee86898c7f2e6586cf6ea2233c452cfacc37161491 SHA512 119f56f8afb4f8eaa2f739ef06aff06747fedd9036da9a70a57f8e13410d540532378841e9b7c54de1d7e6941cc254ad6927d0f4b83f330623a088866cbd6b5a
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
-EBUILD xfe-1.42.ebuild 1501 BLAKE2B 762aae1813d757093b1262edabdcf952f6be3d3e217ccb17bab63fa574c4762c20549c1e369fcfb71e59543ff29d7309ce42e08d4a1ee723b5ecbbbcb822f5c9 SHA512 9dfe2f4abf6e1a1b2d04e0d4feee6890b9f2fca96a7ab7332c68449568eb135a2a1b2442e82ab38a3fb17e040a3a5133b9c614a41b2f4a1a4c31a5bacbd9add5
+EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
new file mode 100644
index 000000000000..1394f59abc2c
--- /dev/null
+++ b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
@@ -0,0 +1,57 @@
+--- xfe-1.42/configure.ac
++++ xfe-1.42/configure.ac
+@@ -29,6 +29,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ # Internationalization
+@@ -109,16 +110,13 @@
+ 	
+ 	echo "checking whether FOX was compiled with Xft support... yes"
+ 
+-	# Check for FreeType2 headers
+-	freetype_config=''
+-	AC_CHECK_PROGS(freetype_config,freetype-config,)
+-	if test -n "$freetype_config"; then
+-	  freetype_cflags=`$freetype_config --cflags`
+-	  freetype_libs=`$freetype_config --libs`
+-	  LIBS="$LIBS $freetype_libs"
+-	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-	fi
+-	AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))])
++	# Check for FreeType2
++	PKG_CHECK_MODULES(FREETYPE, freetype2, [
++		freetype_cflags="$FREETYPE_CFLAGS"
++		freetype_libs="$FREETYPE_LIBS"
++		LIBS="$LIBS $freetype_libs"
++		CPPFLAGS="$freetype_cflags $CPPFLAGS"
++	], AC_MSG_ERROR("freetype not found"))
+ 
+ 	# Check for Xft headers
+ 	xft_config=''
+@@ -131,15 +129,13 @@
+ 	  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+ 	else
+ 		# On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead
+-		pkg_config=''
+-		AC_CHECK_PROGS(pkg_config,pkg-config,)
+-		if test -n "$pkg_config"; then
+-		  xft_cflags=`$pkg_config --cflags xft`
+-		  xft_libs=`$pkg_config --libs xft`
+-		  LIBS="$LIBS $xft_libs"
+-		  CPPFLAGS="$xft_cflags $CPPFLAGS"
+-		  CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H"
+-		fi
++		PKG_CHECK_MODULES(XFT, xft, [
++			xft_cflags="$XFT_CFLAGS"
++			xft_libs="$XFT_LIBS"
++			LIBS="$LIBS $xft_libs"
++			CPPFLAGS="$xft_cflags $CPPFLAGS"
++			CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H"
++		], AC_MSG_ERROR("Xft not found"))
+ 	fi
+ 	AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found"))
+ 
diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
index df2bd089efc3..dd6e5a79a2de 100644
--- a/x11-misc/xfe/xfe-1.42.ebuild
+++ b/x11-misc/xfe/xfe-1.42.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
@@ -36,6 +36,8 @@ DEPEND="
 
 DOCS=( AUTHORS BUGS ChangeLog README TODO )
 
+PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" )
+
 src_prepare() {
 	default
 
@@ -62,15 +64,15 @@ src_prepare() {
 		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
 		configure.ac || die
 
-	eapply_user
-
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable startup-notification sn) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable startup-notification sn)
 		--enable-minimalflags
+	)
+	econf "${myeconfargs[@]}"
 }