Version bump, bug 541822

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

4 files changed, 122 insertions, 8 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 0be59fcda716..52021401b4d4 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.105 2015/01/17 18:16:17 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.106 2015/04/01 23:11:10 dilfridge Exp $
+
+*perl-tk-804.33.0 (01 Apr 2015)
+
+  01 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +perl-tk-804.33.0.ebuild, +files/perl-tk-804.33.0-xorg.patch:
+  Version bump, bug 541822
 
   17 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> perl-tk-804.32.0-r1.ebuild:
   Stable for all wrt bug #536798
diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest
index c0e0ccc60a07..96a61bc4f75b 100644
--- a/dev-perl/perl-tk/Manifest
+++ b/dev-perl/perl-tk/Manifest
@@ -4,17 +4,30 @@ Hash: SHA256
 AUX freetype_location.patch 1071 SHA256 f7868f23736afdfeaa9227a2272eb0deb0ca07d4429a9b9aa5eb705210a025ca SHA512 d7224dda007882cec4364f5c31f4089d797d99ed51ca0aa7928d4d0a6665ab4b9bdbcf5b9ac86b367959e4323d1f83dea0fb0bf8c4e9165ca0c550a5890e11c0 WHIRLPOOL adddd8b331573b6cb93a0eb98076bd0144459b49c4cbda644066bd85504eda554cbdda3822a54942d5a87ff92ae8f0ff1e90df793aa5e14da43e3263d6a037ed
 AUX mainwindow_segfaults.patch 773 SHA256 ed0d1003153a4c429b169eb39e357bd364ffc766da08304d295c6f2f7ed3714a SHA512 1932cc7e0a7929039d1760bc952b4ef78abb4c1a42d61daa31794c62d18748e6257764a7995c3de2577b3bbb7c8773b310c05daffa095eaee8aa1a51b659e256 WHIRLPOOL 46b3ef43b0d4c5c526782571c199b3d7e9d8eb019eb3995d97ae904ee6328f24b57e94f16d98ff8dd5ce9adb1352ed8aab6c512c0247beddbc6fc49806454574
 AUX perl-tk-804.31.0-xorg.patch 1352 SHA256 500c66b93a8f023e6eca345b0be692f12fe2d75bb1cc4acd3160dcd5d84a6f5e SHA512 46c2eee16dff6e3127433ac37a7a02bd7af207c59c16277a168d69b011e6e0ca24e490a70734f2a605a1de898cb6f84c9a3deec245377a149bcd4f413f646057 WHIRLPOOL 8dd906bd1b60b6f91b8bdd95f84d591a607bc28d8e2b304df99e52381185f1eb41827ded04366944261be7b8d21d6bf9553896c979839ead00ad87b7188ef5c7
+AUX perl-tk-804.33.0-xorg.patch 1331 SHA256 811ff09fc479765a47b5d99e9daf5eed1b821a149c11c02d59827a8c8f053134 SHA512 830eb3ff11671834743fd694efd19ff66882a613dd85d5fe8f90231db10e450b4f921b359b5a07168065870734d102e0f95775c9aa6634fbe2d17670d97ffded WHIRLPOOL 4bfe7cd23eae013afc49f615aba4c4b6b43dafdf006c10efd7a59e8758af8d70a5efef6c905039e24a12c5d40e9bda6d4240b4908ebe9a0d4c04a4e6c24595d6
 DIST Tk-804.032.tar.gz 6933200 SHA256 8003fa82672367093d8fd26d89dcac695afad92f4ad406a106d56e07e9dd5949 SHA512 9370c7d954a11b4a16317d749fd06a8ea70b37309a9ba6bb8c9ff6fecf1a264d12f101fcc9aaf1aac781a42f45758e66c955b2f550d7894e94927060a5e29ef7 WHIRLPOOL 1851c9fde36f62a5a96e17c6c1c3eb206a948f669457ac765c28b560076e4b0e32f4ef6c49e725b90f7c704aa270265b7c305ceb3c1dc277eedfafc1a831cb10
