Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome Bug, ...

Package-Manager: portage-2.0.53_rc7

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index ca035c093a0d139e565bb08144d754d6a51c3514..71163f4fce40401afac269858300552d8c2dce64 100644 (file)
--- 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.73 2005/10/04 18:42:05 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.74 2005/11/02 14:07:25 obz Exp $
+
+*dia-0.94-r4 (02 Nov 2005)
+
+  02 Nov 2005; Mike Gardiner <obz@gentoo.org> +files/dia-0.94-png.patch,
+  +files/dia-0.94-sheets-png.tar.bz2, +dia-0.94-r4.ebuild:
+  Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome
+  Bug, #154079 for more information.
 
   04 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r3.ebuild:
   Stable on ppc.

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 5d79c56a568845852dc5b3a9cad5e1c8a639a84e..4dfd6e73bd45e1ccbcaf44f7fd733482342b439f 100644 (file)
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,14 +1,18 @@
-MD5 0eadea95c1e7e3b42021ca2f9584a7a9 ChangeLog 8798
+MD5 5c1fc913a41a807ab3e428cec7b0b990 ChangeLog 9070
 MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
 MD5 e64a64c8b1e5e3be5cf29d34c7374513 dia-0.94-r2.ebuild 1655
 MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
+MD5 0246566e2cfd2158ad43ea52cb27c8c8 dia-0.94-r4.ebuild 2019
 MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
 MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093
 MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940
+MD5 8905a098072f0dbd22a14ea86e790b85 files/dia-0.94-sheets-png.tar.bz2 5449
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r4 62
 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596

diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild
new file mode 100644 (file)
index 0000000..5731ce2
--- /dev/null
+++ b/app-office/dia/dia-0.94-r4.ebuild
@@ -0,0 +1,68 @@
+# 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-r4.ebuild,v 1.1 2005/11/02 14:07:25 obz Exp $
+
+inherit eutils gnome2 libtool
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="http://www.gnome.org/projects/dia/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~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
+
+       libtoolize --force --copy || die "Elibtoolize failed"
+
+       # Install png's instead of xpm's, (bug #103401) and upstream.
+       epatch ${FILESDIR}/${P}-png.patch
+       tar jxf ${FILESDIR}/${P}-sheets-png.tar.bz2
+       aclocal  || die "Aclocal failed"
+       automake || die "Automake failed"
+
+       # 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
+       # Fix python execution hole. bug #107916
+       epatch ${FILESDIR}/${P}-secure-eval.patch
+}

