Improve patch for libpng issue. Just add one missing call to pkg-config.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xA832680F

3 files changed, 19 insertions, 19 deletions

diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog
index 79c0bdfd9bb7..d6c1a9bd36a9 100644
--- a/dev-perl/perl-tk/ChangeLog
+++ b/dev-perl/perl-tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/perl-tk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.91 2014/01/21 14:45:13 civil Exp $
+
+  21 Jan 2014;  <civil@gentoo.org>
+  files/perl-tk-804.31.0-fix-libpng-option.patch:
+  Improve patch for libpng issue. Just add one missing call to pkg-config.
 
 *perl-tk-804.31.0-r1 (21 Jan 2014)
 
diff --git a/dev-perl/perl-tk/Manifest b/dev-perl/perl-tk/Manifest
index 0807cd341a5d..d7e447bbc304 100644
--- a/dev-perl/perl-tk/Manifest
+++ b/dev-perl/perl-tk/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 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-fix-libpng-option.patch 667 SHA256 cbf87db5313eb29365cedb626104c8b622bc2867b2990c0568ef5c0cdcf14eb8 SHA512 a0ec0978fe5e9acf8e1d660ab8845ffe6f2df5d398d7ea2861fe3a0afdcad6ee12e6d0c6b9198dffeeb2796ab5e09c4ed5db87ac284dd23b3204aa03c7b2adf7 WHIRLPOOL 3942edb2fb437409a00a5b7d5224454d0c2f6529f24df41ca7b3ae51d6b074d251bbd90dbddbbb3603992bba0bf30644328603200eab081899f40fc1a2728d3a
+AUX perl-tk-804.31.0-fix-libpng-option.patch 554 SHA256 318f256a7b14e0af433946f45e28fe666dfad83070be08f2920a9fa67ab045a0 SHA512 7d2b9f951a0d3564d67a7ea92458de3b6fd9259399ac0dedea95bd307c7cb8322cbb16596f479fe1aba26967f7d8af847523f72ab69cc64854bb1a2d49d140b9 WHIRLPOOL 72a44490cad7d9c9eaf93f6647e7b632fe714b66dc3112dca111bc963ba699a580cd61c8a0d78ce99052a2155ba92dace97071e511a1e86103f0e4b15763ed16
 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
@@ -13,16 +13,16 @@ EBUILD perl-tk-804.29.0.ebuild 1225 SHA256 f7c431b3c413c858eeb3363d8881b382a9218
 EBUILD perl-tk-804.30.0.ebuild 1193 SHA256 cce434812dcd23b473a066ee64d1eccc6e2fb14910470def6398d12d4d8360c3 SHA512 8f2634eebc4e74443c7d428d3e0ac493208c9fe6fd9d0ae3703bb2b45e320d3015cc944d041e65979aa3f3bd6f8072f606598cbd8473733bfa056e9616266f1c WHIRLPOOL 9ed4f66339672c6b01b864e6e7038bdc296ae3d4c7e2b0f49a11fcddfe93f8dd27321a3f91a7356638aebea5718b32df2905952757cc75cf83b0cb9d64834cec
 EBUILD perl-tk-804.31.0-r1.ebuild 1652 SHA256 3b779c6b802bc6fa62110b6a7dcb9b20b0bca62e35219bc588b396dd4ce6477f SHA512 19ec1b8b444c52bb80be69c03e90deb15639672d4da9eb938cfc5090e7536974052bfaed0033a987a287adb9b9755de044884900826814fee57ca3f058f7d18a WHIRLPOOL 0b25cea8cbdd8ab2c1665b9bc06bea2ae3938953ac433e72939bb76316e3ca9bbf1f4dc9cb760814a66a116892d97eb87a5157c1d81d6b047c2a773c30cfa56c
 EBUILD perl-tk-804.31.0.ebuild 1196 SHA256 f253cf588f904af1a9fa1def74c39816dc0746f53df854861a08427ca4068076 SHA512 c6bd5a20016e9c08a2d7279f282a60da9b49facd1f2745f3122afb63ecc8caa9171c2010e6c7cf4c3dec35dd21bbd7d037cf78f49fd45cc2e12f2aadf9ba1982 WHIRLPOOL f8eee40eab20ae515339c5d04b9443d0a18f6aa425e2f1bcb6c7db83a1212040b538fc013bbcd56b13aa9bad7cfb8f525f5faff506b76a836f05f5acb327eb57
