Version bump

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

5 files changed, 119 insertions, 20 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index deddd53ed82b..873c97a90359 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2012/01/17 17:53:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.17 2012/02/07 16:58:08 xarthisius Exp $
+
+*ceph-0.41 (07 Feb 2012)
+
+  07 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +ceph-0.41.ebuild,
+  ceph-0.40.ebuild, files/ceph.initd:
+  Version bump
 
 *ceph-0.40 (17 Jan 2012)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index ddb4f44f68f5..e12d3881f53a 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 AUX ceph-0.26-autotools.patch 738 RMD160 422f48adcc95f1d9900d921998ff536d9ea01254 SHA1 edfd9dce7269c935db5e0aea560642ee91ac4721 SHA256 ea8c32c83d460a8b4e6646896d32ab146b711631d4dac6c179a4a31927732dc0
 AUX ceph-issue1869.patch 680 RMD160 d76f31a6f2e6fadf818da96565b6eb4d9053ccd0 SHA1 aa0e5992c732a452239edf5f7373bf3200f3e1eb SHA256 a094f46dad5e3e2bf083f6110cc47b88c24b79963333bd778e44b0aba1f73bc3
 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8
-AUX ceph.initd 400 RMD160 58873ca15a29a81ecd64bda17749eee1ca96af01 SHA1 544beae2d460fa0a44eb4e9eb26a7bbcd96405d7 SHA256 9b957c42c3ab27e3e29f42aaae718396e14cd91256df7f959e212446d2f90618
+AUX ceph.initd 418 RMD160 4c3823b5c561ea362745e5c5727b2b2e28ee9f2f SHA1 d17d3c08722178042f68b1c804b579617bd2e780 SHA256 9735d06c771b730dc899c0085f7c3d08b0c291e7ffd73b6e22b0f18a854f2bcb
 DIST ceph-0.38.tar.gz 2900293 RMD160 ac912f56348fdcbd3d71f81324c847f3b2613c86 SHA1 0b62f8e30501f20f1c125e2c698c136ee4993545 SHA256 df98be68f32a64860761ccdb02572de1c98ab3f2a54be57fcb846a0686fef72d
 DIST ceph-0.40.tar.gz 2925781 RMD160 bf512355cf7564e8f599ed2e466cc82cbb1122d2 SHA1 7d10523c68eefa9f83ba2d4a459e9de46f02bf9f SHA256 5c337312689b91c57c30037783c09b678daa70884115d56ab34fb3157a7047c1
+DIST ceph-0.41.tar.gz 2935011 RMD160 333c4f17deaa94e24747c5c85914eeb92b9e4b9d SHA1 683cb7507992c3f5ab053c1d47fe8d825a46b06e SHA256 d9e0ab15153c067d326de6e9a2de1514561fd2261d85bd283edf7a7f0152a4aa
 EBUILD ceph-0.38.ebuild 2109 RMD160 e8ba89e43020e3a1eb0acc53c54ea3ec007095ce SHA1 264baca0cb37834e2dadec7999a2adc8d646beff SHA256 c3e000cccbe1c3f855b7dfdae42f493007de0446a44bd41e4ee7969d93763aab
-EBUILD ceph-0.40.ebuild 2008 RMD160 b434438c121c1755acf6e6e8d21da928870c7866 SHA1 f6b8163cf06f105cd84574d69d61faf1e77166e5 SHA256 c6bab77bf24aa4d34d8a8417568a9326f5f89dd85225572b9be6db02cedb3dbe
-MISC ChangeLog 2843 RMD160 15fbf80508272ed538d7fdea6446b141c2158e8f SHA1 c5f2548ae9cb7e9c527b7670771aafd8c7d6ae4d SHA256 dcfa03aeaa22bc1352480e916203ae1a45d04e88defa64c92127d8bd983f11e1
+EBUILD ceph-0.40.ebuild 2097 RMD160 9546d7bf0298fda40e7109b322ae4426439cf5f4 SHA1 98c351c443534bfcd686e3ff6c1d26b9132e11e3 SHA256 228fdb50c9463d88075b75bd0d8ca42ad3cd3aee1068501bf3a83a1867f8ba4c
+EBUILD ceph-0.41.ebuild 2097 RMD160 3dc84ffc16b2b067877644a6de69ee90235a4060 SHA1 9a7ba7d79e31a01867024fc02b80bae5b29b33d1 SHA256 2eb1e7609133075cebaa826e17086b1a8a996eb174b9e01d832dd921d4850191
+MISC ChangeLog 2996 RMD160 f8e5eca37f93b98a5a1e802747936bed7b57aa70 SHA1 83374ad4e9c24df4ff1ca149ba7ff2176ea14f66 SHA256 63ceaa6f667eafd54f60722b4465761549aa40a23fe964e912ebd9f4959f0dda
 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPFbWOAAoJEF0huFKJUZL5jDwP/jXagkt4xEFyhc6bxFFM0FvR
