Fix autotools patch wrt #363497. Thanks to Peter Große for reporting.

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

5 files changed, 31 insertions, 33 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index e85643ada2e6..aeb294fbc1c6 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.6 2011/04/06 11:10:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.7 2011/04/26 10:30:33 ultrabug Exp $
+
+  26 Apr 2011; Ultrabug <ultrabug@gentoo.org>
+  -files/ceph-0.24.1-autotools.patch, ceph-0.26.ebuild,
+  +files/ceph-0.26-autotools.patch:
+  Fix autotools patch wrt #363497. Thanks to Peter Große for reporting.
 
 *ceph-0.26 (06 Apr 2011)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f1c6ce45aa46..b06af8196057 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ceph-0.24.1-autotools.patch 699 RMD160 12fee9434e154afde078ce5b41ec4295a0bb1209 SHA1 a4e5ab770c2487329cf406f6b5758dfb3a835f8f SHA256 51aba64dd4fc80934071d4844db7dff2d54bd9f567a81e4d6ae20039f60cd434
+AUX ceph-0.26-autotools.patch 738 RMD160 422f48adcc95f1d9900d921998ff536d9ea01254 SHA1 edfd9dce7269c935db5e0aea560642ee91ac4721 SHA256 ea8c32c83d460a8b4e6646896d32ab146b711631d4dac6c179a4a31927732dc0
 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8
 AUX ceph.initd 400 RMD160 58873ca15a29a81ecd64bda17749eee1ca96af01 SHA1 544beae2d460fa0a44eb4e9eb26a7bbcd96405d7 SHA256 9b957c42c3ab27e3e29f42aaae718396e14cd91256df7f959e212446d2f90618
 DIST ceph-0.26.tar.gz 2613461 RMD160 3f3bdadb6696dffe334d24855ab073da35d8e10e SHA1 c23cde4f37344acb8164218f4f5f32ba7e66b9aa SHA256 cb4d97bb67bb737e20c0edb41b328e320ef431e8ac884852618a786c5b68945d
-EBUILD ceph-0.26.ebuild 2195 RMD160 6f3a94cd87f134f0818af81529269d7422b4b6fe SHA1 bc9552199cdbf9c7d7375c290ee91855e4759aae SHA256 351e6131fb0c0cf9571b22726bf2d8ace9dd3a8b41304615a83df74748bf9a73
-MISC ChangeLog 1202 RMD160 50ae36e62ad4bcd1c873e832870b8722c74000be SHA1 8e0c91932a4cc203cd56b3d6e0c4c5918997666f SHA256 d20c4fb9d2b306ced387a9d321173e20e7e87d4c8643a76e7b6110ab7dc67e9c
+EBUILD ceph-0.26.ebuild 2195 RMD160 2e30c8948c50caba95616f2b7cc160dc3a711041 SHA1 6a2b940bd8f1a05526e5ae6f370613798519fdfe SHA256 7f95c7a72f19cb52c03c1168a543bdf802d110d467f512aa15013eb2a267068b
+MISC ChangeLog 1416 RMD160 a3da0f4e22e318381df8e933cb0c54709338426b SHA1 68e665aac1fbfa1bc7f62159542db11e437c0cc8 SHA256 c5747b9f250bdf245f4a9b93aa7020cfb55ea74af47757fc05af331a7c499d28
 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNnEoSAAoJEOf+E+/4L5LmiBoP/RpE2YkX6xcapuJTYTNBkGRP
