bug #142712 and bug #148733 fixed

Package-Manager: portage-2.1.2_pre1

4 files changed, 117 insertions, 15 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 869c4c20644b..14b8017a2854 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.91 2006/09/21 21:04:53 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.92 2006/09/24 06:34:57 lu_zero Exp $
+
+*graphviz-2.8-r2 (24 Sep 2006)
+
+  24 Sep 2006; Luca Barbato <lu_zero@gentoo.org> +graphviz-2.8-r2.ebuild:
+  fix libtool/autotools deps and language binding bug #142712 and bug #148733,
+  thanks to the respective reporters
 
 *graphviz-2.8-r1 (21 Sep 2006)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index a21bb17a4e02..ce6d5e016955 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdgen.c.patch 756 RMD160 b7ce39a4f82362974a7815a1fea24a6aa7be6c7d SHA1 4138a9beb80d854a857368d751521e37c2f8358f SHA256 13da476f3aa8aca5c96ebe82308a937a4391815f3d9bd768ad08cadc8218f6b7
 MD5 5e8726d7d859188692efcfe9e9155761 files/gdgen.c.patch 756
 RMD160 b7ce39a4f82362974a7815a1fea24a6aa7be6c7d files/gdgen.c.patch 756
@@ -95,14 +92,18 @@ EBUILD graphviz-2.8-r1.ebuild 1956 RMD160 1d473161a154c5509786e0ae3c758048ee50d8
 MD5 075667ea1426d8a96684591a9476c1c8 graphviz-2.8-r1.ebuild 1956
 RMD160 1d473161a154c5509786e0ae3c758048ee50d87c graphviz-2.8-r1.ebuild 1956
 SHA256 96acaee82094127549ed364cc18fc7916ee72b8e39d192661b41422c9b8514b6 graphviz-2.8-r1.ebuild 1956
+EBUILD graphviz-2.8-r2.ebuild 2453 RMD160 19f873157176d7229a8451ec94fe3f1a6264e89f SHA1 0ada1520b4ef2c794b53c77097678f87b19e7903 SHA256 865382a55eeed8a1bf5a614868df87b73a1b6e32312d06742496488951db70cd
+MD5 7a432a2cd10c4bdca31ad63b8f5196f5 graphviz-2.8-r2.ebuild 2453
+RMD160 19f873157176d7229a8451ec94fe3f1a6264e89f graphviz-2.8-r2.ebuild 2453
+SHA256 865382a55eeed8a1bf5a614868df87b73a1b6e32312d06742496488951db70cd graphviz-2.8-r2.ebuild 2453
 EBUILD graphviz-2.8.ebuild 1943 RMD160 98d05f169d55c18852dcb355165f88cee125dca8 SHA1 263ff02a2f64d27abf4bcd8b3e810415967731dd SHA256 8995bf0e076a8b30d15581f85de02242bc5076d31da9f784c30b9c8b0589edea
 MD5 057a4c1c77c66ba42238a67ea8df7ce1 graphviz-2.8.ebuild 1943
 RMD160 98d05f169d55c18852dcb355165f88cee125dca8 graphviz-2.8.ebuild 1943
 SHA256 8995bf0e076a8b30d15581f85de02242bc5076d31da9f784c30b9c8b0589edea graphviz-2.8.ebuild 1943