diff --git a/app-office/dia/files/dia-0.94-png.patch b/app-office/dia/files/dia-0.94-png.patch
new file mode 100644 (file)
index 0000000..84ca2ae
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-png.patch
@@ -0,0 +1,127 @@
+diff -ur dia-0.94/sheets/ER/Makefile.am dia-0.94-png/sheets/ER/Makefile.am
+--- dia-0.94/sheets/ER/Makefile.am     2004-08-16 15:56:30.000000000 +0800
++++ dia-0.94-png/sheets/ER/Makefile.am 2005-11-02 16:56:49.000000000 +0800
+@@ -1,7 +1,7 @@
+ ERsheetdir = $(pkgdatadir)/sheets/ER
+ 
+ PIX = \
+-      weakentity.xpm
++      weakentity.png
+ 
+ ERsheet_DATA = $(PIX)
+ 
+diff -ur dia-0.94/sheets/GRAFCET/Makefile.am dia-0.94-png/sheets/GRAFCET/Makefile.am
+--- dia-0.94/sheets/GRAFCET/Makefile.am        2004-08-16 15:56:30.000000000 +0800
++++ dia-0.94-png/sheets/GRAFCET/Makefile.am    2005-11-02 17:00:04.000000000 +0800
+@@ -2,12 +2,12 @@
+ GRAFCETsheetdir = $(pkgdatadir)/sheets/GRAFCET
+ 
+ PIX = \
+-      etapei.xpm \
+-      etapems.xpm \
+-      etapeme.xpm \
+-      etapemc.xpm \
+-      etapesp.xpm \
+-      vergent_and.xpm
++      etapei.png \
++      etapems.png \
++      etapeme.png \
++      etapemc.png \
++      etapesp.png \
++      vergent_and.png
+ 
+ GRAFCETsheet_DATA = $(PIX)
+ EXTRA_DIST = $(PIX)
+diff -ur dia-0.94/sheets/Istar/Makefile.am dia-0.94-png/sheets/Istar/Makefile.am
+--- dia-0.94/sheets/Istar/Makefile.am  2004-08-16 15:56:31.000000000 +0800
++++ dia-0.94-png/sheets/Istar/Makefile.am      2005-11-02 17:10:13.000000000 +0800
+@@ -2,16 +2,16 @@
+ Istarsheetdir = $(pkgdatadir)/sheets/Istar
+ 
+ PIX = \
+-      agent.xpm \
+-      decomposition.xpm \
+-      dependency.xpm \
+-      goal.xpm \
+-      means_ends.xpm \
+-      neg_contrib.xpm \
+-      pos_contrib.xpm \
+-      position.xpm \
+-      role.xpm \
+-      task.xpm 
++      agent.png \
++      decomposition.png \
++      dependency.png \
++      goal.png \
++      means_ends.png \
++      neg_contrib.png \
++      pos_contrib.png \
++      position.png \
++      role.png \
++      task.png 
+ 
+ Istarsheet_DATA = $(PIX)
+ EXTRA_DIST = $(PIX)
+diff -ur dia-0.94/sheets/Jackson/Makefile.am dia-0.94-png/sheets/Jackson/Makefile.am
+--- dia-0.94/sheets/Jackson/Makefile.am        2004-08-16 15:56:31.000000000 +0800
++++ dia-0.94-png/sheets/Jackson/Makefile.am    2005-11-02 17:11:00.000000000 +0800
+@@ -2,9 +2,9 @@
+ Jacksonsheetdir = $(pkgdatadir)/sheets/Jackson
+ 
+ PIX = \
+-      designed_domain.xpm \
+-      machine_domain.xpm \
+-      req_phen.xpm 
++      designed_domain.png \
++      machine_domain.png \
++      req_phen.png 
+ 
+ Jacksonsheet_DATA = $(PIX)
+ EXTRA_DIST = $(PIX)
+diff -ur dia-0.94/sheets/KAOS/Makefile.am dia-0.94-png/sheets/KAOS/Makefile.am
+--- dia-0.94/sheets/KAOS/Makefile.am   2004-08-16 15:56:31.000000000 +0800
++++ dia-0.94-png/sheets/KAOS/Makefile.am       2005-11-02 18:16:47.000000000 +0800
+@@ -2,24 +2,24 @@
+ KAOSsheetdir = $(pkgdatadir)/sheets/KAOS
+ 
+ PIX = \
+-      and-complete-ref.xpm \
+-      and-ref.xpm \
+-      assumption.xpm \
+-      capable-of.xpm \
+-      conflicts.xpm \
+-      controls.xpm \
+-      input.xpm \
+-      monitors.xpm \
+-      obstacle.xpm \
+-      obstructs.xpm \
+-      op-ref.xpm \
+-      or-complete-ref.xpm \
+-      or-ref.xpm \
+-      output.xpm \
+-      performs.xpm \
+-      requirement.xpm \
+-      responsibility.xpm \
+-      softgoal.xpm
++      and-complete-ref.png \
++      and-ref.png \
++      assumption.png \
++      capable-of.png \
++      conflicts.png \
++      controls.png \
++      input.png \
++      monitors.png \
++      obstacle.png \
++      obstructs.png \
++      op-ref.png \
++      or-complete-ref.png \
++      or-ref.png \
++      output.png \
++      performs.png \
++      requirement.png \
++      responsibility.png \
++      softgoal.png
+ 
+ KAOSsheet_DATA = $(PIX)
+ EXTRA_DIST = $(PIX)
+

diff --git a/app-office/dia/files/dia-0.94-sheets-png.tar.bz2 b/app-office/dia/files/dia-0.94-sheets-png.tar.bz2
new file mode 100644 (file)
index 0000000..d6b23e1
Binary files /dev/null and b/app-office/dia/files/dia-0.94-sheets-png.tar.bz2 differ

diff --git a/app-office/dia/files/digest-dia-0.94-r4 b/app-office/dia/files/digest-dia-0.94-r4
new file mode 100644 (file)
index 0000000..a4366b0
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.94-r4
@@ -0,0 +1 @@
+MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869