summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/graphviz/ChangeLog7
-rw-r--r--media-gfx/graphviz/Manifest10
-rw-r--r--media-gfx/graphviz/graphviz-2.28.0.ebuild16
3 files changed, 16 insertions, 17 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 939f8f22517a..9f3f089b9258 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
# 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.250 2012/05/28 21:35:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.251 2012/05/28 22:33:05 sping Exp $
+
+ 28 May 2012; Sebastian Pipping <sping@gentoo.org> graphviz-2.28.0.ebuild:
+ Remove use of --with(out)-x as there is no parameter by that name. Add use
+ flag "X" to compile without libXaw (bug #276992) as Xaw is only needed by
+ lefty. As a side note both cairo and gtk can be compiled with USE=-X.
28 May 2012; Sebastian Pipping <sping@gentoo.org> graphviz-2.28.0.ebuild:
Add missing dependency on zlib, discovered in configure.ac
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c4ca5f87586b..03760fc4cd0a 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -10,13 +10,13 @@ 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 6360 RMD160 9afa12dff38ef6508a4c5fdb6a0a9bed9571aa1a SHA1 136a9c7b2d55f7e153a4245897ff2d25e6c34caa SHA256 b9044b6ffe39715728cd787aa186e020d6439f6c2076683f80ed5d59cd644a2e
-EBUILD graphviz-2.28.0.ebuild 6761 RMD160 7dd3ac1d37a45c0422946ef6c8111320a8c8ea3e SHA1 102ccf02f850ed5ec5729dd4e33d41145b031df3 SHA256 23f8d272f2ce9709903a2fe2f004fbc7e9810bc7d7ecfbeff3925d971b3273b5
-MISC ChangeLog 36534 RMD160 418fd16a9eb0b26fe82a76d2a64d679ec7e7361b SHA1 111e1fed276abee6d984e954d7f1da81b29397d0 SHA256 a8459a08138356fde104b7e8bf4bf19df3946b21bfadb5983ae8ef97cbf8ea73
+EBUILD graphviz-2.28.0.ebuild 6647 RMD160 6580dfb7f96be37b14975ac42d7aae00fa4e6e0c SHA1 c3b6e4e5ae82acfeee887eb53316c9037a7895a1 SHA256 1e08607700d90b22b28a80b1de6b6f247adaffea104d346c29a863d24503b7a4
+MISC ChangeLog 36836 RMD160 cc325d97a9d3ddd387495c0269a1457e6cfd6045 SHA1 85e2be7f41c7180b29aa61a0b1a4a2734892f664 SHA256 76c2d9bcbba43d8e5750bcd1885fb822580f300bf616c5ea0866ef61a3231a92
MISC metadata.xml 1811 RMD160 b5169cbeb7e0a7cfb47de44e4f72ab6c10d42726 SHA1 48027b996e89ab227afe11a587483a51c842aa61 SHA256 995e4cbbcb197713ea64e93943cad2ee005671baaa30da15fa1a2b78dcca103d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/D74YACgkQsAvGakAaFgAnxgCeIaaS/2Sqej5OmjYerOPSA5Ph
-gO8An2Jdz8v50EiH3vrI45zAlXYzyHv+
-=boOe
+iEYEARECAAYFAk/D/RwACgkQsAvGakAaFgCd4gCeNb/oWv/06RmBxZMdMT1KTp0B
+fzYAoNYh5jQQ/yaATat8GBb0UrXSe8l0
+=syRU
-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index bda55c69f829..0bf1072cae85 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.3 2012/05/28 21:35:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.4 2012/05/28 22:33:05 sping Exp $
EAPI=3
PYTHON_DEPEND="python? 2"
@@ -15,7 +15,8 @@ LICENSE="CPL-1.0"
SLOT="0"
#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
KEYWORDS=""
-IUSE="cairo devil doc examples gs gtk gts java lasi nls perl python qt4 ruby svg static-libs tcl elibc_FreeBSD"
+# NOTE: Migration from "+X" to "X" needs checking of all reverse dependencies for use of lefty
+IUSE="cairo devil doc examples gs gtk gts java lasi nls perl python qt4 ruby svg static-libs tcl +X elibc_FreeBSD"
# Requires ksh
RESTRICT="test"
@@ -30,8 +31,8 @@ RDEPEND="
>=media-libs/libpng-1.2:0
virtual/jpeg
virtual/libiconv
+ X? ( x11-libs/libXaw )
cairo? (
- x11-libs/libXaw
>=x11-libs/pango-1.12
>=x11-libs/cairo-1.1.10[svg]
)
@@ -39,7 +40,6 @@ RDEPEND="
gs? ( app-text/ghostscript-gpl )
gtk? (
x11-libs/gtk+:2
- x11-libs/libXaw
>=x11-libs/pango-1.12
>=x11-libs/cairo-1.1.10
)
@@ -158,13 +158,6 @@ src_configure() {
# libtool file collision, bug 276609
local myconf="--without-included-ltdl --disable-ltdl-install"
- # Core functionality:
- # All of X, cairo-output, gtk (and probably qt) need the pango+cairo functionality
- if use gtk || use cairo || use qt4; then
- myconf="${myconf} --with-x"
- else
- myconf="${myconf} --without-x"
- fi
myconf="${myconf}
$(use_with cairo pangocairo)
$(use_with devil)
@@ -173,6 +166,7 @@ src_configure() {
$(use_with qt4)
$(use_with lasi)
$(use_with svg rsvg)
+ $(use_with X lefty)
--with-digcola
--with-fontconfig
--with-freetype2