Pull in correct SLOT of media-libs/libpng for headers.

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

3 files changed, 28 insertions, 13 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 0008064b4344..fe04267724ba 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.247 2012/05/24 06:17:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.248 2012/05/24 10:17:34 ssuominen Exp $
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> graphviz-2.28.0.ebuild:
+  Pull in correct SLOT of media-libs/libpng for headers.
 
   24 May 2012; Jeff Horelick <jdhore@gentoo.org> graphviz-2.26.3-r4.ebuild:
   marked x86 per bug 417327
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index ebc07f4a63d9..1c22482a1b66 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 RMD160 e0d11e4bfdc940b51e3a913b2c1178d84336f8c5 SHA1 4c43de8d197ac02a5373614f14269e45b4597b44 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
 AUX graphviz-2.28.0-Xaw-configure.patch 2129 RMD160 c7916c0c763b803d12678ce46fb6b51a1b9b500a SHA1 f0302b38f55d5e1eccf08a0074b4f8c4b76b1599 SHA256 7c5c37aa637031aee0001ec57f80229a697ba184540366204fe99d2bc8ae878a
@@ -7,6 +10,17 @@ DIST graphviz-2.28.0.tar.gz 19620087 RMD160 5a5fae7cb1128d4e863b954bee5f2491ff23
 EBUILD graphviz-2.26.3-r2.ebuild 6042 RMD160 be5fd321509b6235439aa12c96bff9da73592321 SHA1 8a2afa62e52c160009a9f7ffe95a96efbdaca80d SHA256 ec0fed34881cceb9fe5c8c6bf8f3829e7976cb6ac5704269d7ed2deafa2e0156
 EBUILD graphviz-2.26.3-r3.ebuild 6129 RMD160 f5ef4cfc60ba769f054a301f0ee0ce421742941a SHA1 ba7e36973a7e017e1adfd1e78d9351f9393d0c53 SHA256 201e7768c7e39b912c7efa93a0fb216b381ee2cc401d30392b5feafddd8e13fb
 EBUILD graphviz-2.26.3-r4.ebuild 6364 RMD160 23764bc433a2bc2077fd95dd7f86489d0334c3e7 SHA1 97ba958aed77bda71afd4fc930e877a2fa9ebdab SHA256 333a88eec56822c8b481ca24489b1e83eeef818c0c777bda7b12885aee3a4aea
-EBUILD graphviz-2.28.0.ebuild 6795 RMD160 4a54268f7202e69c4de3a800aee962701fdf8f03 SHA1 350595035397a986196746b90b63003c3b04d468 SHA256 31254808c32ef90e107d2e104896123b5d18ae399eef5d25ed60c31c2d0c4c2d
-MISC ChangeLog 36148 RMD160 494e81477332b4831264d8b334733ff6ff5a6580 SHA1 0598373add4502516d1950fc81a54b59b5a1e0d7 SHA256 ef4accc4c66c6fa5a7e5f131278eca39fe826323c20a44c51be004fb9c4e4e06
+EBUILD graphviz-2.28.0.ebuild 6750 RMD160 7f0f0e3b867f8d49ade9bae4f3a9a534a56e1cc2 SHA1 4124f786f6c831de2c5605d8008f7bc90dc6157e SHA256 4e852901253437bc406b841d6e5d309285f3caaccf129bd4f2b7132e7bcdde8a
+MISC ChangeLog 36287 RMD160 2c4c73a2c928ccb0d918363475a846262e736286 SHA1 67e3f3d3eff687a2e0e70db2080946802238df94 SHA256 d8c3f6152d98a79b043d13b620a47a0e16c77bac97a14ef81d81b192f720d3f2
 MISC metadata.xml 1811 RMD160 b5169cbeb7e0a7cfb47de44e4f72ab6c10d42726 SHA1 48027b996e89ab227afe11a587483a51c842aa61 SHA256 995e4cbbcb197713ea64e93943cad2ee005671baaa30da15fa1a2b78dcca103d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPvgrCAAoJEEdUh39IaPFNtOsH/3XpmQUfOmYzQihIWKnlk6gZ
+2CZfjdMV6Z9z3tzNFfoubucHIOajTcmbpEpXv2LCB1gCYb/cpVgES8eqKfJ1/8+Y
+nIH24w9KAba/bP2Lli5kkNC2SCbfEx9tvMcb9kuqbWhWjNuKRemtad3lvIkyC9f4
+ybKEjvBuNVP8GY6J/fGSeLU6F8R4b4/Tnh+lK8QRVI8Zv2Q475v7PS0SmR/YXuKA
+fSEiMpzbvGyw0OFg5h9yMD805wMEHA0ySUEWzr9VkBCBNkZdPuWMpvVh1gQHzjWr
++qsn0l0G4r1t2GKyyDAZT4bELgoz/2m2OdgLGxc0avZsVZgpdRZVxazGxjiPXtU=
+=IKDi
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index 5f940590143b..9a6a5ad4ef50 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.1 2012/05/23 19:20:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.2 2012/05/24 10:17:34 ssuominen Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -21,12 +21,12 @@ IUSE="cairo devil doc examples gs gtk gts java lasi nls perl python qt4 ruby svg
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-libs/expat-2.0.0
+	>=dev-libs/expat-2
 	>=dev-libs/glib-2.11.1
 	>=media-libs/fontconfig-2.3.95
 	>=media-libs/freetype-2.1.10
 	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype]
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.2:0
 	virtual/jpeg
 	virtual/libiconv
 	cairo?	(
@@ -45,8 +45,8 @@ RDEPEND="
 	gts?	( sci-libs/gts )
 	lasi?	( media-libs/lasi )
 	qt4?	(
-		x11-libs/qt-core
-		x11-libs/qt-gui
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10
 	)
@@ -219,13 +219,11 @@ src_install() {
 		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
 		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
 		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install || die "emake install failed"
+		install || die
 
-	use examples || rm -rf "${D}/usr/share/graphviz/demo"
+	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
 
-	if ! use static-libs; then
-		find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
-	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 
 	dodoc AUTHORS ChangeLog NEWS README
 }