[gentoo-commits] dev/xmw:master commit in: sys-cluster/ceph/

["Michael Weber" <xmw@gentoo.org>]

commit:     4390355c5f47c9b8beb2ef4d24ff5a581cd02492
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue Mar  3 08:15:10 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:15:10 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=4390355c

Add 0.93 and 0.80.8.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 62EEF090

 sys-cluster/ceph/ChangeLog                             |  7 +++++++
 sys-cluster/ceph/Manifest                              | 10 +++++-----
 .../ceph/{ceph-0.87.1.ebuild => ceph-0.80.8.ebuild}    | 18 +++---------------
 sys-cluster/ceph/ceph-0.87.1.ebuild                    |  3 +++
 .../ceph/{ceph-0.87.1.ebuild => ceph-0.93.ebuild}      | 15 ++++++++++-----
 sys-cluster/ceph/metadata.xml                          |  2 ++
 6 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 2bedbcb..aa3e7ec 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,3 +1,10 @@
+*ceph-0.80.8 (03 Mar 2015)
+*ceph-0.93 (03 Mar 2015)
+
+  03 Mar 2015; Michael Weber <xmw@gentoo.org> +ceph-0.80.8.ebuild,
+  +ceph-0.93.ebuild, ceph-0.87.1.ebuild, metadata.xml:
+  Add 0.93 and 0.80.8.
+
   02 Mar 2015; Michael Weber <xmw@gentoo.org> +files/README.gentoo,
   +files/ceph-0.87.1-stdint.patch, +files/ceph.confd-r1, +files/ceph.initd-r1,
   +files/ceph.logrotate, ceph-0.87.1.ebuild, metadata.xml:

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 6aa9320..f1e2801 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST ceph-0.80.8.tar.bz2 4042112 SHA256 f0dbeada16333c50cd7f56f51eac87e7ba8cd22c42edccbd40576a23f813f725 SHA512 cb002a81a99462a05ef4db4bb5a8e09ec19b84c8041cab88c36e46d77fe512e57e1636f1aaa5aeb9fe03c4449816961cf9f82a183603fae99213e06dd519be6f WHIRLPOOL b6ee10a22e27ad7262ca0fc75ed1625a1f31218040411e723ef6872e5c13a5e0495eb179d8ff606305e8c04dafb4233cf5562e285427cd15200aac9d5ee8801f
 DIST ceph-0.87.1.tar.bz2 5834385 SHA256 a9a68ed58571af20fbbd7be4227dc71f5176eeb0713707ba3d8fddc00972b007 SHA512 d032f257506049cadd583c8c8b516667bc5a271060641d307cfd22b923e8038ff506ad06f38d84ce01dfdc877498322033cd08310927e60665d03b05119aeb1a WHIRLPOOL 0408a0d9aa5c78808568b09e505375d2ebd32e1ae307e1292c1389fc5e70a9a769ed9c54abebce96cb21b4e5cd828674268c8de6cecae72e20934b6d7ec5e8f1
+DIST ceph-0.93.tar.bz2 7008770 SHA256 36174c47f52b0db1f0ee081a72040349052b07f477f2d97a2f5a2bf1727c0fe4 SHA512 3587deb4c38717d933f91ac4219317f0f36b71f08a0cb9698b2452a8427d7ace2b4a82a0883728d4c4990ccab1dd60cb911c4e1f380cb6241a1228ba89c7dfa3 WHIRLPOOL 5df04619f949674fad921c06dc401cbbfbcc5deb126c0f0b36f5e70a55dc4c7cb6384622c57327e4346c081f8648935d6b08840cb87cb3ac453731459f7ea60f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlT0elRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JANFgD+JWZJ6H132mx40wrJv2Vs/L6h
-RUXfmdU1uNWYHHpQj9wA/1dCFG8SmRqc+dCnToSKKq5mVU2DCneB1sw70mKAWFPs
-=ufs6
+iF4EAREIAAYFAlT1bY4ACgkQknrdDGLu8JAevAD+OE2Cox1f6adqYVdm4UoZHc6v
+9M6tjUZ95v8eNPozE1sA/119vb+MLwEtYxiCrdCAQAESV0FGow98LPrWDOJ5cDGq
+=fZ3h
 -----END PGP SIGNATURE-----

diff --git a/sys-cluster/ceph/ceph-0.87.1.ebuild b/sys-cluster/ceph/ceph-0.80.8.ebuild
similarity index 84%
copy from sys-cluster/ceph/ceph-0.87.1.ebuild
copy to sys-cluster/ceph/ceph-0.80.8.ebuild
index c009cb1..087f2e6 100644
--- a/sys-cluster/ceph/ceph-0.87.1.ebuild
+++ b/sys-cluster/ceph/ceph-0.80.8.ebuild
@@ -24,11 +24,11 @@ HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs zfs"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.56.0:=[threads]
 	dev-libs/fcgi
 	dev-libs/libaio
 	dev-libs/libedit
