Apply libpng-1.5 patch to 2.9 as well.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f1a5f118015e9b243ffb3294686b991f4b16dd05..d0527d6c5132bd4845bfd9aba07a094a1d781a96 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.271 2011/10/09 10:27:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.272 2011/10/25 04:06:33 dirtyepic Exp $
+
+  25 Oct 2011; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.1.1.ebuild:
+  Apply libpng-1.5 patch to 2.9 as well.
 
   09 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> wxGTK-2.8.12.0.ebuild,
   wxGTK-2.9.1.1.ebuild:

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 2d88d68905a006377697c1c0594e7369292c5ee7..0871474069158ff2ae83ff3ff654ca8901812880 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -26,17 +26,13 @@ EBUILD wxGTK-2.6.4.0-r6.ebuild 5081 RMD160 38cc13a487641134bce1c381c14249815c4cc
 EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 a6789613db3edb542a6ac8a26a2d3c19375c70a7 SHA1 566cbd5fae5564534bfb9600b96a1911416c9745 SHA256 47a6d6fc2145160b4a5240568aca10dde15586e166f9916a956608928266ce68
 EBUILD wxGTK-2.8.11.0.ebuild 3593 RMD160 5e8aa42e27ee630ffd2896f01a484772e430dda8 SHA1 e4fff06d03f5332bf84c8736d8e8908129038101 SHA256 641af41063c7adfebc6356bb0dec01a06df65ed96150ddfb05127993ebb90fba
 EBUILD wxGTK-2.8.12.0.ebuild 3565 RMD160 bbcf7f17f7b44f9d50b6e59efd54f709bbdc0af7 SHA1 2a150047003d83de600a06ad18285e505c760a62 SHA256 0f34a2d9f1b49e02378904fbc3063e5ec5d61eb3997fced519820ab253bf0ce9
-EBUILD wxGTK-2.9.1.1.ebuild 3696 RMD160 b5f903b0af8020219a7278c44564b91eb809d62f SHA1 3bd3abc0845a0b84bd35530a9e7e5f3b6a4ccd98 SHA256 9aba184a97b09bd6a1396c100c85a6b951f77dd39a52f444144ebd8c5456d692
-MISC ChangeLog 42414 RMD160 3c8ff2dffbcc86c25160cf92f9df76eb76e945dc SHA1 c587352b6f015b274ad7ba8a95ea1f7071d58fc3 SHA256 cd9e4748f456135f49b98469fc1adacb05fd316558a39a551d3ed9f79f2dbfe2
+EBUILD wxGTK-2.9.1.1.ebuild 3746 RMD160 e40ab6696f141305a491d3607abc821b0a287266 SHA1 2b8b0073824536446903de0bc2600411c10b355a SHA256 fd394a27d71771bd5be69dce7567938ae257f3b69de3f049fca383c2e1c89e68
+MISC ChangeLog 42526 RMD160 e228ff7d957cf0a9058ee6250af2874e9b09cf7a SHA1 ab4346df6c478905d9d91267c571e248467c1d61 SHA256 feee02729d79e73b78b24c73be6fbdeba40ab13cb363c82119f50837a8307c53
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkXc4AAoJEEdUh39IaPFNr9cH/jebBCJ+0GSHBU+uBTKRjSHP
-mnkr3/r+GLQIqG/ktN0HbiQ8LdiEhBSAxxC7mTNyk1CxkSlmioHY9eIz/+WzODh+
-X98p2JTsgRQBszak/IY28r7Ab0vG/AApaDrzQE9IOZvG/g6timtk/5hnJcjQkRLn
-IKuIjNhbZQBAurVY7+olJG5U+1T58fk9i/XX8TkVCc1GtxH7COlw5DUgtP2489wC
-4z8b/HrwL9TdeBdGxLuWWpPcJhxyZy6HT28RP6I3Oryn3jqcsgYRRI9TsB3kP8qv
-nev4xFwXxUSpv4KRKiFG2cprD3NZP4eJ4buzlbo9Y+nSt6lzGPazbs9Bl+saen0=
-=Qvwj
+iEYEARECAAYFAk6mOCQACgkQiqiDRvmkBmL0bwCfVxHZQ6rVu2qJwKNr4oKFEPK1
+O8QAni5oddh06qAkaH+oL2EdcTgl0d7o
+=eWyE
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
index 8547d9a40e0c073a0546b4992031368b793a3b73..79a647b85cb57b6201a6e8c411df0c8b8d85c2c2 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.3 2011/10/09 10:27:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.4 2011/10/25 04:06:33 dirtyepic Exp $
 
 EAPI="3"
 
@@ -56,6 +56,7 @@ S="${WORKDIR}/wxPython-src-${PV}"
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-collision.patch
+       epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch
 }
 
 src_configure() {