Version bump

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

3 files changed, 130 insertions, 16 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 8c21823b7d9b..5375e5a9c72c 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2013/03/26 09:27:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.35 2013/04/03 13:44:57 alexxy Exp $
+
+*ceph-0.60 (03 Apr 2013)
+
+  03 Apr 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.60.ebuild:
+  Version bump
 
   26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -ceph-0.49.ebuild:
   Remove old
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 342b682e46f4..04be4fa397e0 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ceph.confd 225 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 SHA512 64a68d9985a2dc87cfddc4c6dd5f2af7147b56a677c5b5451caf37b8a07ee49567c7aab368e30974bcd8d670d3471bc79488522a556788e0f2cbf350c272d120 WHIRLPOOL d46cc51dbcf77e17f57126c417955475b9fa2c883bada7c843cbda7c524622690a760795bc6c0af13331abd7e0eca8ba7b139f44b51ec9d5a560137f2f321328
 AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
@@ -7,27 +7,29 @@ DIST ceph-0.56.3.tar.bz2 3214620 SHA256 5ea39c9fce4741e0a4adb04262fa02d491834996
 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 2420 SHA256 14d3b1d88a95397226f0e5d6578cb22cfe004c841af063b579e0c6b74d9cc4d1 SHA512 fa0eeea332ebbc34fea3c95625d1696a2d26c1017d4e777ffec8b84be7ebcd3b5785b95808d2a0962e0d2aa94967d7fa158962695cfce586d7da62ed1e0b562f WHIRLPOOL 2621b734ef317fc471accefa43633fdab0c084ee939b2bb3c0c50b2c853fd6d34b4acaef7f746c0207cc8c184841c24ced56cc4d87580998e65bba96158b7cdc
 EBUILD ceph-9999.ebuild 2420 SHA256 e886c12140974e0c1f68930edd508114dff15d8e9e33f106b7264360477f4968 SHA512 1b34f228141207e34515c5a66c35105c9b18660dc243c3112b2e41d8635aa19ce329b24d0b0fae91f33a84c1c97e0115ca2e6b9411dd6fc700e19f7d73cddfb7 WHIRLPOOL aeb8888d4194ff82a820031e4bac005b79be03c178ba354cfc70c610766f0ec081917ef68b779baf1e119d542404278bb159a7fc0fa70393e01f8378c14c734c
-MISC ChangeLog 5760 SHA256 1b6a0320c92ddb0dd6e242b3dcced673d52bfbe9df3b01c3401646bc121c092f SHA512 73398898910963a007e195476fed1cf406dd56ab5efba8142b8a1ee086d792713e44dc510ab8712814c4bfc0fd2b11c2d63f1075097ba4eb5639e5dc246d5e87 WHIRLPOOL 091404d8ed732a57dabba70cf89c66b0e213b3f8fda77a83aafd982949a9f0f913677d6756b9d11e4dae3668401710dff53e2bcdb75f048fd5285e37e153b472
+MISC ChangeLog 5875 SHA256 4cc7fcfd154dbb9204874e663b90e4ef58e199cc8a0f5ace61336f5a516bf5d9 SHA512 d105916ad1b8f3d0d1bbc097e6b0d5394a29a9f4ab57a42738edebe1c0ba14350960acdfd7978adc194744a04d31508bbb7a0659642cf318ad9645bc80cbeaca WHIRLPOOL f2e6b6355caaf0bc19cf156f87bfc04aef117c87c17fd7cfc5de2b70fc2e962ccaf18b9f7e0126a90206dca2e33f759e141ad8473f7f50183ebb52a6d70639de
 MISC metadata.xml 500 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407 SHA512 ecb262b3c942a347291496583730bc59599950983d66f1497110a459a16f5366e79273376c1967d5f59fa245c2cd64c93c11be7d16b7e85428a277bd81ac3984 WHIRLPOOL 21976221c15b97596c1ff94a80040adc5b29012afe9f80c12cd7e60fd3857947ada817d0ef83dcf533df287be0e6925596d4604e9522a0ccdcb844610373089a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRUWoGAAoJELp701BxlEWf+CQQAKBGktOUexSuI6TwwR6dZqbl
