Fix libpng pkg-config, force unbundling of jpeg, libpng, zlib

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

3 files changed, 76 insertions, 2 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 9f8d2ed1bf39..79c0bdfd9bb7 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/perl-tk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.89 2013/08/13 11:56:24 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.90 2014/01/21 13:40:35 civil Exp $
+
+*perl-tk-804.31.0-r1 (21 Jan 2014)
+
+  21 Jan 2014;  <civil@gentoo.org>
+  +files/perl-tk-804.31.0-fix-libpng-option.patch, +perl-tk-804.31.0-r1.ebuild:
+  Fix libpng pkg-config, force unbundling of jpeg, libpng, zlib
 
 *perl-tk-804.31.0 (13 Aug 2013)
 
diff --git a/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch b/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch
new file mode 100644
index 000000000000..015984061ba4
--- /dev/null
+++ b/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch
@@ -0,0 +1,16 @@
+--- Tk-804.031/PNG/Makefile.PL.old	2014-01-21 17:04:09.961441121 +0400
++++ Tk-804.031/PNG/Makefile.PL	2014-01-21 17:08:15.582448981 +0400
+@@ -17,10 +17,10 @@
+ 
+ my $libpng_cflags;
+ my $libpng_libs;
+-system('pkg-config --exists libpng');
++system('pkg-config --exists png');
+ if ($? == 0) {
+-    chomp($libpng_cflags = `pkg-config --cflags libpng`);
+-    chomp($libpng_libs   = `pkg-config --libs libpng`);
++    chomp($libpng_cflags = `pkg-config --cflags png`);
++    chomp($libpng_libs   = `pkg-config --libs png`);
+ } else {
+     warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
+     $libpng_cflags = '-I/usr/local/include';
diff --git a/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild b/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild
new file mode 100644
index 000000000000..47f3318d6080
--- /dev/null
+++ b/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild,v 1.1 2014/01/21 13:40:35 civil Exp $
+
+EAPI=5
+
+MY_PN=Tk
+MODULE_AUTHOR=SREZIC
+MODULE_VERSION=804.031
+inherit multilib perl-module
+
+DESCRIPTION="A Perl Module for Tk"
+
+LICENSE+=" BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
+	media-libs/freetype
+	>=media-libs/libpng-1.4
+	virtual/jpeg"
+RDEPEND="${DEPEND}"
+
+# No test running here, requires an X server, and fails lots anyway.
+SRC_TEST="skip"
+PATCHES=( "${FILESDIR}"/${P}-xorg.patch
+	"${FILESDIR}/${P}"-fix-libpng-option.patch )
+
+src_prepare() {
+	MAKEOPTS+=" -j1" #333049
+	myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) )
+	mydoc="ToDo VERSIONS"
+
+	perl-module_src_prepare
+	# fix detection logic for Prefix, bug #385621
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
+	# having this around breaks with perl-module and a case-IN-sensitive fs
+	rm build || die
+
+	# Remove all bundled libs, fixes #488194
+	local BUNDLED="PNG/libpng \
+					PNG/zlib \
+					JPEG/jpeg"
+	for dir in ${BUNDLED}; do
+		rm -r "${S}/${dir}" || die "Can't remove bundle"
+		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
+		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
+		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
+	done
+}