Block broken glibc-2.3.1

3 files changed, 31 insertions, 27 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 49275e305731..d83d8e6f5638 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.25 2003/07/02 11:45:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.26 2003/07/08 18:28:41 pauldv Exp $
+
+  08 Jul 2003; <paul@gentoo.org> openoffice-1.1_beta2-r1.ebuild:
+  Block on glibc-2.3.1 as it won't work (bug #24085 and oo bug #10210)
 
   30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-1.1_beta2-r1.ebuild:
   Add ooweb symlink
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 37bc5719021b..34a83bab9efe 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,49 +1,49 @@
-MD5 31c8cf0fa7463a0390a5bf879a02d1d5 ChangeLog 5991
-MD5 142125805450e0dff55c8797670fba2a openoffice-1.0.2-r1.ebuild 18438
-MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
-MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
-MD5 7be2c0518bd82dedf07ccf650e74adcf openoffice-1.0.3-r1.ebuild 21121
+MD5 bbc02230ed23ce369c71d5cd8f9ee40a openoffice-1.1_beta2-r1.ebuild 17168
 MD5 26d9f59c911d655ed5ce40a8c0bd7999 openoffice-1.0.3.ebuild 20926
+MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
 MD5 d383c77d0167af08c9a41b7aab23fd94 openoffice-1.1_beta2.ebuild 17229
-MD5 5e126b7a11615a91781c6db3679fc64a openoffice-1.1_beta2-r1.ebuild 17141
+MD5 7be2c0518bd82dedf07ccf650e74adcf openoffice-1.0.3-r1.ebuild 21121
+MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
+MD5 d3cbd78fdd841f9102b6df40de8295d5 ChangeLog 6250
+MD5 de42479dde6f411d87f199d750a8e3d6 openoffice-1.0.2-r1.ebuild 18435
+MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2-r1 198
+MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2 198
 MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2 260
+MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3 330
 MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2-r1 260
 MD5 b58bd85a59e18b13fe10d416940da3de files/digest-openoffice-1.0.2-r2 1170
-MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3 330
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330
-MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2 198
-MD5 595681e533f93f0ffe52a8af67b6953f files/digest-openoffice-1.1_beta2-r1 198
+MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.2/openoffice-1.0.1-fix-asm.patch 2207
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.2/freetype-2.1.3.patch 1367
-MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper 7460
 MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.2/openoffice-1.0.1-compiler-flags.patch 954
 MD5 bda06da1ebc54aa07da68831cb77480f files/1.0.2/openoffice-1.0.1-dont-unset-home.patch 1000
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.2/openoffice-1.0.1-fix-asm.patch 2207
+MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper 7460
+MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch 1052
 MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.2/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.2/openoffice-1.0.1-no-mozab.patch 2496
 MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.2/openoffice-1.0.2-default-fonts.patch 15285
 MD5 3834566292e23e2832f625e0b5accf85 files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
+MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.2/openoffice-1.0.1-no-mozab.patch 2496
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.2/openoffice-errno.patch 291
+MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.2/openoffice-1.0.1-compiler-flags.patch 954
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.2/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch 1052
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.2/openoffice-1.0.2-default-fonts.patch 15285
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.2/openoffice-errno.patch 291
+MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
 MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
 MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
 MD5 46080de39ef5acd7488ce1e76ac10cbe files/1.0.3/ooffice-wrapper-1.3 8362
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
+MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
 MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
 MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
+MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
+MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
+MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
+MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
+MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
 MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
 MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 67ce98390eb8da814deb778bc3b524f7 files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch 612
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
-MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
 MD5 9ded113d20e703977e226bdc8373a6d4 files/1.1_beta2/ooffice-wrapper-1.3 8409
 MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta2/openoffice-xrender.patch 330
+MD5 306a5f04de5bff97195455b539bd6d14 files/1.1_beta2/no-mozab.patch 2345
+MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta2/newstlportfix.patch 10531
diff --git a/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild b/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
index 524c048bcf5d..7d51f129da4c 100644
--- a/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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_beta2-r1.ebuild,v 1.2 2003/06/30 14:34:42 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta2-r1.ebuild,v 1.3 2003/07/08 18:28:41 pauldv Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -68,6 +68,7 @@ KEYWORDS="-x86 -ppc"
 IUSE="gnome kde"
 
 RDEPEND=">=sys-libs/glibc-2.1
+	!=sys-libs/glibc-2.3.1*
 	>=dev-lang/perl-5.0
 	virtual/x11
 	app-arch/zip