+DIST Tk-804.033.tar.gz 6924238 SHA256 84756e9b07a2555c8eecf88e63d5cbbba9b1aa97b1e71a3d4aa524a7995a88ad SHA512 ea56be8246123bbc570d86a7d4f1610349cced91ad92ab740baca4c280822aac2e3acab6334bef60b10a70d5840f331fa40b507aba47a7929f44960df95f2aee WHIRLPOOL 105bce71314e63d7512c6c8bcfa913c6026d8081ad2a5a1bde19f471552026d1c31d28589ae27a0468e73946f030e21d2b79f838033ba5623df94be02bd14826
 EBUILD perl-tk-804.32.0-r1.ebuild 1700 SHA256 3df9310bfcfdb1bd0ab9797d09254feaa1475e1e61e7851d31be79cd620770b7 SHA512 e7d719fa49ca3376517da3851387cc96f5544791e1925c5cba1a1dcff690f6b2c9c4988271ed91f1dae5438fb2bdbc1ac44c7843d553203fa0cdfdfaccf810c2 WHIRLPOOL 1f2b3f8bb46a24bb396c26fa2741741f2cbe320d6ea9e819293be99f515c34caab203f4e39800d1a7b88d47889fe3d2b2626b547f58eaa1f294f667fa3c24a60
 EBUILD perl-tk-804.32.0.ebuild 1613 SHA256 74e255a2d7a580ffe828964249ece6087e539536f163ab1e534a7cd10322d908 SHA512 25c8d614d23cc3155c33827a93e9a7fe6664ac90eb99ac2945fc6708e8c52abc4fcc2835b6d904f8b90d6291604f8f78aea479ad90448bf2c11a6b4eec319cc1 WHIRLPOOL c983175024adba5afa8b8df9319b9f541aef20d1159876512398fbd44c7d23a953467420361832cf006725c8cfb6b950afb59ef318186ccac433a506f10952ae
-MISC ChangeLog 13482 SHA256 87066c4a7dd4e319b497666e9ec26631440cdcfb0b4bc82977f433c27bfdfe70 SHA512 30ed1707725bab2554a05cfbe3fa9b25f6d1818e6cc61623575235bd8b7be68bc5b2143e25218152422ae365f248f80b0366c7abff6261eff5b3672d99b96256 WHIRLPOOL cae0c4ac7c06a9f2c72be8c7e52246b5fd3975522c466aeb4d7b59c66d1ac069a27af18fe98f2bf17ba61ddd8915e51d849fc96bcd45e781573501427ef9a0e0
+EBUILD perl-tk-804.33.0.ebuild 1619 SHA256 f38409f005cd3cb601bcd111fd00af18962eed8db5f2480e633775013d8736ed SHA512 4701b05254909e6f4793d2147ebf240ba9cbde3c9760669a82f71847eaec890ddfcb0f17db3476fd2b48167e09fa2063ac2d7505d6af6b344328dd02fb3a83ee WHIRLPOOL e12efbd0188bd219971b4c162b768a0ab304c03de07b9052b3a64aa921b4eb6eb88cfefdc3b85a07e7a1cc0cee1556155b4cebb666eb5bf396b3cbf34c741a84
+MISC ChangeLog 13666 SHA256 0019594f8ae69376910b25c1a06d481d136375e41b25d3ee68ae45e6b805ea3a SHA512 5b9e2a72cdec8c66d2db414c9c94f6776df82fb1951a3873336f6a12308102117dceec2f0753ac529e0ea21744a2b1cb8bdd49c958b969b614fa6ad719421a2c WHIRLPOOL 0f425a06a0d0c4d25eb1d8fdd98670485c8415f3bc49f4df4eeb07cb82a84d1a2e236c1910bb385ed9c0b1418f49dbc0d98317f55cb57e3465e0a294499a76e6
 MISC metadata.xml 7699 SHA256 ed1cd91728df56c3509e91b213fa7e3ecb543418f51ce0f4b16121ba49097fc4 SHA512 86c428b85e8759f269943738637b93233708317c3439fa7428e297969a12ff818ff013ad71f18a8438d7bca1f59e858dffed08c4bbaf2e2a6c7be293582c5e74 WHIRLPOOL 122a1c504ff2f5b37506f73271654629b1ad793b3ef44d621b3e6a7e51f2acde261c0dcd65a146c78d6e226c4a8c12de06cb2fd6726154e3abc8f2f4e50962f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlS6ppMACgkQG9wOWsQutdZQDgQAkM3OGZEHqX98UVTf+DelUaSY
