registry updates

4 files changed, 16 insertions, 11 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index aa1c3032769c..718c94f89873 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.3 2002/05/12 17:44:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.4 2002/07/15 18:51:54 azarah Exp $
+
+*openoffice-bin-1.0.0-r2 (15 Jul 2002)
+
+  15 Jul 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.0-r2.ebuild :
+  Fix the registry for 1.0.
 
 *openoffice-bin-1.0.0-r1 (12 May 2002)
 
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-1.0.0-r2 b/app-office/openoffice-bin/files/digest-openoffice-bin-1.0.0-r2
new file mode 100644
index 000000000000..b4959b03cb4a
--- /dev/null
+++ b/app-office/openoffice-bin/files/digest-openoffice-bin-1.0.0-r2
@@ -0,0 +1,2 @@
+MD5 24b64e79509f4e6b4e458fe35f82c762 OOo_1.0.0_LinuxIntel_install.tar.gz 69877656
+MD5 7097e016fdfdfc01b4e98da4a42dcff7 openoffice-1.0.0b-registry.tbz2 126982
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-641d-r1 b/app-office/openoffice-bin/files/digest-openoffice-bin-641d-r1
deleted file mode 100644
index 7e7acf796f22..000000000000
--- a/app-office/openoffice-bin/files/digest-openoffice-bin-641d-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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-r1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.0.0-r2.ebuild
index 5380828492b9..6cb50f81fd53 100644
--- a/app-office/openoffice-bin/openoffice-bin-641d-r1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-641d-r1.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.0.0-r2.ebuild,v 1.1 2002/07/15 18:51:54 azarah Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -14,11 +14,11 @@
 MY_PV="`echo ${PV} | gawk '{ print toupper($1) }'`"
 LOC="/opt"
 MAIN_VER="`echo ${PV} |sed -e "s:[a-z]::g"`"
-S="${WORKDIR}/normal"
+S="${WORKDIR}/install"
 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://www.ibiblio.org/gentoo/distfiles/openoffice-${PV}-registry.tbz2"
+SRC_URI="http://ny1.mirror.openoffice.org/${PV}/OOo_${MY_PV}_LinuxIntel_install.tar.gz
+	http://sf1.mirror.openoffice.org/${PV}/OOo_${MY_PV}_LinuxIntel_install.tar.gz
+	http://www.ibiblio.org/gentoo/distfiles/openoffice-${PV}b-registry.tbz2"
 HOMEPAGE="http://www.openoffice.org"
 
 DEPEND="virtual/glibc
@@ -32,7 +32,7 @@ SLOT="0"
 
 src_unpack() {
 
-	unpack install${MY_PV}_linux_intel.tar.gz
+	unpack OOo_${MY_PV}_LinuxIntel_install.tar.gz
 }
 
 src_install() {
@@ -76,12 +76,12 @@ src_install() {
 	# Install binary with "./setup -net" to generate.
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry
 	rm -rf *
-	tar -jxpf ${DISTDIR}/openoffice-${PV}-registry.tbz2 || \
+	tar -jxpf ${DISTDIR}/openoffice-${PV}b-registry.tbz2 || \
 		die "Could not unpack registry!"
 	# Fix paths
 	cd ${D}${LOC}/OpenOffice-${PV}/share/config/registry/instance/org/openoffice/Office
 	cp Common.xml Common.xml.orig
-	sed -e "s:/opt/OpenOffice.org641:${LOC}/OpenOffice-${PV}:g" \
+	sed -e "s:/opt/OpenOffice\.org1\.0:${LOC}/OpenOffice-${PV}:g" \
 		Common.xml.orig >Common.xml
 	rm -f Common.xml.orig