diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-03-07 11:09:29 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-03-07 11:09:29 +0000 |
| commit | a2b8711b297876ff45d903618a5ef2a6f84f685a (patch) | |
| tree | f212509c238fd0d40877abf2a0f1899c6ad73d6c /kde-base/kdebase | |
| parent | Marked ~amd64, keywording KDE split ebuilds, bug 80944. (diff) | |
| download | gentoo-2-a2b8711b297876ff45d903618a5ef2a6f84f685a.tar.gz gentoo-2-a2b8711b297876ff45d903618a5ef2a6f84f685a.tar.bz2 gentoo-2-a2b8711b297876ff45d903618a5ef2a6f84f685a.zip | |
Proper handling of java (#82032).
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.4.0_rc1.ebuild | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 9316f754a3fd..0ed68b8f7ed1 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.185 2005/02/27 22:51:12 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.186 2005/03/07 11:09:29 greg_g Exp $ + + 07 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-3.4.0_rc1.ebuild: + Proper handling of java (#82032). *kdebase-3.4.0_rc1 (27 Feb 2005) diff --git a/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild b/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild index 306302c02547..b3d85ae87964 100644 --- a/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild +++ b/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild,v 1.1 2005/02/27 22:51:12 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.0_rc1.ebuild,v 1.2 2005/03/07 11:09:29 greg_g Exp $ inherit kde-dist eutils @@ -18,7 +18,6 @@ DEPEND="arts? ( ~kde-base/arts-${PV} ) ssl? ( dev-libs/openssl ) opengl? ( virtual/opengl ) samba? ( >=net-fs/samba-3.0.4 ) - java? ( || ( virtual/jdk virtual/jre ) ) lm_sensors? ( sys-apps/lm_sensors ) logitech-mouse? ( dev-libs/libusb ) ieee1394? ( sys-libs/libraw1394 ) @@ -26,6 +25,7 @@ DEPEND="arts? ( ~kde-base/arts-${PV} ) >=sys-apps/hal-0.4 )" RDEPEND="${DEPEND} + java? ( || ( virtual/jdk virtual/jre ) ) sys-apps/eject" src_unpack() { @@ -44,15 +44,10 @@ src_compile() { use pam && myconf="${myconf} --with-pam=yes" \ || myconf="${myconf} --with-pam=no --with-shadow" - if use java ; then - if has_version virtual/jdk ; then - myconf="${myconf} --with-java=$(java-config --jdk-home)" - else - myconf="${myconf} --with-java=$(java-config --jre-home)" - fi - else - myconf="${myconf} --without-java" - fi + # the java test is problematic (see kde bug 100729) and + # useless. All that's needed for java applets to work is + # to have the 'java' executable in PATH. + myconf="${myconf} --without-java" kde_src_compile } |