summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2016-01-08 10:03:23 +0000
committerPatrice Clement <monsieurp@gentoo.org>2016-01-08 10:28:52 +0000
commit3fa7492ae679c65ed8dc9c5b2034871a7d352c11 (patch)
tree82a7c594595dd3199e4b8aaa64ff4c30a9c5c9dc /dev-java/ognl
parentdev-java/ognl: Clean up old. (diff)
downloadgentoo-3fa7492ae679c65ed8dc9c5b2034871a7d352c11.tar.gz
gentoo-3fa7492ae679c65ed8dc9c5b2034871a7d352c11.tar.bz2
gentoo-3fa7492ae679c65ed8dc9c5b2034871a7d352c11.zip
dev-java/ognl: Fix DESCRIPTION length. Add missing die.
Package-Manager: portage-2.2.26 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-java/ognl')
-rw-r--r--dev-java/ognl/ognl-3.0.8.ebuild21
1 files changed, 13 insertions, 8 deletions
diff --git a/dev-java/ognl/ognl-3.0.8.ebuild b/dev-java/ognl/ognl-3.0.8.ebuild
index b2bcdbd53812..b57bff465078 100644
--- a/dev-java/ognl/ognl-3.0.8.ebuild
+++ b/dev-java/ognl/ognl-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="Object-Graph Navigation Language; an expression language for getting/setting properties of objects"
+DESCRIPTION="Object-Graph Navigation Language: get/set properties of objects"
HOMEPAGE="http://www.ognl.org/"
SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
@@ -18,23 +18,28 @@ SLOT="3.0"
KEYWORDS="~amd64 ~x86"
CDEPEND="dev-java/javassist:3"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
app-arch/unzip
- ${CDEPEND}"
+ >=virtual/jdk-1.6"
S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
java_prepare() {
- find -name '*.jar' -exec rm -v {} + || die
+ java-pkg_clean
cp "${DISTDIR}/osbuild.xml" "${S}/" || die
sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
-i osbuild.xml || die
- cd lib/build
+ cd lib/build || die
+
java-pkg_jar-from javassist-3
}