Add patch to fix mds crash, also fix deps #465120

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

7 files changed, 70 insertions, 238 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index f301787b9b27..9de15d7bf9f9 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.36 2013/04/04 09:54:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.37 2013/04/12 10:21:14 alexxy Exp $
+
+*ceph-0.60-r1 (12 Apr 2013)
+
+  12 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.60-r1.ebuild,
+  +files/ceph-0.60-mds_sessionmap.patch, -ceph-0.58.ebuild, -ceph-0.59.ebuild,
+  -ceph-0.60.ebuild, ceph-9999.ebuild:
+  Add patch to fix mds crash, also fix deps #465120
 
   04 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> ceph-0.60.ebuild,
   ceph-9999.ebuild:
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 706c62ceb095..d7ccd01307d3 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,35 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ceph-0.60-mds_sessionmap.patch 979 SHA256 04018fdb183cd76d3271b9ecd6f2701aadc31873150fb5c3724a784ff51687e7 SHA512 b51966450eb0355562793c3561b6b6bd1d50be037255951b358782c96e6894bb1a811e0164124892c69d2a5a721c04448eae3b9a55aebe96a84215d8e564891c WHIRLPOOL 8b84bbe25968c827bce348884bd94b40418fbb0009e709db5a6c139d52460ff32a7a7cee1041224fe72a49a2c8da895762313b930974fa30ea979a45ddb11eae
 AUX ceph.confd 225 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 SHA512 64a68d9985a2dc87cfddc4c6dd5f2af7147b56a677c5b5451caf37b8a07ee49567c7aab368e30974bcd8d670d3471bc79488522a556788e0f2cbf350c272d120 WHIRLPOOL d46cc51dbcf77e17f57126c417955475b9fa2c883bada7c843cbda7c524622690a760795bc6c0af13331abd7e0eca8ba7b139f44b51ec9d5a560137f2f321328
 AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
 DIST ceph-0.56.3.tar.bz2 3214620 SHA256 5ea39c9fce4741e0a4adb04262fa02d491834996c5819709463748095c9ad1b5 SHA512 b5f3ad54c81a9412f9219f99abb72efc6bc2010ccb29f1bf8a540b15e817ea7f7ccfaddea2b190739a0fba3dd378ac366006879ca66d6c9cafefe8baac0248e8 WHIRLPOOL 82e30278e352adfe3dd38c6bda49f8ae9abe49bab9e40d271d43bad6ad14c299c46fb51089fdb7216df96bc143a82c0073e735e26ae39c471dbe2b5b82d2fd7c
 DIST ceph-0.56.4.tar.bz2 3286520 SHA256 985b110f8f11e9eb1ad360c309015400b15ecee5065591c00c6e3a88d1859d2a SHA512 3c2760e72e097e3aa44a8e1e075cf12591b2d9b9b9d0d520cd3776ef106785f3c9085c34d4ea71ff20570de3d05f1fc968e6f2a69492ba0f2e8d2c2000096136 WHIRLPOOL 7115aeac01f4b70f888e2c4cee708237f536437d78ba88d333579addc148f4a3de3dc8066ddfca60b41f8b716245be50df819451555f73291adb1117f1d806f6
