Re-enabling the perl,python,ruby bindings, thanks to a patch written by dleverton

(Portage version: 2.1.2-r10)

3 files changed, 182 insertions, 12 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 229106967edb..4b3ed44fc2fe 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.111 2007/03/03 17:10:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.112 2007/03/05 08:04:45 dev-zero Exp $
+
+  05 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/graphviz-2.12-bindings.patch, graphviz-2.12.ebuild:
+  Re-enabling the perl,python,ruby bindings, thanks to a patch written by
+  dleverton
 
   03 Mar 2007; Tiziano Müller <dev-zero@gentoo.org> graphviz-2.12.ebuild:
   Added a sed-patch to nuke the dead binding-symlinks.
diff --git a/media-gfx/graphviz/files/graphviz-2.12-bindings.patch b/media-gfx/graphviz/files/graphviz-2.12-bindings.patch
new file mode 100644
index 000000000000..d5b3bde52700
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.12-bindings.patch
@@ -0,0 +1,153 @@
+--- configure.ac~	2007-03-04 20:20:30.000000000 +0000
++++ configure.ac	2007-03-04 20:20:39.000000000 +0000
+@@ -606,6 +606,7 @@
+   PERL_ARCHLIB=`$PERL -e 'use Config; print $Config{archlib};'`
+   PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
+   PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
++  PERL_INSTALL_DIR="`$PERL -e 'use Config; print $Config{vendorarch};'`"
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"
+   AC_CHECK_HEADER(EXTERN.h,,[
+@@ -616,6 +617,7 @@
+ fi
+ AC_SUBST(PERL_INCLUDES)
+ AC_SUBST(PERL_LIBS)
++AC_SUBST(PERL_INSTALL_DIR)
+ fi
+ fi
+ AM_CONDITIONAL(WITH_PERL, [test "x$PERL" != "x"])
+@@ -684,6 +686,7 @@
+     PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+     PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
+     PYTHON_LIBS="-L$PYTHON_PREFIX/lib$LIBPOSTFIX -lpython$PYTHON_VERSION_SHORT"
++    PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
+     save_CPPFLAGS=$CPPFLAGS
+     CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+     AC_CHECK_HEADER(Python.h,,[
+@@ -695,6 +698,7 @@
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ AC_SUBST(PYTHON_LIBS)
++AC_SUBST(PYTHON_INSTALL_DIR)
+ fi
+ fi
+ fi
+@@ -715,6 +719,7 @@
+ if test "x$RUBY" != "x"; then
+   RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
+   RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` -lruby"
++  RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
+   AC_CHECK_HEADER(ruby.h,,[
+@@ -725,6 +730,7 @@
+ fi
+ AC_SUBST(RUBY_INCLUDES)
+ AC_SUBST(RUBY_LIBS)
++AC_SUBST(RUBY_INSTALL_DIR)
+ fi
+ fi
+ fi
+--- tclpkg/gv/Makefile.am~	2007-03-04 21:22:38.000000000 +0000
++++ tclpkg/gv/Makefile.am	2007-03-04 21:23:24.000000000 +0000
+@@ -70,7 +70,7 @@
+ gv_ocaml.cpp $(OCAML_hdr): gv.i
+ 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
+ 
+-pkgperldir = $(pkglibdir)/perl
++pkgperldir = @PERL_INSTALL_DIR@
+ PERL_hdr = gv.pm
+ nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_hdr)
+ libgv_perl_la_SOURCES = $(BASESOURCES)
+@@ -88,7 +88,7 @@
+ gv_php.cpp $(PHP_hdr): gv.i
+ 	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
+ 
+-pkgpythondir = $(pkglibdir)/python
++pkgpythondir = @PYTHON_INSTALL_DIR@
+ PYTHON_hdr = gv.py
+ nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_hdr)
+ libgv_python_la_SOURCES = $(BASESOURCES)
+@@ -97,7 +97,7 @@
+ gv_python.cpp $(PYTHON_hdr): gv.i
+ 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
+ 
+-pkgrubydir = $(pkglibdir)/ruby
++pkgrubydir = @RUBY_INSTALL_DIR@
+ RUBY_hdr = 
+ nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_hdr)
+ libgv_ruby_la_SOURCES = $(BASESOURCES)
+@@ -118,6 +118,7 @@
+ pkginclude_DATA = gv.i gv.cpp
+ pkglib_LTLIBRARIES = 
+ TESTS =
++mann_MANS =
+ if WITH_SWIG
+ if WITH_SHARP
+ pkgsharp_DATA = $(SHARP_hdr) gv_sharp.man
+@@ -150,9 +151,11 @@
+ TESTS += test_ocaml
+ endif
+ if WITH_PERL
+-pkgperl_DATA = $(PERL_hdr) gv_perl.man
++pkgperl_DATA = $(PERL_hdr)
++if WITH_TCL
++mann_MANS += gv_perl.man
++endif
+ pkgperl_LTLIBRARIES = libgv_perl.la
+-TESTS += test_perl
+ endif
+ if WITH_PHP
+ pkgphp_DATA = $(PHP_hdr) gv_php.man
+@@ -160,19 +163,21 @@
+ TESTS += test_php
+ endif
+ if WITH_PYTHON
+-pkgpython_DATA = $(PYTHON_hdr) gv_python.man
++pkgpython_DATA = $(PYTHON_hdr)
++if WITH_TCL
++mann_MANS += gv_python.man
++endif
+ pkgpython_LTLIBRARIES = libgv_python.la
+-TESTS += test_python
+ endif
+ if WITH_RUBY
+-pkgruby_DATA = $(RUBY_hdr) gv_ruby.man
++if WITH_TCL
++mann_MANS += gv_ruby.man
++endif
+ pkgruby_LTLIBRARIES = libgv_ruby.la
+-TESTS += test_ruby
+ endif
+ if WITH_TCL
+ pkgtcl_DATA = $(TCL_hdr) gv_tcl.man
+ pkgtcl_LTLIBRARIES = libgv_tcl.la
+-TESTS += test_tcl
+ 
+ all-local: pkgIndex.tcl
+ 
+@@ -192,11 +197,21 @@
+ endif
+ 
+ install-data-hook:
++if WITH_LUA
+ 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
+-	(cd $(DESTDIR)$(pkgperldir);   rm -f gv.so;  $(LN_S) libgv_perl.so gv.so;)
+-	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
+-	(cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so;  $(LN_S) libgv_ruby.so gv.so;)
++endif
++if WITH_PERL
++	(cd $(DESTDIR)$(pkgperldir);   rm -f gv.so libgv_perl.so libgv_perl.so.0 libgv_perl.la;  mv libgv_perl.so.0.0.0 gv.so;)
++endif
++if WITH_PYTHON
++	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so libgv_python.so libgv_python.so.0 libgv_python.la; mv libgv_python.so.0.0.0 _gv.so;)
++endif
++if WITH_RUBY
++	(cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so libgv_ruby.so libgv_ruby.so.0 libgv_ruby.la;  mv libgv_ruby.so.0.0.0 gv.so;)
++endif
++if WITH_TCL
+ 	(cd $(DESTDIR)$(pkgtcldir);    rm -f gv.so;  $(LN_S) libgv_tcl.so gv.so;)
++endif
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;)
\ No newline at end of file
diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild
index 8f44fa68cdec..312be0dcfb22 100644
--- a/media-gfx/graphviz/graphviz-2.12.ebuild
+++ b/media-gfx/graphviz/graphviz-2.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.8 2007/03/03 17:10:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.9 2007/03/05 08:04:45 dev-zero Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
 
-inherit eutils autotools multilib
+inherit eutils autotools multilib python
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -14,7 +14,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 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="doc examples gnome gtk nls pango X tcl tk"
+IUSE="doc examples gnome gtk nls pango perl python ruby X tcl tk"
 
 RDEPEND=">=media-libs/gd-2.0.28
 	>=sys-libs/zlib-1.2.3
@@ -28,12 +28,18 @@ RDEPEND=">=media-libs/gd-2.0.28
 	pango? ( x11-libs/pango )
 	gnome? ( gnome-base/libgnomeui )
 	gtk? ( >=x11-libs/gtk+-2 )
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	ruby? ( dev-lang/ruby )
 	X? ( x11-libs/libXaw x11-libs/libXpm )
 	tcl? ( >=dev-lang/tcl-8.3 )
 	tk? ( >=dev-lang/tk-8.3 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
 	tcl? ( dev-lang/swig )"
 
 # Dependency description / Maintainer-Info:
@@ -58,8 +64,7 @@ DEPEND="${RDEPEND}
 # - python (enabled via python) *1
 # - ruby (enabled via ruby) *1
 # - tcl (enabled via tcl)
-# *1 = Bindings build, but should be installed to /usr/lib/python2.x/site-packages
-#      rather than /usr/lib/graphviz/python (the same goes for ruby, ...)
+# *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)
 
@@ -85,6 +90,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-notcl.patch"
 	epatch "${FILESDIR}/${P}-find-system-libgd.patch"
 	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch "${FILESDIR}/${P}-bindings.patch"
 
 	sed -i \
 		-e 's:LC_COLLATE=C:LC_ALL=C:g' \
@@ -111,9 +117,6 @@ src_unpack() {
 	# Nuke the dead symlinks for the bindings
 	sed -i \
 		-e '/$(pkgluadir)/d' \
-		-e '/$(pkgperldir)/d' \
-		-e '/$(pkgpythondir)/d' \
-		-e '/$(pkgrubydir)/d' \
 		tclpkg/gv/Makefile.am || die "sed failed"
 
 	eautoreconf
@@ -142,10 +145,10 @@ src_compile() {
 		--disable-java \
 		--disable-ocaml \
 		--disable-lua \
-		--disable-perl \
+		$(use_enable perl) \
 		--disable-php \
-		--disable-python \
-		--disable-ruby \
+		$(use_enable python) \
+		$(use_enable ruby) \
 		$(use_with gtk) \
 		$(use_with pango pangocairo) \
 		${myconf} \
@@ -176,4 +179,13 @@ 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
 }