bison and flex are only build time dependencies (bugs #221317 and #221581), also remove javaldx hack

Package-Manager: portage-2.1.5.2

4 files changed, 15 insertions, 16 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6e4af225dd6f..770b7534aecd 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.398 2008/05/29 09:50:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.399 2008/05/29 12:24:40 suka Exp $
+
+  29 May 2008; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.4.0.ebuild, openoffice-2.4.1_rc1.ebuild:
+  bison and flex are only build time dependencies (bugs #221317 and
+  #221581), also remove javaldx hack, shouldn't be necessary anymore
 
   29 May 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.4.1_rc1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 84159d57f968..3965b6c53aae 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -20,7 +20,7 @@ DIST ooo-build-2.4.1.1.tar.gz 8813021 RMD160 ae3c806123a6713694ff5282552260ff036
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
-EBUILD openoffice-2.4.0.ebuild 12706 RMD160 7413dafed817b48a0fcd3d5505cb0ca4bce866c8 SHA1 cbbcf120777424771ebe0d734c838a1178429b87 SHA256 0f1fef5abc41a64d3f08ef029ff75f4e021b36625c2fa9c312eaf68e8ac2fddf
-EBUILD openoffice-2.4.1_rc1.ebuild 12765 RMD160 08ad40bb977c008fd5c7320978a9b56ba25d61e1 SHA1 56446d699173c16e550cf2c553fed9913928471b SHA256 bba391210507c5cd32974ca4fdb13d2948dca5516c79c7581cd1e0f3f9cd5004
-MISC ChangeLog 82750 RMD160 44386080f88364f0a550a393c92e4eb11a1d6ec5 SHA1 855643794a31d2ea1d98901db53364bb57b891d7 SHA256 a0e64d2cc8cb3d140806dc5b8f707eb40a6a9d6ba971c76cbe20107eb89841e6
+EBUILD openoffice-2.4.0.ebuild 12526 RMD160 80183a9a47575e26c34f84e11acfaff572bb7841 SHA1 573230844c7f8a6b37b7753f96541af4639a3fd2 SHA256 9db8c468920f8bbf40ba98eec1e1b2175c6c150254678ac30b602887dd13b9dc
+EBUILD openoffice-2.4.1_rc1.ebuild 12585 RMD160 28059c76b85fd88feb90d3b2d739a59abbaa13fd SHA1 5e42ad832673e1731e14114d2a24374cb3ef01c9 SHA256 96fd9cf4dc0a673826be66342b8e4609c0756641f87f842cbccf01eb463fe663
+MISC ChangeLog 82997 RMD160 3acfee11dbc730efb701454f46c64f8b6eb7d9ff SHA1 e042c5a7550455a89a83fa14b2e44dc408e0c9a8 SHA256 d04a78cdf44f0e01d6db3a8ab4128774e94eef685937bdf9717d1fb9d4b89305
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index e11d9a9ef9f0..df4018500397 100644
--- a/app-office/openoffice/openoffice-2.4.0.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.18 2008/05/23 12:56:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.19 2008/05/29 12:24:40 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -89,8 +89,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	cups? ( net-print/cups )
 	media-libs/jpeg
 	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
 	app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
@@ -124,6 +122,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.33.1
+	sys-devel/flex
+	sys-devel/bison
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.0
 	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
@@ -359,9 +359,6 @@ src_install() {
 	# record java libraries
 	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
 
-	# trying to work around javaldx problems on start
-	cp ${S}/build/${MST}/solver/*/*/lib/sunjavapluginrc ${D}/usr/$(get_libdir)/openoffice/program/ || die "Java config not found!"
-
 }
 
 pkg_postinst() {
diff --git a/app-office/openoffice/openoffice-2.4.1_rc1.ebuild b/app-office/openoffice/openoffice-2.4.1_rc1.ebuild
index 3bdbfe0661ca..e9469468137a 100644
--- a/app-office/openoffice/openoffice-2.4.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-2.4.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v 1.2 2008/05/29 09:50:33 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v 1.3 2008/05/29 12:24:40 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -90,8 +90,6 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	cups? ( net-print/cups )
 	media-libs/jpeg
 	media-libs/libpng
-	sys-devel/flex
-	sys-devel/bison
 	app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
@@ -125,6 +123,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=dev-libs/boost-1.33.1
+	sys-devel/flex
+	sys-devel/bison
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.0
 	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
@@ -360,9 +360,6 @@ src_install() {
 	# record java libraries
 	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
 
-	# trying to work around javaldx problems on start
-	cp ${S}/build/${MST}/solver/*/*/lib/sunjavapluginrc ${D}/usr/$(get_libdir)/openoffice/program/ || die "Java config not found!"
-
 }
 
 pkg_postinst() {