upgraded to EAPI=4, made cairo a requirement for the other modules that need it via REQUIRED_USE, enabled cairo by default so that users won't run into USE restriction unnecessarily, tested smyrna but it segfaulted all the time so it stays disabled, made ebuild documentation a bit more complete, added relevant descriptions to use flags in metadata

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 78 insertions, 39 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 54891ed93734..24bcd38241f2 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,22 @@
 # 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.256 2012/05/30 18:57:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.257 2012/06/04 21:02:31 axs Exp $
+
+  04 Jun 2012; Ian Stakenvicius <axs@gentoo.org> graphviz-2.28.0.ebuild,
+  metadata.xml:
+  upgraded to EAPI=4, made cairo a requirement for the other modules that need
+  it via REQUIRED_USE, enabled cairo by default so that users won't run into
+  USE restriction unnecessarily, tested smyrna but it segfaulted all the time
+  so it stays disabled, made ebuild documentation a bit more complete, added
+  relevant descriptions to use flags in metadata
+
+  04 Jun 2012; Ian Stakenvicius <axs@gentoo.org> graphviz-2.28.0.ebuild,
+  metadata.xml:
+  upgraded to EAPI=4, made cairo a requirement for the other modules that need
+  it via REQUIRED_USE, enabled cairo by default so that users won't run into
+  USE restriction unnecessarily, tested smyrna but it segfaulted all the time
+  so it stays disabled, made ebuild documentation a bit more complete, added
+  relevant descriptions to use flags in metadata
 
   30 May 2012; Markus Meier <maekke@gentoo.org> graphviz-2.26.3-r4.ebuild:
   arm stable, bug #417327
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 9fb62aaf1b07..26ad67f674bc 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -11,13 +11,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 e2b7f201f9c1869feae8949909edbf238abf44d7 SHA1 427fcc76685a43e95abc5c459c2006ec46026d53 SHA256 bcd6d933ac7aab4b0f73ee5c626f1a733eaf87bca96dcf2e7aa268b4cdd49240
-EBUILD graphviz-2.28.0.ebuild 6727 RMD160 6b3d38d7166defed824cee31c78f44727189a203 SHA1 31cd71dc1c60fe6883599f8b43621f4c039a8190 SHA256 9833ed914f7a30f9d6ede61d397ac9a58c8b4a55e2320479ff83dd0d1515611e
-MISC ChangeLog 37584 RMD160 3d2bf4887db76066edc3460a8abdc959512e051b SHA1 d8a3501da3e57bd2d2aa4f40acefa82f495a382a SHA256 7691fc8100c834fa0abf360b3a38d01b262a21e7652f54dc3c7f8af25fb5c28d
-MISC metadata.xml 1811 RMD160 b5169cbeb7e0a7cfb47de44e4f72ab6c10d42726 SHA1 48027b996e89ab227afe11a587483a51c842aa61 SHA256 995e4cbbcb197713ea64e93943cad2ee005671baaa30da15fa1a2b78dcca103d
+EBUILD graphviz-2.28.0.ebuild 7189 RMD160 8039057b312281cf98867cfde1098b99f3294629 SHA1 92e02c5dc0bc909143b8de96f30ac5d83151c4ea SHA256 fed2afe9a47f8dacfa86d62667bdd1840955ed326d1f7d577bab402536bf9743
+MISC ChangeLog 38481 RMD160 baf089fcc400a8c2f69913b4c797bcfce42d244a SHA1 0e15962f4914411f50323b6440d5f4b368adc0ca SHA256 57ff9f1f74844292aff8689cd5003d3f997fa27472c90534b294b34521445e44
+MISC metadata.xml 2158 RMD160 2305e4f794f2ad67f5599bcec98b38526dd15d98 SHA1 45d5dd5c0f2c4fb3431d41ea695691d29419dc34 SHA256 5e7e65c30a0323366851bbf4d8ac3978ae613b07f9b2c5a25570aa576ea141b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/Gbi8ACgkQkKaRLQcq0GKsRQCeJI9Wp8vTcU7+TCglT0xyGgwM
-m7kAnixGi+JQoRIxdr/qpQMszO0JQCL0
-=Dzx8
+iF4EAREIAAYFAk/NIoEACgkQ2ugaI38ACPDRoQD/TlwtBYOgDKftzNQycBnl3egc
+XE/UwkXcKvcEna7QS9QA/RTXxVzrR7/pSi+nd1c6O2lNIPYD2O6DBgZqB9s+8pm6
+=BITM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index a1b29a50a008..6811834b71b1 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.ebuild
@@ -1,8 +1,8 @@
 # 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.5 2012/05/28 23:21:25 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.6 2012/06/04 21:02:31 axs Exp $
 
-EAPI=3
+EAPI=4
 PYTHON_DEPEND="python? 2"
 
 inherit eutils autotools multilib python flag-o-matic
