vesrion bump, fix bug #496118, #469564

1) version 0.67.5, 0.72.2 added
2) live ebuild updated
3) add myself as co-maintainer

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

6 files changed, 302 insertions, 34 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 219a17077e22..372b08b06949 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,14 @@
 # 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.41 2013/08/18 18:57:39 alexxy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.42 2014/01/15 08:21:14 dlan Exp $
+
+*ceph-0.67.5 (15 Jan 2014)
+*ceph-0.72.2 (15 Jan 2014)
+
+  15 Jan 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.67.5.ebuild,
+  +ceph-0.72.2.ebuild, ceph-9999.ebuild, metadata.xml:
+  vesrion bump, fix bug #496118, #469564  1) version 0.67.5, 0.72.2 added 2)
+  live ebuild updated 3) add myself as co-maintainer
 
 *ceph-0.61.7-r1 (18 Aug 2013)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index df68e9edf59f..8bf67796ddf5 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -9,30 +9,34 @@ DIST ceph-0.56.4.tar.bz2 3286520 SHA256 985b110f8f11e9eb1ad360c309015400b15ecee5
 DIST ceph-0.56.5.tar.bz2 3292416 SHA256 4fe49885d2d013747098fb748855d7ab0844f9e25b204a6ad9f5d49954cfb4be SHA512 beeb6bf5a26eed34b742289ce88788f4f70ee6498d3e801431f0dedbd870c3d417ad20059a4699bc56645114271f67b54dfbf1dedd29306c8cbc2851ef352c7c WHIRLPOOL 9d08263e5f33fb3bd0ad6ac9dca01ccbfa3eab94bcd0bbf4be1734140419917178d0aebdc5ce528e5a1f1f7b743be0006113cb227882af095c5c737c017e95c3
 DIST ceph-0.61.1.tar.bz2 3150098 SHA256 784c30692dc9705b160d69797dd8183786ec26725b13a09f91ba0095ae1b0f26 SHA512 8de8d4602185623f161c1c219d2127c0caaa7a2ac202cd5e105fe4eac889261acfa17afb9ffef6bd4f28185f9945c7f05d85d4c746879ebdfabfd0e9553d8a7f WHIRLPOOL 9b2fbcec6ccb29cd04e4d08ec8a7c53e2f45d9473751b82d46f809dcb9b34f08c23ea381697b87406581265688b4149c5e0e44e4635f2f4106b07cdda06b4bc7
 DIST ceph-0.61.7.tar.bz2 3151436 SHA256 29e095cf967e4e0e425adbd31cd036cae9815c9ea70384f52b28361c2f453daa SHA512 7d59e96f7284caef05f43aef7507bb898546f8329b65f8eddae15e0c34829c4f5eb9b2959ac38864539d379213b6681839065dff8b7e72a1efc7ef3a959c6672 WHIRLPOOL 4e4d192e8f3c09b86e847975673b5c4b43a5ff9c393b6f554f83c1c33f4cf92516cadb941e141fc733b185c39ad64be0586472744abf8784c651b50f8b8df727
+DIST ceph-0.67.5.tar.bz2 3334320 SHA256 803c93c34ad3d047bce6c54fc006e7a0c880367e4095446d9014c7b3a94ad464 SHA512 191ce0b6c8b30fa96669c488b30ac3334e0918d8d0cb395091a73f22daec569fec2000b0e0080befb5c26b49c8e8e8502476eca28daed477cb25ce4de67b7a9b WHIRLPOOL d8915ece435732a2a8dddaaadc81b4aacf6a6d66a1560d001f040732acfcaa7d4c2e1966ecec6aedbdaba9990f26e7dd160672a37371489130dbf4963fbd7985
 DIST ceph-0.67.tar.bz2 3305744 SHA256 0e568d591fcfc290fe015cc6cb819af0ad75358715c2835cdebce1ce145b8817 SHA512 f9235ae0a7ba6b95474e858dc8577fd81ff530044cff6488ccb84496806db754e1a49edeb3acb020c0cba7869aa5e9a91f9c8813866fde19c63075d233dbc2ca WHIRLPOOL d73103c14e47b39745c1538caca4e79e0dc97325ddbfe31a53d60c0f5cdcd333604b162c0f2b64ed70a76b588c76cb49ed9d1b7be6d3ab04b7ae17ba1d02b4f3
