New revision, including a patch to create the man page correctly (bug #98610)

Package-Manager: portage-2.0.51.22-r1

5 files changed, 93 insertions, 3 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index ec5cf688fcea..44b519adddcc 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.53 2005/06/13 19:20:44 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.54 2005/07/12 09:51:05 leonardop Exp $
+
+*dia-0.94-r2 (12 Jul 2005)
+
+  12 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r2.ebuild,
+  files/dia-0.94-db2man.patch:
+  New revision. Added patch from upstream's CVS repository to correctly
+  generate the man page, resolves bug #98610.
 
   13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> dia-0.94-r1.ebuild:
   alpha stable
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index bc6d5f14b4d4..59669f4b9b8f 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,7 +1,10 @@
-MD5 168b72d03c652800672a98ab53e97a38 ChangeLog 6872
-MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
+MD5 4410a82a558b05ef00385351b2fdcac6 ChangeLog 7129
+MD5 edf3997b3d4785e3793d81b80743dea0 dia-0.94-r2.ebuild 1651
 MD5 858a96d79b7c8b479edd95aedcf0c0c6 metadata.xml 589
+MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
+MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62
 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
diff --git a/app-office/dia/dia-0.94-r2.ebuild b/app-office/dia/dia-0.94-r2.ebuild
new file mode 100644
index 000000000000..9b3da9303d7a
--- /dev/null
+++ b/app-office/dia/dia-0.94-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r2.ebuild,v 1.1 2005/07/12 09:51:05 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://www.gnome.org/projects/dia/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome png python static zlib"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=x11-libs/pango-1.1.5
+	>=dev-libs/libxml2-2.3.9
+	>=dev-libs/libxslt-1
+	>=media-libs/freetype-2.0.9
+	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 )
+	python? ( >=dev-lang/python-1.5.2
+		>=dev-python/pygtk-1.99 )
+	~app-text/docbook-xml-dtd-4.2
+	app-text/docbook-xsl-stylesheets"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.21
+	dev-util/pkgconfig"
+
+G2CONF="${G2CONF} $(use_enable gnome) $(use_with python) $(use_enable static)"
+
+DOCS="AUTHORS ChangeLog KNOWN_BUGS NEWS README RELEASE-PROCESS THANKS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Disable python -c 'import gtk' during compile to prevent using
+	# X being involved (#31589)
+	epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch
+
+	# Fix generation of the man page (bug #98610).
+	rm doc/en/dia.1
+	epatch ${FILESDIR}/${P}-db2man.patch
+	autoconf || die "Autoconf failed"
+
+	# Disable buggy font cache. See bug #81227.
+	epatch ${FILESDIR}/${P}-no_font_cache.patch
+	# Fix help display. See bug #83726.
+	epatch ${FILESDIR}/${P}-help.patch
+	# GCC 4 compile fixes
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
diff --git a/app-office/dia/files/dia-0.94-db2man.patch b/app-office/dia/files/dia-0.94-db2man.patch
new file mode 100644
index 000000000000..c1abb4a09da1
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-db2man.patch
@@ -0,0 +1,21 @@
+diff -NurdB dia-0.94/configure.in dia-0.94-patched/configure.in
+--- dia-0.94/configure.in	2005-07-12 02:54:25.000000000 -0500
++++ dia-0.94-patched/configure.in	2005-07-12 02:57:37.000000000 -0500
+@@ -386,14 +386,9 @@
+ 
+ dnl Have to have the nwalsh docbook.xsl, which does manpages.
+ dnl RedHat installs it in a version-numbered place.  Grumpf.
+-db2man_file=
+-for file in \
+-  /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
+-  /usr/share/sgml/docbook/xsl-stylesheets-\*/manpages/docbook.xsl; do
+-  if test -f $file; then db2man_file=$file; break; fi
+-done
+-AM_CONDITIONAL(HAVE_DB2MAN, test "x$db2man_file" != x)
+-AC_SUBST(DB2MAN, "$db2man_file")
++AC_PATH_PROG(XSLTPROC, xsltproc, no)
++AM_CONDITIONAL(HAVE_DB2MAN, test "x$XSLTPROC" != xno)
++AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
+ 
+ dnl Handling for Python
+ AC_ARG_WITH(python,
diff --git a/app-office/dia/files/digest-dia-0.94-r2 b/app-office/dia/files/digest-dia-0.94-r2
new file mode 100644
index 000000000000..a4366b0c6a35
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.94-r2
@@ -0,0 +1 @@
+MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869