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

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 26 insertions, 78 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/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