Version bump. Fix inverted test to build documentation, bug #271047. Fix bashism in configure.ac. Fix automagic libemf detection, bug #276148.

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

5 files changed, 249 insertions, 2 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 6a754710b3e6..c91f98253c89 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.112 2009/06/27 10:26:45 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.113 2009/07/14 22:41:36 eva Exp $
+
+*dia-0.97-r1 (14 Jul 2009)
+
+  14 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> +dia-0.97-r1.ebuild,
+  +files/dia-0.97-automagic-libemf.patch, +files/dia-0.97-fix-bashism.patch:
+  Version bump. Fix inverted test to build documentation, bug #271047. Fix
+  bashism in configure.ac. Fix automagic libemf detection, bug #276148.
 
   27 Jun 2009; Romain Perier <mrpouet@gentoo.org> dia-0.97.ebuild:
   Fix bug #275468 -- automake failure for doc/*/Makefile.am to a bad sed
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index dbc62fd86ce5..35d53406eeaf 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,13 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c
+AUX dia-0.97-automagic-libemf.patch 1837 RMD160 c376aec16206770e563109a4b21aa1df0af172cc SHA1 1228ec728fa5e2b789bd8d0e652342683dcdba2c SHA256 dbefca0dcd1dcba1a0f9d7806367cfd6702bf2c9ddd3b71ca432ac219b605409
+AUX dia-0.97-fix-bashism.patch 2108 RMD160 1aea51e0f753de6d61c8431cfac07de955ff7901 SHA1 711f28ad8dcff816ba78cf7121795dfee49fe4b2 SHA256 f915fe62981b5433ebf126c2d5b1c66e02265be93ff0a1773d114da2be02a874
 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
+EBUILD dia-0.97-r1.ebuild 2593 RMD160 d3e0bfceb74597bc5b52ff2b6edfb86c85a13f13 SHA1 6c5bcfc41309cb35ed7702c9ac55722533fbd141 SHA256 5d4cc895173e1e418b848803b815557516cfee76a439aac43ff4f1540115f510
 EBUILD dia-0.97.ebuild 2471 RMD160 892c2bb18ac744a76e2f89cb6443d72b7b5ba7a8 SHA1 a38bfd49a597706f7b98ca78c5c7154ba3fb8b17 SHA256 70c1c360c56e495e1e8bcc0b682282c1d029b7d8403b6e671638ab7970f91ee8