@@ -38,7 +38,6 @@ CDEPEND="
 	sys-apps/keyutils
 	sys-apps/util-linux
 	dev-libs/libxml2
-	babeltrace? ( dev-util/babeltrace )
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
 	xfs? ( sys-fs/xfsprogs )
@@ -54,7 +53,6 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
 	$(python_gen_any_dep '
 	' )
 	${PYTHON_DEPS}
@@ -84,9 +82,6 @@ pkg_setup() {
 src_prepare() {
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	sed -e '1i#include <stdint.h>' \
-		-i src/tracing/{objectstore,oprequest,osd,pg}.tp || die
-
 	epatch_user
 	eautoreconf
 }
@@ -107,14 +102,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
 		$(use_with xfs libxfs) \
-		$(use_with zfs libzfs) \
-		--without-kinetic \
-		--without-librocksdb \
-		$(use_with lttng ) \
-		$(use_with babeltrace)
-
-	# patch files generated by lttng-gen-lp
-	#epatch "${FILESDIR}"/${P}-stdint.patch
+		$(use_with zfs libzfs)
 }
 
 src_install() {

diff --git a/sys-cluster/ceph/ceph-0.87.1.ebuild b/sys-cluster/ceph/ceph-0.87.1.ebuild
index c009cb1..acc33cf 100644
--- a/sys-cluster/ceph/ceph-0.87.1.ebuild
+++ b/sys-cluster/ceph/ceph-0.87.1.ebuild
@@ -26,6 +26,9 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs zfs"
 
+# packages not in gentoo:
+# --with-kinetic requires Seagate kinetic API
+# --with-rocksdb requires http://rocksdb.org/
 CDEPEND="
 	app-arch/snappy
 	dev-libs/boost:=[threads]

diff --git a/sys-cluster/ceph/ceph-0.87.1.ebuild b/sys-cluster/ceph/ceph-0.93.ebuild
similarity index 88%
copy from sys-cluster/ceph/ceph-0.87.1.ebuild
copy to sys-cluster/ceph/ceph-0.93.ebuild
index c009cb1..1f15634 100644
--- a/sys-cluster/ceph/ceph-0.87.1.ebuild
+++ b/sys-cluster/ceph/ceph-0.93.ebuild
@@ -24,8 +24,11 @@ HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs zfs"
+IUSE="babeltrace cryptopp debug fuse gtk jemalloc libatomic +libaio lttng +nss radosgw static-libs tcmalloc xfs xio zfs"
 
+# packages not in gentoo:
+# --with-kinetic requires Seagate kinetic API
+# --with-rocksdb requires http://rocksdb.org/
 CDEPEND="
 	app-arch/snappy
 	dev-libs/boost:=[threads]
@@ -54,6 +57,7 @@ CDEPEND="
 		net-misc/curl
 	)
 	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( dev-libs/jemalloc )
 	lttng? ( dev-util/lttng-ust )
 	$(python_gen_any_dep '
 	' )
@@ -69,6 +73,7 @@ RDEPEND="${CDEPEND}
 	' )"
 REQUIRED_USE="
 	^^ ( nss cryptopp )
+	jemalloc? ( tcmalloc )
 	"
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
@@ -106,15 +111,15 @@ src_configure() {
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
+		$(use_with jemalloc) \
 		$(use_with xfs libxfs) \
 		$(use_with zfs libzfs) \
 		--without-kinetic \
 		--without-librocksdb \
 		$(use_with lttng ) \
-		$(use_with babeltrace)
-
-	# patch files generated by lttng-gen-lp
-	#epatch "${FILESDIR}"/${P}-stdint.patch
+		$(use_with babeltrace) \
+		--enable-root-make-check \
+		$(use_enable xio)
 }
 
 src_install() {

diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 8e46f85..6da5dfe 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -14,12 +14,14 @@ Ceph is a distributed network file system designed to provide excellent performa
 	<flag name='cryptopp'>Use <pkg>dev-libs/crypto++</pkg> for cryptography</flag>
 	<flag name='fuse'>Build fuse client</flag>
 	<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
+	<flag name='jemalloc'>Enable jemalloc for memory allocations</flag>
 	<flag name='libaio'>Use libaio as asynchronous input/output library</flag>
 	<flag name='lttng'>Add support for LTTng</flag>
 	<flag name='babeltrace'>Add support for LTTng babeltrace</flag>
 	<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 	<flag name='radosgw'>Add radosgw support</flag>
 	<flag name='xfs'>Add xfs support</flag>
+	<flag name='xio'>Build Ceph Accelio transport</flag>
 	<flag name='zfs'>Add zfs support</flag>
 </use>
 </pkgmetadata>