Cleanup wrt #140499

(Portage version: 2.1.1)
 (Signed Manifest commit)

16 files changed, 14 insertions, 834 deletions

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index fb9e7c91accc..f104c53e2ffc 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,75 +1,26 @@
-AUX 0.94-disable_python_gtk_import.patch 313 RMD160 01592615b8983621a9b22e934e10fe70aa9d25b2 SHA1 9e28377808829af8f7d37b6e8bf2120f68562a20 SHA256 8bbd4151586e302fdb35635469a640b82c4f4fa9b1a3595599d8bffc5f4d6989
-MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
-RMD160 01592615b8983621a9b22e934e10fe70aa9d25b2 files/0.94-disable_python_gtk_import.patch 313
-SHA256 8bbd4151586e302fdb35635469a640b82c4f4fa9b1a3595599d8bffc5f4d6989 files/0.94-disable_python_gtk_import.patch 313
-AUX dia-0.94-db2man.patch 901 RMD160 dd68e88b0a2130b3cb186eea5b90aaead397d73d SHA1 c9873ada338f8c163d95fa8fef21e1785d1c9ba6 SHA256 35ec88f147ac00052f04b3707004198466a453115ee2735a75a00705ca8ca6f9
-MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
-RMD160 dd68e88b0a2130b3cb186eea5b90aaead397d73d files/dia-0.94-db2man.patch 901
-SHA256 35ec88f147ac00052f04b3707004198466a453115ee2735a75a00705ca8ca6f9 files/dia-0.94-db2man.patch 901
-AUX dia-0.94-gcc4.patch 934 RMD160 2a876c7362845bdeeeb0468b2984b456bed75d5a SHA1 76da842695a5ac06ce14b07de988c938cf95dd25 SHA256 a3d24a60044fb0a5570634b39ccaaa16e299aa915178b2ea2764af558cf5c64a
-MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
-RMD160 2a876c7362845bdeeeb0468b2984b456bed75d5a files/dia-0.94-gcc4.patch 934
-SHA256 a3d24a60044fb0a5570634b39ccaaa16e299aa915178b2ea2764af558cf5c64a files/dia-0.94-gcc4.patch 934
-AUX dia-0.94-help.patch 2766 RMD160 2f98abc9472219278802786861a217bbf404c866 SHA1 8a7da33631ad70c1a213ad237d74d5d40ae049f9 SHA256 e72c7f673572e83677dc8168890f9240f617c1df1089036702088deeefb952ed
-MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
-RMD160 2f98abc9472219278802786861a217bbf404c866 files/dia-0.94-help.patch 2766
-SHA256 e72c7f673572e83677dc8168890f9240f617c1df1089036702088deeefb952ed files/dia-0.94-help.patch 2766
-AUX dia-0.94-no_font_cache.patch 473 RMD160 e8e9dc24fe95f6563d1180fd2ba4df7e332a000d SHA1 c7a7017f63f0d864054521118068c9bef0c91de4 SHA256 d4d523c894ca13326e34d2aa9f60df8718d50781988722ba1a53e4fb999e1634
-MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
-RMD160 e8e9dc24fe95f6563d1180fd2ba4df7e332a000d files/dia-0.94-no_font_cache.patch 473
-SHA256 d4d523c894ca13326e34d2aa9f60df8718d50781988722ba1a53e4fb999e1634 files/dia-0.94-no_font_cache.patch 473
-AUX dia-0.94-pkgconfig.patch 296 RMD160 83f99edc0c3ef8f84b2ee34bb569a2bf5e6488ad SHA1 4683f342d20ea26bcbf98196585cb2108676a051 SHA256 e5bcf7c038e5a8e657d3aabc4acec50c6f80b036fe567d1084aa5580c789fff0
-MD5 b7b66d45324f178764257ee9d06e9b1a files/dia-0.94-pkgconfig.patch 296
-RMD160 83f99edc0c3ef8f84b2ee34bb569a2bf5e6488ad files/dia-0.94-pkgconfig.patch 296
-SHA256 e5bcf7c038e5a8e657d3aabc4acec50c6f80b036fe567d1084aa5580c789fff0 files/dia-0.94-pkgconfig.patch 296
-AUX dia-0.94-png.patch 3093 RMD160 c6ef542b8b3bcd914b85b424bd55332b25c7aa5f SHA1 89f14fdc49121438f4acc6560ecd0c7c14827eca SHA256 06794ba39eb526e6de4b0f706d00f1ef0377dd3890eded73606dee81ba3bb86c
-MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093
-RMD160 c6ef542b8b3bcd914b85b424bd55332b25c7aa5f files/dia-0.94-png.patch 3093
-SHA256 06794ba39eb526e6de4b0f706d00f1ef0377dd3890eded73606dee81ba3bb86c files/dia-0.94-png.patch 3093
-AUX dia-0.94-secure-eval.patch 1940 RMD160 7344d197e440361963c41a5707de66077550cdc0 SHA1 6c2461faac4b0584ce1e9cb374dec0ccc7ef3c78 SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89
-MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940
-RMD160 7344d197e440361963c41a5707de66077550cdc0 files/dia-0.94-secure-eval.patch 1940
-SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89 files/dia-0.94-secure-eval.patch 1940
-AUX dia-0.94_xfigoverflowfix.patch 5903 RMD160 45af56cf313bb04f8eced280f1afde2f518b6129 SHA1 a3e15228ccecd8f80fbc07b6e4be17b61798f115 SHA256 c7c99a44448b504929699f7c2449da09519ca724eb5a7dcb5d8f3450773c8a93
-MD5 bac280ec7e2d2c5ad790838679cba3b3 files/dia-0.94_xfigoverflowfix.patch 5903
-RMD160 45af56cf313bb04f8eced280f1afde2f518b6129 files/dia-0.94_xfigoverflowfix.patch 5903
-SHA256 c7c99a44448b504929699f7c2449da09519ca724eb5a7dcb5d8f3450773c8a93 files/dia-0.94_xfigoverflowfix.patch 5903
-DIST dia-0.94-sheets-png.tar.bz2 5449 RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc SHA1 2e0006396af4851844dfc7cd053dadba720a5dd5 SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629
-DIST dia-0.94.tar.bz2 3348869 RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 SHA1 5d8467738f386d3e908cdb588240dc9a9aa4584a SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST dia-0.95-1.tar.bz2 4203188 RMD160 680102d2da144c1a720a61e5b85c030f353000cc SHA1 887482cd25735ede7465302cb10b8c3efdc1da15 SHA256 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
-EBUILD dia-0.94-r3.ebuild 1738 RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 SHA1 bdd94d3c3ecde1c6207331ab65885126a8a8ea58 SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a
-MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
-RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 dia-0.94-r3.ebuild 1738
-SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a dia-0.94-r3.ebuild 1738
-EBUILD dia-0.94-r4.ebuild 2194 RMD160 07d6e3c06e6bd8cde99937a91124ec116a8ace90 SHA1 635d0ad554a3a1850db2e7633183d5c0cd99cea4 SHA256 cdae9f99638b5f0ab408f0816d307fb52b516c4c255c5afb1e0fbe7c7cc38f4c
-MD5 f4df25e5a1c709f24ae3eff6ea57f60e dia-0.94-r4.ebuild 2194
-RMD160 07d6e3c06e6bd8cde99937a91124ec116a8ace90 dia-0.94-r4.ebuild 2194
-SHA256 cdae9f99638b5f0ab408f0816d307fb52b516c4c255c5afb1e0fbe7c7cc38f4c dia-0.94-r4.ebuild 2194
-EBUILD dia-0.94-r5.ebuild 2262 RMD160 011927c5cf96d751756b83622456bc62cc6c92fc SHA1 930b0a37ef99c5c643a8756bccda5b75a7c390f2 SHA256 d043407e003a09bc18cde81cf79d6df87d65921a2a0442a1cdb37554caf7e21a
-MD5 51f7b34223a251d3e5a0fbb47d874f36 dia-0.94-r5.ebuild 2262
-RMD160 011927c5cf96d751756b83622456bc62cc6c92fc dia-0.94-r5.ebuild 2262
-SHA256 d043407e003a09bc18cde81cf79d6df87d65921a2a0442a1cdb37554caf7e21a dia-0.94-r5.ebuild 2262
 EBUILD dia-0.95.1.ebuild 1675 RMD160 22390dc1aee3733c463f811dd9f247540831c007 SHA1 f8fbb4007a0bb69f5b874f4ffa273cf04e6fb5c6 SHA256 09b3ebf368f675e929abedb7afc30987efd336fc5023059c5bba50a9b0948c93
 MD5 74e12b87329e54c92802fc42252fc665 dia-0.95.1.ebuild 1675
 RMD160 22390dc1aee3733c463f811dd9f247540831c007 dia-0.95.1.ebuild 1675
 SHA256 09b3ebf368f675e929abedb7afc30987efd336fc5023059c5bba50a9b0948c93 dia-0.95.1.ebuild 1675
