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

(Portage version: 2.1.9.46/cvs/Linux x86_64)

4 files changed, 25 insertions, 17 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/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])