Clean up old revisions, bug #277869.

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

10 files changed, 16 insertions, 421 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index e212675a8761..0398c3f79efb 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.125 2010/02/28 21:22:10 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.126 2010/03/07 21:11:29 eva Exp $
+
+  07 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> -dia-0.95.1.ebuild,
+  -dia-0.96.1-r1.ebuild, -files/dia-0.96.1-64bit-fixes.patch,
+  -files/dia-0.96.1-gnome-doc.patch, -files/dia-0.96.1-xml-fixes.patch,
+  -dia-0.97.ebuild, dia-0.97-r1.ebuild, metadata.xml:
+  Clean up old revisions, bug #277869.
 
   28 Feb 2010; Tobias Heinlein <keytoaster@gentoo.org> dia-0.97.1.ebuild:
   amd64 stable, security bug #257020
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index a6859d582ce2..917a2dd99550 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,28 +1,20 @@
 -----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.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
 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 2585 RMD160 7aacd2b553f09dec6aabba5c95967acb1ddef353 SHA1 1856aa2a3dd190b7dfa811cda15a13eb7b52c29c SHA256 ccfd5d186905a0e1e4d9d0413461ccbe10bfe0126bab0761e599abaee40ad9a1
+EBUILD dia-0.97-r1.ebuild 2537 RMD160 473f0b62a6071132a8db520a1939030bad644c9d SHA1 96b975af924862d41df4028d1a2c12a7c31db808 SHA256 f0a058df4337624b431dcacfec3a82378e5ead7e27a40fbbe7e300307098b7ef
 EBUILD dia-0.97.1.ebuild 2447 RMD160 92c5ca15c2600bed770202eabdfba6d3ff2e1a84 SHA1 2c2b0e2e956cca0ca38d24d372bc6efbf22dd06d SHA256 c4e84c8cc1708f5c64e117386cef0531db304aba17e2378708d9f4389ed05ec2