-MISC ChangeLog 11245 RMD160 037a7f8829b1e5b05c1b72bc8775737d53eb37d1 SHA1 ad417a67d2fd6549886120115c019f8b16f0cf44 SHA256 ceb52cc3bdd1de4dc22273f72eb3611eb4f78211a576d94b66ee6c47cbd226ce
-MD5 1c0d91c1d735e193ae9c24a32c0e4f70 ChangeLog 11245
-RMD160 037a7f8829b1e5b05c1b72bc8775737d53eb37d1 ChangeLog 11245
-SHA256 ceb52cc3bdd1de4dc22273f72eb3611eb4f78211a576d94b66ee6c47cbd226ce ChangeLog 11245
+MISC ChangeLog 11699 RMD160 a5db4aebff400b0f27c8c9419dbdbf72f3325339 SHA1 1d48424b92f44e7b97cab1b4f61a8e96b8aa8b86 SHA256 675f598811b5322abcc2b86c3458f763316c556aa29dc807ad6b0f4b565d1a7f
+MD5 334a30499e9a003565d04d5a466e5270 ChangeLog 11699
+RMD160 a5db4aebff400b0f27c8c9419dbdbf72f3325339 ChangeLog 11699
+SHA256 675f598811b5322abcc2b86c3458f763316c556aa29dc807ad6b0f4b565d1a7f ChangeLog 11699
 MISC metadata.xml 596 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 SHA1 457717e2ae12542ee6a135ee884af2b428feefa8 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3
 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3 metadata.xml 596