+DIST ceph-0.72.2.tar.bz2 3433514 SHA256 f8c3017e107fbc1e48c784539fdc855c9d187095bc54df51d76f4d1e6300bd11 SHA512 35df8484df69cc43b83f01518b9cf337c85a08f702084efc77ebede648d13e562a76a2180c367b4e39bcc0a836d9ff7c52a6aade61351dbaeaef11f82c6a0c7d WHIRLPOOL 983ed699a40dc686de125d92741b5452a9ceeaabef7997147ea5478cdb673834ce8ab02769f2252237d15f7be0e7488754a7f53cce3d39723071af74bb4ef5af
 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.56.5.ebuild 2386 SHA256 b15d09939ff77a42b1b5b3a21196af89e1cb6f532955327c3c027def0bb28485 SHA512 0135e1294f506c84ec85e8843180d541f719699aa4c5d7a0804e4300dde948abcdf0107783fc7afc9abb0b2a1f55660384904384767061d06df349a0b1bec613 WHIRLPOOL 713877691bf0b45403e00e888565463d8c0b6a7e31257b2744f218187187032c5bbfe6727ddd4fd5d1feb67158580e273e30ae8b6be8f75d2162837702b22b2e
 EBUILD ceph-0.61.1.ebuild 2433 SHA256 4b115a71581ddecdb1fe83e569e64b9af0fc1e7925a3805ff90a3caacdb0b08e SHA512 8b6b6df78cc9d99d04fc011e28a8981dc111c7901a1ab4b3d1c1bdfb92c69305b8fea3ea19e814bc685ac013b723be632104d61fc2f9f302fa1aebd9ea38d0a7 WHIRLPOOL 9e576ac87af6374cae4403789d1f1720e96495e37bd26fbcc9c9d384d6eb7004874aff39c0c1f264cfccca990322d31fc39d56de443277e986416e11366d4097
 EBUILD ceph-0.61.7-r1.ebuild 2483 SHA256 7354292370f2ce1f42d0f1fc70043a74081151a39746eb6e4a5cad81e678062d SHA512 fe96a1f3001bc62e7c296dcacf27728426704df126f101a05c6f7409363ae0acfa6f7dbc223336a3d57f0e3240b8347a4e0e98ea2ef6d858ae255bcfde6bf673 WHIRLPOOL f70cba1212cff7ef50eb3cc22500b1739abdc688723da74faa01284065a8283effa221f9f03d271bfe0d4b28eddc09ff886c0c95d05d9baa1081ee62edda76e5
+EBUILD ceph-0.67.5.ebuild 2687 SHA256 43d103e026ede767fc639c84a716fff42f1c768e34873ddbdd084c6bd4d5b0a0 SHA512 72a9652b4b5292e951cfb6e41a4d3e7284c7ae563483ee13911c9fdc8e32b15058ad91fa2f7975060768d42a20baa0bae59cb960f2f96312822a76d57357e173 WHIRLPOOL fc3dc631b21c91cab0e79c6665a628a564e996d07ca0f79fcfb74d1a68097bb3529a4901d7c7b9b9441f611837f276814db49c815815fa41b90bccd86253bd5f
 EBUILD ceph-0.67.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
