Another round of fixes to the ebuild

Package-Manager: portage-2.1.1_pre5-r3

3 files changed, 19 insertions, 19 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index f25716cf6e26..aa39755cda25 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.242 2006/08/24 09:56:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.243 2006/08/24 18:58:20 suka Exp $
+
+  24 Aug 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.4_rc1.ebuild:
+  Some cleanups and fixes for AMD64, thanks to Jon Severinsson 
+  <jon@severinsson.net> for pointing them out in Bug #140728
 
   24 Aug 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.4_rc1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 55ffac79e655..7789d03d9e1d 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -28,14 +28,14 @@ EBUILD openoffice-2.0.3.ebuild 8771 RMD160 d8e4177da714bf2baf0918254d55d74b007c0
 MD5 1bb775b012dc3e889ce2deb201d52cf7 openoffice-2.0.3.ebuild 8771
 RMD160 d8e4177da714bf2baf0918254d55d74b007c0450 openoffice-2.0.3.ebuild 8771
 SHA256 64fb4fc0fce9c69df56246ceec62779be3256d6e9eff1d876ab566e245a29e20 openoffice-2.0.3.ebuild 8771
-EBUILD openoffice-2.0.4_rc1.ebuild 9433 RMD160 eda2328f119b400fe4d33f4311fc949d016cefc1 SHA1 70851d84ca5bde1fd89070fb584806a2e845896d SHA256 d38e832a41618d245350dc81d5fb30ed8ac81d597f6c9f00be623e43a56f150d
-MD5 401ffad9e0f935e0349ff2dc2bd968a3 openoffice-2.0.4_rc1.ebuild 9433
-RMD160 eda2328f119b400fe4d33f4311fc949d016cefc1 openoffice-2.0.4_rc1.ebuild 9433
-SHA256 d38e832a41618d245350dc81d5fb30ed8ac81d597f6c9f00be623e43a56f150d openoffice-2.0.4_rc1.ebuild 9433
-MISC ChangeLog 50574 RMD160 1c460a614c9af7ed2168c24f6d8cbbada1b4acbd SHA1 86864226301d634d4f55ad554b8f7712bba99b45 SHA256 25304d9a724a97ad3432a60f554e96f590a0879868b0428e20f383394a73d425
-MD5 2a5d37011628fc1a9cdf8358b3c8b400 ChangeLog 50574
-RMD160 1c460a614c9af7ed2168c24f6d8cbbada1b4acbd ChangeLog 50574
-SHA256 25304d9a724a97ad3432a60f554e96f590a0879868b0428e20f383394a73d425 ChangeLog 50574
+EBUILD openoffice-2.0.4_rc1.ebuild 9181 RMD160 d9610edd8dd5a8d15888a3e70e21980574c9eefb SHA1 3cdaedd025f8284f1c371bbd0022c047dc0259be SHA256 292a6ca4e37a9f7995af15e306349aa4910536e81cdd4e2c73b613d30b5816da
+MD5 0bed8e45731f97269f1cdbafbcff4797 openoffice-2.0.4_rc1.ebuild 9181
+RMD160 d9610edd8dd5a8d15888a3e70e21980574c9eefb openoffice-2.0.4_rc1.ebuild 9181
+SHA256 292a6ca4e37a9f7995af15e306349aa4910536e81cdd4e2c73b613d30b5816da openoffice-2.0.4_rc1.ebuild 9181
+MISC ChangeLog 50784 RMD160 ad2034d9bde2d538620e17aacb6436451ac9ed27 SHA1 5dd7a7ac73400d71512a678e054d0aeefa0120c3 SHA256 4f85194442b16588ccc93614a70725391f3cda393fb9735fa54d5c75c4aa4802
+MD5 c6de67ecfb6538dbb323258e95604221 ChangeLog 50784
+RMD160 ad2034d9bde2d538620e17aacb6436451ac9ed27 ChangeLog 50784
+SHA256 4f85194442b16588ccc93614a70725391f3cda393fb9735fa54d5c75c4aa4802 ChangeLog 50784
 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.ebuild b/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
index 04ccd10f2842..1994282e8692 100644
--- a/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.4_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2006/08/24 09:56:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4_rc1.ebuild,v 1.3 2006/08/24 18:58:20 suka Exp $
 
 inherit check-reqs debug eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
@@ -71,8 +71,7 @@ RDEPEND="!app-office/openoffice-bin
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
 	dev-libs/expat
-	java? ( >=virtual/jre-1.4
-		>=dev-java/java-config-2 )
+	java? ( >=virtual/jre-1.4 )
 	>=sys-devel/gcc-3.2.1
 	amd64? ( >=dev-libs/boost-1.33.1 )
 	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
@@ -90,7 +89,6 @@ DEPEND="${RDEPEND}
 		virtual/x11 )
 	net-print/cups
 	>=sys-apps/findutils-4.1.20-r1
-	app-shells/bash
 	dev-perl/Archive-Zip
 	dev-perl/Compress-Zlib
 	dev-util/pkgconfig
@@ -104,7 +102,7 @@ DEPEND="${RDEPEND}
 	app-admin/eselect-oodict
 	java? ( >=virtual/jdk-1.4
 		dev-java/ant-core
-		>=dev-java/java-config-1.2.11-r1 )
+		>=dev-java/java-config-2.0.19-r1 )
 	!java? ( dev-libs/libxslt
 		>=dev-libs/libxml2-2.0 )
 	ldap? ( net-nds/openldap )
@@ -157,10 +155,7 @@ pkg_setup() {
 		epause 10
 	fi
 
-	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
-	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"
-
-	use java && java-pkg-opt-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
 
 }
 
@@ -240,7 +235,7 @@ src_compile() {
 	cd ${S}
 	autoconf || die
 	./configure ${MYCONF} \
-		--with-distro="${DISTRO}" \
+		--with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \