use subslot, adjust deps, update to python-any-r1

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

7 files changed, 454 insertions, 37 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 57af714a13da..6aebe43c36d1 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.43 2014/01/15 13:45:32 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.44 2014/01/23 16:12:10 dlan Exp $
+
+*ceph-0.75 (23 Jan 2014)
+*ceph-0.72.2-r2 (23 Jan 2014)
+*ceph-0.67.5-r2 (23 Jan 2014)
+
+  23 Jan 2014; Yixun Lan <dlan@gentoo.org> +ceph-0.67.5-r2.ebuild,
+  +ceph-0.72.2-r2.ebuild, +ceph-0.75.ebuild, ceph-9999.ebuild, metadata.xml:
+  use subslot, adjust deps, update to python-any-r1
 
 *ceph-0.67.5-r1 (15 Jan 2014)
 *ceph-0.72.2-r1 (15 Jan 2014)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 70fb75e8bd37..e2a1e93d6772 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ceph-0.61.7-install.patch 380 SHA256 12bf7caa3561401fd7ceb4323d58544319f0d8296facdd53c165ae8eae1b27b4 SHA512 68966c29f8ef27be1c422f35568d62a98fc60c03acdb834558eeb42fe9101413040a6d802813afac5985f275b4ae25756cf01eb52a35baab2ecdf4ada3b09b54 WHIRLPOOL 7394431ead772cb5c681cb495837617407fea79ac6e3b6fda567b973011c166c5ee10cd6b79341650fa57462e54b54ca47ad472b35530cb950f96092b9aa01a1
 AUX ceph.confd 225 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 SHA512 64a68d9985a2dc87cfddc4c6dd5f2af7147b56a677c5b5451caf37b8a07ee49567c7aab368e30974bcd8d670d3471bc79488522a556788e0f2cbf350c272d120 WHIRLPOOL d46cc51dbcf77e17f57126c417955475b9fa2c883bada7c843cbda7c524622690a760795bc6c0af13331abd7e0eca8ba7b139f44b51ec9d5a560137f2f321328
 AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
@@ -12,31 +9,18 @@ DIST ceph-0.61.7.tar.bz2 3151436 SHA256 29e095cf967e4e0e425adbd31cd036cae9815c9e
 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
+DIST ceph-0.75.tar.bz2 3714113 SHA256 015121d6f62f499857dec7f2d59ea56189aeb572c9596f2c4c5284224b32a47f SHA512 08a7970b510a40b45e068da756bff68a9dfc2f9bb0538cd7dde55a29f580a16ae495ebad820982235b1505ee491faf29aae6cd2bd93e675e33d75ee3f26e4d38 WHIRLPOOL d6f9553ad37246f60a882f18d6614deb96b0c121716da53048448a3fbb8a3dbe7e61d3a2062e8e0414e169e4c2bbefaaa57e57c0c1c054e34268c2dd99baae14
 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-r1.ebuild 2744 SHA256 2c024fe208c94f7c7e2dff9e1481e952d9fd026623cfda572fe2082c932985e3 SHA512 8df059745c1963fb95ce63e3b0a5a57a42825bef6229abf2058363b7ff8039fa501ed5ec157fa90fb4f069c111ebe5dfca682cbaa8d3c30e95d435be734d2972 WHIRLPOOL de61e18d91f43a2c44ac50caf32303c9c877bcdb9e3ea0f4db69b044f249bc3f9abba5dfa349ba849de8f2b5c7ab2b951a9408b235da2f22ef2e7dc454b21d0b
+EBUILD ceph-0.67.5-r2.ebuild 2971 SHA256 5e4fad943cbe128c99810171831715150922b2729a6eeddc344faafbbc3fb48f SHA512 7ab717374168e868c68ff74a5dcfc6f32cdc05a1724f053d5849d91133aa9f3bdaa5049261dd8e32c9fcd7cadce8f6fe77b628f394a34d20514a10cc26c7fb94 WHIRLPOOL 6c5d3a4b4a15947e891bb531fdbb92171667c5fcf21cbb452358e97f36a026cc5ee065653ca368eb461df4800fdae0a9acbcba284504cb0c3e7921bfa722258a
 EBUILD ceph-0.67.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
 EBUILD ceph-0.72.2-r1.ebuild 2672 SHA256 fc8384963abcdb7822ead4e5e76cc0bdc3f3deaaa27938a94fc86791159b2435 SHA512 4acc129fbb6cc53a727e9722ea5ec61579935db79c3243ed32a7655cae81e8f14ed4c81a0dafb26bb692aca793f69be2d98d2c46ee23cb89b4f7423daaf52925 WHIRLPOOL f71fff7e656b4228cd398c1c9afba71f17121893ed7ff1efddc88c41833dc4974a40d9f2c0c8ea0e8dc6d20d39fdf5eb589384833b3dbc13767d205d81b132bc
