dev-perl/perl-tk: Version Bump

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 109 insertions, 17 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index dadb1d2b4d38..9f8d2ed1bf39 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.88 2013/03/03 10:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.89 2013/08/13 11:56:24 jlec Exp $
+
+*perl-tk-804.31.0 (13 Aug 2013)
+
+  13 Aug 2013; Justin Lecher <jlec@gentoo.org> +perl-tk-804.31.0.ebuild,
+  +files/perl-tk-804.31.0-xorg.patch:
+  Version Bump
 
   03 Mar 2013; Mike Frysinger <vapier@gentoo.org> perl-tk-804.29.0.ebuild,
   perl-tk-804.30.0.ebuild:
diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest
index 2700c6498678..fecf349af1f5 100644
--- a/dev-perl/perl-tk/Manifest
+++ b/dev-perl/perl-tk/Manifest
@@ -1,29 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 804.028-path.patch 555 SHA256 3b5466b95f1549886e25071d4609bba9bc8a2956a920cf727467c13614ee2563 SHA512 2fd58038bcdf23babd184db4e7f5ae47550e4772c47b3564304d34afa540210af9f2005062e1e3776e7da4ee87371f0ab1256c2b2e85d828a932c90e29ac3284 WHIRLPOOL 63cac5ee1076c590538d63581df09f6c1eb51aa8b8d4e6bea57b371146b4af7f64bc74fa99879f6c89f7f37698e8d9d929888a9ed67470e7ef8a8c653f557867
 AUX 804.029-X11_XLIB_H.patch 830 SHA256 a4dbec5e8b61bab63dd875d580f1fbb7715ee034b6495cc1b55a774c4e670252 SHA512 67050643e73bd729a38b23188e4475b5ed16f115ef10585fc52b8bd76c0aa1079c27803f42334dd6731c261c6b9d1e9b0d3705f4d74772ff110c8a99bc1970ba WHIRLPOOL 52f0b41d47f01ead0b9468b1aa2d3a8f0b8d5f3c3932e8e674e3bed3fef3fbbb87809396cba1bdb0f16ea07d52348a23806470bcefd1ea88dc1ddbea0eda60df
+AUX perl-tk-804.31.0-xorg.patch 1352 SHA256 500c66b93a8f023e6eca345b0be692f12fe2d75bb1cc4acd3160dcd5d84a6f5e SHA512 46c2eee16dff6e3127433ac37a7a02bd7af207c59c16277a168d69b011e6e0ca24e490a70734f2a605a1de898cb6f84c9a3deec245377a149bcd4f413f646057 WHIRLPOOL 8dd906bd1b60b6f91b8bdd95f84d591a607bc28d8e2b304df99e52381185f1eb41827ded04366944261be7b8d21d6bf9553896c979839ead00ad87b7188ef5c7
 AUX xorg.patch 1893 SHA256 f20d6f8c78b10f05cf02c02396cd699ddc66cd48de584eef6dc0b010894fea07 SHA512 1dbf9ce2fc25b688ce157af8415f3f7c0d6e4025d4077c389af2384543bc2f0aab7385bd5498c6a5e8f790fe0b072f7063fe274945ff56238fc200424f02c422 WHIRLPOOL 02283abdbbb77b64b36f98de0f46114517a4e847657bd5f86c031133c8a9225978b7af4763acc7effbb7d9c2186a799478d14f586827b380a4db4009e5cbe9e8
 DIST Tk-804.029.tar.gz 6924235 SHA256 41e31d393c29301918949d0f93d7d1a1f877777ac6e65cd92e11741c68a4bc7f SHA512 c965f9f855ecb51bc0ece5304cddf9823b0668de41ebfc8cf9e64336bb96fe8b9bb311fd22f778b85a6ae1ba11ad377e9f7c1f6197d90b2ee8df0ca045802f72 WHIRLPOOL 32f02309c5fa0bc85df6774405ccae02632ce12f0927620864ebca95be9030e9df5373ad83c19e814629b47d314e65863bb02f7cd2bd19e28ec43f5a60c9985a
 DIST Tk-804.030.tar.gz 6928048 SHA256 8b3d55ae2e9ae950a170cd46399660064920d6d7c3ba167bca40e533d26e8d78 SHA512 9c9d2b600b8c2c9e72d17cdc1772b63781ad5126c6ed1793c2f3ba3b047fae4a5aa2e0b2c53e4dcd9ecba622497b69d18b7432aaa90f4c23c85f324a57245344 WHIRLPOOL e7098fc47c861a7b4c64afa36ed94fa137048d07d87af3d16ae18c4ad0d539ab186436cb3ef752f5ed95cb63ae7f51367c9d28e501c5e86457aa0f1fe207e25b
