[sys-cluster/ceph] Version bump & clean up

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

4 files changed, 43 insertions, 97 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 43c778e27738..d87380f64196 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.3 2011/01/20 18:58:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.4 2011/03/28 16:21:12 alexxy Exp $
+
+*ceph-0.25.2 (28 Mar 2011)
+
+  28 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org> -ceph-0.23.1.ebuild,
+  -ceph-0.24.1.ebuild, +ceph-0.25.2.ebuild:
+  Version bump & clean up
 
 *ceph-0.24.1 (20 Jan 2011)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 5c9d2ea10056..a935132d67bc 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -4,26 +4,24 @@ Hash: SHA256
 AUX ceph-0.24.1-autotools.patch 699 RMD160 12fee9434e154afde078ce5b41ec4295a0bb1209 SHA1 a4e5ab770c2487329cf406f6b5758dfb3a835f8f SHA256 51aba64dd4fc80934071d4844db7dff2d54bd9f567a81e4d6ae20039f60cd434
 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8
 AUX ceph.initd 400 RMD160 58873ca15a29a81ecd64bda17749eee1ca96af01 SHA1 544beae2d460fa0a44eb4e9eb26a7bbcd96405d7 SHA256 9b957c42c3ab27e3e29f42aaae718396e14cd91256df7f959e212446d2f90618
-DIST ceph-0.23.1.tar.gz 1506941 RMD160 ee0238e3c01719711d41a696f57996a017d503ba SHA1 a4e487c2ceaf6634b70c6837f1ce926a68673958 SHA256 d42161d8f96322ee3486d30676bfa547b16d4fd2dd6b5af3554bef4e6b2514c6
-DIST ceph-0.24.1.tar.gz 1530486 RMD160 370786e2d0a19f2a6fc2ff179a277df1f78bd246 SHA1 840c82b7d760ad87128371c750c95d84c631b1b2 SHA256 f601d94b309743c3e0c9576e00f445f06ded3c20f840aebc67825c155b67cfbf
-EBUILD ceph-0.23.1.ebuild 1764 RMD160 2dcd25f1516c57b10a95a81da53bcfffa3e37fd0 SHA1 f2186a0c708b5a5d68623e4db5063dfe0bc5556d SHA256 21c54faa77a017844d54144a1fbdfc079106930510802b34525f36758e4afb0c
-EBUILD ceph-0.24.1.ebuild 1838 RMD160 16dc17f7f2c2c12f8034929cdc18624f2c9bc1f8 SHA1 0ffe54d7e0c479e0a9812d6155d956bc02567666 SHA256 b40d3decb08ca5c5632a510134e4ccb44e837433dae1cb96b92c802c38eb9cef
-MISC ChangeLog 729 RMD160 35579d71d550da446b23722644f5893d43e8c53e SHA1 db65bd27d4b741d04e98117e4d12ec03361cde93 SHA256 84ec6fedaa28b8ca17292925666c06afa60c6643c70f6e93b54cb2392372e41d
+DIST ceph-0.25.2.tar.gz 2568570 RMD160 9dafe0df82ebcf940ea7f0044fdb7b2aef0099cb SHA1 7742c239fdbf26299051954059824138b7f22f9c SHA256 8773dde6af3252aade8388fdfdb411bbbf5f803fc1935dbd096d0c19c5fdb9bb
+EBUILD ceph-0.25.2.ebuild 2012 RMD160 08edc40e408229465deac0492a31324e88d0b0d8 SHA1 3ff4a1585a2b78f88be53e7854e3d15faf503aeb SHA256 133c62318aa3778ee1a1f3887211859c93de825a0ea50c32b6ef3b9dbccce09c
+MISC ChangeLog 900 RMD160 3adb5b26a0531380c547816cc689cedef4163cd8 SHA1 feb65e4c74e50ae7eeb4f6daeb16d56d2b123c4c SHA256 523da54af89f68df4d4c08bda3a31c81a0c19e4f6cdf6d783a2d9b2398904b2c
 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNOIX3AAoJEOf+E+/4L5LmzIYP/2oazHkyl74IePuQ7LRKyt89
