initial commit of 2.28 with empty keywords while testing ensues

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 358 insertions, 8 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 9ee7747a0b7e..66b3739f8142 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.244 2012/05/12 04:08:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.245 2012/05/23 19:20:08 axs Exp $
+
+*graphviz-2.28.0 (23 May 2012)
+
+  23 May 2012; Ian Stakenvicius <axs@gentoo.org> +graphviz-2.28.0.ebuild,
+  +files/graphviz-2.28.0-Xaw-configure.patch,
+  +files/graphviz-2.28.0-automake-1.11.2.patch, metadata.xml:
+  initial commit of 2.28 with empty keywords while testing ensues
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> graphviz-2.26.3-r4.ebuild:
   add workaround to build on FreeBSD and keyword ~amd64-fbsd
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 1d5bab456603..a1688de0f6ed 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 RMD160 e0d11e4bfdc940b51e3a913b2c1178d84336f8c5 SHA1 4c43de8d197ac02a5373614f14269e45b4597b44 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
+AUX graphviz-2.28.0-Xaw-configure.patch 2129 RMD160 c7916c0c763b803d12678ce46fb6b51a1b9b500a SHA1 f0302b38f55d5e1eccf08a0074b4f8c4b76b1599 SHA256 7c5c37aa637031aee0001ec57f80229a697ba184540366204fe99d2bc8ae878a
+AUX graphviz-2.28.0-automake-1.11.2.patch 838 RMD160 50b48a2ae4bf76373fd378e2e537ae2aa050efb6 SHA1 794f831ea82d4c358607c5b275b267fdcfdc352f SHA256 a1bebbee3dbe7bbf7cf62ecaf85f8e0fe529ea72e060d879006e509cf4752ed4
 DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
+DIST graphviz-2.28.0.tar.gz 19620087 RMD160 5a5fae7cb1128d4e863b954bee5f2491ff23ada0 SHA1 4725d88a13e071ee22e632de551d4a55ca08ee7d SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
 EBUILD graphviz-2.26.3-r2.ebuild 6042 RMD160 be5fd321509b6235439aa12c96bff9da73592321 SHA1 8a2afa62e52c160009a9f7ffe95a96efbdaca80d SHA256 ec0fed34881cceb9fe5c8c6bf8f3829e7976cb6ac5704269d7ed2deafa2e0156
 EBUILD graphviz-2.26.3-r3.ebuild 6129 RMD160 f5ef4cfc60ba769f054a301f0ee0ce421742941a SHA1 ba7e36973a7e017e1adfd1e78d9351f9393d0c53 SHA256 201e7768c7e39b912c7efa93a0fb216b381ee2cc401d30392b5feafddd8e13fb
 EBUILD graphviz-2.26.3-r4.ebuild 6367 RMD160 5d8d146a55c29cf6026c78e8f1847382ad13dae1 SHA1 144c267811698f3f5dad4fce524fee2eb6597c86 SHA256 606cac67d99dfcb95b4954c6fcdd7af608e1eefd8387e2c88973e012e2b80f24
