diff options
Diffstat (limited to 'media-gfx/graphviz')
| -rw-r--r-- | media-gfx/graphviz/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/graphviz/files/graphviz-2.12-configure.patch | 27 | ||||
| -rw-r--r-- | media-gfx/graphviz/files/graphviz-2.12-notcl.patch | 7 | ||||
| -rw-r--r-- | media-gfx/graphviz/graphviz-2.12.ebuild | 138 |
4 files changed, 128 insertions, 52 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog index 9a603209474c..a83de59f376d 100644 --- a/media-gfx/graphviz/ChangeLog +++ b/media-gfx/graphviz/ChangeLog @@ -1,6 +1,12 @@ # 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.109 2007/02/20 16:17:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.110 2007/03/03 12:00:15 dev-zero Exp $ + + 03 Mar 2007; Tiziano Müller <dev-zero@gentoo.org> + +files/graphviz-2.12-configure.patch, files/graphviz-2.12-notcl.patch, + graphviz-2.12.ebuild: + Dropped all bindings except the one for tcl since it is needed for the tools + to work. Cleanups and documentation. 19 Feb 2007; Chris Bainbridge <chrb@gentoo.org> graphviz-2.12.ebuild: Remove AM_ICONV macro from configure on non-nls builds, bug #155791 diff --git a/media-gfx/graphviz/files/graphviz-2.12-configure.patch b/media-gfx/graphviz/files/graphviz-2.12-configure.patch new file mode 100644 index 000000000000..bdad04225445 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.12-configure.patch @@ -0,0 +1,27 @@ +--- configure.ac.orig 2007-02-17 22:39:20.000000000 +0100 ++++ configure.ac 2007-02-17 22:41:17.000000000 +0100 +@@ -1255,6 +1255,16 @@ + dnl ----------------------------------- + dnl INCLUDES and LIBS for GNOMEUI. + ++AC_ARG_WITH(gtk, ++ [AC_HELP_STRING([--with-gnomeui], ++ [use gnomeui library])]) ++ ++### default is to build with gtk+ ++if test "x$with_gnomeui" != "xno"; then ++ with_gnomeui=yes ++fi ++ ++if test "x$with_gnomeui" = "xyes"; then + PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0], + [HAVE_GNOMEUI=1 + AC_DEFINE_UNQUOTED(HAVE_GNOMEUI,1, +@@ -1262,6 +1272,7 @@ + [AC_MSG_WARN(gnomeui library not available. using alternate code for firefox interaction)]) + AC_SUBST(GNOMEUI_CFLAGS) + AC_SUBST(GNOMEUI_LIBS) ++fi + AM_CONDITIONAL(WITH_GNOMEUI, [test "x$HAVE_GNOMEUI" != "x"]) + + dnl ----------------------------------- diff --git a/media-gfx/graphviz/files/graphviz-2.12-notcl.patch b/media-gfx/graphviz/files/graphviz-2.12-notcl.patch index 834a9a04240e..f409bc6d200b 100644 --- a/media-gfx/graphviz/files/graphviz-2.12-notcl.patch +++ b/media-gfx/graphviz/files/graphviz-2.12-notcl.patch @@ -1,11 +1,12 @@ ---- graphviz-2.12/tclpkg/gv/Makefile.am.old 2007-02-12 12:26:18.000000000 +0900 -+++ graphviz-2.12/tclpkg/gv/Makefile.am 2007-02-12 12:31:29.000000000 +0900 +--- tclpkg/gv/Makefile.am.orig 2007-02-17 22:48:51.000000000 +0100 ++++ tclpkg/gv/Makefile.am 2007-02-17 22:50:31.000000000 +0100 @@ -184,7 +184,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 +- tclsh $(srcdir)/gv_doc_writer.tcl "$(srcdir)" +if WITH_TCL - tclsh $(srcdir)/gv_doc_writer.tcl "$(srcdir)" ++ $(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)" +else + echo "Not building man pages as they would require tcl" + touch $@ diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild index 113e64a95125..9ff0fd9ea7c2 100644 --- a/media-gfx/graphviz/graphviz-2.12.ebuild +++ b/media-gfx/graphviz/graphviz-2.12.ebuild @@ -1,6 +1,6 @@ # 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.6 2007/02/19 18:47:35 chrb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.7 2007/03/03 12:00:15 dev-zero Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -14,10 +14,9 @@ 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="cairo doc examples gtk tcl tk X guile java lua pango perl php python ruby ocaml nls" +IUSE="doc examples gnome gtk nls pango X tcl tk" -RDEPEND=" - >=media-libs/gd-2.0.28 +RDEPEND=">=media-libs/gd-2.0.28 >=sys-libs/zlib-1.2.3 >=media-libs/freetype-2.1.3 >=media-libs/libpng-1.2.5 @@ -25,39 +24,57 @@ RDEPEND=" >=dev-libs/expat-1.95.5 dev-libs/glib virtual/libiconv - sys-devel/libtool media-libs/fontconfig - cairo? ( >=x11-libs/libsvg-cairo-0.1.3 ) pango? ( x11-libs/pango ) + gnome? ( gnome-base/libgnomeui ) gtk? ( >=x11-libs/gtk+-2 ) + X? ( x11-libs/libXaw x11-libs/libXpm ) tcl? ( >=dev-lang/tcl-8.3 ) - tk? ( >=dev-lang/tk-8.3 ) - guile? ( dev-scheme/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 )" + tk? ( >=dev-lang/tk-8.3 )" DEPEND="${RDEPEND} dev-util/pkgconfig - tcl? ( dev-lang/swig ) - guile? ( dev-lang/swig ) - java? ( dev-lang/swig ) - perl? ( dev-lang/swig ) - ocaml? ( >=dev-lang/swig-1.3.31 ) - lua? ( >=dev-lang/swig-1.3.31 ) - php? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig )" + tcl? ( dev-lang/swig )" + +# Dependency description / Maintainer-Info: + +# Rendering is done via the following plugins (/plugins): +# - core, dot_layout, neato_layout, gd (the ones which are always compiled in, depend on zlib, gd) +# - gtk (depends on gtk-2, cairo, libX11, gtk-2 depends on cairo and libX11 as well) +# - ming ( depends on ming-3.0 which is still p.masked) +# - pango ( depends on pango and cairo, but pango depends on cairo as well) +# - xlib ( depends on libX11, Xrender AND pango, can make use of gnomeui and inotify support) +# - ming ( depends on ming-3 which is still masked, ?) + +# 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 = Bindings build, but should be installed to /usr/lib/python2.x/site-packages +# rather than /usr/lib/graphviz/python (the same goes for ruby, ...) +# *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 pkg_setup() { - if use guile && has_version '>=dev-scheme/guile-1.8' && \ - ! built_with_use dev-scheme/guile deprecated; then - die "dev-scheme/guile must be built with deprecated" + if use tcl && ! built_with_use dev-lang/swig tcl ; then + eerror "SWIG has to be built with tcl support." + die "Missing tcl USE-flag for dev-lang/swig" fi } @@ -67,13 +84,26 @@ src_unpack() { epatch "${FILESDIR}/${P}-notcl.patch" epatch "${FILESDIR}/${P}-find-system-libgd.patch" + epatch "${FILESDIR}/${P}-configure.patch" sed -i \ -e 's:LC_COLLATE=C:LC_ALL=C:g' \ lib/common/Makefile.* || die "sed failed" # bug 134834 - # Make sure SWIG interface is rebuilt - touch tclpkg/gv/gv.i + # 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' + fi + + # This is an old version of libtool + rm -rf libltdl + sed -i -e '/libltdl/d' \ + configure.ac || die "sed failed" # no nls, no gettext, no iconv macro, so disable it use nls || sed -i '/^AM_ICONV/d' configure.ac @@ -82,27 +112,38 @@ src_unpack() { } src_compile() { - # Ming 3.0 is needed but still masked + # If we want pango, we need --with-x, otherwise + # nothing gets built. Dependencies should be ok. + local myconf="" + if use X || use pango ; then + myconf="--with-x" + else + myconf="--without-x" + fi + econf \ - --disable-dependency-tracking \ + --enable-ltdl \ --with-libgd \ + --with-digcola \ + --with-ipsepcola \ --without-ming \ - $(use_with pango pangocairo) \ - $(use_with gtk) \ + --disable-{sharp,io} \ $(use_enable tcl) \ $(use_enable 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!" - emake || die "Compile Failed!" + --disable-guile \ + --disable-java \ + --disable-ocaml \ + --disable-lua \ + --disable-perl \ + --disable-php \ + --disable-python \ + --disable-ruby \ + $(use_with gtk) \ + $(use_with pango pangocairo) \ + ${myconf} \ + $(use_with gnome gnomeui) \ + || die "econf failed" + emake || die "emake failed" } src_install() { @@ -116,14 +157,15 @@ src_install() { htmlinfodir=/usr/share/doc/${PF}/html/info \ pdfdir=/usr/share/doc/${PF}/pdf \ pkgconfigdir=/usr/$(get_libdir)/pkgconfig \ - install || die "Install Failed!" + install || die "emake install failed" - use doc || rm -rf "${D}/usr/share/doc/${PF}"/{pdf,html} 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 } |