-MISC ChangeLog 11382 SHA256 40d1ad4fbaf24b07eb1bb6bbd5f47b6154b69f9b4f18ecd74e53400609a4f351 SHA512 c739f37d3c5a09f415cf19f4fd10c10373e941e9c5f8c1a491c5508afbe6fcd80986dc0a5755c7dd96dffefef2333bc9312b75279eb331ab402bbe1f6fa3aab4 WHIRLPOOL 11ac82a23c3bd251de162ca9131bb153c977e0155e2dc8d7f902a15d20727af328bcd03511f073b9b208696c47672d260cee336092a6857fd23b18f6f554a75e
+MISC ChangeLog 11543 SHA256 2740e411f5f8a5b209262ffdb43f862fa334935a79a54bd62364727ac1bc753e SHA512 337649293b41351f31893d5a453eadc1d53279bb8a60b4a12a463f00121e7afe58a8dfd5c61088abf68449c0472fcbc1ee3d9bfb09608209713dc929baf535db WHIRLPOOL 10ba920f9cf9336b122c4f952fd62833949d0cc6948d9f02173f17df50555bbd8e5b1fd3cce9c140661b07cc7e974547e81ce4b41cc0ed138e4b19bd8c8db694
 MISC metadata.xml 7699 SHA256 ed1cd91728df56c3509e91b213fa7e3ecb543418f51ce0f4b16121ba49097fc4 SHA512 86c428b85e8759f269943738637b93233708317c3439fa7428e297969a12ff818ff013ad71f18a8438d7bca1f59e858dffed08c4bbaf2e2a6c7be293582c5e74 WHIRLPOOL 122a1c504ff2f5b37506f73271654629b1ad793b3ef44d621b3e6a7e51f2acde261c0dcd65a146c78d6e226c4a8c12de06cb2fd6726154e3abc8f2f4e50962f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS3niWAAoJEIMvOqnEeZDC5BYH/3utZseGMWIKkHN1H3MFuT4s
-Qgj4EynYuSB9ZRFwKJXmCYnruzoEIuDxT4pSjFXWZLHlvkJk7ycYDyVx5JMIQKqM
-WGeqGHAW9OaUfuV0MfYChonNYumGVJtRSm9DfzYPe2LPEYaKxcynm1FbNZlQj9KY
-yB8/yh2LAA9rXrwmRVLOxxa+tMsSWTvc9ngMiPiHuwYWwfwVIJ6tYWP+GBZWfqjP
-/fVpbiUTRiVhF6uclzldwrE88g/quOPcTigopS2M6Zs3/cw4ARTFF4SHYQ5Mq/j3
-NMfu1Umok9WuaDYWaaNSdwSh6+3szNYJoP+DOlioMMBUnwmmsOVniS1Yuif22ks=
-=62bl
+iQEcBAEBCAAGBQJS3oe6AAoJEIMvOqnEeZDChLMH/28YRxuojKaeEcwydhwFD06i
+qGalk+foXmShW839jlfsXW96V5vhJWnYz9g1IUyCbDZqfcdqut8PeNVW6gj4Okqf
+W+X0RNY1HeFhQVkrXc80Dy2GmRnFUkX1hfjxJIrfPNybpd0eguaZtjIyVkUcein0
+z3sIxCI4GcemL5uqjfZXKH2fAU5pMm+yDtKs8KLHVr6E5UFY19NNABe2/W+MdfEz
+wlh4hqD5HdkDvvsIbyvJJ1iC681usPJlEQbQxCElDrPirMP4iPHpRoTlZzy8DKxe
+44cm7r2avfiys7X/SWol0OmRX8aGqzJdv9sAVxTd+tVsKjb4CKcMyjP24gnwxJU=
+=Ud9+
 -----END PGP SIGNATURE-----
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
index 015984061ba4..9ec7ab7af8dc 100644
--- 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
@@ -1,16 +1,12 @@
 --- 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;
+@@ -17,10 +17,11 @@
  my $libpng_libs;
--system('pkg-config --exists libpng');
-+system('pkg-config --exists png');
+ system('pkg-config --exists libpng');
  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`);
+     chomp($libpng_cflags = `pkg-config --cflags libpng`);
+     chomp($libpng_libs   = `pkg-config --libs libpng`);
++    chomp($libpng_libs  .= `pkg-config --libs zlib`);
  } else {
      warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
      $libpng_cflags = '-I/usr/local/include';