-EBUILD ceph-9999.ebuild 2431 SHA256 838ae7c201f62b06b1bc4ce84cddc7284b14841e8ffa00d926c2c754bddaff62 SHA512 fc180a1cd63eb977982b683021bde8f263a912087ace01139e02c65158ec109530813d9911965d874d84d94864f1812045d160642710b84654e3df7b4169f111 WHIRLPOOL 8457e692ba829923d91f7691ada3130ac78b34cb4b888d50a781098ef9d7336e0e02c4c4d532ce7298b755945d675c031bf8f323f019eff86a5ce6c6debb8dbb
-MISC ChangeLog 6933 SHA256 423ec98b0a80b32aa1db80ce5ad30ba4a6bbbed335ccc53764d5d24cd136137c SHA512 07c680523302bf34602ef4741ef6d09e124722949332e4152a6cd00e580a12c900b6fe042c18badce761fa6501e5802121afacc08d21d9cc71743bfdb7886cc0 WHIRLPOOL 33822d01baff07ab210a96f6ac0ce0629436ec51b6b848682ecc5e2ab6043356df5bed130579e6b6388e065869a86803429e605c2d45b594b1620671a2d3659d
-MISC metadata.xml 500 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407 SHA512 ecb262b3c942a347291496583730bc59599950983d66f1497110a459a16f5366e79273376c1967d5f59fa245c2cd64c93c11be7d16b7e85428a277bd81ac3984 WHIRLPOOL 21976221c15b97596c1ff94a80040adc5b29012afe9f80c12cd7e60fd3857947ada817d0ef83dcf533df287be0e6925596d4604e9522a0ccdcb844610373089a
+EBUILD ceph-0.72.2.ebuild 2615 SHA256 d3282d775114774290af1b3a096ef18ea570728740f63fcd1ca5c6bed578c519 SHA512 e1dd0b45d573a017aafb72fdd29e6fcbbd635b4fa4f35966e7ee6d8aefcbf87fae92444271feb0aea5fcfa42b0377281c8e97fc39447c99043e98dbc3e403f32 WHIRLPOOL 7fe24955089550f363ad2359db8c25c1264523ae2c1fd438a083f2c07e851afcbff9b4b93b08487d3342982788305163f118e1b14b6b0290437b1aea178b2baf
+EBUILD ceph-9999.ebuild 2613 SHA256 9503b1be82b56254778b1f0bdb8a68c4f5d8dbeec543530175644f7db527adf4 SHA512 2e099e661e8548b261e659f9d6da305af8455d1429101f19709ed847cb0c5d55e6e796e424e7182451fc08efc420c66d11d9fe0207c7ff17a7e26a726c0f993e WHIRLPOOL 9261415174d29b26ce3de33cd3d1b05226c68ee129452e252d8ad98e09096ccc54363680e33f1e324fddb40900b95ca2fa5dba3a128c4c06b6b1f63e9fcb2c8b
+MISC ChangeLog 7236 SHA256 35a7f01257d55280f34005d63279350eafbf50fa880910c0141989f64a401c62 SHA512 981942529aeae1f50a79fb2f6d7f70b3e274f8069e22eed3a6b5c54debac5c3ea27f02f84fa553468ce897e8fc8946b3dd922e3c1b8570f2afcd7cf31d0c2484 WHIRLPOOL 53878df6dbb573cf40461c7c342e4904b0c384b83e910ab1de0f7ce43b8a6ba1615b21986f0df9ab242363a08bbff2983b277113974e66bfdf04f48bba44a1f1
+MISC metadata.xml 716 SHA256 786e87f2d426c9531b75babb107225b4616e38fd8ed1a3d1fe80803c8ff1bf6d SHA512 2d74cdf4d1097315b925f79e9a72e71f6e946eda88cc38682aafcf11ee7f4a15262772fd19d2495877cc55d61de13b2859f29cc6472208a8e6abea19b2c4de62 WHIRLPOOL 69d5d05f9317e169e8ada93aded5f3ef46d79fcff2481c1ad56a9fc0ff878cebeb4198272b2eed83c4d006c385715ca8cf554f3711b72f01a945c94c28dc64f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSERkeAAoJEOf+E+/4L5LmIG8P/jE6IWpi0oGg9CmcuT+n+nnt
-3nidvHX+6IifNu+oPfmPm8KxTf3Is4UiPaYxWigkez3fX52Ozj68jU4pQiukBxyv
-mA7EpfMagekSqDLG8U64px+RmQITqc/0ARaDXstzv3xg88ZzvqdSoWLheFtkBVR1
-fYlVHwnsoFAHq0wwABvQhqs/xm55ZbfbS+tk4smygGF2nqVO/X/C0MK3ajkCJ68o
-+2dFMx0XMmCwyiZBtqvHJKmewK0h/DtcckcTIfERaHJYWieQJl1Kx9dqig6mdTVe
-oupOf0EPwoW9PgRAKY5NbOIDptVrt4ICI1cTYoMCfV1pXpJvjKsigwcGfgAQUeGO
-sIfHp16VDQP85CCZuNvmwNJ5fD2ifBhXdewLlBuaSV3uKgTOrKnb3CXSTRBeZj1l
-oLEOZqZSxwY264uCcwTyjGq2/JaDo6hiskTFFLCJspgZOsYpfWXA+eD+aJZVTgpX
-UH8Rh7ZsJDb6cgYS1irRR2OcIigdRuzY1b4EVg+y4v/si/aoC+wROoLplXj7bE1k
-LOE0+V7hdbuviHr8Au8O3cmaNepc6D7jC1hrUn4my+mi88SDOCD0OXSHMwCVxYh9
-/C9rk7B6KX7sOoT9Zdnjg3qgiM/lSdt3SXBXXLNamUNENOcaNM99DPG1ux/7kpuK
-C55sVyWNeLZgmOi4BWN6
-=lB9f
+iQIcBAEBCAAGBQJS1kKlAAoJEJIMDbyqvv1VLxwQALh93gbHEaj3FGw15eWU/bxc
+mzq+7muUcLCDUzW5oDShBPe4FuOn5Us9wyRLOrJPSuSDWN7bsaPzy6+mgmJqKhPr
+ofmYPOrRTNkpwvLUKG5Oh1VmG/jCe7jTXMOxNfFpSAAtJHsk4T0b8HHTDvJ92kQb
+/8H2ZdSs+ZX5C/Ig6UFQh/g6ETHjSgqbII1FX2ky5IUkZ4Qhcjs02dIMyHhVmOfq
+PaRx7ZninDSeazNQ7LTlrna3gIS1UQ//f+hUWuvNudSD/Q1thmk4JlvHM+S7LGQr
+MYmZhcqm7hgn7EL8RzABJrqemKpOEeNBdbPf6QlapnmAzblAGoETF0vOHz+k59h5
+HV6A+QIQle0fyoFoosJ5CvzdVcFrZ8KygwfKIMmmhN/FJBzZmiumm+tLNqWuEw/A
+O6ghv46zPksCDlPPo6nlrcudbTr51neqCgNWLsyEvBS+6FTXFrZRw54SEA96OA4N
+8R6vxqq+L3fWgAeDk2h/tx6DYudTSVaFl+fntAMi7Jk+7U9Rjud+PDUl5/9rl2JD
+Bp5hO/RksdworfY+RBwLVr2A2tFIuZXSrHJ4O/SohZv/rF5mUKYu4wmKvnh/I3iU
+yc7orOAxVMJcuecyQcZld54AdJ/uWiCEjxOBLVLGb0zbXx0MINrJ1tTxn/2ut4Rq
+X1QE4fUIILc57xKdGMVR
+=lD5P
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.67.5.ebuild b/sys-cluster/ceph/ceph-0.67.5.ebuild
new file mode 100644
index 000000000000..bfadefc73694
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.67.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.67.5.ebuild,v 1.1 2014/01/15 08:21:14 dlan Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	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 python-r1 udev ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug fuse gtk libatomic +libaio radosgw static-libs tcmalloc"
+
+CDEPEND="
+	app-arch/snappy
+	dev-libs/boost[threads]
+	dev-libs/fcgi
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/leveldb[snappy]
+	dev-libs/crypto++
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/keyutils
+	sys-apps/hdparm
+	sys-apps/util-linux
+	sys-block/parted
+	sys-fs/cryptsetup
+	dev-libs/libxml2
+	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 )
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-fs/btrfs-progs"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+src_prepare() {
+	if [ ! -z ${PATCHES[@]} ]; then
+		epatch ${PATCHES[@]}
+	fi
+	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
+		> "${T}"/${PN}.initd || die
+	sed -e '/^ceph_sbindir =/s:$(exec_prefix)::' -i src/Makefile.am || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-hadoop \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--includedir=/usr/include \
+		$(use_with debug) \
+		$(use_with fuse) \
+		$(use_with libaio) \
+		$(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
+
+	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}
+
+	python_replicate_script \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#install udev rules
+	udev_dorules udev/50-rbd.rules
+	udev_dorules udev/95-ceph-osd.rules
+}
diff --git a/sys-cluster/ceph/ceph-0.72.2.ebuild b/sys-cluster/ceph/ceph-0.72.2.ebuild
new file mode 100644
index 000000000000..63a81bb0fc78
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.72.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.72.2.ebuild,v 1.1 2014/01/15 08:21:14 dlan Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	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 python-r1 udev ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug fuse gtk libatomic +libaio radosgw static-libs tcmalloc"
+
+CDEPEND="
+	app-arch/snappy
+	dev-libs/boost[threads]
+	dev-libs/fcgi
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/leveldb[snappy]
+	dev-libs/crypto++
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-apps/keyutils
+	sys-apps/hdparm
+	sys-apps/util-linux
+	sys-block/parted
+	sys-fs/cryptsetup
+	dev-libs/libxml2
+	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 )
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-fs/btrfs-progs"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+src_prepare() {
+	if [ ! -z ${PATCHES[@]} ]; then
+		epatch ${PATCHES[@]}
+	fi
+	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
+		> "${T}"/${PN}.initd || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-hadoop \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--includedir=/usr/include \
+		$(use_with debug) \
+		$(use_with fuse) \
+		$(use_with libaio) \
+		$(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
+
+	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}
+
+	python_replicate_script \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#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 dfd987400e17..752768997cde 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.4 2013/04/12 10:21:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.5 2014/01/15 08:21:14 dlan Exp $
 
 EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
