commit: 45d13f3fdb4263f3a7626d939f3aff299d7311fe
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Mon Mar 2 14:57:24 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Mar 2 14:57:24 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=45d13f3f
Version bump with new use flags
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 62EEF090
---
sys-cluster/ceph/ChangeLog | 6 ++++++
sys-cluster/ceph/Manifest | 10 +++++-----
.../ceph/{ceph-0.87.ebuild => ceph-0.87.1.ebuild} | 12 +++++++-----
sys-cluster/ceph/files/ceph-fix-gnustack.patch | 22 ----------------------
sys-cluster/ceph/metadata.xml | 4 ++++
5 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 81a3e9d..06f1009 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,3 +1,9 @@
+*ceph-0.87.1 (02 Mar 2015)
+
+ 02 Mar 2015; Michael Weber <[email protected]> +ceph-0.87.1.ebuild,
+ -ceph-0.87.ebuild, -files/ceph-fix-gnustack.patch, metadata.xml:
+ Version bump with new use flags
+
*ceph-0.87 (02 Mar 2015)
02 Mar 2015; Michael Weber <[email protected]> +ceph-0.87.ebuild,
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f5072f8..6aa9320 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST ceph-0.87.tar.bz2 5819214 SHA256
6ca61e32c6b04f92d68f735408a981f95da699a65845908e5617b25defe90b32 SHA512
76f2fc58b3af6810d44196fa2c644357b6a279f2d288e9a4eb2d7a832421ea6f22073926ab5aaf319f3f1d1461be9ca7326278adbfc11cfa156a62ec6e76d1e4
WHIRLPOOL
2ff85d00a83611f59375e615de256b5104be77499f579a7538981de44da891bda398c27dda44ff763ae7cc053172dba0d253b3e3b5f408759a31700bb9743a27
+DIST ceph-0.87.1.tar.bz2 5834385 SHA256
a9a68ed58571af20fbbd7be4227dc71f5176eeb0713707ba3d8fddc00972b007 SHA512
d032f257506049cadd583c8c8b516667bc5a271060641d307cfd22b923e8038ff506ad06f38d84ce01dfdc877498322033cd08310927e60665d03b05119aeb1a
WHIRLPOOL
0408a0d9aa5c78808568b09e505375d2ebd32e1ae307e1292c1389fc5e70a9a769ed9c54abebce96cb21b4e5cd828674268c8de6cecae72e20934b6d7ec5e8f1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iL4EAREIAGYFAlT0cWFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlT0elRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBrBgD+OX43rNSZZbFUuKG7L03gTPOw
-FLRdKRH6ghk75l3B/zQA/RZu6+lekheOi54k+vhPG2eYrnQp1wY1uDlWwpATZqkC
-=AX1y
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JANFgD+JWZJ6H132mx40wrJv2Vs/L6h
+RUXfmdU1uNWYHHpQj9wA/1dCFG8SmRqc+dCnToSKKq5mVU2DCneB1sw70mKAWFPs
+=ufs6
-----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.87.ebuild
b/sys-cluster/ceph/ceph-0.87.1.ebuild
similarity index 90%
rename from sys-cluster/ceph/ceph-0.87.ebuild
rename to sys-cluster/ceph/ceph-0.87.1.ebuild
index 3769bd8..4399c34 100644
--- a/sys-cluster/ceph/ceph-0.87.ebuild
+++ b/sys-cluster/ceph/ceph-0.87.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://ceph.com/";
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs
tcmalloc xfs zfs"
+IUSE="babeltrace cryptopp debug fuse gtk kinetic libatomic +libaio lttng +nss
radosgw rocksdb static-libs tcmalloc xfs zfs"
CDEPEND="
app-arch/snappy
@@ -38,6 +38,7 @@ 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 )
@@ -53,6 +54,7 @@ CDEPEND="
net-misc/curl
)
tcmalloc? ( dev-util/google-perftools )
+ lttng? ( dev-util/lttng-ust )
$(python_gen_any_dep '
' )
${PYTHON_DEPS}
@@ -104,10 +106,10 @@ src_configure() {
$(use_with tcmalloc) \
$(use_with xfs libxfs) \
$(use_with zfs libzfs) \
- --with-kinetic \
- --with-librocksdb \
- --with-lttng \
- --with-babeltrace
+ $(use_with kinetic) \
+ $(use_with rocksdb librocksdb ) \
+ $(use_with lttng ) \
+ $(use_with babeltrace)
}
src_install() {
diff --git a/sys-cluster/ceph/files/ceph-fix-gnustack.patch
b/sys-cluster/ceph/files/ceph-fix-gnustack.patch
deleted file mode 100644
index 3e2eace..0000000
--- a/sys-cluster/ceph/files/ceph-fix-gnustack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/common/crc32c_intel_fast_asm.S
b/src/common/crc32c_intel_fast_asm.S
-index 4ca5d65..68d3426 100644
---- a/src/common/crc32c_intel_fast_asm.S
-+++ b/src/common/crc32c_intel_fast_asm.S
-@@ -662,3 +662,6 @@ global %1_slver
- %endmacro
- ;;; func core, ver, snum
- slversion crc32_iscsi_00, 00, 02, 0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
-diff --git a/src/common/crc32c_intel_fast_zero_asm.S
b/src/common/crc32c_intel_fast_zero_asm.S
-index b7246f2..9728be9 100644
---- a/src/common/crc32c_intel_fast_zero_asm.S
-+++ b/src/common/crc32c_intel_fast_zero_asm.S
-@@ -644,3 +644,6 @@ global %1_slver
- %endmacro
- ;;; func core, ver, snum
- slversion crc32_iscsi_zero_00, 00, 02, 0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index ef95520..bba8e8a 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -15,6 +15,10 @@ Ceph is a distributed network file system designed to
provide excellent performa
<flag name='fuse'>Build fuse client</flag>
<flag name='libatomic'>Use libatomic instead of builtin atomic
operations</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='kinetic'>Add support for kinetic</flag>
+ <flag name='rocksdb'>Add support for rocksdb</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>
