version bump

Package-Manager: portage-2.2_rc25/cvs/Linux i686

4 files changed, 234 insertions, 9 deletions

diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
index 8a36e0ed975b..6049662a92e7 100644
--- a/media-gfx/comix/Manifest
+++ b/media-gfx/comix/Manifest
@@ -1,9 +1,16 @@
-DIST comix-3.6.5.tar.gz 459165 RMD160 57d04b97af4c5fa5b9c3290231b0c5bf29187627 SHA1 08966760008d68ef23a132283e43c8457983daca SHA256 79c67d1d1d7cd3244b820879af26d203b6268805d63b0eebd34810be651e8101
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST comix-4.0.1.tar.gz 395972 RMD160 4ccfa073a7b7bc0b65bd457245b00b8fd43efdb5 SHA1 e9eb5b00a812a61dec0249dd2019a9bf353cf045 SHA256 4d7bb0066fdd3d9a9ee36681b21635bacb149336470a8eb717dccbf3a115f2f8
 DIST comix-4.0.3.tar.gz 468112 RMD160 1184650221762e01bf8ffde7818d528fef79e9b6 SHA1 2343c5912e4ff8074b03bcef967750bb1a79f2a4 SHA256 5c468a95452e0c1067508bc9ca7b57fc89c81b60ac947d0d428c714e8acc42fa
-EBUILD comix-3.6.5.ebuild 964 RMD160 a226c4214ab07f9a4101a3b8ffd88200b29d61c5 SHA1 89b580fb55cc34cd60926575bee3fbb6eccb9a8e SHA256 54d87a142f97ec359706810239a58b885f97f7a7b7ad3d8695b189dfc3966c3c
 EBUILD comix-4.0.1-r1.ebuild 1151 RMD160 2bd21d784c21e3264dfb3727b4fd541db876de63 SHA1 16aa7879af3bb4de22a1a5b0a5856cbc53981651 SHA256 6212549bc6881b85c4f46017d77051949e7e1baef13605886d93e6c0434bffee
-EBUILD comix-4.0.1.ebuild 963 RMD160 3113cb29673f113e31739a9793887fd7d727c15e SHA1 d112dab3962929a9505bb4cbf99907a05178822e SHA256 e09934400da86db0db4acfdefb09941abaf297d08e6c6f0cb85ea2f52e64d347
 EBUILD comix-4.0.3.ebuild 1353 RMD160 f5ffc447a5ddc491619e8ef232ecd599029aeed7 SHA1 1993f2ada9c4615582cb2d396d3a6f0a7c3cfe76 SHA256 b3a7b1cadbc06789b7f83d13241f7b7b58298e23582b117c52a27a6d8ac0a02e
-MISC ChangeLog 7646 RMD160 f4037be75ed06a7b19f2dd132c7da40e332e6ba5 SHA1 79394f8a16ea4b2617f371fa4ad0fd989c9122d3 SHA256 0b012434cfe2cb5845ff412ac06c46cd0420b43283236907872ac62dd4afbaa2
+MISC ChangeLog 7745 RMD160 f289c6c8892c8abba6f308d7d965d5dd02ea4a42 SHA1 04bfc8e0819fdc4b7e2fb41f04407c0b730ab8bc SHA256 2ef3eed97fa159e910de8e68b370f48075b978b6b7576d95caee38022d55d329
 MISC metadata.xml 344 RMD160 2d4c0e2c2c5edb017bc2d1a9c8044e3eb99c5cea SHA1 c0c6dc6223aac4e5a5c34faccbd471db1eff45df SHA256 73ad9526aabaf3735281f3e73d1bd4e725e39b7588b0e1002b43e68c3787526b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknCjbEACgkQkKaRLQcq0GKPawCgoOKk9KLwQNQ9MnZw9TcWhS/9