-f3TACj+Qbd+mesLR62/X2wEU6nNKbtnzlrlBFilNtt2A9YDaERCQKM1I7nRYH9qq
-qd5Pof+DUBjg8uoUYLkLsfZl49rUctgXNV7D6MPDGcziWQvY/Yt7wCnQ5kC1dRYH
-Z6zWJrka2nl54y9kzK9HAFaVZFW0aZrojpZRRcz7dAF/uHnr7J+JTs6WUNHXRKhJ
-0kkYmA+Xif3bCeiekGwOWqYA96N2gKkhxkbZoTT92jcjIgzOgM8JDlmDLH7fZYBR
-nrOdf8qKEq07jU8Ouhfj1X8QUseX/9kirtYH92LLuJT1/fhkF7ToYrWd8J2SNeaG
-kVyvNZh7R9axTMLkAWqQ0a3/ykXbCUZDghuT3ryi5/C9FXaMk2teLoz3T2Xb427a
-jiuViFZaRH03DUQGCi0Sd19wdxibwZqxmLe88kAL0tfaKOVCouaEVGhsA6//JYY0
-yupqAONmVHnbRH2jbaGTZoQ6ZDdYaqMPYE8WHE0/uZfk/UBMls5ZXo3CMeLKzhL0
-rbXmnQSLkDPvipQBwf0nfoyTWoMjeU3RXrR5oMXGkX6PvEWybLxR2EmdvpE+Xp0Y
-LfwXn8b5y15fWZ+2Mfj521IBCb1+pbHNBIVPMDhKyc/AQHecMwtvBFnMN+VnfUkM
-4j9lKI4K/MYxPLZjEAeb
-=Zxfj
+iF4EAREIAAYFAk22ntIACgkQKiQSS7ZY+hNLFgD8DGZvv+vQLk2hTHsbdGICO4Z+
+5Y6vvteJ/7UV7l0687AA/1lzxNx5zt2IOgsnzRh3csMooKW9s7qI2Hlsleh4ID8j
+=1KSO
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.26.ebuild b/sys-cluster/ceph/ceph-0.26.ebuild
index 3b1636dca0c2..f0b68876fc9d 100644
--- a/sys-cluster/ceph/ceph-0.26.ebuild
+++ b/sys-cluster/ceph/ceph-0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.26.ebuild,v 1.1 2011/04/06 11:10:05 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.26.ebuild,v 1.2 2011/04/26 10:30:33 ultrabug Exp $
 
 EAPI="3"
 
@@ -45,7 +45,7 @@ src_prepare() {
 	sed -e '/testsnaps/d' -i src/Makefile.am || die
 	# fix Spinlock.h include path, wrt #361203
 	sed -i -e 's|#include "Spinlock.h"|#include "include/Spinlock.h"|g' src/include/rados/atomic.h || die
-	epatch "${FILESDIR}/${PN}-0.24.1-autotools.patch"
+	epatch "${FILESDIR}/${PN}-0.26-autotools.patch"
 	eautoreconf
 }
 
diff --git a/sys-cluster/ceph/files/ceph-0.24.1-autotools.patch b/sys-cluster/ceph/files/ceph-0.24.1-autotools.patch
deleted file mode 100644
index b80371b4d378..000000000000
--- a/sys-cluster/ceph/files/ceph-0.24.1-autotools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac	2011-01-09 00:41:26.000000000 +0100
-+++ b/configure.ac	2011-01-20 13:58:12.071764382 +0100
-@@ -33,7 +33,10 @@
- AC_CHECK_LIB([m], [pow], [true], AC_MSG_FAILURE([libm not found]))
- AC_CHECK_LIB([pthread], [pthread_create], [true], AC_MSG_FAILURE([libpthread not found]))
- PKG_CHECK_MODULES([CRYPTOPP], [libcrypto++], [], [
--	AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp], [true], AC_MSG_FAILURE([libcrypto++ not found]), [-lpthread])])
-+	AC_LANG_PUSH([C++])
-+	AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp], [true], AC_MSG_FAILURE([libcrypto++ not found]), [-lpthread])
-+	AC_LANG_POP([C++])
-+	])
- 
- # debug crap?
- AC_ARG_WITH([debug],
diff --git a/sys-cluster/ceph/files/ceph-0.26-autotools.patch b/sys-cluster/ceph/files/ceph-0.26-autotools.patch
new file mode 100644
index 000000000000..1ffa5d99a849
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.26-autotools.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac	2011-04-26 12:17:33.318491903 +0200
++++ b/configure.ac	2011-04-26 12:19:57.822776369 +0200
+@@ -48,10 +48,12 @@
+     [PKG_CHECK_MODULES([CRYPTOPP],
+ 	    [libcrypto++],
+ 	    [have_cryptopp=yes],
+-	    [AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
++	    [AC_LANG_PUSH([C++])
++	    AC_SEARCH_LIBS([_ZTIN8CryptoPP14CBC_EncryptionE], [crypto++ cryptopp],
+ 		    [have_cryptopp=yes],
+ 		    [true],
+-		    [-lpthread])])])
++		    [-lpthread])
++	    AC_LANG_POP([C++])])])
+ # bail out if given explicit --with-cryptopp
+ if test "x$have_cryptopp" = "xno" -a "x$with_cryptopp" != "xcheck" -a "x$with_cryptopp" != "xno"; then
+     AC_MSG_FAILURE([--with-cryptopp was given, but library was not found])