-OuBnvDmE8YL3GhxxnDPfH9yPbgQZr5riWyRcmUEb8F2lE/4UWcQ/TRN7DeIZAIhP
-paAIgS8uab+CBRSp84Qg94XU7Wbh7t3divZbB+VZSPjsrrzPfi2uIPOZWaehWMgV
-dZhEf6FXHUR/el/LfPso97E7LHhZ76LyrIdWsYPiQ5NLaoDeP1f1cVgTBt8R3EWk
-/pyWKI8NfwJPbqFmsFg0ijwQ35UN0MfI4YKGJ36LwKRkNIuxpvv1AGWRD928cZmF
-tT+Pbtw6gdn7fu0ejPD3gZgaufVM2g22afahs9Kiky7lq1MC5c1zzn0BP/UFutz+
-SHkKxXrYH/ednkxaEP379T/aYZiaHt+M1wDA5JAXY0ZCTv1ryOr1rk4cr10e7wyP
-Q4EjhVjAJ9gpCRUtCmOj6kBaIrJXTBXT1uflg8HNe16lYwoI2lFG+zoc+KVfaFHn
-lwirMldoipcdQ1bVwOCwObMx9/m6fNHpPCKs+x1AwIfyAaednnj60M5P+tmiTxjc
-aojYGKcQV81AAB9enQi4gNCypv7E5g9AhFuDlhAV5oklz2v9Qt2s/Dd81WOTjwyK
-sM816AMDLa7a1NMpzZHTk49SVeLfm5G95Ohtqm5ysCekFP2+ORfe+fUUOmdXYHYO
-tXs27k2ZK865E14hBpg1
-=itC8
+iQIcBAEBCAAGBQJPMVgrAAoJEF0huFKJUZL5MW8P/1cVm2qYuCX2LST02CALXOzc
+x0zYAYnEmsSkPc5wylXHQFAd91u6vh0IaQ7WNjUM+g3jcAmXwTYeJXcyr8wnNka6
+atwFOt6m4MK7KmrYHojn7Dsi7+DKkfD9RLqfMGLJd2wkGHOV86LqEh6sYxo4HDNm
+Qb9PK4QDcJZOksfZqrPT+7K6kqYA0q05mO9fHmXcrtFCM6QMEcoYKQ61bXXtMhKO
+/jDMxu8iiaM4J2MZZftzyo+d+FQnT0/Sz/PdH4DGfTApGeoAKTfSAKs8KKUiz9eg
+6YvMOrOtu62KEDTvC0gQyYCr5/4sn8v8TyvD79UuAkGKupzwS4/QjRAiXVYPna9n
+y4r5PpJ3TaI+RSwhxgpKdmj0jeiDkWtqx2OMWUJCKtO8jVo8FDaYdTMWYf1vb5d6
+YHGDVeRduMvobd+bsjEnaTk2YS2aOrvUiTrB/9OJg7lnqPrxKthVjVHiQqHWrJHI
+Cm8R/WED8CfKvYbN8nf03/p3FrRia7qCN09kHCef1cH+UDF+N+4orl6Ljp7Efepg
+C0j+NiRP/ZleItnHtJc4pFRqh8qMoz3mC/+ufb+6BJ/Ez6OOVKDtVJZ90NiG5r97
+k8lDZjZuy3mDjRC78oOkENQM/p6y0pyGmyHyl4r2iiTV7XYSqU9C56OeeCqlZwUS
+9gTZrytmrBiJWqZnMlQm
+=BjVW
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.40.ebuild b/sys-cluster/ceph/ceph-0.40.ebuild
index ead4a2c4c691..4da706a55fbe 100644
--- a/sys-cluster/ceph/ceph-0.40.ebuild
+++ b/sys-cluster/ceph/ceph-0.40.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.40.ebuild,v 1.1 2012/01/17 17:53:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.40.ebuild,v 1.2 2012/02/07 16:58:08 xarthisius Exp $
 
 EAPI=4
 
@@ -46,6 +46,8 @@ src_prepare() {
 	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
 }
 
@@ -82,6 +84,6 @@ src_install() {
 	keepdir /var/log/${PN}/stat
 	keepdir /var/run/${PN}
 
-	newinitd "${FILESDIR}/${PN}.initd" ${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
new file mode 100644
index 000000000000..4017997d580f
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.41.ebuild
@@ -0,0 +1,89 @@
+# 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.1 2012/02/07 16:58:08 xarthisius 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}
+	dev-util/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/files/ceph.initd b/sys-cluster/ceph/files/ceph.initd
index f56a67b162c4..2e74f0993599 100644
--- a/sys-cluster/ceph/files/ceph.initd
+++ b/sys-cluster/ceph/files/ceph.initd
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 
-opts="reload"
+extra_started_commands="reload"
 bin=/usr/lib/ceph/ceph_init.sh
 
 depend() {