+DIST Tk-804.031.tar.gz 6932339 SHA256 ce8d857a82a77f6bad3f94c1a8c3e3f32d5489bfb41619c3b8cae00103428054 SHA512 9a0c8328dc84a4b871045cb48523ccaa313492efb615ec872a809ff6550fe08ae54c00f04431db194b41a4c406ccd649b15fd26a8e79ddba7d21d1fcd0ad4365 WHIRLPOOL 68fbd922accdfef89ef50f8c9c971c7ae168efa919551788607f4ce80230628922628f9860701e7e996e88454cd2e42ea7b59287c0cf350782cb3cefdf82b45c
 EBUILD perl-tk-804.29.0.ebuild 1225 SHA256 f7c431b3c413c858eeb3363d8881b382a9218b735f2e49fb670c9ccfde184c2f SHA512 5ee0484352bc442a1c843bf12e371abc7367747da060273281b7c06846a19a2540da4bc204cd7b9b1382d6845c3b4001c202433c4f0cd29ea5896ffe3a42cd10 WHIRLPOOL b961c87b284258c85b2181a204dd147ebd791216c254f95512a7ee6bdd57cb0ca423499747f8efbcf235b64feba666cebf9a39ba1275875641e3a8f24d151949
 EBUILD perl-tk-804.30.0.ebuild 1193 SHA256 cce434812dcd23b473a066ee64d1eccc6e2fb14910470def6398d12d4d8360c3 SHA512 8f2634eebc4e74443c7d428d3e0ac493208c9fe6fd9d0ae3703bb2b45e320d3015cc944d041e65979aa3f3bd6f8072f606598cbd8473733bfa056e9616266f1c WHIRLPOOL 9ed4f66339672c6b01b864e6e7038bdc296ae3d4c7e2b0f49a11fcddfe93f8dd27321a3f91a7356638aebea5718b32df2905952757cc75cf83b0cb9d64834cec
-MISC ChangeLog 11007 SHA256 202ae332a9582dc4420a48a0504bad071595948a0849b034b0f3d2e33dec8459 SHA512 0b2deb6592d4f9b678a08b630cdaa74e99db1141195d56a33cbe481ed933068e8f2692ec34af157c1f68c58dd585cb1307ebefdc8a7e004e163b84127a9c7e55 WHIRLPOOL 14752afd5f2f64548fb988a905c4306756d49cd5a041a746b4fde9cc677006aa6041280d3efd2087da5529b202d47326de3d3104a717e4b3838afffee6c13943
+EBUILD perl-tk-804.31.0.ebuild 1196 SHA256 f253cf588f904af1a9fa1def74c39816dc0746f53df854861a08427ca4068076 SHA512 c6bd5a20016e9c08a2d7279f282a60da9b49facd1f2745f3122afb63ecc8caa9171c2010e6c7cf4c3dec35dd21bbd7d037cf78f49fd45cc2e12f2aadf9ba1982 WHIRLPOOL f8eee40eab20ae515339c5d04b9443d0a18f6aa425e2f1bcb6c7db83a1212040b538fc013bbcd56b13aa9bad7cfb8f525f5faff506b76a836f05f5acb327eb57
+MISC ChangeLog 11165 SHA256 0d6ac09a18bc910d29ff9bbb8accd296838606bd8d0d969e6cba9860f8d781f5 SHA512 1948e3db023ebd5dff5c96732024fd8420670ff93f3070f93c3e86f2196f55ba47c0b5fda581efc14284dc561b569d7a59ea532a9ea57895babf2f4b59a0275c WHIRLPOOL 3e717f2d47c30f729923772fb24f8b4fb38d99f15e8d8459a5891298756d073e86abd888c68a9f9938337396296f357923f3e9452c3006855a226d1907412f95
 MISC metadata.xml 7699 SHA256 ed1cd91728df56c3509e91b213fa7e3ecb543418f51ce0f4b16121ba49097fc4 SHA512 86c428b85e8759f269943738637b93233708317c3439fa7428e297969a12ff818ff013ad71f18a8438d7bca1f59e858dffed08c4bbaf2e2a6c7be293582c5e74 WHIRLPOOL 122a1c504ff2f5b37506f73271654629b1ad793b3ef44d621b3e6a7e51f2acde261c0dcd65a146c78d6e226c4a8c12de06cb2fd6726154e3abc8f2f4e50962f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMyOMAAoJELEHsLL7fEFWvT0QAKzkCDzuee62i/rgP4e/88ve
