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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 169 insertions, 7 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/Manifest b/app-office/dia/Manifest
index 406fa12810cc..5495be96812e 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -4,16 +4,19 @@ Hash: SHA1
 AUX dia-0.96.1-64bit-fixes.patch 323 RMD160 5e290e07b95e085eae7d57bee397bdcc1fb51b2c SHA1 eb3272698bcde66ca73393cda06b902a01d6be2a SHA256 f9f7dfa91d8795b76c0958d874b59bba8301970d9836a8fea3ea5a21ebca59ab
 AUX dia-0.96.1-gnome-doc.patch 3322 RMD160 50ec2d4c14a267ab350d5dcdf95ae93a68f17f62 SHA1 0d474985c2d0849323dc0e9d2938b1fd2ead2f9b SHA256 92ee349e6bb13f68821aa9cf36dc239f4f83a7a61936967d261e837efe1f5bf6
 AUX dia-0.96.1-xml-fixes.patch 1064 RMD160 2e3e15a605a76ac87458af4c81380ae2c1c0f863 SHA1 5b93651e9c898a3be1fc84090c4331def8f69207 SHA256 b128d7aada1c8c050a30389ff79e9e70dc444e1fb7c2428974324ec65570e1e9
+AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
 DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
 DIST dia-0.96.1.tar.bz2 4445553 RMD160 aef7b2227be2fb7eb5bdd31536790e868af74311 SHA1 e3d8f16f50dbbd03c1ce0235dba28c3e9612bb6e SHA256 7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
+DIST dia-0.97.tar.bz2 6736670 RMD160 1b2869e2ebdd2f37b908ab3166e529aec1862af6 SHA1 1c5a727e9e4f59b823a4616fc881055006eb8b96 SHA256 9083382bd5435b6d6324fc601f359a7c759504e48adbcece0a7d5c45a76ccf5a
 EBUILD dia-0.95.1.ebuild 1730 RMD160 d55dd6661fee0332bd35fece05d58a49d5d4b982 SHA1 14e67aa90cf656077d23b8355603e794ee52959f SHA256 fbfe966d794f813c4e836181853556f1348dc6dcf439519fb1198bd319ebe8ae
 EBUILD dia-0.96.1-r1.ebuild 2561 RMD160 e4f8bbff497cc77e3cd97c36c3871705d23f3694 SHA1 a79a26bb4b1ddf09e84ba5adf3ef738418f0bff6 SHA256 492e32f4360b095094f04a850d0434213a57518d1662e20174810f6aacc92efe
-MISC ChangeLog 13980 RMD160 74141947ea02bfd8af95f74f0a5040884afeb1f4 SHA1 10d7b084937b37f62b26eb29aca30b3a20db6ba3 SHA256 bcaa95e461bf34bee2cfcf2b70c4e379e725cf5e6f48685c4d00f2a1aaf0e0d2
+EBUILD dia-0.97.ebuild 2327 RMD160 47c757979a33ca7a6b53f2dab111f38079d07784 SHA1 eff92924c32f11112e5e2f8a6799d2a360da6d98 SHA256 c8b98fc6a2034290826b5762dd0f18daee1a36091d75c163d865bae6b94aaa77
+MISC ChangeLog 14195 RMD160 80941ce1896fa71f3db320b600f28a96f70c25fd SHA1 f9370e2ae8308f3541649971089abd879a1ca932 SHA256 ce3a9925aab5450eefb22690c3b3e930443d8892ce9dc75911d6c7f2152e5a63
 MISC metadata.xml 687 RMD160 061a68c1fb154961a49f0e477c60e5622203ee9c SHA1 04993b30fa3d405bb573fb1590063b7300b2bbfe SHA256 bdcc845e385aea41bab345156554851037e00f1d268801d05e922f375ab97145
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkk4VOEACgkQ1fmVwcYIWAZbEQCfRwWxpLMFiJb8y5QCFmnXjoEW
-RRYAnjoA9ND8rdlxUottKfjxosWEc2mr
-=4B7y
+iEYEARECAAYFAkoRy80ACgkQ1fmVwcYIWAZKFgCfRSJ6OGxpHGb49hTuWlv2NNsk
+24AAoJXnwWF+XhhtkEvzuMhLcZ/U/yTs
+=g10q
 -----END PGP SIGNATURE-----
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
+