+	scm_eclass=git-r3
 	EGIT_REPO_URI="
 		git://github.com/ceph/ceph.git
 		https://github.com/ceph/ceph.git"
@@ -16,24 +17,31 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils multilib udev ${scm_eclass}
+inherit autotools eutils multilib python-r1 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"
+IUSE="debug fuse gtk libatomic +libaio radosgw static-libs tcmalloc"
 
 CDEPEND="
 	app-arch/snappy
-	dev-libs/boost
+	dev-libs/boost[threads]
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
-	dev-libs/leveldb
+	dev-libs/leveldb[snappy]
 	dev-libs/crypto++
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	sys-apps/keyutils
+	sys-apps/hdparm
+	sys-apps/util-linux
+	sys-block/parted
+	sys-fs/cryptsetup
+	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
 	gtk? (
@@ -47,6 +55,7 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
+	virtual/python-argparse[${PYTHON_USEDEP}]
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -59,13 +68,10 @@ 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
-	# 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
+
+	epatch_user
 	eautoreconf
 }
 
@@ -76,6 +82,7 @@ src_configure() {
 		--includedir=/usr/include \
 		$(use_with debug) \
 		$(use_with fuse) \
+		$(use_with libaio) \
 		$(use_with libatomic libatomic-ops) \
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
@@ -88,8 +95,6 @@ src_install() {
 
 	prune_libtool_files --all
 
-	rmdir "${ED}/usr/sbin"
-
 	exeinto /usr/$(get_libdir)/ceph
 	newexe src/init-ceph ceph_init.sh
 
@@ -105,6 +110,10 @@ src_install() {
 	newinitd "${T}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
+	python_replicate_script \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
 	#install udev rules
 	udev_dorules udev/50-rbd.rules
 	udev_dorules udev/95-ceph-osd.rules
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 2eeec3696ab5..ca60e61af651 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+    <description>Co Maintainer</description>
+  </maintainer>
 <longdescription>
 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability.
 </longdescription>
 <use>
 	<flag name='fuse'>Build fuse client</flag>
 	<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
+	<flag name='libaio'>Use libaio as asynchronous input/output library</flag>
 	<flag name='radosgw'>Add radosgw support</flag>
 </use>
 </pkgmetadata>