added notcl patch and minimal use flag

Package-Manager: portage-2.1_rc2-r3

4 files changed, 45 insertions, 14 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index ee8559d13241..2fea21f4edb4 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # 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.80 2006/05/28 09:20:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.81 2006/05/29 08:51:13 nerdboy Exp $
+
+  29 May 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/graphviz-2.8-notcl.patch, graphviz-2.8.ebuild:
+  Added notcl patch and minimal use flag.
 
   28 May 2006; Steve Arnold <nerdboy@gentoo.org> graphviz-2.4.ebuild,
   graphviz-2.6.ebuild, graphviz-2.6-r1.ebuild, graphviz-2.8.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2e1140424da0..728efb363e03 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -30,6 +30,10 @@ AUX graphviz-2.6-no-undefined.patch 1900 RMD160 575859663ab93c8333ce1bc9df613ccd
 MD5 b208c7d4ddd47dc60e3e1b5bb78e8bfd files/graphviz-2.6-no-undefined.patch 1900
 RMD160 575859663ab93c8333ce1bc9df613ccda2fd2cbf files/graphviz-2.6-no-undefined.patch 1900
 SHA256 089f27476e30f0cc376e852195a6193a8b6d22a9e5a01aff75f982f29532fccd files/graphviz-2.6-no-undefined.patch 1900
+AUX graphviz-2.8-notcl.patch 597 RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a SHA1 1e4d7f8d7f4637162e033ffc74c30de66774c48a SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8
+MD5 65a1e6939d49ecf72fb450be96465fde files/graphviz-2.8-notcl.patch 597
+RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a files/graphviz-2.8-notcl.patch 597
+SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8 files/graphviz-2.8-notcl.patch 597
 DIST graphviz-1.10.tar.gz 3357416 RMD160 2cccc756d4156936d32659e77348238d8e9ac49c SHA1 ddb54a6050800837c8dd6613676ff17bf31d5e4b SHA256 2400b786c605d8b022b52767038942f93494b0239da1d5541c7b5394207753a0
 DIST graphviz-1.12-configure.ac.bz2 7502 RMD160 976c94a596a3b991f7e247cbcdfe23772387dea6 SHA1 1312bf9d28e271c5b8a5850b5dc8e63877ea7e31 SHA256 d03368f0cb81e05dd200735dbd90b355518cd1c9ed2681b80e10a8ab147a70af
 DIST graphviz-1.12.tar.gz 3371279 RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 SHA1 78f56aaa92f5d58436e5bb5bafd18bb09e04e2d0 SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e
@@ -84,14 +88,14 @@ EBUILD graphviz-2.6.ebuild 1569 RMD160 06b9e7d6c784d2520b6f3c8d00575c17d5f13e27
 MD5 9e8dbaa982649ef17c3e8ac3ed4ade1d graphviz-2.6.ebuild 1569
 RMD160 06b9e7d6c784d2520b6f3c8d00575c17d5f13e27 graphviz-2.6.ebuild 1569
 SHA256 7bad565a5ae2c0597115281236fbd99427e2a7f2594276eb365a588ece032eb2 graphviz-2.6.ebuild 1569
