Fix libpng detection wrt #319339 by Vladimir <v_2e AT ukr.net>.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index 48d344886224542e631744d2da06c4e18944d584..22641c95c533b43b06da75f5f0f8fdad5376200a 100644 (file)
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.48 2010/01/01 16:00:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.49 2010/05/12 09:04:21 ssuominen Exp $
+
+  12 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  k3d-0.7.11.0-r1.ebuild:
+  Fix libpng detection wrt #319339 by Vladimir <v_2e AT ukr.net>.
 
   01 Jan 2010; Raúl Porcel <armin76@gentoo.org> k3d-0.6.7.0-r1.ebuild:
   Drop sparc keywords

diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 73d0554ee5685c1ab347c88b1e505efeee1a938a..1572a9ec25891ad118ad660eaf85a57604296a0e 100644 (file)
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -2,6 +2,6 @@ AUX k3d-0.7.11.0-cuda.patch 1854 RMD160 084495d805cb368123c3c280e037e0a9e581aaa5
 AUX k3d-0.7.11.0-fix-potfiles.patch 640 RMD160 44508c7968befaced78d52d4e06e211adc83a754 SHA1 c9d50079825db508deb612dd416223c5b98fe705 SHA256 b86359e5597f8794cbad3f0ee6837bfbf3440ddc435eaed16487f79a3c20a244
 AUX k3d-0.7.11.0-gcc44.patch 2599 RMD160 c4951b932c1b3595acec30fe443fefb47d9cab4f SHA1 30a406600c59becb6b7513fc99abda390ae82143 SHA256 5e1f43a468bb3fd2d7f3e6d67323921df447b7b1d6538347cbc524d835a11df3
 DIST k3d-source-0.7.11.0.tar.gz 7692200 RMD160 41c31d12fe82e92be75a309660ed3811d1aa02df SHA1 cef63043c7bd8d7a130689e9b53d1023280e2978 SHA256 c6364cb9e989f2ac2412541c2a4368279b23e728822ab7e6b5390d579dd49008
-EBUILD k3d-0.7.11.0-r1.ebuild 2675 RMD160 46a41941f355f0fbdfc7c56e47a6c8a55ae11c93 SHA1 b293677eca3b30e91e45a5a12c260bc07506530b SHA256 07633772198335eac88d70d90f6223b6d8323adfb3839955f3ca9f803fbba0ce
-MISC ChangeLog 7283 RMD160 2e85bda709c4c96ce000eef1310aa99403f46c92 SHA1 3b7380e0fa7373b048894f9d74ce449b5e3a0a2d SHA256 f11ad8e87d0eca048328eb512248d15c8223921187236a088d9f20e460954155
+EBUILD k3d-0.7.11.0-r1.ebuild 2775 RMD160 8feff20d350391d7c3e922b01b48a11457d06903 SHA1 5a3053a58ae26aa55490c90e81b32729c860ddd6 SHA256 83145b5036bf9a42c8882ee9a6938c876b4e0ccdf19d52962aa54f3b6d28e472
+MISC ChangeLog 7432 RMD160 a2e1345a25982a276cc58217e7887814ffd2d97f SHA1 ece25b16addf6e19d83db039059760cb45f344af SHA256 7927e9e41e4808959c817c75f5e7495d3c6e7f60dc405180fc1245dbf733187d
 MISC metadata.xml 418 RMD160 470739aba6d65cd70036df8262a1857af1fa8225 SHA1 5b2334bb5974077964501f07b7573096bdc322c5 SHA256 6c1e740795f5df8ebf35934c124b430673b33f723a162492889c9c4494baacc1

diff --git a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
index 13aaae903d88bc76671dbdaa339a034c7b339084..6ab2d4748ef8095bcd59dcd9236f2f643e418025 100644 (file)
--- a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
+++ b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.3 2009/11/07 20:56:56 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.4 2010/05/12 09:04:21 ssuominen Exp $
 
 EAPI="2"
 
@@ -68,6 +68,10 @@ k3d_use_module() {
 }
 
 src_prepare() {
+       sed -i \
+               -e '/PKG_CHECK_MODULES/s:libpng12:libpng:' \
+               cmake/modules/K3DFindPNG.cmake || die
+
        epatch "${FILESDIR}"/${P}-fix-potfiles.patch \
                "${FILESDIR}"/${P}-cuda.patch \
                "${FILESDIR}"/${P}-gcc44.patch