-12bR6peNDxUKeC+jcVulbacTsVmju3TBNtfOqUZ7P5MWrxT5p1Qdp7oKShXE71rb
-2WIj+EkanQhZdNqMknZJ0Z/iW8L0CYRf9tC3ZefaW1dvl9u/mIbBmneI3PZLzP+k
-E5ID5RjbytixaGWETCoKRbziAFMs5Uhn77NhATax080tBKckXA2SzGpl9OzUIpvK
-ppRzbeB5FXKps46iH1Yqx8iC7OMwpc8qCOtknS34DdCK9Xz2ZDwCGWp27SwIm/pt
-x+G5zAzgAB0yZuRp30SiOShws+lxTXuTDtwKiNEAV8jYP8ckBgINiMVVA3KI0ZIO
-MTIZSIrCYMKl3D+8aWIL0BR6lK4Um2lnoTRLb/G+ueefToljeKJzPkRBG2k7zM6s
-Jzcb7WoQBe5m+0/uHkyA0nU8KYzD2c9YpNoonPisZQYu73IKgey3aDMlkHSqTruo
-ELVUpq3iDrOH2i+Q6NTYaFVm2/Qo8oHiPyKS1el+4WRb8IeeiuiBl/ln9Wdj62np
-wrVPrY38tOe7806Swww8eYR4Z7GpRz0x/9SLiMbZYWh/hnQizfjI8hRAN2JhC5fl
-FbuzJg0a/fWlSezvUSxpUMk90jwmM5I8cQk7vDpdBmEsEB/z0rQbjsDRy3unk3gR
-4ox1+0Rd75EbTxNvczp+
-=Tm4f
+iQIcBAEBCgAGBQJSCh7pAAoJELnU8jG9FViro1gP/iGqZxqrdxdk5G+vEW4ClM1o
+vOgfp1/Nad+LFHNFR2djqACdR4rKVXM6VuPnf6oOtKzQ3AQBAM8IXROy9L4Fflco
+ySFOS0aQouKZO2e7BtBJrRpQK821dzmfL3kNgUwLiBU5cLlkszqP6PwwSKI8HCjT
+ZHGw9hga1AjJ/SyDKcg/hNBStf5ar8KrrT91dZ/Spi2AWq0YODafz7PGx2eRD8AM
+5vdtPTA08xObqAo4zKr8xnmkq3hPpMAxFngvyHX+KIxSs6k8laDB4Srn4mxYuoKp
+EyPBhT1C1UjiL1/6THkPSnyD0QHh9/5RRxEEf9jdoNzberfxO4fhHfnYbAi6SjpW
+ffO2g22yeRUeAbBc7HrKtLQudKgDypQFu+8lfsFu32giYJrB3oaPBAd3hAZw3uX5
+U9TRlwmcSAppqGINVMiBYFoG4QFRI7Wa/N7KiZXeZ0ZiErVqryt7ZFMmzUjviBat
+NzvvI5LIJMu6lBDDJSE/Ixcdj/OEffJEDUAwXbeL/MnYbeHncZkGRhTnan5+UV/w
+I+uhW8mB8QIOqQcu49baverYQZhjbHCKcZCx5so7gALOhfRikdhbo2DFEKeShkX7
+tT3FQkwSOzKZAjWVbYpaiITHbtsBwn+0PNG/CIaS1/beGy1ycTGM6K/UmOf7WQmD
+KBhA+9v1vIiK/U3hI/Yn
+=RVd/
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/perl-tk/files/perl-tk-804.31.0-xorg.patch b/dev-perl/perl-tk/files/perl-tk-804.31.0-xorg.patch
new file mode 100644
index 000000000000..2bad0ba092d5
--- /dev/null
+++ b/dev-perl/perl-tk/files/perl-tk-804.31.0-xorg.patch
@@ -0,0 +1,43 @@
+ myConfig | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/myConfig b/myConfig
+index e0ace45..be52a82 100755
+--- a/myConfig
++++ b/myConfig
+@@ -307,7 +307,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);
+@@ -356,7 +356,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')
++      $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/usr/lib64')
+     }
+ 
+   #
+@@ -375,7 +375,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");
+@@ -387,6 +387,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.31.0.ebuild b/dev-perl/perl-tk/perl-tk-804.31.0.ebuild
new file mode 100644
index 000000000000..582867ac1b3a
--- /dev/null
+++ b/dev-perl/perl-tk/perl-tk-804.31.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/08/13 11:56:24 jlec 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 )
+
+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
+}