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

(Portage version: 2.1.5.2)

3 files changed, 12 insertions, 13 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/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() {