summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-07-12 22:38:23 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-07-12 22:38:23 +0000
commit5408f6ae1bf28617e2a34511ff2311b03d742293 (patch)
tree18ac6e9c4a21620ab4ff038247938e12b1d09b0b /dev-java/commons-lang
parentJavadoc in sun-jdk-1.6 starting with u2 works fine so removing the work aroun... (diff)
downloadhistorical-5408f6ae1bf28617e2a34511ff2311b03d742293.tar.gz
historical-5408f6ae1bf28617e2a34511ff2311b03d742293.tar.bz2
historical-5408f6ae1bf28617e2a34511ff2311b03d742293.zip
Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work around from DEPEND.
Package-Manager: portage-2.1.3_rc8
Diffstat (limited to 'dev-java/commons-lang')
-rw-r--r--dev-java/commons-lang/ChangeLog7
-rw-r--r--dev-java/commons-lang/commons-lang-2.0-r2.ebuild16
2 files changed, 13 insertions, 10 deletions
diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index ddaefcdeec35..5faf5e7b5e37 100644
--- a/dev-java/commons-lang/ChangeLog
+++ b/dev-java/commons-lang/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/commons-lang
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.43 2007/05/23 17:18:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.44 2007/07/12 22:33:06 betelgeuse Exp $
+
+ 12 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+ commons-lang-2.0-r2.ebuild:
+ Javadoc in sun-jdk-1.6 starting with u2 works fine so removing the work
+ around from DEPEND.
23 May 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
Add ~x86-fbsd keyword. Bug #176906.
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
index 81e6d3e889e2..7e9592b8dadd 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -1,29 +1,27 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r2.ebuild,v 1.8 2007/02/10 18:34:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r2.ebuild,v 1.9 2007/07/12 22:33:06 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Jakarta components to manipulate core java classes"
HOMEPAGE="http://jakarta.apache.org/commons/lang/"
SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
-DEPEND="
- !doc? ( >=virtual/jdk-1.4 )
- doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
- >=dev-java/ant-core-1.4
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
LICENSE="Apache-1.1"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
S="${WORKDIR}/${P}-src"
src_install() {
java-pkg_newjar dist/${P}.jar ${PN}.jar
- dodoc RELEASE-NOTES.txt
+ dodoc RELEASE-NOTES.txt || die
java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*