-MISC ChangeLog 13548 RMD160 a216e3b5e4e69c10e42e1a56dd39d5c005263720 SHA1 0d607b8d32918e47926e1012e8a271d33ca61c0f SHA256 76fab12af72b2809a61d868f50535d2414a4e65880e2ff8686c4ef992d23b9e7
-MD5 5a647fad85afa211200d10940b382189 ChangeLog 13548
-RMD160 a216e3b5e4e69c10e42e1a56dd39d5c005263720 ChangeLog 13548
-SHA256 76fab12af72b2809a61d868f50535d2414a4e65880e2ff8686c4ef992d23b9e7 ChangeLog 13548
+MISC ChangeLog 13774 RMD160 ca182b3de3e8b8de1648eb0411a5d2ee050fd42c SHA1 fc0ff79850412da1ad23dc28eb73dca7a8df443c SHA256 bb75dcd4eef3e776478ad2dfec865cb257d3673461345be5a91f2a7983906e90
+MD5 f716605811afd3fb6fa32ee4e19999c3 ChangeLog 13774
+RMD160 ca182b3de3e8b8de1648eb0411a5d2ee050fd42c ChangeLog 13774
+SHA256 bb75dcd4eef3e776478ad2dfec865cb257d3673461345be5a91f2a7983906e90 ChangeLog 13774
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -146,10 +147,6 @@ SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/di
 MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r1 241
 RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r1 241
 SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFFOg4amhnQswr0vIRAv/+AJ4tkBEOYd8ocq4qPedLUvJ5gUoeigCeMuPi
-xQEAgvEgWMb92c8LVLjGIdA=
-=W0R8
------END PGP SIGNATURE-----
+MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r2 241
+RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r2 241
+SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r2 241
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.8-r2 b/media-gfx/graphviz/files/digest-graphviz-2.8-r2
new file mode 100644
index 000000000000..7b7f660f37dd
--- /dev/null
+++ b/media-gfx/graphviz/files/digest-graphviz-2.8-r2
@@ -0,0 +1,3 @@
+MD5 ca921b4a9bcd86da4a1092bb17a57d83 graphviz-2.8.tar.gz 4243130
+RMD160 d3b46e9777e9db5ead4fdf5274c6bd10823fe4cd graphviz-2.8.tar.gz 4243130
+SHA256 be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca graphviz-2.8.tar.gz 4243130
diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
new file mode 100644
index 000000000000..bdc226cd5c91
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.1 2006/09/24 06:34:57 lu_zero Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils libtool autotools
+
+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 hppa ia64 ppc ~ppc-macos ppc64 s390 sparc x86 ~x86-fbsd"
+IUSE="cairo tcltk X static minimal guile java lua perl php python ruby ocaml"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+	>=media-libs/libpng-1.2
+	>=media-libs/jpeg-6b
+	media-libs/gd
+	media-libs/freetype
+	media-libs/fontconfig
+	dev-libs/expat
+	sys-libs/zlib
+	tcltk? ( >=dev-lang/tk-8.3 >=dev-lang/tcl-8.3 )
+	cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
+	guile? ( dev-util/guile )
+	java? ( virtual/jdk )
+	perl? ( dev-lang/perl )
+	ocaml? ( dev-lang/ocaml )
+	lua? ( dev-lang/lua )
+	php? ( dev-lang/php )
+	python? ( dev-lang/python )
+	ruby? ( dev-lang/ruby )
+	X? ( || (
+	    ( x11-libs/libXaw x11-libs/libXpm )
+	virtual/x11 )
+	)
+	sys-devel/libtool"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!minimal? ( dev-lang/swig )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-notcl.patch || die "epatch failed"
+
+	elibtoolize
+	eautoreconf
+}
+
+src_compile() {
+	local my_conf
+	use minimal && my_conf="${my_conf} --disable-swig"
+	econf ${my_conf}  \
+		--disable-dependency-tracking \
+		$(use_enable static) \
+		$(use_with tcltk tcl) \
+		$(use_with tcltk tk) \
+		$(use_enable guile) \
+		$(use_enable java) \
+		$(use_enable lua) \
+		$(use_enable ocaml) \
+		$(use_enable perl) \
+		$(use_enable php) \
+		$(use_enable python) \
+		$(use_enable ruby) \
+		--disable-{sharp,io} \
+		$(use_with X x) || die "Configure Failed!"
+
+	LC_ALL=C emake || die "Compile Failed!"
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile
+	make 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 "Install Failed!"
+	if use minimal ; then
+	    rm -rf "${D}"usr/share/doc/${PF}/{pdf,html}
+	    rm -rf "${D}"usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
+	fi
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	dot -c
+}