-DIST ceph-0.58.tar.bz2 3334624 SHA256 6ed1e11373822fb24461fa74eca629adb2afcbb9c9bf7b7037068e08b56b5e62 SHA512 ca711a7c8989107bbff03bd07baf2b8b4f863e497ef4cf1dbeea0539e53aed146e8108aa6dc3d5072b9939caa37c08d62123612abc66b1e289c7654dd3ef713d WHIRLPOOL c0930c22fc36f86f6b763973a2be88fdb91bc702e7f8a7207a66b36feee5c134aecedc9686617e162b6debb34ed200ba5baf6cffb43722c63483e4378c132d75
-DIST ceph-0.59.tar.bz2 3028949 SHA256 3ccbd4d059555c07f145d1ce2a8fc7e64276f555db846851ebda110e2d4f49dd SHA512 f5151cea890da6440e27be2e1be7ec9b78a86d62923180d58dc0c6265a57845bb126815c9649f4ff498b412096663c51a50a2b454e875200ab09c8148337c40e WHIRLPOOL 23a6873f4c65421cfcb072b69c26010e17b1ab44c38e157aaf48a97cdc8e0c7e38340c258577f8885d5790456000dc4e29747261430ea2bba404e89b830f9365
 DIST ceph-0.60.tar.bz2 3070410 SHA256 6b5bfeadb2487c1fb6d94e75ec021a734b693586a02d93721ab35ede235d607f SHA512 f8bad521c1395f8862a614808368f3ec895101a31ba392f23e0b7905934c9ce1250c1400ed8c699067e445627005cd1a5f448e0008304d1f9b6173c5f92d5e8b WHIRLPOOL 91a2287193b9e34943d4a481e878bf8ef5ed26b17efeb9b379663d9e38d51a4fc70b84d89b6f5ad9d744ef35d8779dc83de9306928051a623be3080e5dee47c9
 EBUILD ceph-0.56.3.ebuild 2381 SHA256 94920bc6603dbec975b98985d42287fd6405ab112b26c8c8ca039df46ee8311c SHA512 021a42525996b60f87bc3c5a93c50c97c979fe76884e1769e9c2fbf7670dbd862599f26c801b60663894d6035ef1cb4ce2725dcaf655d19e78b650a119158cd2 WHIRLPOOL fe629a7295e2573f2aa888650f7b9fe120c37a8f9ac80accc26b80e7b0c2727d61442f4233ed0759af3bb98496cc4abe3b185bd654b7702636d49d4b3e4e247d
 EBUILD ceph-0.56.4.ebuild 2386 SHA256 a780b9692d4b36d3f4c49262761170f5e4bd2bd9e3a20f3a853f864d34560c82 SHA512 203544e17b6241099f21ab0c9b96dbf0d3c651f36f1f4e4321c2ef417ebb229eddaa7c1d50fadc498fb60516e66e310e182eada65512d6310fec8656c29be763 WHIRLPOOL 6b81c9a404a39ab2e8145a1348b7907f2a6e67f3d91686d67081d4cdb99c784334e3e948224cdaf18c92d933635fbbb1357601a21b03823ac766237f60590a96
