diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-11-23 17:55:20 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-11-23 17:55:20 +0000 |
| commit | 29a2c97f70cd2b4f5fcb2a9ed6199749813960e6 (patch) | |
| tree | 5eb9c2aaf78f445f9da3b221137383262fb4bdf1 /kde-base/krossjava | |
| parent | Typo. (diff) | |
| download | gentoo-2-29a2c97f70cd2b4f5fcb2a9ed6199749813960e6.tar.gz gentoo-2-29a2c97f70cd2b4f5fcb2a9ed6199749813960e6.tar.bz2 gentoo-2-29a2c97f70cd2b4f5fcb2a9ed6199749813960e6.zip | |
Block incompatible ibm jdk, fixes bug #446273.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/krossjava')
| -rw-r--r-- | kde-base/krossjava/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-4.11.2.ebuild | 8 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-4.11.3.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog index a7c8b057d175..c15d8c8a4179 100644 --- a/kde-base/krossjava/ChangeLog +++ b/kde-base/krossjava/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/krossjava # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.154 2013/11/05 22:22:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.155 2013/11/23 17:55:20 johu Exp $ + + 23 Nov 2013; Johannes Huber <johu@gentoo.org> krossjava-4.11.2.ebuild, + krossjava-4.11.3.ebuild: + Block incompatible ibm jdk, fixes bug #446273. *krossjava-4.11.3 (05 Nov 2013) diff --git a/kde-base/krossjava/krossjava-4.11.2.ebuild b/kde-base/krossjava/krossjava-4.11.2.ebuild index ec979df4279f..38cc52989d5b 100644 --- a/kde-base/krossjava/krossjava-4.11.2.ebuild +++ b/kde-base/krossjava/krossjava-4.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.2.ebuild,v 1.1 2013/10/09 23:04:42 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.2.ebuild,v 1.2 2013/11/23 17:55:20 johu Exp $ EAPI=5 @@ -9,14 +9,14 @@ KMMODULE="java" inherit java-pkg-2 java-ant-2 kde4-meta multilib DESCRIPTION="Java plugin for the kdelibs/kross scripting framework." -KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND=" >=virtual/jdk-1.5 " -RDEPEND=" - >=virtual/jre-1.5 +RDEPEND="${DEPEND} + !!dev-java/ibm-jdk-bin " pkg_setup() { diff --git a/kde-base/krossjava/krossjava-4.11.3.ebuild b/kde-base/krossjava/krossjava-4.11.3.ebuild index f4347740b03f..4738af26566e 100644 --- a/kde-base/krossjava/krossjava-4.11.3.ebuild +++ b/kde-base/krossjava/krossjava-4.11.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.3.ebuild,v 1.1 2013/11/05 22:22:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.3.ebuild,v 1.2 2013/11/23 17:55:20 johu Exp $ EAPI=5 @@ -15,8 +15,8 @@ IUSE="debug" DEPEND=" >=virtual/jdk-1.5 " -RDEPEND=" - >=virtual/jre-1.5 +RDEPEND="${DEPEND} + !!dev-java/ibm-jdk-bin " pkg_setup() { |