New revision with patches for bugs #67999, #81227 and #83726

(Portage version: 2.0.51.19)

6 files changed, 160 insertions, 3 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 9883b77e79d1..34b725e46617 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,11 +1,20 @@
 # 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.41 2005/01/02 21:40:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.42 2005/03/17 08:12:06 leonardop Exp $
+
+*dia-0.94-r1 (17 Mar 2005)
+
+  17 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild,
+  files/dia-0.94-no_font_cache.patch, files/dia-0.94-help.patch:
+  New revision. Added the `static' use flag. Added a patch to fix incorrect
+  font display due to a buggy cache implementation. Resolves bug #81227 and
+  possibly #67999. Thanks to Markus Luisser for his help on bug #81227.
+  Added a patch to fix the Help->Manual action under gnome. See bug #83726.
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
 
-  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.93.ebuild:
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.93.ebuild:
   Stable on alpha.
 
   17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dia-0.93.ebuild:
@@ -38,7 +47,7 @@
   New release, resolves bug #50144. Dependencies corrections. Patch that
   fixes python-related checks in the configure script.
 
-  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.92.2.ebuild:
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.92.2.ebuild:
   Stable on alpha.
 
   03 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.92.2.ebuild:
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index abec2335c22c..7e09aebfbb93 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,7 +1,9 @@
 MD5 7a9b87e91a35db0e6475349018723fdf ChangeLog 5230
+MD5 6767569f6ff9a1ee0f8874bf67f0e471 dia-0.94-r1.ebuild 1022
 MD5 8919b8358acac532bb4c2283e7bdcbb3 dia-0.93.ebuild 1074
 MD5 781ad889a027bae1cadc1a3b2a92e703 dia-0.94.ebuild 994
 MD5 858a96d79b7c8b479edd95aedcf0c0c6 metadata.xml 589
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
 MD5 7459df6c8efd61f2c725351d0da979ad files/dia-0.93-fix_py_prefix.patch 499
 MD5 1df50dee999cd3aa4746682bfc1d1d72 files/digest-dia-0.93 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94 62
diff --git a/app-office/dia/dia-0.94-r1.ebuild b/app-office/dia/dia-0.94-r1.ebuild
new file mode 100644
index 000000000000..6df77008389b
--- /dev/null
+++ b/app-office/dia/dia-0.94-r1.ebuild
@@ -0,0 +1,45 @@
+# 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-r1.ebuild,v 1.1 2005/03/17 08:12:06 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://www.gnome.org/projects/dia/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+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 )"
+
+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 buggy font cache. See bug #81227.
+	epatch ${FILESDIR}/${P}-no_font_cache.patch
+	# Fix help display. See bug #83726.
+	epatch ${FILESDIR}/${P}-help.patch
+}
diff --git a/app-office/dia/files/dia-0.94-help.patch b/app-office/dia/files/dia-0.94-help.patch
new file mode 100644
index 000000000000..9daf87f3080e
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-help.patch
@@ -0,0 +1,82 @@
+diff -NurdB dia-0.94-orig/app/commands.c dia-0.94/app/commands.c
+--- dia-0.94-orig/app/commands.c	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/app/commands.c	2005-03-16 21:13:01.000000000 -0500
+@@ -518,6 +518,9 @@
+ void
+ help_manual_callback(gpointer data, guint action, GtkWidget *widget)
+ {
++#ifdef GNOME
++  gnome_help_display("dia", NULL, NULL);
++#else  
+   char *helpdir, *helpindex = NULL, *command;
+   guint bestscore = G_MAXINT;
+   GDir *dp;
+@@ -579,6 +582,7 @@
+ #endif
+ 
+   g_free(helpindex);
++#endif  /* GNOME */
+ }
+ 
+ void
+diff -NurdB dia-0.94-orig/doc/en/Makefile.in dia-0.94/doc/en/Makefile.in
+--- dia-0.94-orig/doc/en/Makefile.in	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/doc/en/Makefile.in	2005-03-17 01:41:43.000000000 -0500
+@@ -317,13 +317,13 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
++@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia
++docdir = $(helpdir)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+-EXTRA_DIST = $(xml_files) $(omffile) \
+-	dia.1 \
+-	dia.dbk \
++xml_files += \
+ 	authors.xml \
+ 	dia.xml \
+ 	entities.xml \
+@@ -338,10 +338,6 @@
+ 	usage-objects-special.xml \
+ 	usage-objects.xml \
+ 	usage-quickstart.xml \
+-	graphics/line_props.png \
+-	graphics/home_network.png \
+-	graphics/line_icon.png \
+-	graphics/greendots.png
+ 
+ CLEANFILES = omf_timestamp
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
+diff -NurdB dia-0.94-orig/doc/pl/Makefile.in dia-0.94/doc/pl/Makefile.in
+--- dia-0.94-orig/doc/pl/Makefile.in	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/doc/pl/Makefile.in	2005-03-17 01:42:44.000000000 -0500
+@@ -313,11 +313,13 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
++@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia
++docdir = $(helpdir)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+-EXTRA_DIST = $(xml_files) $(omffile) \
++xml_files += \
+ 	authors.xml \
+ 	dia.xml \
+ 	intro.xml \
+@@ -330,9 +332,6 @@
+ 	usage-objects-special.xml \
+ 	usage-objects.xml \
+ 	usage-quickstart.xml \
+-	graphics/line_props.png \
+-	graphics/home_network.png \
+-	graphics/greendots.png
+ 
+ CLEANFILES = omf_timestamp
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
diff --git a/app-office/dia/files/dia-0.94-no_font_cache.patch b/app-office/dia/files/dia-0.94-no_font_cache.patch
new file mode 100644
index 000000000000..9e13979e2ab0
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-no_font_cache.patch
@@ -0,0 +1,18 @@
+--- dia-0.94/lib/font.c	2004-12-17 21:51:41.000000000 +0000
++++ dia-0.94/lib/font.c.new	2004-12-17 22:58:38.379589320 +0000
+@@ -628,6 +628,7 @@
+     item->string = g_strdup(string);
+     item->font = font;
+     
++#if 0
+     /* If it's in the cache, use that instead. */
+     cached = g_hash_table_lookup(layoutcache, item);
+     if (cached != NULL) {
+@@ -637,6 +638,7 @@
+       cached->usecount ++;
+       return cached->layout;
+     }
++#endif
+ 
+     dia_font_ref(font);
+ 
diff --git a/app-office/dia/files/digest-dia-0.94-r1 b/app-office/dia/files/digest-dia-0.94-r1
new file mode 100644
index 000000000000..a4366b0c6a35
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.94-r1
@@ -0,0 +1 @@
+MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869