+CIUAnRunzAjUt0yotCi9zHLRBDL4jYXu
+=lPM6
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 7c8eab9b62eb..ab8cf355c580 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.187 2009/03/12 06:03:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.188 2009/03/19 18:18:29 maekke Exp $
+
+*graphviz-2.22.2 (19 Mar 2009)
+
+  19 Mar 2009; Markus Meier <maekke@gentoo.org> +graphviz-2.22.2.ebuild:
+  version bump
 
   12 Mar 2009; Markus Meier <maekke@gentoo.org> -graphviz-2.22.0.ebuild,
   graphviz-2.22.1.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 12fa22045e06..63490650bb81 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -13,15 +13,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.20.3.tar.gz 13381532 RMD160 64c80f3af55668e487f911132407c332c3c38e87 SHA1 63ae6bdb6b410387477d339225cc4f61c2bc7322 SHA256 583676c2faf0d194838cf19bbe6d71ae5a6ccbed86228901b34cf93ca48c393f
 DIST graphviz-2.22.1.tar.gz 16671625 RMD160 14c190c2b0a940fef6cdc35555b57d5725540bc6 SHA1 ec5f1f62f70bcba7b58be1101ac8431809aef0de SHA256 6c2017cf15f50d49c399abf433a8787e41ad56823dfeff4e130d0f1004d22444
+DIST graphviz-2.22.2.tar.gz 16674049 RMD160 546eebc1a0b97ffdc431a986102c9e25d1ea216e SHA1 92b40b1fb596a6b3e880e74101921d7681f62c94 SHA256 fb08b49592bb83d4e7659776033f4137753d908681f19e3d1f8a8a415550edfb
 EBUILD graphviz-2.12.ebuild 5508 RMD160 54ba09cf066c8be004f59800b0963e31aa2093f3 SHA1 ae7ab99f53b044b05b964be4ce44d121d9960b63 SHA256 eb54344754b76dd0724e43289697af54a1cce1b4099379ed691fcc97ee1364cc
 EBUILD graphviz-2.20.3.ebuild 6335 RMD160 562ffc55fb3b59306358ea39e59309a9a7b9dc5b SHA1 4587a3516c3ea5ccb34623ab37103e3864968ba2 SHA256 a6fff79d3a39c47d63c59e841a48e2be85627c16d4265e5c40d7cacc6df16734
 EBUILD graphviz-2.22.1.ebuild 5574 RMD160 a75261c17aeef9a921270db3d78ad6161f886d0f SHA1 69cad6e5e4d891abf4a63d905dfcddfa9b66388b SHA256 c55e8fb737b2a8ac4767ff394ad9bf74e5967d18e1874117d09aece70154137e
-MISC ChangeLog 27356 RMD160 f664d1627eca1da5b3778976919b0dbe15389c80 SHA1 6a214f5924acd1b00b1768239271424c777a3a68 SHA256 cf504ed2abcd049a5d7ec820d6ecc035f555ce94e774ec419df5840ac9677d35
+EBUILD graphviz-2.22.2.ebuild 5574 RMD160 9f3fde5821e4a2cc9a7b5d5307e66f228adf5d72 SHA1 b935659718486b1bd8ada4471ca212a50dfdafdc SHA256 af17db1cfc06fc5ed8c27445ef8cde78c265dadd92615001d1e7baaf564e6619
+MISC ChangeLog 27477 RMD160 b3f33477b5b5d90f6bbde623a00704d940213b8f SHA1 9a27f888130a92f779275634daa6217da3b373e2 SHA256 6990d512eaab4d69329cb8eae3ee166a5e16957507fe1c398891bad6d48dfdf7
 MISC metadata.xml 1764 RMD160 f0c0bfb4d91c097e212cff8e68dfe940ca2725d8 SHA1 d8d60e976a21c962d96c0b99763db19ab8aacfa2 SHA256 c5067b8a712d29987d3067496174f525312f3162c7f83993f61669ad852a6017
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm4pgUACgkQkKaRLQcq0GKZXgCglkN5Wtj9ntPq21aXM0iwp0zY
-48AAniZUKMFRvSZ7JoSxxNuYgQR72hyd
-=k9Jh
+iEYEARECAAYFAknCjQAACgkQkKaRLQcq0GKv8gCfZjwcvxsyvMCbOgjmH712ijIr
+Z3AAniBHX8kaRLvSYGLXek3aXMszGzP7
+=pWUZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.22.2.ebuild b/media-gfx/graphviz/graphviz-2.22.2.ebuild
new file mode 100644
index 000000000000..5ac0cebba6d9
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.22.2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.22.2.ebuild,v 1.1 2009/03/19 18:18:29 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cairo 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[png?,jpeg?]
+	>=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[svg]
+	)
+	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-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
+#   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
+
+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
+
+	# 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() {
+	local myconf
+
+	# 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)
+		--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-digcola
+		--without-ipsepcola
+		--without-sfdp
+		--without-smyrna"
+
+	use gtk && myconf="${myconf} $(use_with gnome gnomeui)"
+
+	# 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
+	fi
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup
+	fi
+}