Version bump to latest. Stabilise 0.49 on amd64 and x86 redux older versions.

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

7 files changed, 26 insertions, 376 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 1f0043d92464..12ea939a0957 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.25 2012/08/06 14:29:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.26 2012/09/14 08:49:59 scarabeus Exp $
+
+*ceph-0.51 (14 Sep 2012)
+
+  14 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ceph-0.51.ebuild,
+  -ceph-0.38.ebuild, -ceph-0.40.ebuild, -ceph-0.41.ebuild, -ceph-0.44.ebuild,
+  -ceph-0.48.ebuild, ceph-0.49.ebuild:
+  Version bump to latest. Stabilise 0.49 on amd64 and x86 redux older versions.
 
   06 Aug 2012; Alexey Shvetsov <alexxy@gentoo.org> ceph-0.48.ebuild,
   ceph-0.49.ebuild:
diff --git a/sys-cluster/ceph/ceph-0.38.ebuild b/sys-cluster/ceph/ceph-0.38.ebuild
deleted file mode 100644
index b10201570ed1..000000000000
--- a/sys-cluster/ceph/ceph-0.38.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.38.ebuild,v 1.3 2012/05/04 07:20:30 jdhore 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 gtk libatomic radosgw static-libs"
-
-CDEPEND="
-	dev-libs/boost
-	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
-		)
-	radosgw? (
-				dev-libs/fcgi
-				dev-libs/expat
-			)
-	"
-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
-	epatch "${FILESDIR}/${PN}-0.26-autotools.patch" \
-		"${FILESDIR}"/${PN}-issue1869.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--without-tcmalloc \
-		--docdir=/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)
-}
-
-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.40.ebuild b/sys-cluster/ceph/ceph-0.40.ebuild
deleted file mode 100644
index 4bc8aca6619e..000000000000
--- a/sys-cluster/ceph/ceph-0.40.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.40.ebuild,v 1.3 2012/05/04 07:20:30 jdhore Exp $
-
-EAPI=4
-
-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 gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	dev-libs/boost
-	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
-			)
-	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
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir=/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() {
-	emake DESTDIR="${D}" install
-	find "${D}" -type f -name "*.la" -exec rm -f {} \;
-
-	rmdir "${D}/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 "${D}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-	keepdir /var/run/${PN}
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/sys-cluster/ceph/ceph-0.41.ebuild b/sys-cluster/ceph/ceph-0.41.ebuild
deleted file mode 100644
index ee3ff51f07fc..000000000000
--- a/sys-cluster/ceph/ceph-0.41.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.41.ebuild,v 1.4 2012/05/04 07:20:30 jdhore Exp $
-
-EAPI=4
-
-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 gtk libatomic radosgw static-libs tcmalloc"
-
-CDEPEND="
-	dev-libs/boost
-	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
-			)
-	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
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir=/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() {
-	emake DESTDIR="${D}" install
-	find "${D}" -type f -name "*.la" -exec rm -f {} \;
-
-	rmdir "${D}/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 "${D}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-	keepdir /var/run/${PN}
-
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/sys-cluster/ceph/ceph-0.44.ebuild b/sys-cluster/ceph/ceph-0.44.ebuild
deleted file mode 100644
index 98affca5c8df..000000000000
--- a/sys-cluster/ceph/ceph-0.44.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.44.ebuild,v 1.3 2012/06/27 13:53:17 ssuominen Exp $
-
-EAPI=4
-
-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 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
-			)
-	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=/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() {
-	emake DESTDIR="${D}" install
-	find "${D}" -type f -name "*.la" -exec rm -f {} \;
-
-	rmdir "${D}/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 "${D}"/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}
-}
diff --git a/sys-cluster/ceph/ceph-0.49.ebuild b/sys-cluster/ceph/ceph-0.49.ebuild
index 8c612386858e..bad687f957b8 100644
--- a/sys-cluster/ceph/ceph-0.49.ebuild
+++ b/sys-cluster/ceph/ceph-0.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.49.ebuild,v 1.2 2012/08/06 14:29:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.49.ebuild,v 1.3 2012/09/14 08:49:59 scarabeus Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://ceph.com/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc"
 
 CDEPEND="
diff --git a/sys-cluster/ceph/ceph-0.48.ebuild b/sys-cluster/ceph/ceph-0.51.ebuild
index 5106707b1948..005bff0fc1c6 100644
--- a/sys-cluster/ceph/ceph-0.48.ebuild
+++ b/sys-cluster/ceph/ceph-0.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.48.ebuild,v 1.2 2012/08/06 14:29:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.51.ebuild,v 1.1 2012/09/14 08:49:59 scarabeus Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit autotools eutils multilib
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
-SRC_URI="http://ceph.com/download/${P}.tar.gz"
+SRC_URI="http://ceph.com/download/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -25,15 +25,15 @@ CDEPEND="
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
 	gtk? (
-			x11-libs/gtk+:2
-			dev-cpp/gtkmm:2.4
-			gnome-base/librsvg
-		)
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		gnome-base/librsvg
+	)
 	radosgw? (
-				dev-libs/fcgi
-				dev-libs/expat
-				net-misc/curl
-			)
+		dev-libs/fcgi
+		dev-libs/expat
+		net-misc/curl
+	)
 	tcmalloc? ( dev-util/google-perftools )
 	"
 DEPEND="${CDEPEND}
@@ -43,8 +43,6 @@ RDEPEND="${CDEPEND}
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
-S="${WORKDIR}/${P}argonaut"
-
 src_prepare() {
 	sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
 		-i src/logrotate.conf || die
@@ -60,7 +58,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--without-hadoop \
-		--docdir=/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--includedir=/usr/include \
 		$(use_with debug) \
 		$(use_with fuse) \
@@ -72,10 +70,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -type f -name "*.la" -exec rm -f {} \;
+	default
+
+	prune_libtool_files --all
 
-	rmdir "${D}/usr/sbin"
+	rmdir "${ED}/usr/sbin"
 
 	exeinto /usr/$(get_libdir)/ceph
 	newexe src/init-ceph ceph_init.sh
@@ -83,7 +82,7 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins src/logrotate.conf ${PN}
 
-	chmod 644 "${D}"/usr/share/doc/${PF}/sample.*
+	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
 	keepdir /var/lib/${PN}
 	keepdir /var/lib/${PN}/tmp