# 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
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX graphviz-1.16-build.patch 6200 RMD160 63a72f5776f55321a677524cc9be59e278578366 SHA1 362a7f013a8aea313b0745b65689de43d351d447 SHA256 30e792d61416121692fd7cd1baa856ba2ab724dfe00bd56ff676bead07274e2d
MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
RMD160 63a72f5776f55321a677524cc9be59e278578366 files/graphviz-1.16-build.patch 6200
MD5 3dcab6b1ffd0469fd6614a8ea4458366 files/graphviz-1.16-tempdir.patch 1091
RMD160 0c36178e3eca92e7dc6737a4ef646b57e21e57d8 files/graphviz-1.16-tempdir.patch 1091
SHA256 a1d25ed0a81a88f912b6d9614b98154e1379cf7f8182fb566ec45e71e3bf3592 files/graphviz-1.16-tempdir.patch 1091
+AUX graphviz-2.12-configure.patch 856 RMD160 3d1fe3d11498629bb7738d5219a824857830a5e9 SHA1 d420c55e28bbcdbf030ff203f0581b40bbceca3e SHA256 660a8df758487f21810e6d7fa647221d4443463eca2c2053399b2e782b208348
+MD5 5908e21d9ea76638434886a1100bc671 files/graphviz-2.12-configure.patch 856
+RMD160 3d1fe3d11498629bb7738d5219a824857830a5e9 files/graphviz-2.12-configure.patch 856
+SHA256 660a8df758487f21810e6d7fa647221d4443463eca2c2053399b2e782b208348 files/graphviz-2.12-configure.patch 856
AUX graphviz-2.12-find-system-libgd.patch 379 RMD160 0e9fc08b07c038986955353f7063fd954e70b5ab SHA1 b1a6f1f950a0e7484960f6604e9b0d9469e71633 SHA256 b578b083ae55b959f6aac0208296aaa5513627802441e5a4a79ed4f09d26ccb8
MD5 5efafec83eb084e094f3dd1c04dab48e files/graphviz-2.12-find-system-libgd.patch 379
RMD160 0e9fc08b07c038986955353f7063fd954e70b5ab files/graphviz-2.12-find-system-libgd.patch 379
SHA256 b578b083ae55b959f6aac0208296aaa5513627802441e5a4a79ed4f09d26ccb8 files/graphviz-2.12-find-system-libgd.patch 379
-AUX graphviz-2.12-notcl.patch 618 RMD160 6e0cbfce1b5f8100fa14a6b5ada48320cb3c2603 SHA1 e78d6ac336ce5e692b03920d0fc7b51422a87879 SHA256 ec3f1a9d303dcf42bebe8216ef4bfb4fc4928648af1a8de0b777aec61e2b741a
-MD5 df0712acd095e54ef9f3bba115a52205 files/graphviz-2.12-notcl.patch 618
-RMD160 6e0cbfce1b5f8100fa14a6b5ada48320cb3c2603 files/graphviz-2.12-notcl.patch 618
-SHA256 ec3f1a9d303dcf42bebe8216ef4bfb4fc4928648af1a8de0b777aec61e2b741a files/graphviz-2.12-notcl.patch 618
+AUX graphviz-2.12-notcl.patch 642 RMD160 69410279e9349670cbc590f5796092dca49e067e SHA1 9ebf6c41ad1b20f14a0eb05f68968e600306ac42 SHA256 708ad5531ca4342213728e609ab3c28b15912743c8faf412d102ffadc7d2f478
+MD5 34a282256f96861fe9334ca122545e44 files/graphviz-2.12-notcl.patch 642
+RMD160 69410279e9349670cbc590f5796092dca49e067e files/graphviz-2.12-notcl.patch 642
+SHA256 708ad5531ca4342213728e609ab3c28b15912743c8faf412d102ffadc7d2f478 files/graphviz-2.12-notcl.patch 642
AUX graphviz-2.6-macos.patch 2074 RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 SHA1 be35a5edd118bef2c9c54ac3d81e2a5871c32316 SHA256 038b4f20837661519f84eccfe7e6e66f8b5bb2afa48403347fa9ae7067933281
MD5 ef70bc2df3a59b497609b809787e6ea3 files/graphviz-2.6-macos.patch 2074
RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 files/graphviz-2.6-macos.patch 2074
MD5 054c435dd77aa5b94fdaae88f83140f6 graphviz-1.16-r1.ebuild 2128
RMD160 206e1c95874235517ad621d7a5ca93751b658433 graphviz-1.16-r1.ebuild 2128
SHA256 d0e254b507965e6853ed2489e087202dc04d90c32a97aba740cdefd56b651a56 graphviz-1.16-r1.ebuild 2128
-EBUILD graphviz-2.12.ebuild 3249 RMD160 e1a10ab3b6db04019348786d08b222a0beb327e9 SHA1 4670a5b76052ce3edd5aa1287a6c3858b050a22b SHA256 d224c4b7c6e28967d67a4fdb91ac3cf3d50ae4b88f9f15a170731c8e3cfb331c
-MD5 8d4f4c92842d6b92dd54b82e3f9094e2 graphviz-2.12.ebuild 3249
-RMD160 e1a10ab3b6db04019348786d08b222a0beb327e9 graphviz-2.12.ebuild 3249
-SHA256 d224c4b7c6e28967d67a4fdb91ac3cf3d50ae4b88f9f15a170731c8e3cfb331c graphviz-2.12.ebuild 3249
+EBUILD graphviz-2.12.ebuild 4865 RMD160 66a3ad9e9b90bf87121db022d4128a6dbc9c0d0e SHA1 d5e9fd20b40b038104f31b74cca5d285e5a9f19d SHA256 0c14ae9c74974e0530c114af9045a7bad770138cfd15eea44bece5be8404047a
+MD5 7167d5ac84e185004ecf6e205ae327cd graphviz-2.12.ebuild 4865
+RMD160 66a3ad9e9b90bf87121db022d4128a6dbc9c0d0e graphviz-2.12.ebuild 4865
+SHA256 0c14ae9c74974e0530c114af9045a7bad770138cfd15eea44bece5be8404047a graphviz-2.12.ebuild 4865
EBUILD graphviz-2.6-r1.ebuild 1638 RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 SHA1 e1f0b5296e700d5974ce136d73c740b4d287f38c SHA256 37a43a33bd0a53d4053634066f3c99183d665c343d3601d733b25dcac7bc25da
MD5 308666689ed931d9984235894a7e5319 graphviz-2.6-r1.ebuild 1638
RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 graphviz-2.6-r1.ebuild 1638
MD5 46e9a9ef05dcef5fcd74e2ff86b0e284 graphviz-2.8-r2.ebuild 2715
RMD160 3b893a3bf91d1d8ce2588f996d7a5b7788b2c984 graphviz-2.8-r2.ebuild 2715
SHA256 eb3b2d4721e562c7e9df547beac64400f6bc1de2dc8a04a777cb621deccc3bec graphviz-2.8-r2.ebuild 2715
-MISC ChangeLog 16419 RMD160 d4b8b142b902e9f823ad3a520d6be3d59217dec8 SHA1 ebb42252c6dfeca01dfb5d7aa6b17db4821b6098 SHA256 160d7936551243315d72c69cfb74f76cd2e279bcee3eb9245630a225bf0b0f53
-MD5 c02a3da34c061481613e18f2503f46f1 ChangeLog 16419
-RMD160 d4b8b142b902e9f823ad3a520d6be3d59217dec8 ChangeLog 16419
-SHA256 160d7936551243315d72c69cfb74f76cd2e279bcee3eb9245630a225bf0b0f53 ChangeLog 16419
+MISC ChangeLog 16690 RMD160 0ca328086a0c5e309488c631233f8ea46d8b2984 SHA1 1065e8fb2c54c874d71391c8f1d021dca0d3937c SHA256 71b120e0b4f00f5c9019fa8a38bdaa64636a7b487e70017dbab2f414e57d1183
+MD5 c04a689b224de71128bf12ace241588a ChangeLog 16690
+RMD160 0ca328086a0c5e309488c631233f8ea46d8b2984 ChangeLog 16690
+SHA256 71b120e0b4f00f5c9019fa8a38bdaa64636a7b487e70017dbab2f414e57d1183 ChangeLog 16690
MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF2x9r8bi6rjpTunYRApnFAKCL2g8zWOnGqQFs6T3TP5ctE8NZSQCgpuUp
-ruK+Z2TupnffeVuv5EKdJ4E=
-=ZTmD
------END PGP SIGNATURE-----
--- /dev/null
+--- 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 -----------------------------------
---- 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 $@
# 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
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
>=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
}
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
}
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() {
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
}
projects / gentoo.git / commitdiff