move tbz2's to ibiblio

6 files changed, 16 insertions, 7 deletions

diff --git a/app-office/openoffice-bin/files/641d/registry-641d.tbz2 b/app-office/openoffice-bin/files/641d/registry-641d.tbz2
deleted file mode 100644
index f3f5b7eee65b..000000000000
--- a/app-office/openoffice-bin/files/641d/registry-641d.tbz2
+++ /dev/null
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-641d b/app-office/openoffice-bin/files/digest-openoffice-bin-641d-r1
index 2e9396149cc7..7e7acf796f22 100644
--- a/app-office/openoffice-bin/files/digest-openoffice-bin-641d
+++ b/app-office/openoffice-bin/files/digest-openoffice-bin-641d-r1
@@ -1 +1,2 @@
 MD5 970c701d9ca584bbf6d9113956fbc51c install641D_linux_intel.tar.gz 69450027
+MD5 7f19c3b07938ebeeada00c968d048264 openoffice-641d-registry.tbz2 126826
diff --git a/app-office/openoffice-bin/openoffice-bin-641d.ebuild b/app-office/openoffice-bin/openoffice-bin-641d-r1.ebuild
index d8a087213269..1cd1001b0015 100644
--- a/app-office/openoffice-bin/openoffice-bin-641d.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-641d-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-641d.ebuild,v 1.3 2002/04/20 22:38:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-641d-r1.ebuild,v 1.1 2002/05/03 22:55:25 azarah Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -18,7 +18,8 @@ MAIN_VER="`echo ${PV} |sed -e "s:[a-z]::g"`"
 S="${WORKDIR}/normal"
 DESCRIPTION="OpenOffice productivity suite"
 SRC_URI="http://ny1.mirror.openoffice.org/${PV}/install${MY_PV}_linux_intel.tar.gz
-	http://sf1.mirror.openoffice.org/${PV}/install${MY_PV}_linux_intel.tar.gz"
+	http://sf1.mirror.openoffice.org/${PV}/install${MY_PV}_linux_intel.tar.gz
+	http://www.ibiblio.org/gentoo/distfiles/openoffice-${PV}-registry.tbz2"
 HOMEPAGE="http://www.openoffice.org"
 
 DEPEND="virtual/glibc
@@ -30,6 +31,11 @@ DEPEND="virtual/glibc
 
 SLOT="0"
 
+src_unpack() {
+
+	unpack install${MY_PV}_linux_intel.tar.gz
+}
+
 src_install() {
 
 	# Generate a install script
@@ -71,7 +77,7 @@ src_install() {
 	# Install binary with "./setup -net" to generate.
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry
 	rm -rf *
-	tar -jxpf ${FILESDIR}/${PV}/registry-${PV}.tbz2 || \
+	tar -jxpf ${DISTDIR}/openoffice-${PV}-registry.tbz2 || \
 		die "Could not unpack registry!"
 	# Fix paths
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry/instance/org/openoffice/Office
diff --git a/app-office/openoffice/files/641d/registry-641d.tbz2 b/app-office/openoffice/files/641d/registry-641d.tbz2
deleted file mode 100644
index f3f5b7eee65b..000000000000
--- a/app-office/openoffice/files/641d/registry-641d.tbz2
+++ /dev/null
diff --git a/app-office/openoffice/files/digest-openoffice-641d b/app-office/openoffice/files/digest-openoffice-641d-r1
index e1c2a6cdf0ff..5dd70c999147 100644
--- a/app-office/openoffice/files/digest-openoffice-641d
+++ b/app-office/openoffice/files/digest-openoffice-641d-r1
@@ -1,2 +1,3 @@
 MD5 6f72837c9609b17ed7631ab5539259bc oo_641d_src.tar.bz2 116352036
 MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
+MD5 7f19c3b07938ebeeada00c968d048264 openoffice-641d-registry.tbz2 126826
diff --git a/app-office/openoffice/openoffice-641d.ebuild b/app-office/openoffice/openoffice-641d-r1.ebuild
index c836a06b784c..f6cee5a74407 100644
--- a/app-office/openoffice/openoffice-641d.ebuild
+++ b/app-office/openoffice/openoffice-641d-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors: Preston A. Elder <prez@goth.net>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-641d.ebuild,v 1.4 2002/04/24 22:41:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-641d-r1.ebuild,v 1.1 2002/05/03 22:55:20 azarah Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -28,7 +28,8 @@ S="${WORKDIR}/oo_${PV}_src"
 DESCRIPTION="OpenOffice productivity suite"
 SRC_URI="http://ny1.mirror.openoffice.org/${PV}/oo_${PV}_src.tar.bz2
 	http://sf1.mirror.openoffice.org/${PV}/oo_${PV}_src.tar.bz2
-	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"
+	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
+	http://www.ibiblio.org/gentoo/distfiles/${PN}-${PV}-registry.tbz2"
 HOMEPAGE="http://www.openoffice.org"
 
 COMMONDEPEND=">=sys-libs/glibc-2.1
@@ -71,7 +72,7 @@ export LS_COLORS=""
 
 src_unpack() {
 	cd ${WORKDIR}
-	unpack ${A}
+	unpack oo_${PV}_src.tar.bz2 gpc231.tar.Z
 	cd ${WORKDIR}/gpc231
 	cp gpc.* ${S}/external/gpc
 	cd ${S}
@@ -266,7 +267,7 @@ src_install() {
 	# Install binary with "./setup -net" to generate.
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry
 	rm -rf *
-	tar -jxpf ${FILESDIR}/${PV}/registry-${PV}.tbz2 || \
+	tar -jxpf ${DISTDIR}/${PN}-${PV}-registry.tbz2 || \
 		die "Could not unpack registry!"
 	# Fix paths
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry/instance/org/openoffice/Office