Remove xml-use-flag, no longer support monolithic X and minor dep-cleanups

Package-Manager: portage-2.1.1

3 files changed, 30 insertions, 35 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 60019c243c93..921ff7e60a30 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.247 2006/09/12 11:13:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.248 2006/09/12 11:29:42 suka Exp $
+
+  12 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.4_rc1-r1.ebuild:
+  Some more ebuild cleanups: Remove xml-use-flag, hard-depend on it instead
+  (it's needed anyway), remove support for monolithic X, no longer supported
+  on Gentoo, also clean up dependencies a bit.
 
   12 Sep 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4_rc1-r1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 9b5da19b7545..04055c681c6c 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -29,14 +29,14 @@ EBUILD openoffice-2.0.3.ebuild 8889 RMD160 d088a15fccd5971b4b36499092c4736204898
 MD5 9cc02ad193304b6f9b98891d4791196c openoffice-2.0.3.ebuild 8889
 RMD160 d088a15fccd5971b4b36499092c4736204898dc7 openoffice-2.0.3.ebuild 8889
 SHA256 874ec681fcc754dd5b54db0f8e1ad3f6446d80496e8188926ae17918d062afd7 openoffice-2.0.3.ebuild 8889
-EBUILD openoffice-2.0.4_rc1-r1.ebuild 9065 RMD160 5dcd65a7d8fb6a6f0d6b9af440433d7725fb6b3f SHA1 d98b92487dd88f633da456898bc78730f4ad62f9 SHA256 75e99fac26bd4aaa9ecc69333fd29e62b14d26b5e4c72b408bb56da279b5b881
-MD5 eb16f626b59cb3c4496fd837a1887165 openoffice-2.0.4_rc1-r1.ebuild 9065
-RMD160 5dcd65a7d8fb6a6f0d6b9af440433d7725fb6b3f openoffice-2.0.4_rc1-r1.ebuild 9065
-SHA256 75e99fac26bd4aaa9ecc69333fd29e62b14d26b5e4c72b408bb56da279b5b881 openoffice-2.0.4_rc1-r1.ebuild 9065
-MISC ChangeLog 51574 RMD160 21378f07411e9360fc6794da7ef5666e77353508 SHA1 882d9ed4ef0054d3918f790905ffd07171c1d838 SHA256 9207e6c5d691613039e8e611227149f72788bc49261004142476a9c1c8bb3667
-MD5 7017afb91b23adf7835aac4c2ada96b4 ChangeLog 51574
-RMD160 21378f07411e9360fc6794da7ef5666e77353508 ChangeLog 51574
-SHA256 9207e6c5d691613039e8e611227149f72788bc49261004142476a9c1c8bb3667 ChangeLog 51574
+EBUILD openoffice-2.0.4_rc1-r1.ebuild 8792 RMD160 a66e0f4693cf26c39f7f53d13d4223aa41f97240 SHA1 5d5a793c2c7c71920f4b899d9b6135140cbeaf72 SHA256 657da701807181e8d9deb7686e5de28ade4015db6ae88127420383cae79f575c
+MD5 67e8a98f949e029eb0b1457032f6eb5f openoffice-2.0.4_rc1-r1.ebuild 8792
+RMD160 a66e0f4693cf26c39f7f53d13d4223aa41f97240 openoffice-2.0.4_rc1-r1.ebuild 8792
+SHA256 657da701807181e8d9deb7686e5de28ade4015db6ae88127420383cae79f575c openoffice-2.0.4_rc1-r1.ebuild 8792
+MISC ChangeLog 51862 RMD160 4f1e1228d5c46eb5955ec66f11595298c24e1f45 SHA1 187d90f521f23e65c8627fc0e0affad437ee2c79 SHA256 2eb41e8c0b2e58b8d638f208e99938bfceb97bae1aa96f24123a274c7ee3feeb
+MD5 9da9f937b989c85dfbeec32fa89b87ef ChangeLog 51862
+RMD160 4f1e1228d5c46eb5955ec66f11595298c24e1f45 ChangeLog 51862
+SHA256 2eb41e8c0b2e58b8d638f208e99938bfceb97bae1aa96f24123a274c7ee3feeb ChangeLog 51862
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
index d78f91eda7f4..e8f26a20274f 100644
--- a/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild,v 1.3 2006/09/12 11:13:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1-r1.ebuild,v 1.4 2006/09/12 11:29:42 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
-IUSE="binfilter branding cairo eds firefox gnome gstreamer gtk kde ldap mono odk pam xml"
+IUSE="binfilter branding cairo eds firefox gnome gstreamer gtk kde ldap mono odk pam"
 
 MY_PV="${PV}"
 PATCHLEVEL="OOD680"
@@ -41,11 +41,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="!app-office/openoffice-bin
-	|| ( (
-			x11-libs/libXaw
-			x11-libs/libXinerama
-		)
-		virtual/x11 )
+	x11-libs/libXaw
+	x11-libs/libXinerama
 	virtual/libc
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.4
@@ -64,6 +61,7 @@ RDEPEND="!app-office/openoffice-bin
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.2.0
+	net-print/cups
 	media-libs/libpng
 	sys-devel/flex
 	sys-devel/bison
@@ -72,23 +70,19 @@ RDEPEND="!app-office/openoffice-bin
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
 	java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )  )
-	>=sys-devel/gcc-3.2.1
 	amd64? ( >=dev-libs/boost-1.31.0 )
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
 	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
-	|| ( (
-			x11-libs/libXrender
-			x11-proto/printproto
-			x11-proto/xextproto
-			x11-proto/xproto
-			x11-proto/xineramaproto
-		)
-		virtual/x11 )
-	net-print/cups
+	x11-libs/libXrender
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
 	>=sys-apps/findutils-4.1.20-r1
+	>=sys-devel/gcc-3.2.1
 	dev-perl/Archive-Zip
 	dev-perl/Compress-Zlib
 	dev-util/pkgconfig
@@ -102,11 +96,10 @@ DEPEND="${RDEPEND}
 	>=app-admin/eselect-oodict-20060706
 	java? ( || ( =virtual/jre-1.4* =virtual/jre-1.5* )
 		dev-java/ant-core )
-	!java? ( dev-libs/libxslt
-		>=dev-libs/libxml2-2.0 )
+	!java? ( dev-libs/libxslt )
 	ldap? ( net-nds/openldap )
 	mono? ( >=dev-lang/mono-1.1.6 )
-	xml? ( >=dev-libs/libxml2-2.0 )"
+	>=dev-libs/libxml2-2.0"
 
 PROVIDE="virtual/ooo"
 
@@ -147,8 +140,7 @@ pkg_setup() {
 		ewarn " You are building with java-support disabled, this results in some "
 		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
 		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. Also the xml use-flag is disabled with "
-		ewarn " -java to prevent build breakage. "
+		ewarn " java in your USE-flags. "
 		ewarn
 	fi
 
@@ -211,10 +203,7 @@ src_compile() {
 	filter-flags "-ftracer"
 	filter-flags "-ffast-math"
 	filter-flags "-fforce-addr"
-	replace-flags "-O3" "-O2"
-	replace-flags "-Os" "-O2"
-	replace-flags "-O1" "-O2"
-	replace-flags "-O0" "-O2"
+	replace-flags "-O?" "-O2"
 
 	use ppc && append-flags "-D_STLP_STRICT_ANSI"