From 8f031cf4564c25ba2794bf83184f8e68772e6752 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 9 May 2013 22:07:46 +0000 Subject: Fix source and doc install. (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) --- dev-java/joda-time/ChangeLog | 5 ++++- dev-java/joda-time/joda-time-2.2.ebuild | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-java/joda-time/ChangeLog b/dev-java/joda-time/ChangeLog index 74cd42b94c24..11c9dedb68a3 100644 --- a/dev-java/joda-time/ChangeLog +++ b/dev-java/joda-time/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/joda-time # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.45 2013/05/09 20:52:55 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.46 2013/05/09 22:07:46 radhermit Exp $ + + 09 May 2013; Tim Harder joda-time-2.2.ebuild: + Fix source and doc install. *joda-time-2.2 (09 May 2013) diff --git a/dev-java/joda-time/joda-time-2.2.ebuild b/dev-java/joda-time/joda-time-2.2.ebuild index ab10eb8f2ba0..20d6695101b5 100644 --- a/dev-java/joda-time/joda-time-2.2.ebuild +++ b/dev-java/joda-time/joda-time-2.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/dev-java/joda-time/joda-time-2.2.ebuild,v 1.1 2013/05/09 20:52:55 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-2.2.ebuild,v 1.2 2013/05/09 22:07:46 radhermit Exp $ EAPI="5" @@ -25,8 +25,6 @@ DEPEND=">=virtual/jdk-1.5 )" RDEPEND=">=virtual/jre-1.5" -S="${WORKDIR}/${P}" - java_prepare() { rm -v *.jar || die "Failed to remove bundled jars." cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file." @@ -52,7 +50,7 @@ src_install() { dodoc NOTICE.txt RELEASE-NOTES.txt - use doc && java-pkg_dojavadoc build/docs + use doc && java-pkg_dojavadoc target/site/apidocs use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/java/org + use source && java-pkg_dosrc src/main/java/* } -- cgit v1.2.3-65-gdbad