-EBUILD dia-0.97.ebuild 2471 RMD160 892c2bb18ac744a76e2f89cb6443d72b7b5ba7a8 SHA1 a38bfd49a597706f7b98ca78c5c7154ba3fb8b17 SHA256 70c1c360c56e495e1e8bcc0b682282c1d029b7d8403b6e671638ab7970f91ee8
-MISC ChangeLog 16233 RMD160 a38317edf85846ebc967631bfa6578de19f867ed SHA1 d6480e5a74b24df634570b35c8be98c621ccd493 SHA256 05b77d271d2508f18595802bedf969ae337da5bad9c8c1b9fac32dc7e900f2e2
-MISC metadata.xml 687 RMD160 061a68c1fb154961a49f0e477c60e5622203ee9c SHA1 04993b30fa3d405bb573fb1590063b7300b2bbfe SHA256 bdcc845e385aea41bab345156554851037e00f1d268801d05e922f375ab97145
+MISC ChangeLog 16528 RMD160 b5b908364b155f03cbea258f0f802bc9f25d6ffb SHA1 83f6b95e13f00491df5fc8deb5e6816a973209a8 SHA256 70d71b9985059935ee844692b3d3f8b511cf3d4c73576e9c18f844ba96ee6c97
+MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuK3o8ACgkQt3UOBHx+2m90LwCggt2uMfpZxeUY1jEEN6DgORvK
-ThYAn3Q89wJiRtyrBNlW17/TN2jiC3Lk
-=ikcE
+iEYEARECAAYFAkuUFocACgkQ1fmVwcYIWAZubACgnbExHXXhTJaVFJPVh/xigRJq
+LtAAnRdQSVcQy4Z9gH716ZvBMdyncLFX
+=gHjb
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.95.1.ebuild b/app-office/dia/dia-0.95.1.ebuild
deleted file mode 100644
index 9748fe8f3f3d..000000000000
--- a/app-office/dia/dia-0.95.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.95.1.ebuild,v 1.11 2008/03/09 16:21:33 leio Exp $
-
-inherit eutils gnome2 libtool autotools versionator
-
-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=$(replace_version_separator 2 '-' )
-MY_PV_MM=$(get_version_component_range 1-2 )
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${PN}-${MY_PV}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gnome png python zlib"
-
-RDEPEND=">=x11-libs/gtk+-2.6.0
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/pango-1.1.5
-	>=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 )
-	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)"
-
-DOCS="AUTHORS ChangeLog COPYING KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Disable python -c 'import gtk' during compile to prevent using
-	# X being involved (#31589)
-	# changed the patch to a sed to make it a bit more portable - AllanonJL
-	sed -i -e '/AM_CHECK_PYMOD/d' configure.in
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
diff --git a/app-office/dia/dia-0.96.1-r1.ebuild b/app-office/dia/dia-0.96.1-r1.ebuild
deleted file mode 100644
index a6157775698a..000000000000
--- a/app-office/dia/dia-0.96.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.96.1-r1.ebuild,v 1.9 2008/12/04 22:08:27 eva Exp $
-
-inherit eutils gnome2 libtool autotools versionator python
-
-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}/${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
-IUSE="cairo doc gnome gnome-print png python zlib"
-
-RDEPEND=">=x11-libs/gtk+-2.6.0
-	>=dev-libs/glib-2.6.0
-	>=x11-libs/pango-1.1.5
-	>=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 )
-	gnome-print? ( gnome-base/libgnomeprint )
-	cairo? ( x11-libs/cairo )
-	python? (
-		>=dev-lang/python-1.5.2
-		>=dev-python/pygtk-1.99 )
-	doc? (
-		~app-text/docbook-xml-dtd-4.2
-		 app-text/docbook-xsl-stylesheets )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	  dev-util/pkgconfig"
-
-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)
-		$(use_with gnome-print gnomeprint)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Disable python -c 'import gtk' during compile to prevent using
-	# X being involved (#31589)
-	# changed the patch to a sed to make it a bit more portable - AllanonJL
-	sed -i -e '/AM_CHECK_PYMOD/d' configure.in
-
-	# Fix compilation in a gnome environment, bug #159831
-	epatch "${FILESDIR}/${PN}-0.96.1-gnome-doc.patch"
-
-	# Fix broken XML in documentation
-	epatch "${FILESDIR}/${PN}-0.96.1-xml-fixes.patch"
-
-	# Skip man generation
-	use doc || sed -i -e '/if HAVE_DB2MAN/,/man_MANS/d' doc/*/Makefile.am
-
-	# Fix compilation QA, bug #191673
-	epatch "${FILESDIR}/${PN}-0.96.1-64bit-fixes.patch"
-
-	# Fix tests
-	echo "dia.desktop.in" >> po/POTFILES.skip
-
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize /usr/share/dia
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/share/dia
-}
diff --git a/app-office/dia/dia-0.97-r1.ebuild b/app-office/dia/dia-0.97-r1.ebuild
index 9d8419ffaf7a..2f3d53488558 100644
--- a/app-office/dia/dia-0.97-r1.ebuild
+++ b/app-office/dia/dia-0.97-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.7 2009/08/03 03:48:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97-r1.ebuild,v 1.8 2010/03/07 21:11:29 eva Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="ppc"
 # 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"
diff --git a/app-office/dia/dia-0.97.ebuild b/app-office/dia/dia-0.97.ebuild
deleted file mode 100644
index fef37083f3fa..000000000000
--- a/app-office/dia/dia-0.97.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.ebuild,v 1.3 2009/06/27 10:26:45 mrpouet 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: libEMF stuff is completely automagic
-# 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)
-		--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
-
-	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.96.1-64bit-fixes.patch b/app-office/dia/files/dia-0.96.1-64bit-fixes.patch
deleted file mode 100644
index 68ebf5c897d1..000000000000
--- a/app-office/dia/files/dia-0.96.1-64bit-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dia-0.96.1/app/load_save.c~	2007-06-09 09:55:13.000000000 +0200
-+++ dia-0.96.1/app/load_save.c	2007-06-09 10:02:30.000000000 +0200
-@@ -17,6 +17,8 @@
-  */
- #include <config.h>
- 
-+/* so we get fdopen declared even when compiling with -ansi */
-+#define _POSIX_C_SOURCE 2
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
diff --git a/app-office/dia/files/dia-0.96.1-gnome-doc.patch b/app-office/dia/files/dia-0.96.1-gnome-doc.patch
deleted file mode 100644
index 370fad1a5435..000000000000
--- a/app-office/dia/files/dia-0.96.1-gnome-doc.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- xmldocs.make	2007-01-06 23:39:36.000000000 +0100
-+++ xmldocs.make	2008-02-12 12:45:21.000000000 +0100
-@@ -36,11 +36,7 @@
- # **********  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.
--if HAVE_GNOME
- docdir = $(datadir)/gnome/help/$(docname)/$(lang)
--else
--docdir = $(datadir)/help/$(docname)/$(lang)
--endif
- 
- # **********  You should not have to edit below this line  **********
- xml_files = $(entities) $(docname).xml
---- doc/Makefile.am	2008-02-12 12:51:13.000000000 +0100
-+++ doc/Makefile.am	2008-02-12 12:45:59.000000000 +0100
-@@ -11,6 +11,7 @@
- helpdir = $(datadir)/gnome/help/dia
- else
- helpdir = $(pkgdatadir)/help
-+docdir = $(datadir)/help/$(docname)/$(lang)
- endif
- 
- # a simple rule to symlink en to C
---- doc/en/Makefile.am	2008-02-12 12:51:13.000000000 +0100
-+++ doc/en/Makefile.am	2008-02-12 12:47:12.000000000 +0100
-@@ -5,6 +5,11 @@
- entities=
- 
- include $(top_srcdir)/xmldocs.make
-+
-+if ! HAVE_GNOME
-+docdir = $(datadir)/help/$(docname)/$(lang)
-+endif
-+
- dist-hook: app-dist-hook
- 
- nodist_include_EXTRAS = dia.1
---- doc/eu/Makefile.am	2008-02-12 12:51:13.000000000 +0100
-+++ doc/eu/Makefile.am	2008-02-12 12:47:23.000000000 +0100
-@@ -5,6 +5,11 @@
- entities=
- 
- include $(top_srcdir)/xmldocs.make
-+
-+if ! HAVE_GNOME
-+docdir = $(datadir)/help/$(docname)/$(lang)
-+endif
-+
- dist-hook: app-dist-hook
- 
- EXTRA_DIST += \
---- doc/pl/Makefile.am	2008-02-12 12:51:13.000000000 +0100
-+++ doc/pl/Makefile.am	2008-02-12 12:47:33.000000000 +0100
-@@ -5,6 +5,11 @@
- entities=
- 
- include $(top_srcdir)/xmldocs.make
-+
-+if ! HAVE_GNOME
-+docdir = $(datadir)/help/$(docname)/$(lang)
-+endif
-+
- dist-hook: app-dist-hook
- 
- EXTRA_DIST += \
---- configure.in	2008-02-12 12:13:12.000000000 +0100
-+++ configure.in	2008-02-12 12:40:16.000000000 +0100
-@@ -111,17 +111,19 @@
- fi
- 
- AC_MSG_CHECKING([whether GNOME specific code should be used])
--AC_ARG_ENABLE(gnome,[  --enable-gnome          enable gnome code],
--              GNOME=$enableval, GNOME=no)
--if test "$GNOME" = "yes" ; then
-+AC_ARG_ENABLE(gnome,
-+	      AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
-+	      enable_gnome=no)
-+if test "x$enable_gnome" = "xyes" ; then
-     GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
-     AC_DEFINE(GNOME,1,[Define if building with GNOME support])
-+    AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
-     AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
--    have_gnome=true
-+    have_gnome=yes
- else
--    have_gnome=false
-+    have_gnome=no
- fi
--AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
-+AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
- AC_MSG_RESULT($GNOME)
- 
- dnl GTK2:     libgnomecanvas-2.0 ?
-@@ -130,7 +132,8 @@
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--AM_CONDITIONAL(HAVE_BONOBO,false)
-+#AM_CONDITIONAL(HAVE_BONOBO,false)
-+AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
- 
- dnl Look for Gnome Print
- AC_ARG_WITH(gnomeprint,
-@@ -534,7 +537,7 @@
- 	Source code location:	${srcdir}
- 	Compiler:		${CC}
- 
--	Gnome support:				${GNOME}
-+	Gnome support:				${have_gnome}
- 	Python support:				${with_python}
- 	Libart support (PNG export):		${have_libart}
- 	Cairo support (experimental):		${with_cairo}
diff --git a/app-office/dia/files/dia-0.96.1-xml-fixes.patch b/app-office/dia/files/dia-0.96.1-xml-fixes.patch
deleted file mode 100644
index d225a70425b8..000000000000
--- a/app-office/dia/files/dia-0.96.1-xml-fixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/en/dia.xml	2007-03-29 08:08:39.000000000 +0200
-+++ doc/en/dia.xml	2008-04-03 12:04:19.000000000 +0200
-@@ -4,8 +4,7 @@
- 
- <!DOCTYPE book
- 
--  PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"
--
-+  PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-   [
- 
-     <!ENTITY VERSION "0.96.1">
---- doc/en/usage-layers.xml	2007-01-21 17:12:45.000000000 +0100
-+++ doc/en/usage-layers.xml	2008-04-03 12:03:43.000000000 +0200
-@@ -26,7 +26,7 @@
-       </para>
-     </tip>
-     <para>
--      Each new diagram comes with the default layer labelled “Background”. Of course you can change its name and settings to customize it to your needs as you can do with any other layer.
-+      Each new diagram comes with the default layer labelled <emphasis>Background</emphasis>. Of course you can change its name and settings to customize it to your needs as you can do with any other layer.
-     </para>
-     <para>
-       You can use layers to create overlay slide show by drawing each incremental slide in a
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index 4bbda02bd16a..a257c2310768 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -10,8 +10,4 @@
   possible to add support for new shapes by writing simple XML
   files, using a subset of SVG to draw the shape.
 </longdescription>
-<use>
-  <flag name='gnome-print'>Gnome-Print support
-    (<pkg>gnome-base/libgnomeprint</pkg>)</flag>
-</use>
 </pkgmetadata>