diff options
author | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-07 20:35:37 +0000 |
---|---|---|
committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-07 20:35:37 +0000 |
commit | 888a928c347b36657f4aaf967b3f361a268532e7 (patch) | |
tree | 9879571a20b25c8f1418ac122049ec280ebffbc0 /kde-base/kdejava | |
parent | Allow mixing of split & monolithic ebuilds, where possible, thanks to Arfreve... (diff) | |
download | gentoo-2-888a928c347b36657f4aaf967b3f361a268532e7.tar.gz gentoo-2-888a928c347b36657f4aaf967b3f361a268532e7.tar.bz2 gentoo-2-888a928c347b36657f4aaf967b3f361a268532e7.zip |
Allow mixing of split & monolithic ebuilds, where possible, thanks to Arfrever Frehtes Taifersar Arahesis!
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base/kdejava')
-rw-r--r-- | kde-base/kdejava/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdejava/kdejava-3.5.9.ebuild | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog index a9b322a03f9d..bfa6e81af682 100644 --- a/kde-base/kdejava/ChangeLog +++ b/kde-base/kdejava/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdejava # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.70 2008/02/23 20:09:59 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.71 2008/03/07 20:35:37 ingmar Exp $ + + 07 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdejava-3.5.9.ebuild: + Allow mixing of split & monolithic ebuilds, where possible, thanks to + Arfrever Frehtes Taifersar Arahesis! 23 Feb 2008; Vlastimil Babka <caster@gentoo.org> kdejava-3.5.9.ebuild: Apply the patch for bug #208631 also in 3.5.9. diff --git a/kde-base/kdejava/kdejava-3.5.9.ebuild b/kde-base/kdejava/kdejava-3.5.9.ebuild index fe959bc53df9..78ac132dad12 100644 --- a/kde-base/kdejava/kdejava-3.5.9.ebuild +++ b/kde-base/kdejava/kdejava-3.5.9.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/kde-base/kdejava/kdejava-3.5.9.ebuild,v 1.2 2008/02/23 20:09:59 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.9.ebuild,v 1.3 2008/03/07 20:35:37 ingmar Exp $ KMNAME=kdebindings KMEXTRACTONLY=qtjava @@ -12,8 +12,7 @@ inherit java-pkg-2 kde-meta DESCRIPTION="KDE java bindings" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" -COMMONDEPEND=">=kde-base/kwin-${PV}:${SLOT} - >=kde-base/kcontrol-${PV}:${SLOT} +COMMONDEPEND="|| ( ( >=kde-base/kwin-${PV}:${SLOT} >=kde-base/kcontrol-${PV}:${SLOT} ) >=kde-base/kdebase-${PV}:${SLOT} ) >=kde-base/qtjava-${PV}:${SLOT}" DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND" RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND" |