summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-24 10:17:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-24 10:17:34 +0000
commit1026b610b5b1746b86f86d32e34a3406a459c198 (patch)
tree4c1d3cd4bfd447aad395bea383ce387f0edbd400 /media-gfx/graphviz
parentStable for x86, wrt bug #414605 (diff)
downloadgentoo-2-1026b610b5b1746b86f86d32e34a3406a459c198.tar.gz
gentoo-2-1026b610b5b1746b86f86d32e34a3406a459c198.tar.bz2
gentoo-2-1026b610b5b1746b86f86d32e34a3406a459c198.zip
Pull in correct SLOT of media-libs/libpng for headers.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphviz')
-rw-r--r--media-gfx/graphviz/ChangeLog5
-rw-r--r--media-gfx/graphviz/graphviz-2.28.0.ebuild18
2 files changed, 12 insertions, 11 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/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
}