-EBUILD graphviz-2.8.ebuild 1657 RMD160 aac2ed359293d503c3adbe7009f3052ceb613d7b SHA1 03a3a8cfcdec44d5d48f84296f20274a191e15e1 SHA256 754198e7187f55892178abc103f66cfe87a67ac225c31a5d423ef4775ccd0549
-MD5 8ef60aa26823703fc5b158ba898ac622 graphviz-2.8.ebuild 1657
-RMD160 aac2ed359293d503c3adbe7009f3052ceb613d7b graphviz-2.8.ebuild 1657
-SHA256 754198e7187f55892178abc103f66cfe87a67ac225c31a5d423ef4775ccd0549 graphviz-2.8.ebuild 1657
-MISC ChangeLog 12267 RMD160 7dbfaa12fafb615da0ab9021dda21242ffad305c SHA1 be93b7ce1e98508c2174c17497905897cefea6bc SHA256 b70daba661cf3efa4e4dc0fc0aebef528f1dceec25c1c77c0f61cc9571201d8f
-MD5 31f8ddb429de0d14dd4dfca1e9f0ae50 ChangeLog 12267
-RMD160 7dbfaa12fafb615da0ab9021dda21242ffad305c ChangeLog 12267
-SHA256 b70daba661cf3efa4e4dc0fc0aebef528f1dceec25c1c77c0f61cc9571201d8f ChangeLog 12267
+EBUILD graphviz-2.8.ebuild 1950 RMD160 5acfc2de134b707d355e02a52dece58e0a5e3107 SHA1 18f4676c50b0351493c0883e58d1a215085aec07 SHA256 130308ca2dacfb7d4a9b1363cd6409afca01f284f8de510dbbac72d947057301
+MD5 73facb1158185211c88f1c31b49c5c8a graphviz-2.8.ebuild 1950
+RMD160 5acfc2de134b707d355e02a52dece58e0a5e3107 graphviz-2.8.ebuild 1950
+SHA256 130308ca2dacfb7d4a9b1363cd6409afca01f284f8de510dbbac72d947057301 graphviz-2.8.ebuild 1950
+MISC ChangeLog 12415 RMD160 f1ed781b172625cb23b671d045a9e400120bc911 SHA1 a9603a91ed392ae925b846b9d72e039ab1b0dfe4 SHA256 0d96bc17f990d9ec372b00c32f3b91047bc402c78bbb46a4f2fd94d9115f84e0
+MD5 7ac4c2459216e3f9c93dfb525a229562 ChangeLog 12415
+RMD160 f1ed781b172625cb23b671d045a9e400120bc911 ChangeLog 12415
+SHA256 0d96bc17f990d9ec372b00c32f3b91047bc402c78bbb46a4f2fd94d9115f84e0 ChangeLog 12415
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
diff --git a/media-gfx/graphviz/files/graphviz-2.8-notcl.patch b/media-gfx/graphviz/files/graphviz-2.8-notcl.patch
new file mode 100644
index 000000000000..9937bcefa8e4
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.8-notcl.patch
@@ -0,0 +1,15 @@
+--- graphviz-2.8-old/tclpkg/gv/Makefile.am	2006-05-28 20:02:32.000000000 +0300
++++ graphviz-2.8/tclpkg/gv/Makefile.am	2006-05-28 20:17:05.000000000 +0300
+@@ -170,7 +170,12 @@
+ gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
+ gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
+ gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
++if WITH_TCL	
+ 	tclsh ./gv_doc_writer.tcl
++else
++	echo "Not building man pages as they would require tcl"
++	touch $@
++endif
+ 
+ install-data-hook:
+ 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
diff --git a/media-gfx/graphviz/graphviz-2.8.ebuild b/media-gfx/graphviz/graphviz-2.8.ebuild
index 0a58becfd963..0d3518b8c68c 100644
--- a/media-gfx/graphviz/graphviz-2.8.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2006/05/28 09:20:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8.ebuild,v 1.5 2006/05/29 08:51:13 nerdboy Exp $
 
 inherit eutils libtool
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo tcltk X static"
+IUSE="cairo tcltk X static minimal"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.2
@@ -30,17 +30,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-lang/swig"
+	!minimal? ( dev-lang/swig )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch ${FILESDIR}/${P}-notcl.patch || die "epatch failed"
+
 	elibtoolize
+	autoreconf -v --install --force
 }
 
 src_compile() {
 	local my_conf
-	use no-bindings && my_conf="${my_conf} --disable-swig"
+	use minimal && my_conf="${my_conf} --disable-swig"
 	econf ${my_conf}  \
 		--disable-dependency-tracking \
 		$(use_enable static) \
@@ -52,13 +55,18 @@ src_compile() {
 
 src_install() {
 	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile
-		make DESTDIR="${D}" \
+	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() {