diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2003-12-24 21:25:48 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2003-12-24 21:25:48 +0000 |
| commit | c2dea701662b237b83b7315cfb5cd762d4b9a868 (patch) | |
| tree | 09255a98af788c0958aa70b8d41ec4ceb9a6bfcd /kde-base/kdebase | |
| parent | No longer available from CPAN. (diff) | |
| download | historical-c2dea701662b237b83b7315cfb5cd762d4b9a868.tar.gz historical-c2dea701662b237b83b7315cfb5cd762d4b9a868.tar.bz2 historical-c2dea701662b237b83b7315cfb5cd762d4b9a868.zip | |
Change java dep to use either jdk or jre - see bug 28445
Diffstat (limited to 'kde-base/kdebase')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/Manifest | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.1.4.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.2.0_beta2.ebuild | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 7d244388b084..b4bdb559d9d1 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.102 2003/12/24 19:41:32 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.103 2003/12/24 21:25:40 caleb Exp $ + + 24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild, + kdebase-3.2.0_beta2.ebuild: + Change java dep to use either jdk or jre - as noted in bug 28445 24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta2.ebuild: Dependency cleanups. diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 30ba4c1a3a6a..9763422210cf 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,10 +1,10 @@ MD5 0ddf72a18a286698c80e009c517ea462 kdebase-3.2.0_beta1-r1.ebuild 3614 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791 -MD5 08ae898de787c2a7886930c191181a67 kdebase-3.2.0_beta2.ebuild 3117 +MD5 df76eb3581871ef425f9ffc1868438f9 kdebase-3.2.0_beta2.ebuild 3136 MD5 924761c92da94a05214375c0d374e947 kdebase-3.0.5b.ebuild 7924 -MD5 0435e781dab8701a5abeca3c68b425e0 kdebase-3.1.4.ebuild 4011 +MD5 4e706951ae26c2b9c6f6c1c6cfe99985 kdebase-3.1.4.ebuild 4026 MD5 2e7914e7f0c37c2da3d1db99bbf38d1f kdebase-3.0.4-r3.ebuild 4486 -MD5 79ebe35ca8023b1d80804140a3547b78 ChangeLog 18138 +MD5 4cad4694fd6a988894aeb37d066bb36f ChangeLog 18305 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405 diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild index e72401fed3c5..59bf5de5cb49 100644 --- a/kde-base/kdebase/kdebase-3.1.4.ebuild +++ b/kde-base/kdebase/kdebase-3.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.12 2003/11/29 22:56:02 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.13 2003/12/24 21:25:40 caleb Exp $ inherit kde-dist eutils IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java" @@ -18,7 +18,7 @@ newdepend ">=media-sound/cdparanoia-3.9.8 ssl? ( >=dev-libs/openssl-0.9.6b ) opengl? ( virtual/opengl ) samba? ( net-fs/samba ) - java? ( virtual/jdk ) + java? ( || ( virtual/jdk virtual/jre ) ) >=media-libs/freetype-2 dev-util/pkgconfig" # lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet diff --git a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild index b5f1fff3a994..f1b6904dc1d0 100644 --- a/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild +++ b/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.2 2003/12/24 19:41:32 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta2.ebuild,v 1.3 2003/12/24 21:25:40 caleb Exp $ inherit kde-dist eutils IUSE="ldap pam motif encode cups ssl opengl samba java" @@ -17,7 +17,7 @@ DEPEND="media-sound/cdparanoia ssl? ( dev-libs/openssl ) opengl? ( virtual/opengl ) samba? ( net-fs/samba ) - java? ( virtual/jdk ) + java? ( || ( virtual/jdk virtual/jre ) ) >=media-libs/freetype-2 dev-util/pkgconfig" |