-EBUILD ceph-0.58.ebuild 2420 SHA256 9ff3e3fbfe5451766a878607c8efd51e06e5eb06af1e85d6a78d476ccfa46234 SHA512 95e28cd3d7560de840648addcfa3b457b87a380e3fa41201dedeb51aa8dcd7fbacaa5b21203395677d0db2dee723e8f468942e06de33a7ae708ebbdbfec4f195 WHIRLPOOL 842db01a72c49d0b9b7b0b5000117a7039b5713fab85c7dfe57517d4b0440b8eaa9081c8f2b816dde0e76bf036d2d547ce3ab763438662f745e7e4930eb7072e
-EBUILD ceph-0.59.ebuild 2375 SHA256 ce75c35d6e58188331e232c8b43104d48587c846c92dec60d5610dadf5e7ac6d SHA512 8b58e10fccfdb27cd1a16bd2e5769c56f4a8a5837c06432080f3dcd329092258095af8da7eb9df6336678b4609f8621e734a482071554521726ce9dc1a1b7552 WHIRLPOOL 0d76ecee280103203af753be18d628ab47872b9efa34934c1e66585c0b7ef7ec2523865d89c9d7446e957542b2aa805b62a30f8b3b65e609fbb3dc4155454d72
-EBUILD ceph-0.60.ebuild 2336 SHA256 9dd67c1d577799e542dcbcdd53c726ef2582f4c5d7dfbb485a259a09fae15b3b SHA512 25b1f81860e6b1445b9d8c666d9073e161701165119025a0838e6947d0a77465530b3e32c1257e43d41e75e4e6463edf0839b5ad1a23d8d8307805b12378dc38 WHIRLPOOL 7c731a41fb3a071aa1ca888f0c8b82dce810dac24cac5c2a1d47f1d24af245cf482dd510f707dc1f7ba818a82e1d74f245001d6dadae688f21ce8eba3d00bb89
-EBUILD ceph-9999.ebuild 2336 SHA256 5e7b4e24188d67976ef78d59dae44394eda7c601b2c922e2aa6f0a35992efaf0 SHA512 c122313032d2736cb9431e409b88c424aeede41c719823ec822ed15a2600b5c40cac09b6cc55d49407e2985c6d2715893f1a4ca7085c8f7375833b658781ed40 WHIRLPOOL 3acd84d1337c6f6cee11eada8d7ca84d750a127a55623f7bfc1f7ef3e28a4738f13cd9bbea66468810e3009920f8a99700eafd7ae0918fcd9d50e4313d338e71
-MISC ChangeLog 5985 SHA256 f6392c52ff420165fe4326f288cde3dc9cdc3b9d7bf71410cad989a6bc08027a SHA512 42af9c8bae6473271043f55110938ac03817d7a8213ea68f1b026d5593976961442ef89e255159e8b80944637833752038a746f8634770dcd6a4f56846abe2e9 WHIRLPOOL 58034f93e4af7bbb71872d5976e94bed6f0d362975a5482b45650131e84d709e7a49ccbfcefffaab9024fb439ed73a5d80dfd797d8262fd9ad4c39a120e9856b
+EBUILD ceph-0.60-r1.ebuild 2488 SHA256 98befe0810c56a94ba6e3ca8e83af56d352c9c1a4a21dcc4e57a58b31e07bfc0 SHA512 f554c6b1ee0ecc215cc455d01a70e19ab7f1279ec671693cf2b3eff1df94a5208decb3bcd9fad960bb09dc187ec705c9452e7f925bd8a62cc837584981c7ad5b WHIRLPOOL 419e17677fc0aafaf4928b3d9ed1cee07dc8610c468585902f57dccac37ce375e201c33d6313d2213f06befad4d4b5a44d99760cbbe597f62cdaa7cde4b9db61
+EBUILD ceph-9999.ebuild 2431 SHA256 838ae7c201f62b06b1bc4ce84cddc7284b14841e8ffa00d926c2c754bddaff62 SHA512 fc180a1cd63eb977982b683021bde8f263a912087ace01139e02c65158ec109530813d9911965d874d84d94864f1812045d160642710b84654e3df7b4169f111 WHIRLPOOL 8457e692ba829923d91f7691ada3130ac78b34cb4b888d50a781098ef9d7336e0e02c4c4d532ce7298b755945d675c031bf8f323f019eff86a5ce6c6debb8dbb
+MISC ChangeLog 6258 SHA256 e306d2465f7b5ec520f2c503f904a633e496411ef000e112e478b45607370940 SHA512 b9f64d05427b7d3b818ec038ec9ef8b4fa7fd25d2a3d171819fed9aaf9938d6d8a1464e3196ec251e93422118bee1141002c7b8c5480716443d04152cbbdc368 WHIRLPOOL c08dbf35c02750aea5f26fd5504477560514141345d409db4d36faddf07603919afbadeaa66ab1b6e1ea7dc9cb7e7bfb3533308a5a0a4fb6150e3ed2c5dea315
 MISC metadata.xml 500 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407 SHA512 ecb262b3c942a347291496583730bc59599950983d66f1497110a459a16f5366e79273376c1967d5f59fa245c2cd64c93c11be7d16b7e85428a277bd81ac3984 WHIRLPOOL 21976221c15b97596c1ff94a80040adc5b29012afe9f80c12cd7e60fd3857947ada817d0ef83dcf533df287be0e6925596d4604e9522a0ccdcb844610373089a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRXU3jAAoJEOf+E+/4L5LmvXEP/2Nr0Ls0e63DiuvnrjQOspGu