-m11UkTHB0w+wfwffMpcrNKAodQZatSzqgqm1R8DHisUQTUofECW2wLnGpp4GBquZ
-285M3rntUoreWYgb5ZyC06E1Ski/s0y8lM3dhueheV413XJ/mXVIn4q1K69CRCL6
-mkMU+HGOdf0mhoj7+zu0w+iCY9mV22+2O1fUlKcudvjLwifE1Z0E2hxd9zUyct0j
-S35YFzW3KVYtgcRZDYD1U3HqitlT+fNOFBU1Nrg2Saxl+gooJEf2aSj3O0ySgTFQ
-S44BslO4Pmk6LfuCaksiqXXIHQne1woBflEic0UhfuPJhC5C2/E9r2I2qUhRxmVR
-yZbrci076mI2SsNIIBNgdOmlLLJ7VcIdhsQSFDrbrrvhLNgUzZZu/wu9oOWon9zI
-XqyDo+2W7DEEok7UFCDMrg7PGbhUOM7IlCIi3rwGtNK/trPOCC8z5fMSFOIJnxRk
-FR3b1upVeluO4F9vwz7zZRdd6+dPJgJbQJscSaHjdLJ/3RJGuRTJme//XuKnJdJj
-g7z+igHaZt5JD4lMUUVF2GtIZ43E7es3lt1rV5izljwf9IXvLW2oLuiwIUvGuGb4
-+XyfvsynlJhoHHBXsasyvkS+M9+lYL/ViMX9BwQl9rBYP/67X4vvP6oUo2152rEu
-IJwSdA+EaTkTewM66eiq
-=H8hj
+iQIcBAEBCAAGBQJRXDJXAAoJEOf+E+/4L5Lmy6AP/jb12vqY/A7Tnxoh+yobyuQu
+/tMZ6vtpd2VixLdXTI8HGAEMeyOUS/PnzZpDMvH66khSi9rHlrk+3S1kbm98ZeqU
+o5jX2ZqYAiPiXaWF0MiKVH8hJlohzKCpQgKzq7UT84BeN5uuHSOKLWthux7+OUuR
+xAMPCwfrn9UKkQCv6mFZGk0jvjizKDV2jfaLZRNSp4NZ7YXkLwpYOKFOsNqKxIhm
+Jy06f+PfYtGVorZVIE9lBbRUXqvWzC+H/anFTK+OcK3R3e+Y90TcVUk5XSO1B7Ba
+fXc2vkhwKUqV/mwmbHUJJ0ycdYuThkkK7MMhngq1+MicjPiV1j2HrO3eVPhULy5a
+z/vnZr7ErEdFWZNZQd4yAX2AWBnjzaqzffvVD6qkwgaiTZVUuyux/xcGp2wzKoBo
+GYzky39iG15aBuYrjik7tZ3oXFVw0aiJu+PyIMMwiLlGWJT0FdekiGz/6iK8smcq
+kwaSiK2RnSCH+y2xm7QELmGsvMx/MMvn0LLw5NJfQFrWdbL3QNAEudgZtajm99vY
+QZ+XcjKYCsusUxH2ExLBCbdtCPxS+8DDmgNnmg89qZL1o07SLX0W34PABHcEQ67e
+9rcQDHhbmw1gNisPPSG4ddTLrAFBHTtSvcU7M9/yQ765QA9s1FetkSesK1CeiLdp
+5rLqIn8pBbU0Rxcm4gPB
+=mJgJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.60.ebuild b/sys-cluster/ceph/ceph-0.60.ebuild
new file mode 100644
index 000000000000..4558f7836590
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.60.ebuild
@@ -0,0 +1,107 @@
+# 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.1 2013/04/03 13:44: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
+}