-MD5 ab3d07265b315d730fca27480ded9696 files/digest-dia-0.94-r3 232
-RMD160 67be87c91e3cd94aa49d9fad91dac57c2803f15c files/digest-dia-0.94-r3 232
-SHA256 8aa68103c81d99ce80f755e7346495b8b4be634913b52d594240f49656a5631a files/digest-dia-0.94-r3 232
-MD5 d6db5d92d74a6b9ef5c2f55493e7de4e files/digest-dia-0.94-r4 488
-RMD160 24563351a93bd15b36bfab7173107ad7e20177e5 files/digest-dia-0.94-r4 488
-SHA256 7b383bc183866d1227210ea7b1f90511e18387d2f13d764e1ff183d7ea058388 files/digest-dia-0.94-r4 488
-MD5 d6db5d92d74a6b9ef5c2f55493e7de4e files/digest-dia-0.94-r5 488
-RMD160 24563351a93bd15b36bfab7173107ad7e20177e5 files/digest-dia-0.94-r5 488
-SHA256 7b383bc183866d1227210ea7b1f90511e18387d2f13d764e1ff183d7ea058388 files/digest-dia-0.94-r5 488
 MD5 30dc3948e6f3de8197c055bcc0b48996 files/digest-dia-0.95.1 238
 RMD160 282d00f25653bfa0ba3ba375b1f5e1353add697d files/digest-dia-0.95.1 238
 SHA256 82a5d7c4b760fe506a71919ef875114ceb30ce5ebe4ad4ff0159a37e073c4ede files/digest-dia-0.95.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFQkDqKRy60XGEcJIRArw+AKCs3rzqLSJJGWsU9VjAiMhBt4IZ5ACgodBE