-EBUILD ceph-9999.ebuild 2667 SHA256 411a3531e044b3e684465902b23da9a37db80a7cb9e56eb63e6a9eed459c3053 SHA512 59b9590fae00dc1553b18f7a707f74422965cf5b7bcd259e90130715d256fac95304a1f16409c3868d22a20eabb36e0ec7fdec497410acc73617ff4e25460c6c WHIRLPOOL c891299197b937ebd7258d982279db6b71c3df50efcc9881aa09e830195aaa5102e2bd14a68501753d2bf642ec78b765f0649af77d128ae3dc7f4710123a3c28
-MISC ChangeLog 7488 SHA256 2aebdbca3f3f3d37a904c283d74b793bb0318c6a438589b3a02fbf3c75e0ed6f SHA512 bb840244a739b6dc0f5c123611631ccc5a3cebaf82ab8c09dfae5d2f938e94c5a5a1dc318bfdeda4d968f7b043b32b0afa306832efa122e877514ff62921a1e9 WHIRLPOOL e87d7607cb301b5b8a57927285af83473e6dcc05a69b0a77fe15064626d052a9c9c5db06265e8c9f51ac19040fb054061ae0b108d8f4577bc7dea2418894d1a5
-MISC metadata.xml 716 SHA256 786e87f2d426c9531b75babb107225b4616e38fd8ed1a3d1fe80803c8ff1bf6d SHA512 2d74cdf4d1097315b925f79e9a72e71f6e946eda88cc38682aafcf11ee7f4a15262772fd19d2495877cc55d61de13b2859f29cc6472208a8e6abea19b2c4de62 WHIRLPOOL 69d5d05f9317e169e8ada93aded5f3ef46d79fcff2481c1ad56a9fc0ff878cebeb4198272b2eed83c4d006c385715ca8cf554f3711b72f01a945c94c28dc64f6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJS1o6mAAoJEJIMDbyqvv1V/RUP/0e770o5dyfscydBjxkj1Wfo
-/yERce/6aqIZXACMCrRJiMZp/RzfoffcMHbvh09Hw/cgF22J9DY2J/wu1VhTKFFq
-Ku6Ida5NVfB5aexVnBxVrNsf80VPZQP8sFQOQGR5dZEvoThDJtl8O/XMFKBHfOpD
-R5IFmA4Xi/3POXY7TVRLqltEIkSpfMBJPvMPEd1WHhtFlc9tgxonvfbtKPR6n+b5
-tJjlyqM4MIhemLiH9VqvZEaL2BhWFEw6DPoJAszSv4XJvS23tvwmjHyiSCSWYZlf
-/WQV4OmVDOZefMDLI9w5MDQhvBoiLnYIJNYWhAabPISje1fkJ22J3IL2dfJZijyN
-HQVDQAxKktuBhVyxje8+LdEfwfgTmsXFKMhckSFjJe2w6/Xmnlj3LRn0jPJmkeD5
-DNFuvqekx23YiIYlhryrzZuZ2iWLK72IN7XJ2dwQaqoKIG8z0K1rwYdwWisXImEL
-fh+wo2PjVq1QbUpzANSNX7OJQejTeo4esMDgvCrwxmFL7WwSEHq4xVij5+Wv3V7x
-jJshTaZqs4hEjmht2acG0skpG1ekvZppy4KPvlFOs7vVPNDoxot+L+zCDh1tXPIv
-0fkhYZuJ9AgfyRcz4GI2ipNvgxVK1dGP4X7J+cVzKNzo1GGWU/C7Nn5WNfhx+RBp
-xCwNa0AT2GJ6cjJmLQ+c
-=vXbE
------END PGP SIGNATURE-----
+EBUILD ceph-0.72.2-r2.ebuild 2899 SHA256 acbdf18b5e3fed97d13081aa53c4c828713c5dbb5e571b2d2c8aff8eb143b04a SHA512 9c9abb2280584a0bb4a360feea3c8bb9d0d5f419f46dcb2791f577b8255251bf6515cf421405b1b80f5a2652e9c792e13a5a7114eb7b66d73354f2a615fcf8bd WHIRLPOOL 74c9f1348f49ffdcc151695633b0528bcaba48c1b847f8f95c46dc64fd072a67edb95082679f1e722817c154aa202ead92a3acb139042fa9658f0a256413679e
+EBUILD ceph-0.75.ebuild 2883 SHA256 1d58964315961bc61f484f39bbe1593e97e5b2ee1052fd92630700fa7363c207 SHA512 0f3c43a9fa3a715bc318dd30fc74b0f8bfa7c18d2d77d337fe6674c0577cb1acd61beeba42f87dbcf17c4f6152363616b914605569af673b017565639fc6ce4c WHIRLPOOL 05910f44f140fbf03e6dbc76a78c7e7f02a973c3e530ceb9352adf9f6f29311de45d7d86ae7504ea7654761034b06133fab2c78027af2faa4f143b329d27f35e
+EBUILD ceph-9999.ebuild 2894 SHA256 362abfaae0fc5227464c7c21f3c5c1784574370cc14015a9e9cb56f8350ed5ac SHA512 bbe656f22b56103620f3c5f1fb3120b0960c8b76caa75808a106005c50465ba08cc2e9b50b0ca5f9bb0b98b915eb0456cc9101ee945b51e7bcdda9ef8db90b15 WHIRLPOOL 44ea25899c02ab6224a3f147f33615d6dd67f5d9b9912fb30c5db95e329e6285cdb176d0ec0773ea1d9d8e224fccecf5359e796ac1b5b5caefa6940d98571628
+MISC ChangeLog 7771 SHA256 5d2e5ad87762e4498e02611df109646431f5eb2aac917acb0f4422ef790bbf87 SHA512 a8f0880ff120a31e29a5bbd57c101a46885c3ab5676496bfd67339bfcce3e34686eee462192c3f472834888346e26adc092e251aa5ec8b064abdeb69be5b1e24 WHIRLPOOL aa628c1b41ea562b9df788033c4d00af131b5e648dd06ff4db5440c1f6dc067c1446bdac32bd1f05d71c246c78626a15264307a8234f429989258a10a2855b7f
+MISC metadata.xml 866 SHA256 e71ccbb990bed7595e80b061bcfda8af1848287763d9c33252df645cb38d55e2 SHA512 c446f82a796da9f507c86077cb28ac3e6f62fb09c742a71430946dd39e51d5ae8bcbdb27f304d2680f0d78e3a194c16fa58fe6a551fc707011946e5e71f6e7d6 WHIRLPOOL 1d82537997cc2938fb1ca2ef08d645f7a9214416777d823dd50db94578a8c9ca51fccaf994f5502686bfba4e40ccd11df43f22c5750863ca45fd7102f56f10b5
diff --git a/sys-cluster/ceph/ceph-0.67.5-r2.ebuild b/sys-cluster/ceph/ceph-0.67.5-r2.ebuild
new file mode 100644
index 000000000000..156db487e4d5
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.67.5-r2.ebuild
@@ -0,0 +1,137 @@
+# 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-r2.ebuild,v 1.1 2014/01/23 16:12:10 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-any-r1 udev ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss 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]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	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 )
+	$(python_gen_any_dep '
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	' )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/btrfs-progs
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	${PYTHON_REQUIRED_USE}
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+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 nss) \
+		$(use_with cryptopp) \
+		$(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_rewrite_shebang \
+		"${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-r2.ebuild b/sys-cluster/ceph/ceph-0.72.2-r2.ebuild
new file mode 100644
index 000000000000..12f966749708
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.72.2-r2.ebuild
@@ -0,0 +1,136 @@
+# 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-r2.ebuild,v 1.1 2014/01/23 16:12:10 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-any-r1 udev ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss 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]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	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 )
+	$(python_gen_any_dep '
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	' )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/btrfs-progs
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	${PYTHON_REQUIRED_USE}
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+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 nss) \
+		$(use_with cryptopp) \
+		$(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_rewrite_shebang \
+		"${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.75.ebuild b/sys-cluster/ceph/ceph-0.75.ebuild
new file mode 100644
index 000000000000..c8d92c17e8ee
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.75.ebuild
@@ -0,0 +1,136 @@
+# 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.75.ebuild,v 1.1 2014/01/23 16:12:10 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=""
+fi
+
+inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss 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]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	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 )
+	$(python_gen_any_dep '
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	' )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/btrfs-progs
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	${PYTHON_REQUIRED_USE}
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+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 nss) \
+		$(use_with cryptopp) \
+		$(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_rewrite_shebang \
+		"${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 c718537c1d7e..804d92ee009d 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2014/01/15 13:45:32 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.7 2014/01/23 16:12:10 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,30 +17,26 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-inherit autotools eutils multilib python-r1 udev ${scm_eclass}
+inherit autotools eutils multilib python-any-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"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc"
 
 CDEPEND="
 	app-arch/snappy
-	dev-libs/boost[threads]
+	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}]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
 	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 )
@@ -55,17 +51,33 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
+	$(python_gen_any_dep '
 	virtual/python-argparse[${PYTHON_USEDEP}]
+	' )
 	${PYTHON_DEPS}
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	sys-apps/hdparm
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/btrfs-progs
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	${PYTHON_REQUIRED_USE}
+	"
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	if [ ! -z ${PATCHES[@]} ]; then
 		epatch ${PATCHES[@]}
@@ -86,6 +98,8 @@ src_configure() {
 		$(use_with fuse) \
 		$(use_with libaio) \
 		$(use_with libatomic libatomic-ops) \
+		$(use_with nss) \
+		$(use_with cryptopp) \
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
@@ -112,7 +126,7 @@ src_install() {
 	newinitd "${T}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
-	python_replicate_script \
+	_python_rewrite_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
 		"${ED}"/usr/bin/{ceph,ceph-rest-api}
 
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index ca60e61af651..350ee821ff70 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -11,9 +11,11 @@
 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability.
 </longdescription>
 <use>
+	<flag name='cryptopp'>Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag>
 	<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='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 	<flag name='radosgw'>Add radosgw support</flag>
 </use>
 </pkgmetadata>