@@ -15,8 +15,7 @@ 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=""
-# 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"
+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"
@@ -31,25 +30,25 @@ RDEPEND="
 	>=media-libs/libpng-1.2:0
 	virtual/jpeg
 	virtual/libiconv
-	X? ( x11-libs/libXaw )
+	X? (
+		x11-libs/libXaw
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)
 	cairo?	(
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10[svg]
 	)
 	devil?	( media-libs/devil[png,jpeg] )
 	gs?	( app-text/ghostscript-gpl )
-	gtk?	(
-		x11-libs/gtk+:2
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-	)
+	gtk?	( x11-libs/gtk+:2 )
 	gts?	( sci-libs/gts )
 	lasi?	( media-libs/lasi )
 	qt4?	(
 		x11-libs/qt-core:4
 		x11-libs/qt-gui:4
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
 	)
 	ruby?	( dev-lang/ruby )
 	svg?	( gnome-base/librsvg )
@@ -63,6 +62,7 @@ DEPEND="${RDEPEND}
 	python?	( dev-lang/swig )
 	ruby?	( dev-lang/swig )
 	tcl?	( dev-lang/swig )"
+REQUIRED_USE="!cairo? ( !X !gtk !gs !lasi )"
 
 # Dependency description / Maintainer-Info:
 
@@ -71,20 +71,24 @@ DEPEND="${RDEPEND}
 #   the ones which are always compiled in, depend on zlib, gd
 # - gtk
 #   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
 #   gtk-2 depends on pango, cairo and libX11 directly.
 # - gdk-pixbuf
 #   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
 # - ming
 #   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
 #   incomplete.
-# - cairo:
+# - cairo/pango:
 #   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib :
+# - xlib:
 #   needs cairo+pango,
-#   can make use of gnomeui and inotify support,
+#   can make use of gnomeui and inotify support (??? unsure),
 #   needs libXaw for UI
-# - qt4 :
-#   based on ./configure it needs qt-core and qt-gui only
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
 
 # There can be swig-generated bindings for the following languages (/tclpkg/gv):
 # - c-sharp (disabled)
@@ -107,8 +111,17 @@ DEPEND="${RDEPEND}
 # tkspline, tkstubs ; enabled with: --with-tk
 
 # And the commands (/cmd):
-# - dot, dotty, gvpr, lefty, lneato, tools/* :)
-# Lefty needs Xaw and X to build
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt4'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
 
 pkg_setup() {
 	if use python; then
@@ -120,8 +133,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-Xaw-configure.patch \
-		"${FILESDIR}"/${P}-automake-1.11.2.patch
-	epatch "${FILESDIR}"/${P}-dot-pangocairo-link.patch
+		"${FILESDIR}"/${P}-automake-1.11.2.patch \
+		"${FILESDIR}"/${P}-dot-pangocairo-link.patch
 
 	# ToDo: Do the same thing for examples and/or
 	#       write a patch for a configuration-option
@@ -134,11 +147,9 @@ src_prepare() {
 	fi
 
 	# This is an old version of libtool
-	# use the existing ./configure option to exclude its use, instead of sed'ing it out
-	# but delete the dir since we don't need to eautoreconf it
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
 	rm -rf libltdl
-	#sed -i -e '/libltdl/d' configure.ac || die
-	#sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
 
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
@@ -167,6 +178,8 @@ src_configure() {
 		$(use_with qt4)
 		$(use_with lasi)
 		$(use_with svg rsvg)
+		$(use_with X x)
+		$(use_with X xaw)
 		$(use_with X lefty)
 		--with-digcola
 		--with-fontconfig
@@ -216,7 +229,7 @@ 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
+		install
 
 	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
 
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 1aded05c9167..ff55a617856c 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -29,11 +29,21 @@ documents
 a database of telephone calls or e-mail messages
 </longdescription>
 <use>
-	<flag name='lasi'>
-		Enables PostScript output via <pkg>media-libs/lasi</pkg> library
+	<flag name='devil'>Enables DevIL output plugin -Tdevil</flag>
+	<flag name='gs'>
+		Enables PostScript output via ghostscript, for 
+		plugin -Tgs (needs cairo)
 	</flag>
-	<flag name='devil'>Enables support for DevIL</flag>
-	<flag name='gs'>Builds graphviz against ghostscript</flag>
+	<flag name='gtk'>Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
 	<flag name='gts'>Enables support for gts</flag>
+	<flag name='lasi'>
+		Enables PostScript output via <pkg>media-libs/lasi</pkg>, for 
+		plugin -Tlasi (needs cairo)
+	</flag>
+	<flag name='qt4'>Builds gvedit front-end</flag>
+	<flag name='X'>
+		Builds lefty front-end, builds plugin -Txlib, and enables support
+		for x11 in various other modules (needs cairo)
+	</flag>
 </use>
 </pkgmetadata>