diff options
author | Serkan Kaba <serkan@gentoo.org> | 2008-09-25 21:12:03 +0000 |
---|---|---|
committer | Serkan Kaba <serkan@gentoo.org> | 2008-09-25 21:12:03 +0000 |
commit | 3597f359980bbe2b3a6e3c9f0acd12a52817a886 (patch) | |
tree | 03db8b00940694ddf5c90488f73f69cb36e5bd26 /dev-java/randomguid | |
parent | Update patch to make it work for new epatch behavior. (diff) | |
download | gentoo-2-3597f359980bbe2b3a6e3c9f0acd12a52817a886.tar.gz gentoo-2-3597f359980bbe2b3a6e3c9f0acd12a52817a886.tar.bz2 gentoo-2-3597f359980bbe2b3a6e3c9f0acd12a52817a886.zip |
Update patch to make it work for new epatch behavior. Fixed quoting. Added necessary calls to die.
(Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-java/randomguid')
-rw-r--r-- | dev-java/randomguid/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/randomguid/files/1.2.1-examples-package.patch | 5 | ||||
-rw-r--r-- | dev-java/randomguid/randomguid-1.2.1-r1.ebuild | 14 |
3 files changed, 17 insertions, 11 deletions
diff --git a/dev-java/randomguid/ChangeLog b/dev-java/randomguid/ChangeLog index 5c6e7ef60758..e26d3269de16 100644 --- a/dev-java/randomguid/ChangeLog +++ b/dev-java/randomguid/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/randomguid -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/randomguid/ChangeLog,v 1.18 2007/08/27 15:55:33 betelgeuse Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/randomguid/ChangeLog,v 1.19 2008/09/25 21:12:02 serkan Exp $ + + 25 Sep 2008; Serkan Kaba <serkan@gentoo.org> + files/1.2.1-examples-package.patch, randomguid-1.2.1-r1.ebuild: + Update patch to make it work for new epatch behavior. Fixed quoting. Added + necessary calls to die. 27 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> -randomguid-1.2.1.ebuild: diff --git a/dev-java/randomguid/files/1.2.1-examples-package.patch b/dev-java/randomguid/files/1.2.1-examples-package.patch index 95e82d7ea3fb..d801887461c0 100644 --- a/dev-java/randomguid/files/1.2.1-examples-package.patch +++ b/dev-java/randomguid/files/1.2.1-examples-package.patch @@ -1,5 +1,6 @@ ---- /usr/share/doc/randomguid-1.2.1-r1/RandomGUIDdemo.java.orig 2007-08-19 18:19:21.000000000 -0400 -+++ RandomGUIDdemo.java 2007-08-19 18:14:45.000000000 -0400 +diff -Nur RandomGUID/RandomGUIDdemo.java RandomGUID_patched/RandomGUIDdemo.java +--- RandomGUID/RandomGUIDdemo.java 2002-01-30 04:19:53.000000000 +0200 ++++ RandomGUID_patched/RandomGUIDdemo.java 2008-09-26 00:06:43.000000000 +0300 @@ -4,7 +4,7 @@ // Generate 20 of 'em!
public static void main(String[] args) {
diff --git a/dev-java/randomguid/randomguid-1.2.1-r1.ebuild b/dev-java/randomguid/randomguid-1.2.1-r1.ebuild index 2e3d5e7d9062..71f2cc82024d 100644 --- a/dev-java/randomguid/randomguid-1.2.1-r1.ebuild +++ b/dev-java/randomguid/randomguid-1.2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/randomguid/randomguid-1.2.1-r1.ebuild,v 1.5 2007/08/27 15:52:29 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/randomguid/randomguid-1.2.1-r1.ebuild,v 1.6 2008/09/25 21:12:02 serkan Exp $ inherit java-pkg-2 @@ -17,8 +17,8 @@ DEPEND=">=virtual/jdk-1.4" S=${WORKDIR} src_compile() { - mkdir -p com/javaexchange - mv RandomGUID.java com/javaexchange/RandomGUID.java~ + mkdir -p com/javaexchange || die "mkdir failed" + mv RandomGUID.java com/javaexchange/RandomGUID.java~ || die "mv failed" # We need to move RandomGUID.class into the # com.javaexchange package. This is necessary to prevent @@ -26,16 +26,16 @@ src_compile() { # (which has a different <default> package for JSP files). epatch "${FILESDIR}/1.2.1-examples-package.patch" - cd com/javaexchange + cd com/javaexchange || die "cd failed" echo >RandomGUID.java "package com.javaexchange;" cat RandomGUID.java~ >>RandomGUID.java ejavac RandomGUID.java || die "compile problem" # don't want .java files in jar - rm RandomGUID.java* + rm RandomGUID.java* || die "rm failed" - cd ${S} + cd "${S}" || die "cd failed" jar cf RandomGUID.jar com || die "jar problem" } |