Update patch to make it work for new epatch behavior. Fixed quoting. Added necessary calls to die.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 30 insertions, 14 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/Manifest b/dev-java/randomguid/Manifest
index 164fedec809d..41e3cbd259f2 100644
--- a/dev-java/randomguid/Manifest
+++ b/dev-java/randomguid/Manifest
@@ -1,5 +1,15 @@
-AUX 1.2.1-examples-package.patch 485 RMD160 235ba9a8ed1a4afd3c676723368b31ae7278e413 SHA1 5dcbd2f55c6598256e1b6af9597f49375764cc0e SHA256 29cdc5b507ebab06a80cdb7cdbad9a168ad5d66f84fa8af210435b6a01349f7c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.2.1-examples-package.patch 555 RMD160 4e17adddb5bbee02541255ef2e6241f467d94efe SHA1 75e8430cf14b420bc948839baa579c9663bd3328 SHA256 beca88f04e07731d55c5e3a48730b4ee1c34df19fb552b1e66db58d621657e24
 DIST RandomGUID.tar 20480 RMD160 040bdcd974770b6322761c50f41fbfd577389786 SHA1 95435991e830431e8269ee8b5c8b136aca7b8bac SHA256 1f5383a2cbb1fd51653d75770c2ccf0b16832c91e6c87f49e79b2ca715c97c3b
-EBUILD randomguid-1.2.1-r1.ebuild 1538 RMD160 5584e3961593c23aeff54531b479d80c24479e55 SHA1 6a4e9819200a30d69239505ae71297b39cc495e8 SHA256 c237ddb18cf2bf8600ca794db18b98d9426f51783e6b5253a159a881bf1cfbd1
-MISC ChangeLog 1961 RMD160 07ec411b5499d7f194718841a4c550580d98a7ea SHA1 a82cb004b16fa34bf7b839906fffbc2de31ca5c6 SHA256 27381395e69c47248ee1d6ef22789e28277deb086a59a421ed282569869c0f15
+EBUILD randomguid-1.2.1-r1.ebuild 1634 RMD160 14395b425d1132639746cfab30d4a3656c4d9bf4 SHA1 8914a131aa9d1768fd1080de8f937ad4e36ab72c SHA256 0a48cbe84e31ff15df8258c212d8a6f96e2bd336b6469ff5cf5f0e9b299f94fe
+MISC ChangeLog 2174 RMD160 f4f80b58f324fe51f98d35390c8d469bbbd9e054 SHA1 59e7d7492f6ac6f169df6da3c3124d3ce0eb3c3d SHA256 0303b20db32371e816b1d20452c43a60d385a4aaa7ccdefebee0af81dc952ea9
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjb/q8ACgkQRh6X64ivZaIBaACdHJLugvUptdR2Y27USC1362LB
+k+4AnR/4dSOhLvQCiKEqdIJxPl1io9cT
+=HmZY
+-----END PGP SIGNATURE-----
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"
 }