Use -r1 of patches for Resin 4.0.22, fixes build issues, see bug #405433.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

3 files changed, 17 insertions, 14 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index e627d3993ec2..90d09df7c8e8 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.109 2012/02/11 18:52:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.110 2012/02/23 22:23:25 nelchael Exp $
+
+  23 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.22.ebuild:
+  Use -r1 of patches for Resin 4.0.22, fixes build issues, see bug #405433.
 
 *resin-4.0.25 (11 Feb 2012)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 98492bce98d7..2d21183c1ca6 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -19,23 +19,23 @@ DIST resin-4.0.25-src.zip 17971688 RMD160 76f5fbf89f1e032ac4b985fb7aa10bf4615024
 DIST resin-gentoo-patches-4.0.13.tar.bz2 2487 RMD160 f6615dda025bb8a0ac322d5194fe9b76844a7ff6 SHA1 1e69e6c80641904ba42f08c1110dec4fb2eb2ce6 SHA256 56bc88cb760d683f893b68f9421465c2205681de5d3ad7a5f58888d6d0e5a6e4
 DIST resin-gentoo-patches-4.0.14.tar.bz2 2486 RMD160 dfdfa5f327374122088e4a81d29f1fd9842cddb6 SHA1 d14360ef94bbb296c46977cab8d6f541c02727ed SHA256 716f23fa775a8a6460e8ebdf2873932433f18fbe1f05ef868c4769ab4db5c30e
 DIST resin-gentoo-patches-4.0.15.tar.bz2 2494 RMD160 7ace79eaeda84fd5f79396e9fdb7bea337f06b35 SHA1 2d731ebf597705485e57cc1ef656aaef1a7ac1c4 SHA256 e404a734c715123625541d4a4770c8709855a81abc9336b81be5bd6b3be81fee
-DIST resin-gentoo-patches-4.0.22.tar.bz2 2489 RMD160 966e227dc41c17c5661c0dc5e192459ceb6a3a4a SHA1 ce7a1f15518e143a1ef3b465c4f965e49d577f0b SHA256 ba5494cd88c10bdfb3d382d9c5a563d69db4ab7435f0296783dd3ab665ad093e
+DIST resin-gentoo-patches-4.0.22-r1.tar.bz2 2625 RMD160 6533334de58d2ea470c2643485c129643efaa9ae SHA1 f69ca9603b0a54474f0fb41e09c4370479bf02e4 SHA256 4f29cabe826f535d9b2d324d7f70b9983410cd4b8c250a166fa1e74f1ab3d828
 DIST resin-gentoo-patches-4.0.25.tar.bz2 2482 RMD160 085efaa3fff7359231b583b460dff8678103124a SHA1 fba65709aa9b2259642b15329b50c973ebea0976 SHA256 60131072b485459e7e7882ad3620194de6e1c8ce16d50999071ca0a7fd35502d
 EBUILD resin-4.0.13-r1.ebuild 4977 RMD160 590d16626e5bdcb29dcf29d143c0acfe16b97f11 SHA1 7b65d4ba5264379067038529170b7398417200fc SHA256 29254bd9ea5fcb5028fa99a8ee2b1b06fc238a15603a885ed27528b8a3fc5b03
 EBUILD resin-4.0.14.ebuild 4976 RMD160 1aecf62dbb6f9d7c247ab32707b9d734c101e971 SHA1 0f9c882c4ffc6d00de6403dcf8d01f8d37ba2e58 SHA256 a9c4b2c10bf5b7b60b04e25ff7035366278d335adcde39dbedd01401d810b51d
 EBUILD resin-4.0.15.ebuild 4976 RMD160 846f97b4cbcb902b1e4a4c1421b75af9676a47db SHA1 d07c321a48c399c738e38f544ca9e22712c89336 SHA256 b39195c6a36def94f68003f737643bef1194bfbd02765c4b8f829a30905f171a
-EBUILD resin-4.0.22.ebuild 4976 RMD160 d4b95b9b5e7a1bb00c9a742debcb8da17b6ac9d9 SHA1 99be822992d4d84469a39490a661c5f6728b9963 SHA256 732b1f8b7979043573f9fcf758b7d4dbf310715a6677848139f2e40a1cd08eb0
+EBUILD resin-4.0.22.ebuild 4979 RMD160 006ad9ad5de673c797366ec440ad24324a9ea872 SHA1 98f2f0081eef3e4bc709bacf10ccea50aec5684f SHA256 5b5f004f07c072e884638b10c2ba9c06e1c1a6f82a611f51ee9192042999ebe3
 EBUILD resin-4.0.25.ebuild 4976 RMD160 6516d0f3183553c4c2769a1cbb0c65af90ba2faf SHA1 ec43bf9c2824483195b5ee9ff827241a747ea8a4 SHA256 e945fcea2d511e604ad97538bfe9f75d57bf0dc5ba552592f3be4f97fdfaa55b
-MISC ChangeLog 20651 RMD160 1303037b331ba5fc599657b06a22c283df55c93c SHA1 dbc77ddf373c7608ff3d7b4e779cb4fc4d034dfd SHA256 a0319df6b7b0fff903995bae34222397e91e7438ac92b64eef4ff12ab3d48f69
+MISC ChangeLog 20803 RMD160 f87c080ea48349ca8c239f8b200561076c318029 SHA1 90d24a3aa95e6654356158277cfc94d150f324d4 SHA256 cf74acdf1089f3cc4b54bb7a824d4370849516d3651aec9dbccce773133cb4c0
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPNrjyAAoJEBZyv1r2qA5GgIwH/iN3sjAl4okXnU5oft1id0ZR
-essArPoAEZ5dMt8MZly8potVqEi+XoLGwcfv4SHukT+Vqff5RbL71lLvcVwC9tRF
-U/nsvUHlIemRALW0ReiVyXaWb+P2wA27Oq5E++nzQ7TuFtq0B4LhVlEUy4DkovrJ
-VEuxtMOd6Vl2Z/5LRHzbChKSwDQXp5xuieH0a3DZln6mOcW08530F+bYi4yABy0B
-gPNPLgVBllP/4zxxrYiLz9JxLBu1qv5ckJVUqoGZwh4cztKjh3UY/txnGHSWQ7yM
-RUlqymoWy8WKTIjg+ZAUecCaaIjEWG+chuFwL76hwn3rIiAEp1qgbo6R0u9qymQ=
-=WYS+
+iQEcBAEBCgAGBQJPRrxjAAoJEBZyv1r2qA5G1AsH/RVKxHWCL1M8X1ZS597FKuUb
+jXkvnrpJKqdAWQWSZGl0wnMNpc/y4kRIAndx4AE62TAoWBSBGjpb0J2m20fAWul3
+JQjMv4Rm4KCAIVyj+We5DyYiNe6yZLZhoPh4qffrndd3VZwR0s9TZsjz5RMT76gf
+IdFDo8dsNdfloEsB1jmnpL8TaWY6YS/rMJ3nET1Ct7AeUuPmiv+l4SJFcFwsGiIi
+1czDQFwJiEMwbtfgFl2Iye26k8qdhJVlrwWkwErSou9UuVep2MGiC/OQGYDIerMC
+F+fkiZixdnoLNLheunI1LBpym0zQYD+EIIC6/ZHBHuBneH5QIFKSeQKrzBJIuok=
+=SjNJ
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-4.0.22.ebuild b/www-servers/resin/resin-4.0.22.ebuild
index e5ea1ed40c79..b07192e9c320 100644
--- a/www-servers/resin/resin-4.0.22.ebuild
+++ b/www-servers/resin/resin-4.0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.1 2011/09/06 16:46:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.2 2012/02/23 22:23:25 nelchael Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
 DESCRIPTION="A fast Servlet and JSP 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}-r1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"