Remove old, use slot deps for gtk+, and fix swig dependency.

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

7 files changed, 30 insertions, 657 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 968fb6962ed8..e007ad458686 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.233 2011/01/22 19:02:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.234 2011/03/28 20:44:59 radhermit Exp $
+
+  28 Mar 2011; Tim Harder <radhermit@gentoo.org> -graphviz-2.26.0.ebuild,
+  -graphviz-2.26.3.ebuild, -graphviz-2.26.3-r1.ebuild,
+  graphviz-2.26.3-r2.ebuild, graphviz-2.26.3-r3.ebuild:
+  Remove old, use slot deps for gtk+, and fix swig dependency.
 
   22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   graphviz-2.26.3-r2.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index f2e661c2d914..da224ef897df 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
-DIST graphviz-2.26.0.tar.gz 16946980 RMD160 58af87cca486fb8aa42cef6d5a77cbb68af76607 SHA1 e78d93f62738b978d41641a05cc453b7edaa8398 SHA256 2f37344050de50e28dd04a625ae32f881542586ff20209e342ce17969f680691
 DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
-EBUILD graphviz-2.26.0.ebuild 5752 RMD160 2f363b992b01e0913889473185569187cf026817 SHA1 17b6796f3b1eb33e9f0e6e8637c86b8dfa94aaa8 SHA256 3c0b2240459e86646a1daf1733a77f113ae213ead19151193563b799192c2e1b
-EBUILD graphviz-2.26.3-r1.ebuild 5948 RMD160 c3f25acb715e0166064defe8b61737e55a0add4a SHA1 00c69f372fa47761bfb683368beec13196390c10 SHA256 f1dd9f847f3401a26b322af3efeada8a6f01d78a6cbb816fb4d80c0d94f625e5
-EBUILD graphviz-2.26.3-r2.ebuild 6093 RMD160 4eb5551c62bb7349baac8675d5ea361c6a491042 SHA1 7b6892b2e510f2bb994f0c9e7d11a21c50db4a8b SHA256 9b6faa7ea8eea5c5fb927f5abdffacf2b1b4761c03d851c3ec4d5f916e3916c9
-EBUILD graphviz-2.26.3-r3.ebuild 6152 RMD160 8f963611bd00ca44cc0ab4127c69b9c7111eab87 SHA1 1ad0ae04fa0ab6a07b81a1d46167d4925f5a24c2 SHA256 130bcc39993c4b1c7798f784c65547478eb8c07c7d8707a2f0398e793715316b
-EBUILD graphviz-2.26.3.ebuild 5763 RMD160 5fa38c7e6c49be0aca3b9b87268d75180495bbe4 SHA1 3ec324376cce16d522c1b3f32725b9cd3b4dac8e SHA256 6f0a501f5285af155c4aa7470cd5d0d63470925b3c5d58e9078992eaece4a5d9
-MISC ChangeLog 33986 RMD160 519b5fa13ff5b7a7980c5e63ad486a4fdbf728a8 SHA1 a1b5099e861cf52f32abae0e464d6f584e0cccec SHA256 b5c9a574559cd593dca8c9c08ab4eb88e0babe73b38ab6bc2aea955e8a568317
+EBUILD graphviz-2.26.3-r2.ebuild 6046 RMD160 9a5568baec0b2cedc4614567854a1cad5492b316 SHA1 0d7418a80ccca1d6040424a3768c30daff7145ce SHA256 fc33ffc428c76bf4900c97ab8d8aabbccd8328af028d3328d0a3084211b43328
+EBUILD graphviz-2.26.3-r3.ebuild 6106 RMD160 3abad3d7b84d16fe48607affbaf7511e4294d79e SHA1 93bfc6415d3475976ba832b9c53b0f41afe39102 SHA256 b9ea8850149b9591455380a38860224a40d37bc38b5223d503eae8bb99a6dc21
+MISC ChangeLog 34234 RMD160 8979f9edc4abee0ef494bb89f2dd10f6701c8fab SHA1 d1d41d7aea2d13276a369c8f0a42a47a5f42878d SHA256 09a5dc9456a7381a64dd50efbd233f83c44d2e7b9870ef04ef7a5e4698a7bda0
 MISC metadata.xml 1649 RMD160 e2238f2d7f945b9d05aa7cea65ed3a5b4f635251 SHA1 68476203394f16fd247976409d614596138431db SHA256 1d35d9b4fbceffa67229a5e0fcf3537f77bf05e00fbdb5ec0c3c82c4c845cc2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNkPNUAAoJEEqz6FtPBkyj+lEH/3B0Q5QXdDCx10wO3PR6VPLM
+Ux1BmlszZnkw4J/Lt76E2iW2X3ai61BynO9tEh/3n/FEpIo5E5KMRpUILihX55p3
+9EwiwiRjpwlZLiorqdlSnDsAickLVEUnw42QculoToPR1lPjPfbNXXWxA8kS3kVr
++rbxcyYcaqIyj6yTDQ4cmg44WdKAkSpI3ulCV4k3+zO9hF3YUZyDGshMlZVE8NiY
+mSkaOiQZDrwb+0LBjlrQcNda9H9cqwzFUofgshhVONer/azlEVAsTgd9Ud/33FMx
+kwoFQX0oXifKv+yqz2sKnimbOhaPvQXncshnlmYioGjObNgMix3Qg1jw64byrew=
+=CikM
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.26.0.ebuild b/media-gfx/graphviz/graphviz-2.26.0.ebuild
deleted file mode 100644
index 519e7bfeda3c..000000000000
--- a/media-gfx/graphviz/graphviz-2.26.0.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.0.ebuild,v 1.8 2010/11/08 22:23:18 maekke Exp $
-
-EAPI=2
-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 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="cairo doc examples gtk java lasi nls perl 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[jpeg,png]
-	>=media-libs/libpng-1.2.10
-	virtual/jpeg
-	virtual/libiconv
-	cairo?	(
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	gtk?	(
-		>=x11-libs/gtk+-2
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-	)
-	lasi?	( media-libs/lasi )
-	ruby?	( dev-lang/ruby )
-	tcl?	( >=dev-lang/tcl-8.3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	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-1.3.38[tcl]
-		>=dev-lang/swig-1.3.38 ) )"
-
-# 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
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - 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
-
-src_prepare() {
-	# 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
-	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' 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_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--disable-ltdl-install"
-
-	# Core functionality:
-	# All of X, cairo-output, gtk need the pango+cairo functionality
-	if use gtk || use cairo; then
-		myconf="${myconf} --with-x"
-	else
-		myconf="${myconf} --without-x"
-	fi
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with gtk)
-		$(use_with lasi)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--without-gdk-pixbuf
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--without-cgraph
-		--without-devil
-		--without-digcola
-		--without-ipsepcola
-		--without-sfdp
-		--without-smyrna"
-
-	# Bindings:
-	myconf="${myconf}
-		--disable-guile
-		--disable-io
-		$(use_enable java)
-		--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}
-}
-
-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 $(python_get_sitedir)/gv.py
-	fi
-}
-
-pkg_postrm() {
-	if use python ; then
-		python_mod_cleanup $(python_get_sitedir)/gv.py
-	fi
-}
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild
deleted file mode 100644
index 6b25e3c74ae5..000000000000
--- a/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r1.ebuild,v 1.5 2010/11/08 22:23:18 maekke Exp $
-
-EAPI=3
-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 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo doc examples gtk java lasi nls perl python ruby static-libs 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[jpeg,png]
-	>=media-libs/libpng-1.2.10
-	virtual/jpeg
-	virtual/libiconv
-	cairo?	(
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	gtk?	(
-		>=x11-libs/gtk+-2
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-	)
-	lasi?	( media-libs/lasi )
-	ruby?	( dev-lang/ruby )
-	tcl?	( >=dev-lang/tcl-8.3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	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-1.3.38[tcl]
-		>=dev-lang/swig-1.3.38 ) )"
-
-# 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
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - 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
-
-src_prepare() {
-	# 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
-	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' 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 "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
-	else
-		cp "${EPREFIX}"/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_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--disable-ltdl-install"
-
-	# Core functionality:
-	# All of X, cairo-output, gtk need the pango+cairo functionality
-	if use gtk || use cairo; then
-		myconf="${myconf} --with-x"
-	else
-		myconf="${myconf} --without-x"
-	fi
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with gtk)
-		$(use_with lasi)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--without-gdk-pixbuf
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--without-cgraph
-		--without-devil
-		--without-digcola
-		--without-ipsepcola
-		--without-sfdp
-		--without-smyrna"
-
-	# Bindings:
-	myconf="${myconf}
-		--disable-guile
-		--disable-io
-		$(use_enable java)
-		--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 \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		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"
-
-	use examples || rm -rf "${D}/usr/share/graphviz/demo"
-
-	if ! use static-libs; then
-		find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-	use python && python_mod_optimize gv.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup gv.py
-}
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild
index 7ded3231fd91..972a85f188b1 100644
--- a/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild,v 1.9 2011/01/22 19:02:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r2.ebuild,v 1.10 2011/03/28 20:44:59 radhermit Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -34,7 +34,7 @@ RDEPEND="
 		>=x11-libs/cairo-1.1.10[svg]
 	)
 	gtk?	(
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 		x11-libs/libXaw
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10
@@ -50,8 +50,7 @@ DEPEND="${RDEPEND}
 	perl?	( dev-lang/swig )
 	python?	( dev-lang/swig )
 	ruby?	( dev-lang/swig )
-	tcl?	( || ( <dev-lang/swig-1.3.38[tcl]
-		>=dev-lang/swig-1.3.38 ) )"
+	tcl?	( dev-lang/swig )"
 
 # Dependency description / Maintainer-Info:
 
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
index 89feb63048e7..5a4e4813e0c9 100644
--- a/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild,v 1.2 2010/11/24 20:08:52 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild,v 1.3 2011/03/28 20:44:59 radhermit Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -34,7 +34,7 @@ RDEPEND="
 		>=x11-libs/cairo-1.1.10[svg]
 	)
 	gtk?	(
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 		x11-libs/libXaw
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10
@@ -50,8 +50,7 @@ DEPEND="${RDEPEND}
 	perl?	( dev-lang/swig )
 	python?	( dev-lang/swig )
 	ruby?	( dev-lang/swig )
-	tcl?	( || ( <dev-lang/swig-1.3.38[tcl]
-		>=dev-lang/swig-1.3.38 ) )"
+	tcl?	( dev-lang/swig )"
 
 # Dependency description / Maintainer-Info:
 
diff --git a/media-gfx/graphviz/graphviz-2.26.3.ebuild b/media-gfx/graphviz/graphviz-2.26.3.ebuild
deleted file mode 100644
index 033fead04f43..000000000000
--- a/media-gfx/graphviz/graphviz-2.26.3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3.ebuild,v 1.3 2010/11/08 22:23:18 maekke Exp $
-
-EAPI=2
-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 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="cairo doc examples gtk java lasi nls perl 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[jpeg,png]
-	>=media-libs/libpng-1.2.10
-	virtual/jpeg
-	virtual/libiconv
-	cairo?	(
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	gtk?	(
-		>=x11-libs/gtk+-2
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-	)
-	lasi?	( media-libs/lasi )
-	ruby?	( dev-lang/ruby )
-	tcl?	( >=dev-lang/tcl-8.3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	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-1.3.38[tcl]
-		>=dev-lang/swig-1.3.38 ) )"
-
-# 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
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - 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
-
-src_prepare() {
-	# 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
-	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' 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_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--disable-ltdl-install"
-
-	# Core functionality:
-	# All of X, cairo-output, gtk need the pango+cairo functionality
-	if use gtk || use cairo; then
-		myconf="${myconf} --with-x"
-	else
-		myconf="${myconf} --without-x"
-	fi
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with gtk)
-		$(use_with lasi)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--without-gdk-pixbuf
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--without-cgraph
-		--without-devil
-		--without-digcola
-		--without-ipsepcola
-		--without-sfdp
-		--without-smyrna"
-
-	# Bindings:
-	myconf="${myconf}
-		--disable-guile
-		--disable-io
-		$(use_enable java)
-		--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}
-}
-
-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 $(python_get_sitedir)/gv.py
-	fi
-}
-
-pkg_postrm() {
-	if use python ; then
-		python_mod_cleanup $(python_get_sitedir)/gv.py
-	fi
-}