-MvVjkdfqKjIMievrTm3wWN/gTeh5wT3cH0Qsu7iYLbNxPeupN28V0nvmjn9N4xN1
-gtIBO+TiHYvievQ3u8FqqrBO59OQB8BIQgJAyEVjfyJ7cCunYor30wHvyqD2nb6H
-nUa1HWN3B6s6RGSgk+rax7AgF/UgzFqJ8b7+esiDKJmuZuc22Fqg0hVULJK8xJ6D
-k1kxxbQ5bzWLhaE0jQ2Yrfhm18tMlODA+VgbOxlL32lsiVPKLtwjWu1uC//DjVFe
-1palHcF20ER7CeawsTjnbCyfDrwZ5TjQX4Ttl3sw1cd6+yuIxlwrpByThF/T7AP/
-hwuAGTX+qaJMel5ORv5PJVt7uOIUKoraEAQiQTy/M8BunFgeaF5Uk3LIPcFOsFQI
-hwTzF02qGFzpGGPMvXc+U5Z3YlQWDvHXw3ul1a8fqb6Dr4Eo+MKiK4BG775jqH6K
-IJPh4uH/reXP4y2xqDTzes0XXNqKLIUnIJEuOAj/ytrS1XLFzkjZEl/j2yyn7giT
-T28KfaGNiqfUYkpbd00qddQ607t0XNt02BNCsQ4SQA6v5pfCujOOBEyoGi//gwOz
-+2dImfFFwNmhOXHCEm+PFgedadoXXriRg64oi44Dy8uM3ftVQ1ONrYUqc1efIF5s
-hLBouYCa26eWOnkrBUgt
-=5M51
+iQIcBAEBCAAGBQJNkLWAAAoJEOf+E+/4L5LmP4QQAJodaZUwFj4l/tecZV75XZ4B
+2E57vgui+gHVChQzOzsiAuaC8Z3JoxE8QX4Ae1Kl0mA918zw1trHIkVsufXmvxyD
+qrWuBM6toOEEpVI4X05c+rklBXivpTQHinF50zHnXhfVtg5edKDPNri3N2KKtNwX
+OUfKrG3ynkaBq+cdZTjvlUTIU742QoAz354jwc98a0TJwzN0KkiavDhWuFdHpg0Y
+rNTF2HE+3w4UvVCWMQz6yRSuscSUyAqjrAY35bFjv3e/nWQs0d69WnQk+6U0Pck1
+/fU3M1uGF4B/W8bBp0y5It5z0SmZk55tH7CyLSz2AEr2NcFzPbnUhPO9RNC7tNH2
+LAUrbyjjF8oe0JXQs537omgzVjQds+v2PkDcHQbKcfAb4lkPFNoFp10hbyntc3K/
+p2K1ryZzIx9ueH8a8XRRGuebIIJSNYruAlNrtn/zcBOFkaJIHeL4GAXJVzKjjskf
+//7ue7o1qNEdAo61bkxz+EOKIzNOyQZpaievxEzsIT22AaGtpPLm96eh3kfcnNic
+4yQf/sKh91CpXFJ4RBDts1ZAVVR4e30R1fqRAkcjW8NoBQ6F05g6OhBFLG5uc498
+wbkryvGPA025K9NLU97H1KbH5tCE30YxCODzRKlgtgM+L0tPcjbR+nPyXqgsjv71
+hIV5jJMnDbolVO4vZUxQ
+=5zbC
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.23.1.ebuild b/sys-cluster/ceph/ceph-0.23.1.ebuild
deleted file mode 100644
index 11cfec93f9d2..000000000000
--- a/sys-cluster/ceph/ceph-0.23.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.23.1.ebuild,v 1.2 2011/01/19 17:34:13 ultrabug Exp $
-
-EAPI="3"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.newdream.net/"
-SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fuse libatomic radosgw static-libs"
-
-CDEPEND="dev-libs/boost
-	dev-libs/libedit
-	dev-libs/openssl
-	libatomic? ( dev-libs/libatomic_ops )
-	fuse? ( sys-fs/fuse )
-	radosgw? ( dev-libs/fcgi dev-libs/expat )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-fs/btrfs-progs"
-
-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
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--without-tcmalloc \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with radosgw) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}" -type f -name "*.la" -exec rm -f {} \;
-
-	rmdir "${D}/usr/sbin"
-
-	exeinto /usr/$(get_libdir)/ceph || die
-	newexe src/init-ceph ceph_init.sh || die
-
-	insinto /etc/logrotate.d/ || die
-	newins src/logrotate.conf ${PN} || die
-
-	chmod 644 "${D}"/usr/share/doc/${PF}/sample.* || die
-
-	keepdir /var/lib/${PN} || die
-	keepdir /var/lib/${PN}/tmp || die
-	keepdir /var/log/${PN}/stat || die
-	keepdir /var/run/${PN} || die
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-}
diff --git a/sys-cluster/ceph/ceph-0.24.1.ebuild b/sys-cluster/ceph/ceph-0.25.2.ebuild
index cf8b95857125..9d3e154f167b 100644
--- a/sys-cluster/ceph/ceph-0.24.1.ebuild
+++ b/sys-cluster/ceph/ceph-0.25.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.24.1.ebuild,v 1.1 2011/01/20 18:58:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.25.2.ebuild,v 1.1 2011/03/28 16:21:12 alexxy Exp $
 
 EAPI="3"
 
@@ -13,14 +13,22 @@ SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug fuse libatomic radosgw static-libs"
+IUSE="debug fuse gtk libatomic radosgw static-libs"
 
-CDEPEND="dev-libs/boost
+CDEPEND="
+	dev-libs/boost
 	dev-libs/libedit
-	libatomic? ( dev-libs/libatomic_ops )
-	fuse? ( sys-fs/fuse )
-	radosgw? ( dev-libs/fcgi dev-libs/expat )
 	dev-libs/crypto++
+	fuse? ( sys-fs/fuse )
+	libatomic? ( dev-libs/libatomic_ops )
+	gtk? ( 
+			x11-libs/gtk+:2 
+			dev-cpp/gtkmm:2.4
+		)
+	radosgw? ( 
+				dev-libs/fcgi
+				dev-libs/expat
+			)
 	"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
@@ -31,7 +39,9 @@ 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
-	epatch "${FILESDIR}/${P}-autotools.patch"
+	# disable testsnaps
+	sed -e '/testsnaps/d' -i src/Makefile.am || die
+	epatch "${FILESDIR}/${PN}-0.24.1-autotools.patch"
 	eautoreconf
 }
 
@@ -45,6 +55,7 @@ src_configure() {
 		$(use_with fuse) \
 		$(use_with libatomic libatomic-ops) \
 		$(use_with radosgw) \
+		$(use_with gtk gtk2) \
 		$(use_enable static-libs static)
 }
 
@@ -69,4 +80,4 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
 	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-}
+}
\ No newline at end of file