move binary in files to mirrors and cleanup (#120627)

(Portage version: 2.1_pre4-r1)

9 files changed, 20 insertions, 143 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index a022199bc818..ccac45471e64 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/dia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.75 2006/02/17 00:14:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.76 2006/03/22 20:53:06 foser Exp $
+
+  22 Mar 2006; Marinus Schraal <foser@gentoo.org> -files/dia-0.94-sheets-png.tar.bz2 :
+  Move png sheets to mirrors (#120627)
 
   17 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   +files/dia-0.94-pkgconfig.patch, dia-0.94-r4.ebuild:
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 23c6cb399c9f..70a4ea4a69d5 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 61d64bec4267222bed44e154126076ff ChangeLog 9243
 RMD160 bcdaa77ace85874d5354ef81eabbe6f13f8189ba ChangeLog 9243
 SHA256 fb18df5e2f11455884a44f6985e5fd7ebefb13d5cb1094068e9699561e729a21 ChangeLog 9243
-MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
-RMD160 b2e7736a28b1ab842711fa6b36749b81c3a090a6 dia-0.94-r1.ebuild 1479
-SHA256 2456ab6ff7f88311d848c8464fcd2ca230caaf8039a48095409ca726229cab82 dia-0.94-r1.ebuild 1479
-MD5 e64a64c8b1e5e3be5cf29d34c7374513 dia-0.94-r2.ebuild 1655
-RMD160 abca872d7da2f200ed1e230fd38ec166101b4c93 dia-0.94-r2.ebuild 1655
-SHA256 291221ea1348a6f7e45dccb59f94d8102b9e9d128d179c5ca18bf59c2cbddd19 dia-0.94-r2.ebuild 1655
 MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
 RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 dia-0.94-r3.ebuild 1738
 SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a dia-0.94-r3.ebuild 1738
-MD5 2bea828fe222c9372b7f7b545ef6c327 dia-0.94-r4.ebuild 2136
-RMD160 e6df4954b649d3d77e124d9136ad6122d51254d8 dia-0.94-r4.ebuild 2136
-SHA256 345353d519450b3f4b65c1abff611ae69a4460a852f7773f8b546a6958c51a11 dia-0.94-r4.ebuild 2136
+MD5 d0790fd3f3854180e4eb21223329cb18 dia-0.94-r4.ebuild 2193
+RMD160 45f88f1aa924f1cf46659a26cecd68acf5d7bb5e dia-0.94-r4.ebuild 2193
+SHA256 8b73620763dbef26fe8ee1923c3c8dc614ce665f0809a90271d8d159d5927703 dia-0.94-r4.ebuild 2193
 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
@@ -43,25 +34,12 @@ SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89 files/di
 MD5 8905a098072f0dbd22a14ea86e790b85 files/dia-0.94-sheets-png.tar.bz2 5449
 RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc files/dia-0.94-sheets-png.tar.bz2 5449
 SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 files/dia-0.94-sheets-png.tar.bz2 5449
-MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
-RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r1 62
-SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r1 62
-MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62
-RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r2 62
-SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r2 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62
 RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r3 62
 SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r3 62
-MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r4 62
-RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r4 62
-SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r4 62
+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 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
 RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
 SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3 metadata.xml 596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD9RVsJrHF4yAQTrARApW1AKDPq55FkItNQTyaazzbZFnHo5/4CACghsrj
-xMuXhKPKvophwM8I92Ruzus=
-=b7CR
------END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.94-r1.ebuild b/app-office/dia/dia-0.94-r1.ebuild
deleted file mode 100644
index 3701e909f234..000000000000
--- a/app-office/dia/dia-0.94-r1.ebuild
+++ /dev/null
@@ -1,52 +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-r1.ebuild,v 1.11 2005/06/13 19:20:44 ferdy 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*"
-
-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
-	autoconf
-
-	# 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/dia-0.94-r2.ebuild b/app-office/dia/dia-0.94-r2.ebuild
deleted file mode 100644
index 595474c5592e..000000000000
--- a/app-office/dia/dia-0.94-r2.ebuild
+++ /dev/null
@@ -1,58 +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-r2.ebuild,v 1.10 2005/10/03 11:44:49 hardave 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
-}
diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild
index c5cd09b93283..0adf8f8299e4 100644
--- a/app-office/dia/dia-0.94-r4.ebuild
+++ b/app-office/dia/dia-0.94-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/02/17 00:14:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.3 2006/03/22 20:53:06 foser Exp $
 
 inherit eutils gnome2 libtool
 
@@ -8,6 +8,9 @@ DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="http://www.gnome.org/projects/dia/"
 LICENSE="GPL-2"
 
+SRC_URI="${SRC_URI}
+	mirrors://gentoo/${P}-sheets-png.tar.bz2"
+
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnome png python static zlib"
@@ -51,7 +54,7 @@ src_unpack() {
 
 	# Install png's instead of xpm's, (bug #103401) and upstream.
 	epatch ${FILESDIR}/${P}-png.patch
-	tar jxf ${FILESDIR}/${P}-sheets-png.tar.bz2
+	cp -r ${WORKDIR}/sheets/* ${S}/sheets
 	aclocal  || die "Aclocal failed"
 	automake || die "Automake failed"
 
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
deleted file mode 100644
index d6b23e16cf2b..000000000000
--- a/app-office/dia/files/dia-0.94-sheets-png.tar.bz2
+++ /dev/null
diff --git a/app-office/dia/files/digest-dia-0.94-r1 b/app-office/dia/files/digest-dia-0.94-r1
deleted file mode 100644
index a4366b0c6a35..000000000000
--- a/app-office/dia/files/digest-dia-0.94-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869
diff --git a/app-office/dia/files/digest-dia-0.94-r2 b/app-office/dia/files/digest-dia-0.94-r2
deleted file mode 100644
index a4366b0c6a35..000000000000
--- a/app-office/dia/files/digest-dia-0.94-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63584224912dab49fed8d2cf87ea2d85 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
index a4366b0c6a35..7a48511bc812 100644
--- a/app-office/dia/files/digest-dia-0.94-r4
+++ b/app-office/dia/files/digest-dia-0.94-r4
@@ -1 +1,6 @@
+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