diff options
| -rw-r--r-- | dev-java/avalon-logkit/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/swt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.5.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.5.ebuild | 4 |
6 files changed, 18 insertions, 10 deletions
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog index 4b10f6fc56ab..bff9a3c7216c 100644 --- a/dev-java/avalon-logkit/ChangeLog +++ b/dev-java/avalon-logkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/avalon-logkit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.72 2009/11/06 17:23:38 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.73 2009/11/07 11:21:27 caster Exp $ + + 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> + avalon-logkit-1.2.2.ebuild, avalon-logkit-2.1-r4.ebuild: + Use java_prepare. *avalon-logkit-2.1-r4 (06 Nov 2009) diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild index 6bcf097d8cd0..a8820e3a7a02 100644 --- a/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild,v 1.5 2009/11/06 17:13:53 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild,v 1.6 2009/11/07 11:21:27 caster Exp $ EAPI=2 JAVA_PKG_IUSE="doc source test" @@ -33,7 +33,7 @@ S="${WORKDIR}/logkit-${PV}-dev" SRC_DIR="${S}/src/java" JAVADOC_DIR="${S}/javadoc" -src_prepare() { +java_prepare() { epatch "${FILESDIR}/${P}-java6.patch" } diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild index 53259fbc3eb9..73b86fa2e684 100644 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild,v 1.1 2009/11/06 17:23:38 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild,v 1.2 2009/11/07 11:21:27 caster Exp $ EAPI=2 JAVA_PKG_IUSE="doc source test" @@ -32,7 +32,7 @@ DEPEND=">=virtual/jdk-1.4 ) ${COMMON_DEP}" -src_prepare() { +java_prepare() { epatch "${FILESDIR}/${PN}-1.2.2-java6.patch" java-ant_ignore-system-classes diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index debe86ac8d0c..855a4ee9430c 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/swt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.113 2009/11/05 20:42:22 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.114 2009/11/07 11:19:27 caster Exp $ + + 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> swt-3.5.ebuild, + swt-3.5.1.ebuild: + Use java_prepare. *swt-3.5.1 (05 Nov 2009) diff --git a/dev-java/swt/swt-3.5.1.ebuild b/dev-java/swt/swt-3.5.1.ebuild index 92ba3869f668..ca80d776c3d4 100644 --- a/dev-java/swt/swt-3.5.1.ebuild +++ b/dev-java/swt/swt-3.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.1.ebuild,v 1.1 2009/11/05 20:42:22 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.1.ebuild,v 1.2 2009/11/07 11:19:27 caster Exp $ EAPI=2 @@ -77,7 +77,7 @@ src_unpack() { rm -rf about_files/ || die } -src_prepare() { +java_prepare() { # Replace the build.xml to allow compilation without Eclipse tasks cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" diff --git a/dev-java/swt/swt-3.5.ebuild b/dev-java/swt/swt-3.5.ebuild index a585f57eb601..e1e47c6589bb 100644 --- a/dev-java/swt/swt-3.5.ebuild +++ b/dev-java/swt/swt-3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.ebuild,v 1.4 2009/11/04 13:59:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.ebuild,v 1.5 2009/11/07 11:19:27 caster Exp $ EAPI=2 @@ -77,7 +77,7 @@ src_unpack() { rm -rf about_files/ || die } -src_prepare() { +java_prepare() { # Replace the build.xml to allow compilation without Eclipse tasks cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" |