Use revision 1 of patches.

Package-Manager: portage-2.1.5_rc10

3 files changed, 15 insertions, 11 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index a94ff220f0cb..b7f1c9961366 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.70 2008/05/10 20:17:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.71 2008/05/10 21:45:18 nelchael Exp $
+
+  10 May 2008; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.6.ebuild:
+  Use revision 1 of patches.
 
 *resin-3.1.6 (10 May 2008)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index e6793589bc53..6eda1e1ba7cc 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -12,16 +12,16 @@ DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3
 DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
 DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 SHA1 386e94852599c24521665bdf8bb6405e1d936ab7 SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
-DIST resin-gentoo-patches-3.1.6.tar.bz2 3892 RMD160 75e2eda5c6b03f50771d0c4a90055d4036dc6252 SHA1 3e568c0d71416a6dc5ee11736faed6c5f1510988 SHA256 5c499e936c0511d94a4bac791ed34632ffee114dc481541c2a53ebd4f2407428
+DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
 EBUILD resin-3.0.24.ebuild 4014 RMD160 fb70875eb73141ae69661ad84e25c7d641871858 SHA1 35247f240dd19e0bf1365296eb75477796306b00 SHA256 38a9b241b0e40595b41925c12c58a06de56ab9db2f17888b6c19bdc759353bb6
 EBUILD resin-3.0.25.ebuild 4016 RMD160 44543cd1ff351e7ade6824ab860ad662ee585979 SHA1 014b9f9dc3e51a4b5ffe536bbbf92faf307da04d SHA256 3e129ea8ec4a1ac540c86fd41d73a3d8b4150b319da645f6d1a6b0372a3c22c5
-EBUILD resin-3.1.6.ebuild 4040 RMD160 c9c93d7ac667841cbeac65a3adeb143e8aa5c02f SHA1 eaa0ac768437e39f87994fee1deab5528968c5cd SHA256 e3a3eeb773111c7bac1092c6433b6706b7e97379b692a6b41df86486b29a8af1
-MISC ChangeLog 14193 RMD160 f142283d1b6f2c62dfe8892d14dfa0b841dd5604 SHA1 a1607ae2efdf7d64e159c23c6a3af5a661143c4b SHA256 3832050c8661a407528148926681ad0798b076822beec846014ecba0b9c2e13d
+EBUILD resin-3.1.6.ebuild 4103 RMD160 e7bfec70e5a2549c2ebbce651e68d93d4bf70084 SHA1 1230a7993cc0a6232e940040504e4cc46e6b8345 SHA256 89bcbefe3d0188f75ee1dd416d5a1b27b1c6597d30ac8c084c480cff5085f5e2
+MISC ChangeLog 14296 RMD160 541770e8c0bdd4bd75aeade3e663672d1eea9d02 SHA1 0e167639e25579d68dfcbdb6237c3766c74f3dfb SHA256 0094b9e83328831220f326303fb8b67280a5d0350570e9eeba245dbf0e9a4503
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgmEOIACgkQgo/w9rxVVVEF1QCfUgMZv5R3NXMWPs1gl2jEgZJ8
-qXYAoIQb7keHYROSRT/kdhblzsWjglLQ
-=qJr9
+iEYEARECAAYFAkgmF3QACgkQgo/w9rxVVVGP4gCgjkPS12kGxFcPedMe4doU/E3M
+BJwAoKkTS5ev+pMGp574krWWW6ZhsVKz
+=AyK/
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-3.1.6.ebuild b/www-servers/resin/resin-3.1.6.ebuild
index 956eaeb03bf4..ee68b04ae74d 100644
--- a/www-servers/resin/resin-3.1.6.ebuild
+++ b/www-servers/resin/resin-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6.ebuild,v 1.1 2008/05/10 20:17:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6.ebuild,v 1.2 2008/05/10 21:45:18 nelchael Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
 DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine."
 HOMEPAGE="http://www.caucho.com"
 SRC_URI="http://www.caucho.com/download/${P}-src.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
+	mirror://gentoo/resin-gentoo-patches-${PV}-1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin"
@@ -103,7 +103,7 @@ src_install() {
 	make DESTDIR="${D}" install || die
 
 	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
 	dosym /etc/resin ${RESIN_HOME}/conf
 
 	keepdir /var/log/resin
@@ -125,7 +125,8 @@ src_install() {
 	dosym /var/log/resin /usr/share/resin/log
 
 	dodir /var/lib/resin/webapps
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
+		die "mv of webapps failed"
 	rm -rf "${D}/${RESIN_HOME}/webapps"
 	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps