diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-05-04 13:36:42 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-04 13:36:42 +0000 |
| commit | 27c0e1dc8ceea4056c49b1cd0a39fd2434661eda (patch) | |
| tree | dd97954c20cc1094ff95ae36e0d0b6de269982e7 | |
| parent | Added local avfs use-flag for app-misc/worker (diff) | |
| download | gentoo-2-27c0e1dc8ceea4056c49b1cd0a39fd2434661eda.tar.gz gentoo-2-27c0e1dc8ceea4056c49b1cd0a39fd2434661eda.tar.bz2 gentoo-2-27c0e1dc8ceea4056c49b1cd0a39fd2434661eda.zip | |
Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
(Portage version: 2.1.2.5)
| -rw-r--r-- | app-text/trang/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/trang/trang-20030619-r3.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog index 5d62487e134b..5d1aba6d713e 100644 --- a/app-text/trang/ChangeLog +++ b/app-text/trang/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/trang # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.19 2007/03/02 20:55:58 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.20 2007/05/04 13:36:42 betelgeuse Exp $ + + 04 May 2007; Petteri Räty <betelgeuse@gentoo.org> + trang-20030619-r3.ebuild: + Prefer virtual/jdk-1.5 over virtual/jdk-1.4. 02 Mar 2007; Christian Faulhammer <opfer@gentoo.org> trang-20030619-r3.ebuild: diff --git a/app-text/trang/trang-20030619-r3.ebuild b/app-text/trang/trang-20030619-r3.ebuild index cf82276e9b90..e88cb2040c2d 100644 --- a/app-text/trang/trang-20030619-r3.ebuild +++ b/app-text/trang/trang-20030619-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r3.ebuild,v 1.5 2007/03/02 20:55:58 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r3.ebuild,v 1.6 2007/05/04 13:36:42 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -25,7 +25,7 @@ RDEPEND=">=virtual/jre-1.4 # so forcing 1.4 || 1.5 DEPEND=" - || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) + || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ${COMMON_DEP} dev-java/ant-core app-arch/unzip" @@ -34,8 +34,8 @@ src_unpack() { unpack ${A} cd "${S}" - #rm -v *.jar - cp ${FILESDIR}/build-r1.xml "${S}/build.xml" + rm -v *.jar || die + cp "${FILESDIR}/build-r1.xml" "${S}/build.xml" mkdir -p "${S}/src/" cd "${S}/src" |