-MISC ChangeLog 35630 RMD160 f1cadecfc217c37ccc9fd5d6f102a19b7b32fc85 SHA1 ca9cca187acb69e3df9da45780f7aa7853401005 SHA256 734309a2578a4b25a3e0a33ffcf0795ce10739e8053ffd4a5935034d09da27ca
-MISC metadata.xml 1649 RMD160 e2238f2d7f945b9d05aa7cea65ed3a5b4f635251 SHA1 68476203394f16fd247976409d614596138431db SHA256 1d35d9b4fbceffa67229a5e0fcf3537f77bf05e00fbdb5ec0c3c82c4c845cc2b
+EBUILD graphviz-2.28.0.ebuild 6795 RMD160 4a54268f7202e69c4de3a800aee962701fdf8f03 SHA1 350595035397a986196746b90b63003c3b04d468 SHA256 31254808c32ef90e107d2e104896123b5d18ae399eef5d25ed60c31c2d0c4c2d
+MISC ChangeLog 35906 RMD160 45337bb6935dcd25d227797100f61ca603e1d889 SHA1 f3b2776f8540082034b19417df24d4581229485e SHA256 4cd8f99812b5bb26022d614ed3fa553604c8578a684b3eb6ead0f900d33228a6
+MISC metadata.xml 1811 RMD160 b5169cbeb7e0a7cfb47de44e4f72ab6c10d42726 SHA1 48027b996e89ab227afe11a587483a51c842aa61 SHA256 995e4cbbcb197713ea64e93943cad2ee005671baaa30da15fa1a2b78dcca103d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+t4isACgkQvFcC4BYPU0pPVACdGPdGyqupaSDxJ8+j1enZ9ino
-/9AAni+osA62p4QNwAJOKTE9y73NygvM
-=a+v+
+iF4EAREIAAYFAk+9OH0ACgkQ2ugaI38ACPAgmwD6A1Gcf+uuvxaQRXvWdaam0krF
+QJM1a8jOwcM5xOlKHLMA/Ak3ONUWM9RO9EzVmQk6FaJ+To+f0B2/714fxvbsV6Rh
+=+5b5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
new file mode 100644
index 000000000000..095354f49536
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
@@ -0,0 +1,71 @@
+--- configure.ac.old	2011-05-07 05:25:24.000000000 +0200
++++ configure.ac	2011-06-24 13:24:49.000000000 +0200
+@@ -1924,6 +1924,10 @@
+ # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
+ #
+ 
++AC_ARG_WITH(lefty,
++  [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
++  [],[with_xaw=yes])
++
+ AC_ARG_WITH(Xpmincludedir,
+   [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
+   [XPM_INCLUDES="-I$withval"])
+@@ -1931,6 +1935,17 @@
+   [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
+   [XPM_LIBS="-L$withval"])
+ 
++AC_ARG_WITH(Xawincludedir,
++  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
++  [XAW_INCLUDES="-I$withval"])
++AC_ARG_WITH(Xawlibdir,
++  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
++  [XAW_LIBS="-L$withval"])
++
++if test "x$with_xaw" != "xyes"; then
++  use_lefty="No (disabled)"
++else
++
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
+@@ -1941,18 +1956,10 @@
+    AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
+ LDFLAGS=$save_LDFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+-AC_SUBST(XPM_INCLUDES)
+-AC_SUBST(XPM_LIBS)
+ 
+ dnl -----------------------------------
+ dnl INCLUDES and LIBS for XAW
+ 
+-AC_ARG_WITH(Xawincludedir,
+-  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
+-  [XAW_INCLUDES="-I$withval"])
+-AC_ARG_WITH(Xawlibdir,
+-  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
+-  [XAW_LIBS="-L$withval"])
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
+@@ -1978,12 +1985,17 @@
+ fi
+ LDFLAGS=$save_LDFLAGS
+ CPPFLAGS=$save_CPPFLAGS
++
++fi
++
++AC_SUBST(XPM_INCLUDES)
++AC_SUBST(XPM_LIBS)
+ AC_SUBST(XAW_INCLUDES)
+ AC_SUBST(XAW_LIBS)
+-AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
+-if test "x$with_xaw" = "xno"; then
++AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
++if test "x$with_xaw" != "xyes"; then
+     if test "x$no_x" != "xyes"; then
+-	AC_MSG_WARN(Lefty cannot be built)
++	AC_MSG_WARN(Lefty will not be built)
+     fi
+ fi
+ 
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
new file mode 100644
index 000000000000..2800623888d5
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
@@ -0,0 +1,23 @@
+Install dir ( buiding with media-libs/ming ):
+    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
+    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
+    /usr/include/graphviz/gv.cpp
+    /usr/include/graphviz/gv.i
+
+Due to the following change, {pkglib,pkginclude}_DATA is invalid:
+    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+---
+diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
+--- a/plugin/ming/Makefile.am
++++ b/plugin/ming/Makefile.am
+@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
+ else
+ pkglib_LTLIBRARIES = libgvplugin_ming.la
+ endif
+-pkglib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
++fdblibdir = $(libdir)/@PACKAGE@
++fdblib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
+ endif
+ 
+ libgvplugin_ming_C_la_SOURCES = \
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
new file mode 100644
index 000000000000..5f940590143b
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.28.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.1 2012/05/23 19:20:08 axs Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+
+inherit eutils autotools multilib python flag-o-matic
+
+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"
+#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS=""
+IUSE="cairo devil doc examples gs gtk gts java lasi nls perl python qt4 ruby svg static-libs tcl elibc_FreeBSD"
+
+# Requires ksh
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.0.0
+	>=dev-libs/glib-2.11.1
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype]
+	>=media-libs/libpng-1.4
+	virtual/jpeg
+	virtual/libiconv
+	cairo?	(
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10[svg]
+	)
+	devil?	( media-libs/devil[png,jpeg] )
+	gs?	( app-text/ghostscript-gpl )
+	gtk?	(
+		x11-libs/gtk+:2
+		x11-libs/libXaw
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+	)
+	gts?	( sci-libs/gts )
+	lasi?	( media-libs/lasi )
+	qt4?	(
+		x11-libs/qt-core
+		x11-libs/qt-gui
+		>=x11-libs/pango-1.12
+		>=x11-libs/cairo-1.1.10
+	)
+	ruby?	( dev-lang/ruby )
+	svg?	( gnome-base/librsvg )
+	tcl?	( >=dev-lang/tcl-8.3 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	java?	( dev-lang/swig )
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( 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 , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib :
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support,
+#   needs libXaw for UI
+# - qt4 :
+#   based on ./configure it needs qt-core and qt-gui only
+
+# 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 = 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)
+
+# 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 python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-Xaw-configure.patch \
+		"${FILESDIR}"/${P}-automake-1.11.2.patch
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	# use the existing ./configure option to exclude its use, instead of sed'ing it out
+	# but delete the dir since we don't need to eautoreconf it
+	rm -rf libltdl
+	#sed -i -e '/libltdl/d' configure.ac || die
+	#sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
+
+	# no nls, no gettext, no iconv macro, so disable it
+	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+	eautoreconf
+}
+
+src_configure() {
+	# libtool file collision, bug 276609
+	local myconf="--without-included-ltdl --disable-ltdl-install"
+
+	# Core functionality:
+	# All of X, cairo-output, gtk (and probably qt) need the pango+cairo functionality
+	if use gtk || use cairo || use qt4; then
+		myconf="${myconf} --with-x"
+	else
+		myconf="${myconf} --without-x"
+	fi
+	myconf="${myconf}
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt4)
+		$(use_with lasi)
+		$(use_with svg rsvg)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-gdk-pixbuf
+		--without-ming"
+
+	# new/experimental features, to be tested, disable for now
+	myconf="${myconf}
+		--without-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio"
+
+	# Bindings:
+	myconf="${myconf}
+		--disable-guile
+		--disable-io
+		$(use_enable java)
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		--disable-r
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)"
+
+	econf \
+		--enable-ltdl \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install || die "emake install failed"
+
+	use examples || rm -rf "${D}/usr/share/graphviz/demo"
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c
+	use python && python_mod_optimize gv.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup gv.py
+}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index a3b67d0a18db..1aded05c9167 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -32,5 +32,8 @@ a database of telephone calls or e-mail messages
 	<flag name='lasi'>
 		Enables PostScript output via <pkg>media-libs/lasi</pkg> library
 	</flag>
+	<flag name='devil'>Enables support for DevIL</flag>
+	<flag name='gs'>Builds graphviz against ghostscript</flag>
+	<flag name='gts'>Enables support for gts</flag>
 </use>
 </pkgmetadata>