-r2Z4nPvwwpidw9YcgSA00VH78mP6J01aNpY0ilJMNgwCftvTsuy95cZ1+rfn7Ghk
-ML6r8IVlQbLHUDl7VtDaa+FiCD5/qb74HQCmM7i99tVpklW9vup92exDrQmoRFMf
-RLPT2oIxozZxV84BybAFzoiWjM7IH7z2x3CEXItcLJNi+YChvlQBWIxZQgMxayVW
-ZSWwxEwJNekik8E6hhjVfz98fjHeHxRczmkiT6KhrR6T7Vk8oiIZIPmaGah5quim
-bb/hvkT5X3WixXg6QQSqe/xpkcUnXlIeq0s3MOACdcbGtKHL0aWRjssjB6kRhRcf
-JsiYZWRBgY6G+dqit8dtnowxoblGIILeUL/+T17Zkc/mV1EovTNsdobzuGI6b+V2
-M2bz0n6exGLGIWAgtsSlE7CBqX0a4cK8LxWTC1dvXsOo0ZOLAQdv/3KPa65KWPSA
-RmqtV5Nv4eI+CovmpMUTxiKerGVhk9CB1+YLumGWofefM9Exa1kWDGqOfivKA9QN
-quw+5JrUKgJOiqEda14yAsRQFppWIhgJT5SBMZUqrAjlqjealXPKa0ySuhTHKMRg
-SnVmOyvhJbe1kMTgjhenMTOjmRjQtLSuqwdyeoMZ+aE9yAKwi0jk3nRFhCYqmyZV
-JfGcl1O5CFEt8H7Rjn2G
-=2EZi
+iQIcBAEBCAAGBQJRZ+AhAAoJEOf+E+/4L5LmdIUQAIQ9w1OaopQ5zWGb3qYGnu5x
+CNBlgYSrJugMU4Q7zJe67feQ3fBrHSEqC3ZzlS+aDNtd1CJ1EzR2C7jiRAj74kOl
+yvA6ZZI3ghrk5jAx4n0JHPY0A4dsMmCW9C8joA8lxI+SX/n98kpzlOB7EzHvRN0K
+1DRVKraJwICzKEXmzvxvKho253RMYh3xniI268FBxjvz90btEMaT+b3YmaTc99RF
+tZKpjiYgDnXe+CE2BtjmSV4Wm9jaNbH8D8KRXLtV7JNFSz+RhH94eYYQgvdh1jFE
+A0RIoZ6lLWP7KxrBQiCF1NnAdLEfaiSiG+11PY4p6aQKFHg9x1SOSrSzAfEwxuN9
+MFEh8C+xZqpLvu5zwKpnMXrpxpevddcvst4MCNC4FM33fW6DgPUEYF07cgu6W1Xo
+LaO4o5xRK5tZscdfKUsMqGSojtESfZpKgXSNh4q0xcCujAO64z9RB3oCY8sVBCy+
+KdoMjiH7ZMhnmBIB0dKJZ+ZNRvOB3NDxnemywMSTD/fBRo8TqXkK5dVD1kwjPK0H
+2OXJNwriRy3o4K0Of/asC4+zELjuyV/nBTxLZISapxdlb+kBN1kSK8+Ej3kMGru5
+E+b66LGh21jbFAor/SEHL4G/pyFrHXWUzRE47WyeAUT8lnJhvOFciuA9iP56KoAG
+05/ey3gmYbjSamd4tqo5
+=p15N
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.58.ebuild b/sys-cluster/ceph/ceph-0.58.ebuild
deleted file mode 100644
index b82b545ae1d9..000000000000
--- a/sys-cluster/ceph/ceph-0.58.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.58.ebuild,v 1.1 2013/03/11 16:50:57 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-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
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	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
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-0.59.ebuild b/sys-cluster/ceph/ceph-0.60-r1.ebuild
index d7bd965a3658..1307fa70b2d9 100644
--- a/sys-cluster/ceph/ceph-0.59.ebuild
+++ b/sys-cluster/ceph/ceph-0.60-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.59.ebuild,v 1.2 2013/03/26 08:24:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.60-r1.ebuild,v 1.1 2013/04/12 10:21:14 alexxy Exp $
 
 EAPI=5
 
