Missing dev-libs/fcgi and dev-libs/libaio dependencies wrt #410003 by Stoian Ivanov. Fix building with sys-devel/automake >= 1.12 by removing -Werror from AM_INIT_AUTOMAKE wrt #423755 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

3 files changed, 26 insertions, 4 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 1402ae5e8bf8..afdf8538dbb9 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.21 2012/05/04 07:20:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.22 2012/06/27 13:53:17 ssuominen Exp $
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> ceph-0.44.ebuild:
+  Missing dev-libs/fcgi and dev-libs/libaio dependencies wrt #410003 by Stoian
+  Ivanov. Fix building with sys-devel/automake >= 1.12 by removing -Werror from
+  AM_INIT_AUTOMAKE wrt #423755 by Diego Elio Pettenò.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> ceph-0.38.ebuild,
   ceph-0.40.ebuild, ceph-0.41.ebuild, ceph-0.44.ebuild:
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index ca7f11ceab1e..1e3a9403e934 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ceph-0.26-autotools.patch 738 RMD160 422f48adcc95f1d9900d921998ff536d9ea01254 SHA1 edfd9dce7269c935db5e0aea560642ee91ac4721 SHA256 ea8c32c83d460a8b4e6646896d32ab146b711631d4dac6c179a4a31927732dc0
 AUX ceph-issue1869.patch 680 RMD160 d76f31a6f2e6fadf818da96565b6eb4d9053ccd0 SHA1 aa0e5992c732a452239edf5f7373bf3200f3e1eb SHA256 a094f46dad5e3e2bf083f6110cc47b88c24b79963333bd778e44b0aba1f73bc3
 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8
@@ -9,6 +12,17 @@ DIST ceph-0.44.tar.gz 3295381 RMD160 29515a7ac64c8dcbcf7f7ca097d62fb775a25ca1 SH
 EBUILD ceph-0.38.ebuild 2104 RMD160 6e6bc1698b6458093c3ee3bb28228ad1592db78c SHA1 0e3562700686064db6efa81bd7300d87d839977d SHA256 0ded3083b7dfc7d699940103456d05a8de1aed54d90f21d5378a77ad14903956
 EBUILD ceph-0.40.ebuild 2092 RMD160 d08bb246bd810a76b3cfcb8d58290b5ad3d8f031 SHA1 5078f6eec4b6a0168c6452711f27e0850e6d91fe SHA256 906a5c4916c10f5b4952d470b721f26805863a85a165d1e544e2bcea182f348b
 EBUILD ceph-0.41.ebuild 2090 RMD160 b61140690039a9208e7f58c9057b4f29126275bc SHA1 6c46fd428789e16657ae04578fdad0fb766f00f5 SHA256 0f3cf22bed974098e84350b38548795c0e76f7fc7e563dd09751685b52edfde8
-EBUILD ceph-0.44.ebuild 2068 RMD160 ad4c35610d46b297150c1ffbc4201f600699264d SHA1 aae10bc76e1b9f30a2198a828f37360ba1cc7a95 SHA256 bfdd6ef1541304152ec75f2aadb5454db99d9a380f13289bc7fa3fa58c337d12
-MISC ChangeLog 3496 RMD160 1a9325ec78d3879490ec16c5361c7e4bc4d7485e SHA1 f6adb8973f84e2949a90b434fe05069575af366f SHA256 b24392d369de1078b5fc9005925a2dfad94bcd00b8fd36fdee4adb3fa0d373e6
+EBUILD ceph-0.44.ebuild 2187 RMD160 c51c7202a080cf50f07f685c37cca95f70a2cdaa SHA1 ac2a99c3a9095a17c0e0efdeb34efd66d5ed5254 SHA256 bb368466932c3faa13f8d0a7d3aa9f8d2310684b8829b80601228c872cb7983d
+MISC ChangeLog 3786 RMD160 dfb6515a7bc6d044f9a143d01182d57528548fea SHA1 1acdbadc7f9373c95fadf65fba429dda03c8ba1f SHA256 96d33311465c325b669d2f30f768d30a6e7c7681bcab9082710cb490ec8e5c4d
 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP6w8VAAoJEEdUh39IaPFNWnoH/2t+n5/7BAJ6ukPNKbDd+YAG
+jjfrtRj7ja+ObVKDnaQlVNxjgjF9MeN6k9f2SRhdAwCiLN5HRUjHL0IzLy7NqJuI
+YiT3uMOA51Gt4O2FdL1vLMFUvCk/9L1BgVSySbogfAT3DRWJcCr9gWZ8E20izqdU
+sQfjsOidUA5DfrUYDYN6j1xn0ejM2sqdLQXzCbh9xJQQ4AzJ69wC5xvnYFxD2oDh
+0LICMuSnW/vcHBGHPCmaQXA4Nvd/1xFPF/YThBZEOM8BdnXfp3PGG9zt8hl+T8ca
+bxj62fOTftijCH84dPDuATeWWFkLwUYc033r8r0LI12Z7rMQd5ECJR6pYHJJzVo=
+=fFnA
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.44.ebuild b/sys-cluster/ceph/ceph-0.44.ebuild
index 13c029bd9d03..98affca5c8df 100644
--- a/sys-cluster/ceph/ceph-0.44.ebuild
+++ b/sys-cluster/ceph/ceph-0.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.44.ebuild,v 1.2 2012/05/04 07:20:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.44.ebuild,v 1.3 2012/06/27 13:53:17 ssuominen Exp $
 
 EAPI=4
 
@@ -17,6 +17,8 @@ IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
 
 CDEPEND="
 	dev-libs/boost
+	dev-libs/fcgi
+	dev-libs/libaio
 	dev-libs/libedit
 	dev-libs/crypto++
 	sys-apps/keyutils
@@ -48,6 +50,7 @@ src_prepare() {
 	sed -e '/testsnaps/d' -i src/Makefile.am || die
 	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
 		> "${T}"/${PN}.initd || die
+	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755
 	eautoreconf
 }