-MISC ChangeLog 14584 RMD160 543739532fd8d7cd1beea4c9187f4ba800414e92 SHA1 a10b9a851eccbf914ba8fa550385ef3e63afa29b SHA256 d22b770d4839ae41e7f55b232f8090b7465f6ad208b30c597306390c64410b24
+MISC ChangeLog 14908 RMD160 3d3c566a85dff08747dfb3b2da6442e549d01fe9 SHA1 4b6aceec5f0e235cdb120d6032a48f4a467455a6 SHA256 188d3ffd42491943f58cd9fc60177beeca8fcd83325195a56961f0b86f4f15d4
 MISC metadata.xml 687 RMD160 061a68c1fb154961a49f0e477c60e5622203ee9c SHA1 04993b30fa3d405bb573fb1590063b7300b2bbfe SHA256 bdcc845e385aea41bab345156554851037e00f1d268801d05e922f375ab97145
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpdCdgACgkQ1fmVwcYIWAZ7HgCgkFYMvk1kFgrQOdr5ltaMvoIQ
+wk8AoOALvapEnWmINLOkTsUXzh/B9SQY
+=5WJx
+-----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97-r1.ebuild b/app-office/dia/dia-0.97-r1.ebuild
new file mode 100644
index 000000000000..214a3f3d9ebd
--- /dev/null
+++ b/app-office/dia/dia-0.97-r1.ebuild
@@ -0,0 +1,104 @@
+# 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-r1.ebuild,v 1.1 2009/07/14 22:41:36 eva Exp $
+
+EAPI="2"
+
+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: 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)
+		--disable-libemf
+		--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"
+
+	# Fix compilation with USE="python", bug #271855
+	if use python; then
+		epatch "${FILESDIR}/${P}-acinclude-python-fixes.patch"
+	fi
+
+	# Skip man generation
+	if ! use doc; then
+		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am \
+			|| die "sed 2 failed"
+	fi
+
+	# Fix automagic libEMF, bug #276148
+	epatch "${FILESDIR}/${P}-automagic-libemf.patch"
+
+	# Fix bashism
+	epatch "${FILESDIR}/${P}-fix-bashism.patch"
+
+	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-automagic-libemf.patch b/app-office/dia/files/dia-0.97-automagic-libemf.patch
new file mode 100644
index 000000000000..d23c05b1bab2
--- /dev/null
+++ b/app-office/dia/files/dia-0.97-automagic-libemf.patch
@@ -0,0 +1,63 @@
+From 8e41f38007b46f1a1da655b81acd88fc491df59e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 14 Jul 2009 20:17:18 +0200
+Subject: [PATCH] Make libemf plugin optional.
+
+---
+ configure.in |   36 +++++++++++++++++++++++-------------
+ 1 files changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 11f3705..cc5d3aa 100644
+--- a/configure.in
++++ b/configure.in
+@@ -214,23 +214,33 @@ AC_SUBST(PNG_LIBS)
+ LIBS="${old_LIBS} ${PNG_LIBS}"
+ 
+ dnl check for libEMF to provide Windows Metafile plug-in on Linux
+-old_CPPFLAGS="${CPPFLAGS}"
+-old_CFLAGS="${CFLAGS}"
+-old_LIBS="${LIBS}"
+-CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF"
+-AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no)
+-AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++)
+-if test "$emf_ok" = yes; then
+-  LIBEMF_CFLAGS='-I /usr/include/libEMF'
+-  LIBEMF_LIBS='-lEMF -lstdc++'
+-  AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available])
++AC_ARG_ENABLE([libemf],
++	AS_HELP_STRING([--enable-libemf], [enable plugin for windows metafile support]),
++	,
++	enable_libemf=yes)
++
++if test "$enable_libemf" = "yes"; then
++	old_CPPFLAGS="${CPPFLAGS}"
++	old_CFLAGS="${CFLAGS}"
++	old_LIBS="${LIBS}"
++
++	CPPFLAGS="${CPPFLAGS} -I /usr/include/libEMF"
++	AC_CHECK_HEADER(emf.h, emf_ok=yes, emf_ok=no)
++	AC_CHECK_LIB(EMF, CreateEnhMetaFileWithFILEW, , emf_ok=no, -lstdc++)
++
++	if test "$emf_ok" = yes; then
++		LIBEMF_CFLAGS='-I /usr/include/libEMF'
++		LIBEMF_LIBS='-lEMF -lstdc++'
++		AC_DEFINE(HAVE_LIBEMF,1,[libEMF library available])
++	fi
++
++	CPPFLAGS="${old_CPPFLAGS}"
++	CFLAGS="${old_CFLAGS}"
++	LIBS="${old_LIBS}"
+ fi
+ AC_SUBST(LIBEMF_CFLAGS)
+ AC_SUBST(LIBEMF_LIBS)
+ AM_CONDITIONAL(WITH_LIBEMF, test "$emf_ok" = yes)
+-CPPFLAGS="${old_CPPFLAGS}"
+-CFLAGS="${old_CFLAGS}"
+-LIBS="${old_LIBS}"
+ 
+ dnl
+ dnl Debugging
+-- 
+1.6.3.3
+
diff --git a/app-office/dia/files/dia-0.97-fix-bashism.patch b/app-office/dia/files/dia-0.97-fix-bashism.patch
new file mode 100644
index 000000000000..21d62a5508dc
--- /dev/null
+++ b/app-office/dia/files/dia-0.97-fix-bashism.patch
@@ -0,0 +1,60 @@
+From 8d1b50c5c8441a24bb5b6c38637155ebe2976c06 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 14 Jul 2009 19:57:25 +0200
+Subject: [PATCH] Fix bashism
+
+---
+ configure.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d9c0bf4..11f3705 100644
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@ PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, ,
+ 
+ AC_ARG_WITH(freetype,
+ [  --without-freetype        compile without FreeType support],,with_freetype=yes)
+-if test "x$with_freetype" == "xyes"; then
++if test "x$with_freetype" = "xyes"; then
+ PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
+ if test "$have_pangoft2" = "true"; then
+   dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
+@@ -149,7 +149,7 @@ AM_CONDITIONAL(WITH_CAIRO, test "x$with_cairo" != "xno")
+ 
+ dnl with gtk+ >= 2.8 this is no longer optional
+ PKG_CHECK_MODULES(PANGOCAIRO,pangocairo, pangocairo_ok=yes, pangocairo_ok=no)
+-if test "x$pangocairo_ok" == "xyes"; then
++if test "x$pangocairo_ok" = "xyes"; then
+   AC_DEFINE(HAVE_PANGOCAIRO_H,1,[Defined to render text with pangocairo not cairos toy API])
+ fi
+ 
+@@ -260,7 +260,7 @@ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Needed for glib gettext])
+ 
+ AC_CHECK_PROG(XGETTEXT, xgettext, xgettext, none)
+-if test "$XGETTEXT" == none ; then
++if test "$XGETTEXT" = none ; then
+    AC_MSG_ERROR([xgettext program not found: $XGETTEXT.])
+ fi
+ 
+@@ -487,14 +487,14 @@ dnl
+ dnl use jw only if we don't find dblatex
+ dnl
+ AC_PATH_PROG(JW,jw,no)
+-if  test "x$dblatex" == "xno"; then
++if  test "x$dblatex" = "xno"; then
+  AM_CONDITIONAL(WITH_JW, test "x$jw" != "xno")	
+ else
+  AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+ fi
+ hardbook_ok=no
+ xsltproc_ok=no
+-if test "x$with_hardbooks" == "xno"; then
++if test "x$with_hardbooks" = "xno"; then
+   AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+   AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
+   AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
+-- 
+1.6.3.3
+