+ImDfhBrYU87wGC2ZsYfoagI=
+=/2nr
+-----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.94-r3.ebuild b/app-office/dia/dia-0.94-r3.ebuild
deleted file mode 100644
index f79cc3f2c187..000000000000
--- a/app-office/dia/dia-0.94-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-r3.ebuild,v 1.8 2005/10/04 18:42:05 hansmi Exp $
-
-inherit eutils gnome2
-
-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
-
-	# 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/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild
deleted file mode 100644
index 1582a83730a0..000000000000
--- a/app-office/dia/dia-0.94-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 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.4 2006/06/07 13:12:54 allanonjl Exp $
-
-inherit eutils gnome2 libtool
-
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://www.gnome.org/projects/dia/"
-LICENSE="GPL-2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-sheets-png.tar.bz2"
-
-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}
-
-	# Patch to fix configure.in issues with gnome support, bug 118591
-	epatch ${FILESDIR}/dia-0.94-pkgconfig.patch
-
-	# 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
-	cp -r ${WORKDIR}/sheets/* ${S}/sheets
-	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/dia-0.94-r5.ebuild b/app-office/dia/dia-0.94-r5.ebuild
deleted file mode 100644
index 1a41245330bb..000000000000
--- a/app-office/dia/dia-0.94-r5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r5.ebuild,v 1.8 2006/06/07 13:12:54 allanonjl Exp $
-
-inherit eutils gnome2 libtool
-
-DESCRIPTION="Diagram/flowchart creation program"
-HOMEPAGE="http://www.gnome.org/projects/dia/"
-LICENSE="GPL-2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-sheets-png.tar.bz2"
-
-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}
-
-	# Patch to fix configure.in issues with gnome support, bug 118591
-	epatch ${FILESDIR}/dia-0.94-pkgconfig.patch
-
-	# 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
-	cp -r ${WORKDIR}/sheets/* ${S}/sheets
-	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
-	# xfig patch bug #128107
-	epatch ${FILESDIR}/${P}_xfigoverflowfix.patch
-
-}
diff --git a/app-office/dia/files/0.94-disable_python_gtk_import.patch b/app-office/dia/files/0.94-disable_python_gtk_import.patch
deleted file mode 100644
index ec93f258bfc3..000000000000
--- a/app-office/dia/files/0.94-disable_python_gtk_import.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in~	2004-08-17 16:03:26.000000000 +0100
-+++ configure.in	2005-04-27 18:35:43.231299642 +0100
-@@ -401,7 +401,6 @@
- 
- if test "x$with_python" != xno; then
-   AM_PATH_PYTHON(1.5.2)
--  AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)])
-   AM_CHECK_PYTHON_HEADERS
-   AM_CHECK_PYTHON_LIB
- 
diff --git a/app-office/dia/files/dia-0.94-db2man.patch b/app-office/dia/files/dia-0.94-db2man.patch
deleted file mode 100644
index c1abb4a09da1..000000000000
--- a/app-office/dia/files/dia-0.94-db2man.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/dia-0.94-gcc4.patch b/app-office/dia/files/dia-0.94-gcc4.patch
deleted file mode 100644
index 134c429435c0..000000000000
--- a/app-office/dia/files/dia-0.94-gcc4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur dia-0.94-orig/objects/custom/shape_info.h dia-0.94/objects/custom/shape_info.h
---- dia-0.94-orig/objects/custom/shape_info.h	2005-04-15 18:45:52.000000000 -0400
-+++ dia-0.94/objects/custom/shape_info.h	2005-04-15 18:36:55.000000000 -0400
-@@ -166,7 +166,6 @@
- 
- void shape_info_realise(ShapeInfo* info);
- void shape_info_print(ShapeInfo *info);
--void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
- 
- /*MC 11/03 handy g_new0 variant for struct with variable size */
- #define g_new0_ext(struct_type, ext_size)		\
-diff -ur dia-0.94-orig/plug-ins/python/pydia-object.h dia-0.94/plug-ins/python/pydia-object.h
---- dia-0.94-orig/plug-ins/python/pydia-object.h	2005-04-15 18:45:13.000000000 -0400
-+++ dia-0.94/plug-ins/python/pydia-object.h	2005-04-15 18:46:31.000000000 -0400
-@@ -22,7 +22,7 @@
- 
- #include <Python.h>
- 
--#include "object.h"
-+#include "lib/object.h"
- 
- typedef struct {
-     PyObject_HEAD
diff --git a/app-office/dia/files/dia-0.94-help.patch b/app-office/dia/files/dia-0.94-help.patch
deleted file mode 100644
index 9daf87f3080e..000000000000
--- a/app-office/dia/files/dia-0.94-help.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 9e13979e2ab0..000000000000
--- a/app-office/dia/files/dia-0.94-no_font_cache.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/dia-0.94-pkgconfig.patch b/app-office/dia/files/dia-0.94-pkgconfig.patch
deleted file mode 100644
index 9859f6d89e64..000000000000
--- a/app-office/dia/files/dia-0.94-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in	2006/01/15 00:17:25	1.1
-+++ configure.in	2006/01/15 00:17:38
-@@ -53,7 +53,6 @@ AC_SUBST(APP_LIBS)
- dnl Checks for libraries
- 
- AM_PATH_GLIB_2_0(2.0.0)
--AM_PATH_GTK_2_0(2.0.0)
- 
- GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0"
- PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.1.5, , 
diff --git a/app-office/dia/files/dia-0.94-png.patch b/app-office/dia/files/dia-0.94-png.patch
deleted file mode 100644
index 84ca2ae4d4c4..000000000000
--- a/app-office/dia/files/dia-0.94-png.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-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-secure-eval.patch b/app-office/dia/files/dia-0.94-secure-eval.patch
deleted file mode 100644
index 7126dc78838c..000000000000
--- a/app-office/dia/files/dia-0.94-secure-eval.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: plug-ins/python/diasvg_import.py
-===================================================================
---- plug-ins/python/diasvg_import.py	(revision 7)
-+++ plug-ins/python/diasvg_import.py	(working copy)
-@@ -54,6 +54,10 @@
- 		return (int(m.group(1)) / 255.0, int(m.group(2)) / 255.0, int(m.group(2)) / 255.0)
- 	# any more ugly color definitions not compatible with pango_color_parse() ?
- 	return string.strip(s)
-+
-+def eval_secure(s):
-+	return string.translate(s, string.maketrans("\"()", "___"))
-+
- class Object :
- 	def __init__(self) :
- 		self.props = {"x" : 0, "y" : 0, "stroke" : "none"}
-@@ -65,7 +69,8 @@
- 			sp2 = string.split(string.strip(s1), ":")
- 			if len(sp2) == 2 :
- 				try :
--					eval("self." + string.replace(sp2[0], "-", "_") + "(\"" + string.strip(sp2[1]) + "\")")
-+					eval("self." + eval_secure(string.replace(sp2[0], "-", "_")) +
-+						"(\"" + eval_secure(string.strip(sp2[1])) + "\")")
- 				except AttributeError :
- 					self.props[sp2[0]] = string.strip(sp2[1])
- 	def x(self, s) :
-@@ -282,7 +287,7 @@
- 	def CopyProps(self, dest) :
- 		# to be used to inherit group props to childs _before_ they get their own
- 		for p in self.props.keys() :
--			sf = "dest." + string.replace(p, "-", "_") + "(\"" + str(self.props[p]) + "\")"
-+			sf = "dest." + eval_secure(string.replace(p, "-", "_")) + "(\"" + eval_secure(str(self.props[p])) + "\")"
- 			try : # accessor first
- 				eval(sf)
- 			except :
-@@ -561,7 +566,7 @@
- 				o = Group()
- 				stack.append(o)
- 			else :
--				s = string.capitalize(name) + "()"
-+				s = eval_secure(string.capitalize(name)) + "()"
- 				try :
- 					o = eval(s)
- 				except :
-@@ -575,7 +580,7 @@
- 				ma = string.replace(a, "-", "_")
- 				# e.g. xlink:href -> xlink__href
- 				ma = string.replace(ma, ":", "__")
--				s = "o." +  ma + "(\"" + attrs[a] + "\")"
-+				s = "o." +  eval_secure(ma) + "(\"" + eval_secure(attrs[a]) + "\")"
- 				try :
- 					eval(s)
- 				except AttributeError, msg :
diff --git a/app-office/dia/files/dia-0.94_xfigoverflowfix.patch b/app-office/dia/files/dia-0.94_xfigoverflowfix.patch
deleted file mode 100644
index 0462b9274b80..000000000000
--- a/app-office/dia/files/dia-0.94_xfigoverflowfix.patch
+++ /dev/null
@@ -1,202 +0,0 @@
---- dia-0.94/plug-ins/xfig/xfig-import.c.orig	2004-08-16 09:56:21.000000000 +0200
-+++ dia-0.94/plug-ins/xfig/xfig-import.c	2006-03-29 21:40:21.000000000 +0200
-@@ -441,11 +441,17 @@
- static Color
- fig_color(int color_index) 
- {
--    if (color_index == -1) 
-+    if (color_index <= -1) 
-         return color_black; /* Default color */
--    if (color_index < FIG_MAX_DEFAULT_COLORS) 
-+    else if (color_index < FIG_MAX_DEFAULT_COLORS) 
-         return fig_default_colors[color_index];
--    else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else if (color_index < FIG_MAX_USER_COLORS) 
-+	return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else {
-+	message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."),
-+		      color_index);
-+	return color_black;
-+    }
- }
- 
- static Color
-@@ -563,23 +569,25 @@
- static int
- fig_read_n_points(FILE *file, int n, Point **points) {
-     int i;
--    Point *new_points;
--
--    new_points = (Point*)g_malloc(sizeof(Point)*n);
-+    GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n);
- 
-     for (i = 0; i < n; i++) {
- 	int x,y;
-+	Point p;
- 	if (fscanf(file, " %d %d ", &x, &y) != 2) {
- 	    message_error(_("Error while reading %dth of %d points: %s\n"),
- 			  i, n, strerror(errno));
--	    free(new_points);
-+	    g_array_free(points_list, TRUE);
- 	    return FALSE;
- 	}
--	new_points[i].x = x/FIG_UNIT;
--	new_points[i].y = y/FIG_UNIT;
-+	p.x = x/FIG_UNIT;
-+	p.y = y/FIG_UNIT;
-+	g_array_append_val(points_list, p);
-     }
-     fscanf(file, "\n");
--    *points = new_points;
-+    
-+    *points = (Point *)points_list->data;
-+    g_array_free(points_list, FALSE);
-     return TRUE;
- }
- 
-@@ -683,7 +691,7 @@
-     return text_buf;
- }
- 
--static GList *depths[1000];
-+static GList *depths[FIG_MAX_DEPTHS];
- 
- /* If there's something in the compound stack, we ignore the depth field,
-    as it will be determined by the group anyway */
-@@ -693,6 +701,26 @@
-    level.  Best we can do now. */
- static int compound_depth;
- 
-+/** Add an object at a given depth.  This function checks for depth limits
-+ * and updates the compound depth if needed.
-+ *
-+ * @param newobj An object to add.  If we're inside a compound, this
-+ * doesn't really add the object.
-+ * @param depth A depth as in the Fig format, max 999
-+ */
-+static void
-+add_at_depth(DiaObject *newobj, int depth) {
-+    if (depth < 0 || depth >= FIG_MAX_DEPTHS) {
-+	message_error(_("Depth %d of of range, only 0-%d allowed.\n"),
-+		      depth, FIG_MAX_DEPTHS-1);
-+	depth = FIG_MAX_DEPTHS - 1;
-+    }
-+    if (compound_stack == NULL) 
-+	depths[depth] = g_list_append(depths[depth], newobj);
-+    else 
-+	if (compound_depth > depth) compound_depth = depth;
-+}
-+
- static DiaObject *
- fig_read_ellipse(FILE *file, DiagramData *dia) {
-     int sub_type;
-@@ -749,10 +777,7 @@
-     /* Angle -- can't rotate yet */
- 
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-     return newobj;
- }
-@@ -885,10 +910,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1111,10 +1133,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1202,10 +1221,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     g_free(forward_arrow_info);
-@@ -1298,10 +1314,7 @@
-     newobj->ops->set_props(newobj, props);
-     
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     if (text_buf != NULL) free(text_buf);
-@@ -1347,6 +1360,12 @@
- 	    return FALSE;
- 	}
- 
-+	if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) {
-+	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
-+			  colornumber, FIG_MAX_USER_COLORS);
-+	    return FALSE;
-+	}
-+
- 	color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0;
- 	color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0;
- 	color.blue = (colorvalues & 0x000000ff) / 255.0;
-@@ -1393,7 +1412,7 @@
- 	}
- 	/* Group extends don't really matter */
- 	if (compound_stack == NULL)
--	    compound_depth = 999;
-+	    compound_depth = FIG_MAX_DEPTHS - 1;
- 	compound_stack = g_slist_append(compound_stack, NULL);
- 	return TRUE;
- 	break;
-@@ -1551,7 +1570,7 @@
-     for (i = 0; i < FIG_MAX_USER_COLORS; i++) {
- 	fig_colors[i] = color_black;
-     }
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	depths[i] = NULL;
-     }
- 
-@@ -1606,7 +1625,7 @@
-     } while (TRUE);
- 
-     /* Now we can reorder for the depth fields */
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	if (depths[i] != NULL)
- 	    layer_add_objects_first(dia->active_layer, depths[i]);
-     }
---- dia-0.94/plug-ins/xfig/xfig.h	2004-08-16 03:56:21.000000000 -0400
-+++ dia-0.94.new/plug-ins/xfig/xfig.h	2006-04-20 17:19:28.000000000 -0400
-@@ -6,6 +6,7 @@
- 
- #define FIG_MAX_DEFAULT_COLORS 32
- #define FIG_MAX_USER_COLORS 512
-+#define FIG_MAX_DEPTHS 1000
- /* 1200 PPI */
- #define FIG_UNIT 472.440944881889763779527559055118
- /* 1/80 inch */
diff --git a/app-office/dia/files/digest-dia-0.94-r3 b/app-office/dia/files/digest-dia-0.94-r3
deleted file mode 100644
index bf65aff6064c..000000000000
--- a/app-office/dia/files/digest-dia-0.94-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869
-RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869
-SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869
diff --git a/app-office/dia/files/digest-dia-0.94-r4 b/app-office/dia/files/digest-dia-0.94-r4
deleted file mode 100644
index 7a48511bc812..000000000000
--- a/app-office/dia/files/digest-dia-0.94-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8905a098072f0dbd22a14ea86e790b85 dia-0.94-sheets-png.tar.bz2 5449
-RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc dia-0.94-sheets-png.tar.bz2 5449
-SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 dia-0.94-sheets-png.tar.bz2 5449
-MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869
-RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869
-SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869
diff --git a/app-office/dia/files/digest-dia-0.94-r5 b/app-office/dia/files/digest-dia-0.94-r5
deleted file mode 100644
index 7a48511bc812..000000000000
--- a/app-office/dia/files/digest-dia-0.94-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8905a098072f0dbd22a14ea86e790b85 dia-0.94-sheets-png.tar.bz2 5449
-RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc dia-0.94-sheets-png.tar.bz2 5449
-SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 dia-0.94-sheets-png.tar.bz2 5449
-MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869
-RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869
-SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869