Fixed compilation with "utils" USE flag being enabled. Got rid of all instances of MY_PV this time

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 29 insertions, 16 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 13c51351e4a5..1f6a05df02f9 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.383 2013/12/06 21:42:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.384 2013/12/06 22:04:42 polynomial-c Exp $
+
+  06 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> freetype-2.5.1.ebuild,
+  +files/ft2demos-2.5.1-compilefix.patch:
+  Fixed compilation with "utils" USE flag being enabled. Got rid of all
+  instances of MY_PV this time.
 
   06 Dec 2013; Mike Gilbert <floppym@gentoo.org> freetype-2.5.1.ebuild:
   Restore MY_PV variable.
diff --git a/media-libs/freetype/files/ft2demos-2.5.1-compilefix.patch b/media-libs/freetype/files/ft2demos-2.5.1-compilefix.patch
new file mode 100644
index 000000000000..a3124f56d6a2
--- /dev/null
+++ b/media-libs/freetype/files/ft2demos-2.5.1-compilefix.patch
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.1/src/ftgrid.c
++++ ft2demos-2.5.1/src/ftgrid.c
+@@ -53,10 +53,10 @@
+   struct  AF_GlyphHintsRec_;
+   typedef struct AF_GlyphHintsRec_*  AF_GlyphHints;
+ 
+-  extern int            _af_debug_disable_horz_hints;
+-  extern int            _af_debug_disable_vert_hints;
+-  extern int            _af_debug_disable_blue_hints;
+-  extern AF_GlyphHints  _af_debug_hints;
++  int            _af_debug_disable_horz_hints;
++  int            _af_debug_disable_vert_hints;
++  int            _af_debug_disable_blue_hints;
++  AF_GlyphHints  _af_debug_hints;
+ 
+ #ifdef __cplusplus
+   extern "C" {
diff --git a/media-libs/freetype/freetype-2.5.1.ebuild b/media-libs/freetype/freetype-2.5.1.ebuild
index 066709e89a5c..5ac31e3c3cc9 100644
--- a/media-libs/freetype/freetype-2.5.1.ebuild
+++ b/media-libs/freetype/freetype-2.5.1.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v 1.2 2013/12/06 21:42:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v 1.3 2013/12/06 22:04:42 polynomial-c Exp $
 
 EAPI=5
 
 inherit autotools-multilib flag-o-matic multilib
 
-MY_PV=${PV}
-
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
@@ -78,16 +76,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-TT_Load_Simple_Glyph_fix.patch
 
-	#if use png; then
-	#	local pnglibs=$(pkg-config libpng --libs) # 488222 487646
-	#	sed -e "s@Libs.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%@Libs.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS% ${pnglibs}@" \
-	#		-e 's@Requires:@Requires.private: zlib libpng\nRequires:@' \
-	#		-i "${S}/builds/unix/freetype2.in" \
-	#		|| die "Could not sed pkg-config libpng --libs in builds/unix/freetype2.in"
-	#fi
-
 	if use utils; then
-		cd "${WORKDIR}/ft2demos-${MY_PV}" || die
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		epatch "${FILESDIR}"/ft2demos-${PV}-compilefix.patch
 		# Disable tests needing X11 when USE="-X". (bug #177597)
 		if ! use X; then
 			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
@@ -124,7 +115,7 @@ src_compile() {
 		# fix for Prefix, bug #339334
 		multilib_for_best_abi autotools-utils_src_compile \
 			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
-			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${MY_PV}"
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
 	fi
 }
 
@@ -134,9 +125,9 @@ src_install() {
 	if use utils; then
 		install_utils() {
 			einfo "Installing utils"
-			rm "${WORKDIR}"/ft2demos-${MY_PV}/bin/README || die
+			rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
 			local ft2demo
-			for ft2demo in ../ft2demos-${MY_PV}/bin/*; do
+			for ft2demo in ../ft2demos-${PV}/bin/*; do
 				"${BUILD_DIR}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
 					"${ED}"/usr/bin || die
 			done