New upstream release candidate

11 files changed, 22 insertions, 16 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 152372538d5e..aa2672a875cb 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.58 2004/02/10 10:20:03 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.59 2004/03/07 12:15:04 pauldv Exp $
+
+*openoffice-1.1.1_rc1 (07 Mar 2004)
+
+  07 Mar 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1_rc1.ebuild,
+  openoffice-1.1.1b.ebuild:
+  Add a new release candidate. Remove the old beta as the versioning was wrong
 
   10 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r3.ebuild,
   openoffice-1.1.1b.ebuild, files/1.1.0/openoffice-java.patch,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 2cb04a42fed7..9cd5113d432d 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,19 +1,19 @@
-MD5 f2ec9641680c1a2ca4493b3e1e10e86b openoffice-1.1.1b.ebuild 15867
 MD5 fafaf6a6fc199ee0469c40d1607c37b4 openoffice-1.1.0-r2.ebuild 20288
 MD5 c0a6d36a7529f0a22bae30399b11bc5d openoffice-1.0.3-r1.ebuild 21888
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 3bbf39cea6510e3bc3fad91d2648bd2e ChangeLog 14281
+MD5 6c3086453a3f0edc33fdb432c0a3da49 ChangeLog 14505
+MD5 9d680ddd44a8decbf015ecb79ea6ad82 openoffice-1.1.1_rc1.ebuild 15896
 MD5 21a72230c73df5f6951aaf77581fd1bc openoffice-1.1.0-r3.ebuild 15900
-MD5 0844fa234d3e570374b631f1764f7503 files/digest-openoffice-1.1.1b 129
 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0-r2 195
 MD5 601e987d3fa97d8dfc4cdd052b0e9832 files/digest-openoffice-1.1.0-r3 128
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
-MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.1b/ooffice-wrapper-1.3 8972
-MD5 309ec50c6facc777068caebd51640c92 files/1.1.1b/no-mozab.patch 2741
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1b/openoffice-java.patch 2092
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1b/nptl.patch 1285
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.1b/fixed-gcc.patch 644
-MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1b/newstlportfix.patch 10032
+MD5 08d21c415f94c848d18a01c9a286313e files/digest-openoffice-1.1.1_rc1 130
+MD5 ea579df37ecea73bc37977db44c7bba4 files/1.1.1_rc1/ooffice-wrapper-1.3 8972
+MD5 309ec50c6facc777068caebd51640c92 files/1.1.1_rc1/no-mozab.patch 2741
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.1_rc1/openoffice-java.patch 2092
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1_rc1/nptl.patch 1285
+MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.1_rc1/fixed-gcc.patch 644
+MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.1_rc1/newstlportfix.patch 10032
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
 MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
 MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
diff --git a/app-office/openoffice/files/1.1.1b/fixed-gcc.patch b/app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch
index 3f2ee40700af..3f2ee40700af 100644
--- a/app-office/openoffice/files/1.1.1b/fixed-gcc.patch
+++ b/app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch
diff --git a/app-office/openoffice/files/1.1.1b/newstlportfix.patch b/app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch
index dc958c84a6f8..dc958c84a6f8 100644
--- a/app-office/openoffice/files/1.1.1b/newstlportfix.patch
+++ b/app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch
diff --git a/app-office/openoffice/files/1.1.1b/no-mozab.patch b/app-office/openoffice/files/1.1.1_rc1/no-mozab.patch
index f8ccda1bda3b..f8ccda1bda3b 100644
--- a/app-office/openoffice/files/1.1.1b/no-mozab.patch
+++ b/app-office/openoffice/files/1.1.1_rc1/no-mozab.patch
diff --git a/app-office/openoffice/files/1.1.1b/nptl.patch b/app-office/openoffice/files/1.1.1_rc1/nptl.patch
index 212ff05c51b6..212ff05c51b6 100644
--- a/app-office/openoffice/files/1.1.1b/nptl.patch
+++ b/app-office/openoffice/files/1.1.1_rc1/nptl.patch
diff --git a/app-office/openoffice/files/1.1.1b/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3
index c168e6eb803c..c168e6eb803c 100644
--- a/app-office/openoffice/files/1.1.1b/ooffice-wrapper-1.3
+++ b/app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3
diff --git a/app-office/openoffice/files/1.1.1b/openoffice-java.patch b/app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch
index 46a6e9734aa6..46a6e9734aa6 100644
--- a/app-office/openoffice/files/1.1.1b/openoffice-java.patch
+++ b/app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.1_rc1 b/app-office/openoffice/files/digest-openoffice-1.1.1_rc1
new file mode 100644
index 000000000000..957870d51900
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.1.1_rc1
@@ -0,0 +1,2 @@
+MD5 24ed3d57a01a59edfae95fe575476719 OOo_1.1.1rc_source.tar.bz2 194278533
+MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.1b b/app-office/openoffice/files/digest-openoffice-1.1.1b
deleted file mode 100644
index 23e3f0678f1e..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.1.1b
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 40cadaa780e753b5873eb2241cce64f2 OOo_1.1.1b_source.tar.bz2 191917308
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
diff --git a/app-office/openoffice/openoffice-1.1.1b.ebuild b/app-office/openoffice/openoffice-1.1.1_rc1.ebuild
index 5c50aef59961..b194b14c8cc1 100644
--- a/app-office/openoffice/openoffice-1.1.1b.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1b.ebuild,v 1.2 2004/02/10 10:20:03 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1_rc1.ebuild,v 1.1 2004/03/07 12:15:04 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -51,9 +51,9 @@ export WANT_GCC_3="yes"
 
 LOC="/opt"
 INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${PV/1.1.0/1.1}_src"
+S="${WORKDIR}/oo_${PV/_rc1}_src"
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_source.tar.bz2
+SRC_URI="mirror://openoffice/contrib/rc/${PV//_rc1/rc}/OOo_${PV//_rc1/rc}_source.tar.bz2
 	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"
 HOMEPAGE="http://www.openoffice.org/"
 
@@ -250,7 +250,7 @@ src_unpack() {
 	oo_setup
 
 	cd ${WORKDIR}
-	unpack OOo_${PV}_source.tar.bz2 gpc231.tar.Z
+	unpack OOo_${PV//_rc1/rc}_source.tar.bz2 gpc231.tar.Z
 
 	# Install gpc
 	cd ${WORKDIR}/gpc231