@@ -26,12 +26,13 @@ SLOT="0"
 IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
 
 CDEPEND="
+	app-arch/snappy
 	dev-libs/boost
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
-	dev-libs/leveldb
 	dev-libs/crypto++
+	dev-libs/leveldb
 	sys-apps/keyutils
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
@@ -54,7 +55,14 @@ RDEPEND="${CDEPEND}
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
+PATCHES=(
+	"${FILESDIR}/${P}-mds_sessionmap.patch"
+)
+
 src_prepare() {
+	if [ ! -z ${PATCHES[@]} ]; then
+		epatch ${PATCHES[@]}
+	fi
 	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
 		-i src/logrotate.conf || die
 	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
@@ -62,7 +70,6 @@ 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
-	rm -rf src/leveldb
 	eautoreconf
 }
 
diff --git a/sys-cluster/ceph/ceph-0.60.ebuild b/sys-cluster/ceph/ceph-0.60.ebuild
deleted file mode 100644
index 2f0d41166b56..000000000000
--- a/sys-cluster/ceph/ceph-0.60.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.60.ebuild,v 1.2 2013/04/04 09:54:36 alexxy Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils multilib udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-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
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-		-i src/logrotate.conf || die
-	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-	# disable testsnaps
-	sed -e '/testsnaps/d' -i src/Makefile.am || die
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	rmdir "${ED}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index 17bd3337ca08..dfd987400e17 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.3 2013/04/04 09:54:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.4 2013/04/12 10:21:14 alexxy Exp $
 
 EAPI=5
 
@@ -26,10 +26,12 @@ SLOT="0"
 IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
 
 CDEPEND="
+	app-arch/snappy
 	dev-libs/boost
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
+	dev-libs/leveldb
 	dev-libs/crypto++
 	sys-apps/keyutils
 	fuse? ( sys-fs/fuse )
@@ -54,6 +56,9 @@ RDEPEND="${CDEPEND}
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
 src_prepare() {
+	if [ ! -z ${PATCHES[@]} ]; then
+		epatch ${PATCHES[@]}
+	fi
 	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
 		-i src/logrotate.conf || die
 	sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
diff --git a/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch b/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch
new file mode 100644
index 000000000000..65cd8caae930
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.60-mds_sessionmap.patch
@@ -0,0 +1,29 @@
+commit 01f99c9d6cc0c3494bcb81e914b28bcc4ca2f7a1
+Author: Yan, Zheng <zheng.z.yan@intel.com>
+Date:   Fri Apr 5 13:58:36 2013 +0800
+
+    mds: fix session_info_t decoding
+
+    commit 0bcf2ac081 changes session_info_t's format, but there is
+    a typo in the code that decodes old format. We also need to
+    decode struct_v == 1 in the same way as struct_v == 2.
+
+    Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
+    Signed-off-by: Greg Farnum <greg@inktank.com>
+
+diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
+index ad4a71a..b1ce640 100644
+--- a/src/mds/mdstypes.cc
++++ b/src/mds/mdstypes.cc
+@@ -541,9 +541,9 @@ void session_info_t::decode(bufferlist::iterator& p)
+ {
+   DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, p);
+   ::decode(inst, p);
+-  if (struct_v == 2) {
++  if (struct_v <= 2) {
+     set<tid_t> s;
+-    ::decode(completed_requests, p);
++    ::decode(s, p);
+     while (!s.empty()) {
+       completed_requests[*s.begin()] = inodeno_t();
+       s.erase(s.begin());