add cgraph USE-flag for media-gfx/graphviz

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 i686

3 files changed, 256 insertions, 5 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 818aa448fb42..a644279eda07 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.162 2008/05/24 09:50:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.163 2008/07/04 21:34:32 maekke Exp $
+
+*graphviz-2.20.2 (04 Jul 2008)
+
+  04 Jul 2008; Markus Meier <maekke@gentoo.org> +graphviz-2.20.2.ebuild:
+  bump to graphviz-2.20.2 (bug #230227) and readd cairo USE-flag (bug
+  #230683)
 
   24 May 2008; Markus Meier <maekke@gentoo.org> -graphviz-2.16.1-r4.ebuild:
   old
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 7fca64086e5b..faf19110ec09 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -15,15 +15,17 @@ AUX graphviz-2.16.1-tcltk.patch 623 RMD160 13c3764098a6229cef869962f9604737c97d7
 DIST graphviz-2.12.tar.gz 4607023 RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 SHA1 aa48a926395a57c6c7e1e755b9432a29461538e3 SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
 DIST graphviz-2.16.1.tar.gz 8076271 RMD160 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42 SHA1 46b704bd9b81922bcd17167c88f3278a9645e894 SHA256 32c1a185ba39961935f104cc47d2bceea327c0de8c5636edc6ab83ac3c0c56d1
 DIST graphviz-2.18.tar.gz 13322519 RMD160 2c7f23af1a9e480ab6cc5f5f39edad7a5da3ceae SHA1 b638181cf776bc4bb1fa8f95525a3943feb18b4a SHA256 6bc51969fa54c6ee3e64d8a4277c576931d50577b02114115668eeb5e515b42c
+DIST graphviz-2.20.2.tar.gz 13334096 RMD160 93290b212bbe540517278dda614e49cfac096538 SHA1 e08cf95b69a51e6c63accbc662075550f915a54c SHA256 f5d1c8fe6e341fa347c9d68fd2178eb0d0f7362384197570612458926105bc8e
 EBUILD graphviz-2.12.ebuild 5508 RMD160 54ba09cf066c8be004f59800b0963e31aa2093f3 SHA1 ae7ab99f53b044b05b964be4ce44d121d9960b63 SHA256 eb54344754b76dd0724e43289697af54a1cce1b4099379ed691fcc97ee1364cc
 EBUILD graphviz-2.16.1.ebuild 5994 RMD160 55056c9a34909cb12432cfd59d636538fb4daa0a SHA1 804dd7b929b5046c40bb7dce5879e9d2d7782fa2 SHA256 fba8a9d319b7704bb9fefd5f27a260fad28dab4dadfe80b07c0078c5e43574cd
 EBUILD graphviz-2.18.ebuild 5957 RMD160 1f0d5c7157d601461c2f22f2a37103f98130131b SHA1 7bd87588941c9673d98c923d909fa9dcedf9cdc6 SHA256 2055c43dd3f0127993254d341ce237aab1c06c6899cb35fda057d6ae67ab347d
-MISC ChangeLog 24338 RMD160 3cc86674749cf87a437196939c36e276fbe92d0c SHA1 28ea3772fd98c58ea6f036c8b38979316fe25f1e SHA256 bdfcac1a68f3c44308093c939367a615b3154145d1d7a5910c18fc2177897369
+EBUILD graphviz-2.20.2.ebuild 6324 RMD160 631298637b9ddd089c139af6b2e0bc43b0345b2e SHA1 0e6ccad3be0ae9278207a1ace27b8cd558b936b5 SHA256 0c6eee80fc8f184739177d9d5f725e699de620c5a6676613b6d6b97f213d67e5
+MISC ChangeLog 24525 RMD160 65a99d000f898e8a03c317dbe9c29f78219fd21f SHA1 1ae6fc0e8168b9a3054106ad5084db3810122360 SHA256 9345312fbedf024e3ef634faac640d2c42417aca30e33329c90b1e6c6893cfb7
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg35RsACgkQkKaRLQcq0GIoiwCfR4zHkcl38liFNWV6RL1FrzWa
-zZkAmwYFzp4R0mi8j5SPCkIOZIRAelMQ
-=k0cO
+iEYEARECAAYFAkhul7EACgkQkKaRLQcq0GLRlQCdGmQO0LoJT45j7mGgmAGppvMW
+WWIAmQFT4k58X4b4GeE8Fihc3D1owZUX
+=w4oS
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.20.2.ebuild b/media-gfx/graphviz/graphviz-2.20.2.ebuild
new file mode 100644
index 000000000000..da05e54be840
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.20.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.20.2.ebuild,v 1.1 2008/07/04 21:34:32 maekke Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils autotools multilib python
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="http://www.graphviz.org/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cairo cgraph doc examples gnome gtk java jpeg nls perl png python ruby tcl"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.0.0
+	>=dev-libs/glib-2.11.1
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.28
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.10
+	virtual/libiconv
+	cairo?  (
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+	)
+	ruby?	( dev-lang/ruby )
+	tcl?	( >=dev-lang/tcl-8.3 )
+	gtk?	(
+		>=x11-libs/gtk+-2
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+		gnome? ( gnome-base/libgnomeui )
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20
+	sys-devel/flex
+	java?	( dev-lang/swig )
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( dev-lang/swig )
+	python?	( dev-lang/swig )
+	ruby?	( dev-lang/swig )
+	tcl?	( dev-lang/swig )"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - ming
+#   Disabled, depends on ming-3.0 which is still p.masked.
+# - cairo:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib :
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support,
+#   needs libXaw for UI
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvpr, lefty, lneato, tools/* :)
+# Lefty needs Xaw and X to build
+
+pkg_setup() {
+	if use tcl && ! built_with_use dev-lang/swig tcl ; then
+		eerror "SWIG has to be built with tcl support."
+		die "Missing tcl USE-flag for dev-lang/swig"
+	fi
+
+	# bug 181147
+	local gdflags
+	use png && gdflags="png"
+	use jpeg && gdflags="${gdflags} jpeg"
+	if [[ -n ${gdflags} ]] && ! built_with_use media-libs/gd ${gdflags} ; then
+		local diemsg="Re-emerge media-libs/gd with USE=\"${gdflags}\""
+		eerror "${diemsg}"
+		die "${diemsg}"
+	fi
+
+	# bug 202781
+	if use cairo && ! built_with_use x11-libs/cairo svg ; then
+		eerror "x11-libs/cairo has to be built with svg support"
+		die "emerge x11-libs/cairo with USE=\"svg\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	rm -rf libltdl
+	sed -i -e '/libltdl/d' configure.ac || die
+
+	# Update this file from our local libtool which is much newer than the
+	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
+	if has_version ">=sys-devel/libtool-2" ; then
+		cp /usr/share/libtool/config/install-sh config || die
+	else
+		cp /usr/share/libtool/install-sh config || die
+	fi
+
+	# no nls, no gettext, no iconv macro, so disable it
+	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# Core functionality:
+	# All of X, cairo-output, gtk need the pango+cairo functionality
+	if use gtk ; then
+		myconf="${myconf} --with-x"
+	elif use cairo ; then
+		myconf="${myconf} --with-x"
+	else
+		myconf="${myconf} --without-x"
+	fi
+	myconf="${myconf}
+		$(use_with cgraph)
+		$(use_with gtk)
+		$(use_with cairo pangocairo)
+		--without-ming
+		--with-digcola
+		--with-ipsepcola
+		--with-fontconfig
+		--with-freetype2
+		--with-libgd
+		--without-gdk-pixbuf"
+
+	# new/experimental features, to be tested, disable for now
+	myconf="${myconf}
+		--without-sfdp
+		--without-smyrna
+		--without-digcola
+		--without-ipsepcola"
+
+	use gtk && myconf="${myconf} $(use_with gnome gnomeui)"
+
+	# Bindings:
+	myconf="${myconf}
+		--disable-guile
+		$(use_enable java)
+		--disable-io
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		--disable-r
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)"
+
+	econf \
+		--enable-ltdl \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir=/usr/share/doc/${PF} \
+		htmldir=/usr/share/doc/${PF}/html \
+		htmlinfodir=/usr/share/doc/${PF}/html/info \
+		pdfdir=/usr/share/doc/${PF}/pdf \
+		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
+		install || die "emake install failed"
+
+	use examples || rm -rf "${D}/usr/share/graphviz/demo"
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c
+	if use python ; then
+		python_mod_optimize
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup
+	fi
+}