Bump to 0.97. Bug fixes, user GtkPrint for printing, and more, bug #270306.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 161 insertions, 2 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 9744945c0a7e..ddc4f5a4a03d 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.109 2008/12/04 22:08:27 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.110 2009/05/18 20:57:43 eva Exp $
+
+*dia-0.97 (18 May 2009)
+
+  18 May 2009; Gilles Dartiguelongue <eva@gentoo.org> +dia-0.97.ebuild,
+  +files/dia-0.97.0-gnome-doc.patch:
+  Bump to 0.97. Bug fixes, user GtkPrint for printing, and more, bug
+  #270306.
 
   04 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.96.1.ebuild,
   dia-0.96.1-r1.ebuild:
diff --git a/app-office/dia/dia-0.97.ebuild b/app-office/dia/dia-0.97.ebuild
new file mode 100644
index 000000000000..9a1587fdf7fd
--- /dev/null
+++ b/app-office/dia/dia-0.97.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.ebuild,v 1.1 2009/05/18 20:57:43 eva Exp $
+
+inherit eutils gnome2 libtool autotools versionator python
+
+MY_P=${P/_/-}
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://www.gnome.org/projects/dia/"
+LICENSE="GPL-2"
+
+# dia used -1 instead of .1 for the new version.
+MY_PV_MM=$(get_version_component_range 1-2 )
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+# the doc USE flag doesn't seem to do anything without docbook2html
+# FIXME: libEMF stuff is completely automagic
+# FIXME: configure mixes debug and devel meaning (see -DGTK_DISABLE...)
+IUSE="cairo doc gnome png python zlib"
+
+RDEPEND=">=x11-libs/gtk+-2.6.0
+	>=dev-libs/glib-2.6.0
+	>=x11-libs/pango-1.8
+	>=dev-libs/libxml2-2.3.9
+	>=dev-libs/libxslt-1
+	>=media-libs/freetype-2.0.95
+	dev-libs/popt
+	zlib? ( sys-libs/zlib )
+	png? (
+		  media-libs/libpng
+		>=media-libs/libart_lgpl-2 )
+	gnome? (
+		>=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0 )
+	cairo? ( >=x11-libs/cairo-1 )
+	python? (
+		>=dev-lang/python-1.5.2
+		>=dev-python/pygtk-1.99 )
+	doc? (
+		~app-text/docbook-xml-dtd-4.5
+		 app-text/docbook-xsl-stylesheets )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	  dev-util/pkgconfig
+	doc? ( dev-libs/libxslt )"
+
+DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with cairo)
+		$(use_with python)
+		$(use_enable doc db2html)
+		$(use_enable gnome)
+		--without-swig
+		--without-hardbooks
+		--disable-static
+		--docdir=/usr/share/doc/${PF}"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation in a gnome environment, bug #159831
+	epatch "${FILESDIR}/${PN}-0.97.0-gnome-doc.patch"
+
+	# Skip man generation
+	if use doc; then
+		sed -i -e '/if HAVE_DB2MAN/,/man_MANS/d' doc/*/Makefile.am \
+			|| die "sed 2 failed"
+	fi
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/share/dia
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/share/dia
+}
diff --git a/app-office/dia/files/dia-0.97.0-gnome-doc.patch b/app-office/dia/files/dia-0.97.0-gnome-doc.patch
new file mode 100644
index 000000000000..63e13deaf22f
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.0-gnome-doc.patch
@@ -0,0 +1,61 @@
+From 9d40692b695b30f80b263814bdd351c0dbe67733 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 18 May 2009 22:19:35 +0200
+Subject: [PATCH] Fix compilation in a gnome environment, gentoo bug #159831
+
+---
+ configure.in |   19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d27ee6e..d9c0bf4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -110,17 +110,19 @@ if test "$have_libart" = "yes" ; then
+ fi
+ 
+ AC_MSG_CHECKING([whether GNOME specific code should be used])
+-AC_ARG_ENABLE(gnome,[  --enable-gnome          enable gnome code],
+-              GNOME=$enableval, GNOME=no)
+-if test "$GNOME" = "yes" ; then
++AC_ARG_ENABLE(gnome,
++	      AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
++	      enable_gnome=no)
++if test "x$enable_gnome" = "xyes" ; then
+     GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
+     AC_DEFINE(GNOME,1,[Define if building with GNOME support])
++    AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
+     AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
+-    have_gnome=true
++    have_gnome=yes
+ else
+-    have_gnome=false
++    have_gnome=no
+ fi
+-AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
++AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
+ AC_MSG_RESULT($GNOME)
+ 
+ dnl GTK2:     libgnomecanvas-2.0 ?
+@@ -129,7 +131,8 @@ PKG_CHECK_MODULES(GTK,$GTK_MODULES)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-AM_CONDITIONAL(HAVE_BONOBO,false)
++#AM_CONDITIONAL(HAVE_BONOBO,false)
++AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
+ 
+ dnl Look for Cairo
+ AC_ARG_WITH(cairo,
+@@ -627,7 +630,7 @@ Configuration:
+ 	Source code location:	${srcdir}
+ 	Compiler:		${CC}
+ 
+-	Gnome support:				${GNOME}
++	Gnome support:				${have_gnome}
+ 	Python support:				${with_python}
+ 	Libart support (PNG export):		${have_libart}
+ 	Cairo support (PNG, PDF, print):	${with_cairo}
+-- 
+1.6.3
+