-8N83zoGC4+lAY5vkWy2VtzzpsYAhohUNedWbRvcitelGq8cclflq8j7aG2i/mho1
-qbev35igjb7RwtfS0ak1IOfdW7PXiufVbcyO8FxTv6dq4jVugQeqoobFWB60EyFl
-oFKFrb81i5UFewvza3Y=
-=247P
+iQJ8BAEBCABmBQJVHHsQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5+eoQALWrTnqeG9qYOhUXs1Fwm1qk
+xGoNP++5RDhcPkE50OQa+bS+NFEBHhpSLX7hj1jhLwnXKLpA516ZAZp1NJeI9xTa
+urIFB027Ch+7vECXrRdTnNVGw6/+qu9aLILteKhoZlkf1iG1paUFrEYzu6wrNCyZ
+nKH2cHBDwuNwiJSJViUtBmd3K+KPzHtdYk5Wrl39YLJAhEceuM3gzz9dCYK2gpuW
+fTSGXDZ6NGHQKnrKUN5LOXbvWNfJVRFzPUwwLB/AlixJsod+x4ztBhZJs/pDWSJa
+AK9IUOW2d7HvxrtL8y3jqPug/dGWT7A1HdbPWMpAJMjrZvjEEFyGJi2KWdLfkImA
+yPdsztqxcpARoQEGJg8l0M2xwqVWVwIrqoCBOUSqDM4xSbGSa/ZCAGtFiH4fWX6/
+dzbb3VTb/3ZN+4euZP4gjw2/6/f/kAus0SawJXRIGLOe6IV8bRTAjoC5y8Hipayx
+NhUV7wSSvjNQvBNqQFM2mLN5BGUfdPITq5ggHeu/aYr1VTSFb75LgwAkMM2QFefh
+4818P1wIqxwqyeCzPzANqVRMpPWrVdQAAkIfbLBjA/2SnzrIRoWlBfkfWH2oBn6v
+VNt6c+wJhA87J5NePtFGzQT3m4w7Y7dCzDR4dBrT0R0Sk3KzUhu6rsdZ1Gh8/nYF
+hjvEwNuoQ/p3xamvWICz
+=SZqh
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/perl-tk/files/perl-tk-804.33.0-xorg.patch b/dev-perl/perl-tk/files/perl-tk-804.33.0-xorg.patch
new file mode 100644
index 000000000000..d4284a394930
--- /dev/null
+++ b/dev-perl/perl-tk/files/perl-tk-804.33.0-xorg.patch
@@ -0,0 +1,41 @@
+diff --git a/myConfig b/myConfig
+index fcf1933..14033cb 100755
+--- a/myConfig
++++ b/myConfig
+@@ -316,7 +316,7 @@ if ($win_arch eq 'x') {
+ 	}
+ 	close(XMKMF);
+ 	while (defined $uidir) {
+-	  last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o);
++	  last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o);
+ 	  $try = $1;
+ 	  $try =~ s/'x11root'/$ENV{X11ROOT}/;
+ 	  push(@xdirs,$try);
+@@ -365,8 +365,7 @@ if ($win_arch eq 'x') {
+   #
+   unless (defined $xlib)
+     {
+-      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib',
+-                    '/opt/X11/lib')
++      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/opt/X11/lib','/usr/lib64')
+     }
+ 
+   #
+@@ -385,7 +384,7 @@ if ($win_arch eq 'x') {
+       exit 0;
+     }
+ 
+-  ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x;
++  ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x;
+   if (defined $X11INC)
+     {
+       $xinc = &IX11("$X11INC");
+@@ -397,6 +396,8 @@ if ($win_arch eq 'x') {
+     {
+       warn "Cannot find X include files via $base/include\n";
+       $xinc = &IX11(map("$_/include",@xdirs),
++            chooseX11(</usr/include/X11*>),
++		    '/usr/include',
+ 		    '/usr/openwin/include',
+ 		    chooseX11(</usr/X11*/include>),
+ 		    chooseX11(</usr/include/X11*>),
diff --git a/dev-perl/perl-tk/perl-tk-804.33.0.ebuild b/dev-perl/perl-tk/perl-tk-804.33.0.ebuild
new file mode 100644
index 000000000000..35185fb91ebc
--- /dev/null
+++ b/dev-perl/perl-tk/perl-tk-804.33.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 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.33.0.ebuild,v 1.1 2015/04/01 23:11:10 dilfridge Exp $
+
+EAPI=5
+
+MY_PN=Tk
+MODULE_AUTHOR=SREZIC
+MODULE_VERSION=804.033
+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="
+	media-libs/freetype
+	>=media-libs/libpng-1.4:0
+	virtual/jpeg
+	x11-libs/libX11
+	x11-libs/libXft"
+RDEPEND="${DEPEND}"
+
+# No test running here, requires an X server, and fails lots anyway.
+SRC_TEST="skip"
+PATCHES=(
+	"${FILESDIR}"/${P}-xorg.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_ptk || 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
+}