bump 0.79, fix libxfs dep, bug #507924, thanks @LeeL

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

7 files changed, 71 insertions, 178 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index c434341cfa31..1cfe90b81c5a 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.48 2014/03/29 22:43:59 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.49 2014/04/17 23:51:20 dlan Exp $
+
+*ceph-0.79 (17 Apr 2014)
+
+  17 Apr 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.77.ebuild,
+  -ceph-0.78.ebuild, +ceph-0.79.ebuild, ceph-9999.ebuild,
+  +files/ceph-0.79-libzfs.patch, metadata.xml:
+  bump 0.79, fix libxfs dep, bug #507924, thanks @LeeL
 
 *ceph-0.78 (29 Mar 2014)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f47d82578a79..fd0ae7d4c08c 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,36 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ceph-0.79-libzfs.patch 446 SHA256 bab2247437de8fa0254a97d2224ee1dba2b43393984431910ff6513795a03598 SHA512 24e3da2e47a2c4fc0eb3a9b1d7e1c9da124b138ee1f1141f50a4dacf441aa63cf8a2407edc3d8e008534800f7289c48bb9d5b0207ce2a84c335730afc6ef72da WHIRLPOOL 169a81e9b7e9dc68eab5af9b0eac9f77caee206477a944303d4428e4e20c1793a4aff161a4d312981d496079dd2aa06c9acd1366a0c57c1040b13afc59396f53
 AUX ceph-fix-gnustack.patch 867 SHA256 6a92074666a849de2177b4d3a68b01028f8d61dcac598a22eb0a8937cf297ea1 SHA512 bbea19531662d500c483d71d32dfb911dc62b027e1c5de3faf4c705c4c07274f00ccdcff14fcac75d2e8a2190bef82d307eeb1fe49f919a8e570f4afbfe71f6b WHIRLPOOL 6c40204c606e06cc39fe25575f620029b6d4b81eaa9c74d539d13b66ccf1a07913e56cb4c3ea60cd527d671a61371b99c2d97bee09edc6fcf25b64a22adc9bcc
 AUX ceph.confd 225 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8 SHA512 64a68d9985a2dc87cfddc4c6dd5f2af7147b56a677c5b5451caf37b8a07ee49567c7aab368e30974bcd8d670d3471bc79488522a556788e0f2cbf350c272d120 WHIRLPOOL d46cc51dbcf77e17f57126c417955475b9fa2c883bada7c843cbda7c524622690a760795bc6c0af13331abd7e0eca8ba7b139f44b51ec9d5a560137f2f321328
 AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
 DIST ceph-0.56.3.tar.bz2 3214620 SHA256 5ea39c9fce4741e0a4adb04262fa02d491834996c5819709463748095c9ad1b5 SHA512 b5f3ad54c81a9412f9219f99abb72efc6bc2010ccb29f1bf8a540b15e817ea7f7ccfaddea2b190739a0fba3dd378ac366006879ca66d6c9cafefe8baac0248e8 WHIRLPOOL 82e30278e352adfe3dd38c6bda49f8ae9abe49bab9e40d271d43bad6ad14c299c46fb51089fdb7216df96bc143a82c0073e735e26ae39c471dbe2b5b82d2fd7c
 DIST ceph-0.67.7.tar.bz2 3388195 SHA256 a7ec80693ec524800a5ecee1ac729c8aff7d32a761b2b68fe867d16565e7234e SHA512 16e20b5ba5bb9e809bd3c79b7f739127690d84973a12dc00526d68a342f04b6a96933f8e6a5ff517f282e8ec475d7f365f2d572c5b91777a8b1c44921b1d44a4 WHIRLPOOL a899ba31c0226aff685c2fe5fca4fefcb5415288669a3c63f4f5e317ade76ea7f12edef271d42fe64c8d6881e6f54caa612b19c2db1691e0d25938c3a3fa1c6c
 DIST ceph-0.72.2.tar.bz2 3433514 SHA256 f8c3017e107fbc1e48c784539fdc855c9d187095bc54df51d76f4d1e6300bd11 SHA512 35df8484df69cc43b83f01518b9cf337c85a08f702084efc77ebede648d13e562a76a2180c367b4e39bcc0a836d9ff7c52a6aade61351dbaeaef11f82c6a0c7d WHIRLPOOL 983ed699a40dc686de125d92741b5452a9ceeaabef7997147ea5478cdb673834ce8ab02769f2252237d15f7be0e7488754a7f53cce3d39723071af74bb4ef5af
-DIST ceph-0.77.tar.bz2 3850840 SHA256 2c11de10244a6e8cbe52b13d978ff8552dbe8c154e3a3dffdf1b3179f97b6b24 SHA512 546b145ef704c023267d073381865dde19bd33d6e60840b4136dd8963e1ec8e261817cd86d4940cbc021cde8f8e56e0efa0cd8c6921f97ae91a755eea4cbda56 WHIRLPOOL c543a97c3b2abee76c1d19dcc973b956c41cc179de54d730c58893369a96cfb227204f01a0a6f4ac3e6efc136dd80cc29b9e00549d195eb9c7e615f0c3d14a81
-DIST ceph-0.78.tar.bz2 3972873 SHA256 01f049d97cc14b87291b6df9d5efb7f3a889aa50ee812fb3ce5cd36b426a71c9 SHA512 c4c3b911cb78ec53c461e19653541b9a960b5d0942819f59e7b73eee58a408f8cb9c4a1c3d670c8a056022d8ece5e85f3f53b42e21f71ecc0ff7a76b2fc56af1 WHIRLPOOL 2e13caea7cf18dc4fa1ecd3aef37db35eef0f48f8fb154d542e9dd93f1aee1da19e428e1fb095c6b1d189f819eba72dc05768f8f8266bbb21acdd125ad53b439
+DIST ceph-0.79.tar.bz2 4054516 SHA256 fd24ad1578cc90c65a754b26b7183706f2aa678844e85944e761ed44094037d2 SHA512 df1ecb7ef168f70ffac7fcd5df48e72fe94711b406a607c10f996865b1fa40feca4e84711ad1bd8ecee85c2fdc9759f05c205781d2de82383828030baa7f4a78 WHIRLPOOL 55745eaf9b88711082e7300e7eeb9ae56a1dfa1fbeae56965db83e1b50b80d8517d46d550e6792e6ccb919c6d0e808df883d44f9cb24acc414fd228ba3bee75a
 EBUILD ceph-0.56.3.ebuild 2381 SHA256 94920bc6603dbec975b98985d42287fd6405ab112b26c8c8ca039df46ee8311c SHA512 021a42525996b60f87bc3c5a93c50c97c979fe76884e1769e9c2fbf7670dbd862599f26c801b60663894d6035ef1cb4ce2725dcaf655d19e78b650a119158cd2 WHIRLPOOL fe629a7295e2573f2aa888650f7b9fe120c37a8f9ac80accc26b80e7b0c2727d61442f4233ed0759af3bb98496cc4abe3b185bd654b7702636d49d4b3e4e247d
 EBUILD ceph-0.67.7.ebuild 3124 SHA256 f7731d382ccc0bef7e9a53b01f6ecd6fe471539f1b1417c1e7a1243dfc27422d SHA512 e787f773c1b5963f3ea6adc2c232d33e0063493e3062baa0493420b23e281798e03b59610ec4321caa95ea938555c219ce96f7b04c9fee9aede090ee276a3ef1 WHIRLPOOL e60649972c79bf34cf50ab1e4786cbeccd5fc72ccdb7fac1adcf914015a8ede30e99f474eea58bdf76352e607f93c6a2156ab9becbeb2123ffdb4bdeee20b541
 EBUILD ceph-0.72.2-r3.ebuild 3107 SHA256 55157baa102835488f1b1f19110dbe99b2f3ada934ea33b5d4372257a500654e SHA512 59955209a1c76442394d1310127fcbd7ed5277cdf7534e2cfc3e561fb436421af34373adabdd76b2b2da569255eed084fb206c4f0bec2b95996855c3f426a45e WHIRLPOOL debfb3f5c82a6f3a1411383f32b71cceecf4f64a98828745141f6fb4cd87dc824b2d573382abae1eb9b41cf8573c0a6fc5801d999c8199e63a0de5284297075c
-EBUILD ceph-0.77.ebuild 3091 SHA256 5d3445b442c4f5eb9be7e06fdb60db03323fafb881d87fe149ea32cef2482090 SHA512 67ac88a5c4ce17869f42e390fc80c0f39215c9f2b33342f728464f8e553fa5a98f2c1501e06b9dd5460f93c1e2ef50a092a6b2ae05d6c93cc2995914a2411c63 WHIRLPOOL 42b867feed89f044c0a8a2fa9673a0b174b359d9c810365570bdf8058a80bce85b012d2876355f1b77cd6bcfcecc26c046b9947b10632381290b667164b040c9
-EBUILD ceph-0.78.ebuild 3091 SHA256 7f2ac96cd28801abdba0104d91eedc2b0b598aa3a4d66a1ffb1b7fdef7da901e SHA512 879064289334ac48af6573286a4dbf35ed2f19820f7caf10325bb58b34efa86ad832520fe9296754840fa7369a04f4f862f58b29142b1a57cce59f43d5556566 WHIRLPOOL 2a0f6a37cb8b9bae4ac1d3afad7a62d9a0da9238bea06a8ae51baea477f4b93d2f702ebab15e51a63814d460b52340feab46449b605654a60fdc76189faffd95
-EBUILD ceph-9999.ebuild 2870 SHA256 eec6ca45529fdbe004d7109865ada05b83a9705ed9878856a22aaed6379e47e2 SHA512 19c6c24a194eb25d945dd89149af474bb8efbd3ca98df11422161062aee035c25b64e4108bb7f0e3198507fc63966b7615dabd05f2d68d47a30b80df05882755 WHIRLPOOL 689c74f4b3d7e808fdab621a1e0eeb6f1ad06e600375645f95e75237c2ad35a1c7017818683a5ad925a634b8f2b37469781132d358401761ed187da06ec04c1e
-MISC ChangeLog 8656 SHA256 f6f9189b5c47364b164118b94f13bb79a3600634d2bc3159d3f9630516e8d9fb SHA512 3d334a2a54d6f727f4666427a902a48227f452930110a2c23afe18314ade0e16ff4b9939ac2b90c95161d772504339be6687e92a273477a3ac3b084cb8d3bf01 WHIRLPOOL 97dfb74f4f4f4f13b4362f8a44af4a2e0962c3623e2a6c702de57a4110458013a936c0bcb028d7f4b82434591af4e92fa030afa8091100ee7739e5e01833c4e3
-MISC metadata.xml 866 SHA256 e71ccbb990bed7595e80b061bcfda8af1848287763d9c33252df645cb38d55e2 SHA512 c446f82a796da9f507c86077cb28ac3e6f62fb09c742a71430946dd39e51d5ae8bcbdb27f304d2680f0d78e3a194c16fa58fe6a551fc707011946e5e71f6e7d6 WHIRLPOOL 1d82537997cc2938fb1ca2ef08d645f7a9214416777d823dd50db94578a8c9ca51fccaf994f5502686bfba4e40ccd11df43f22c5750863ca45fd7102f56f10b5
+EBUILD ceph-0.79.ebuild 3226 SHA256 76bc84e63ec451c829a31e99e2363b7f7518116f0fafa00592932b275f8ecb70 SHA512 b8cd65669508b865703d9e8fc9e1d78d9ddfb4617e6331fc3b4e13b65315c1918cb9c19c2abdf1a76bf6e55f3c0460c8692af3ef9baadd2e737afdd9c1bbf5a5 WHIRLPOOL 7bbbe5e55f481964eff91ef901401319cfd44675d7faf47bb1e9d16c7be054cf7a1c593f266585a5c703972d7ee9532ccdd0ef27efc1394985e6a382c184ac04
+EBUILD ceph-9999.ebuild 3151 SHA256 dc1e6c2cb026ec073864bd5bfe182e92f9a43065486de162efa90f49420d83f1 SHA512 ce77eb002600344d5da6d199c2abfed88a13883d61bfaf7d0344f1ba63cc96ead6e8d5d21a55a963f0fee4f2914b96ad3d7f72f5b526ba5305b50aae2e7319d1 WHIRLPOOL e400254363f6d5b55d084ec736f0798d762444042e32b5424e0513d08a5c3bfa1fc5c340ee5a6144abdb6a03283c15d3148937a0a7c1a72ece043a26951313f3
+MISC ChangeLog 8905 SHA256 1a3f8ac2086322e43fe47445ba44c9abe7e46d2ecd456cb55db51e07f25e201d SHA512 19170f6d3054f8eb8fdcb7a93d52e90f4618c27f3b5430e4a9744dd20ce62c326056399d101dff1e8e135cd7890f369c99879be9c2163c3ec65052f01423875c WHIRLPOOL d7265e24524cc446082bf28da25fb2c0e9735f82d2415c09c36eb87f9f5888a3bd3a65681e48ce7c8c326c738328988ae7e803b2080939b90112c3134ee590d3
+MISC metadata.xml 954 SHA256 1881d213bbbd6ec1f598587d8c0dec47704398c6cad132c5b30fb9c9589f9e5c SHA512 4f2d44d96abf90442c563a2cf77aec43382d93ef949c3781e197f8d9bea752062d23401297076c3c434dd18a779c8dba25eaa368d3560244c9390e23dc035cc3 WHIRLPOOL 444923e577491eeefd170997d1df344a34ab0719414714d654fb76ba3cbe4684881e7e9abbe64b8b29791b19347727359ed33a5f9befeea408d5b51910a831e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTN0y1AAoJEJIMDbyqvv1VTwoP/iIhInBKcMzVKTzAf1FBGcA5
-JX0cPYvCVui4uvjmSyBacO5tIjoMaFMZgRKe5/0Ck52TMESt356VzDCCheQClRFb
-5LBnzucsShaBK5Q/e9SuC/OhuJpm4FD2km7PrX7ZOe8dZJaatE8U4vFqPIDdZKQJ
-7jl2+BBxLg88yQP5uOvAwp1bheI2eeplpurLobx8hPwww41aaUK/orD/pqe5yOxe
-7imdIPVBr2+K07S8OxFti6ycZwkrHSJtdWMa7zMYIDp8QaDmYqUctbXMIl1C/uth
-baO1c1Gb9KPNMBlDnHfUFarFxpthfTiPEUgFYGDKR3jxZGgWtpBpKJ2mGmENwUA1
-D9joszbp/F6I9zulloJk/qUSnXYU9oPxhljHtBTMxgKfuC0LZQC2dPuUpAG1VDlA
-78ypS1zylzKMgp83qQ2h+6KDhQLEtZRqQQ2Jx+WmcCYhH2k1nNBqiBRFF43NaRHq
-yQdWHiCWklnwmekQeuFnzpLmsSjo5Sl54fGF06MuBW9kWfdLoI49MBUSAzOGuVyn
-9k86mzzWYBC8GVXQDjBTEn4UdXYy9zHdc/NqPKqSv1iABm0Aa7+n993RDvlWNjuh
-qaqWojOvTNtpLR+bmlhcATeX0lyi4zIGMkrIb7iWDslheJCS3TWrUgLze3Lct8Az
-/iCDnljOBfd3x8hsOKYm
-=PcfX
+iQIcBAEBCAAGBQJTUGaiAAoJEJIMDbyqvv1VPPAP/2w/2bOoe5KCbO1BcWb50TLU
+vb4BtNimMvToSwAN6c0ZY/TvI20XRUUcuif/EWSSN2khcRz8ugtYtVuW1j474TEJ
+0ITlZ9z6ftX7RrUMTc2hVpf2XTkqsHoT5qIRtWqVgnWqsJwbMRIQIVLqBYjL1wXY
+V3hneeEqy/bSnV2k4y+APrSCy7y6scOorhTRD9oywaePjuU1pBTKh9PQk1y5U7VT
+yD/PLXhzAnmFknCHgelKR4NlmkobulJmQ6R+xhWtyKBQsK8HnjLAkpHlSEIoLQ69
+zT4trqn8f2EX9vv99k6w5h1NVue/81qe2ofNjyN3waoOJH0xdjH0R98rXxI9Lcqb
+ua+KH0A0Df1SCmZ6Aa4SVOytpRMt168hcA2fKqVMLpswkQuNo2gf22WGG2Gjbibs
+cuvRsX0w1/G0YyFNATWXrg/gGpN0WFCiV/sKpJji/C/IcOnl1AVwqfPBmFhuv57v
+1aEo8lxDY0RvAow/NqDBMSeKr8u2p7lxulI/mLG3z9qe+00ATmo8jE/xQhl7wstz
+2lChQy09Bsm47RPfNR/L5F7PHOgiqnoTzab+B+DDYBqJ4TlWyvTC+1tAXVdUXsV0
+w8FyIfkdEUnPbDy1oVhtym3WKbPS2Nzo1AYCaTstQb7Wwy4GMG2AWhMh4tuMFxNN
+YViIv2zePK0Hy+rAS/q/
+=qfNX
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.78.ebuild b/sys-cluster/ceph/ceph-0.78.ebuild
deleted file mode 100644
index 5e7d5161268a..000000000000
--- a/sys-cluster/ceph/ceph-0.78.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.78.ebuild,v 1.1 2014/03/29 22:43:59 dlan Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS=""
-fi
-
-inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost:=[threads]
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb[snappy]
-	nss? ( dev-libs/nss )
-	cryptopp? ( dev-libs/crypto++ )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	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
-		net-misc/curl
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	$(python_gen_any_dep '
-	virtual/python-argparse[${PYTHON_USEDEP}]
-	' )
-	${PYTHON_DEPS}
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hdparm
-	$(python_gen_any_dep '
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	' )"
-REQUIRED_USE="
-	^^ ( nss cryptopp )
-	"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=( "${FILESDIR}"/${PN}-fix-gnustack.patch )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-hadoop \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--includedir=/usr/include \
-		$(use_with debug) \
-		$(use_with fuse) \
-		$(use_with libaio) \
-		$(use_with libatomic libatomic-ops) \
-		$(use_with nss) \
-		$(use_with cryptopp) \
-		$(use_with radosgw) \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
-
-	chmod 644 "${ED}"/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}
-
-	_python_rewrite_shebang \
-		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-}
-
-pkg_postinst() {
-	elog "We suggest to install following packages"
-	elog " sys-block/parted		to manage disk partions"
-	elog " sys-fs/btrfs-progs	to use btrfs filesytem"
-	elog " sys-fs/cryptsetup	to use encrypted devices with dm-crypt"
-}
diff --git a/sys-cluster/ceph/ceph-0.77.ebuild b/sys-cluster/ceph/ceph-0.79.ebuild
index ee6828bf01c4..bbca4bba03b2 100644
--- a/sys-cluster/ceph/ceph-0.77.ebuild
+++ b/sys-cluster/ceph/ceph-0.79.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.77.ebuild,v 1.1 2014/02/20 10:18:55 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.79.ebuild,v 1.1 2014/04/17 23:51:20 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -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"
+IUSE="cryptopp debug fuse gtk libatomic +libaio libxfs libzfs +nss radosgw static-libs tcmalloc"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,6 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
+	libxfs? ( sys-fs/xfsprogs )
+	libzfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -70,16 +72,18 @@ REQUIRED_USE="
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
-PATCHES=( "${FILESDIR}"/${PN}-fix-gnustack.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-gnustack.patch
+	"${FILESDIR}"/${P}-libzfs.patch
+)
 
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
 	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
 		> "${T}"/${PN}.initd || die
 
@@ -101,7 +105,9 @@ src_configure() {
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
+		$(use_with tcmalloc) \
+		$(use_with libxfs) \
+		$(use_with libzfs)
 }
 
 src_install() {
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index 268b4b8d1bf4..1c47eb6aaaf6 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.8 2014/01/26 08:40:49 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.9 2014/04/17 23:51:20 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -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"
+IUSE="cryptopp debug fuse gtk libatomic +libaio libxfs libzfs +nss radosgw static-libs tcmalloc"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,6 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
+	libxfs? ( sys-fs/xfsprogs )
+	libzfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -60,9 +62,6 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	sys-apps/hdparm
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/btrfs-progs
 	$(python_gen_any_dep '
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
@@ -78,9 +77,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ! -z ${PATCHES[@]} ]; then
-		epatch ${PATCHES[@]}
-	fi
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
 	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
 		> "${T}"/${PN}.initd || die
 
@@ -102,7 +100,9 @@ src_configure() {
 		$(use_with radosgw) \
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
-		$(use_with tcmalloc)
+		$(use_with tcmalloc) \
+		$(use_with libxfs) \
+		$(use_with libzfs)
 }
 
 src_install() {
@@ -133,3 +133,10 @@ src_install() {
 	udev_dorules udev/50-rbd.rules
 	udev_dorules udev/95-ceph-osd.rules
 }
+
+pkg_postinst() {
+	elog "We suggest to install following packages"
+	elog " sys-block/parted		to manage disk partions"
+	elog " sys-fs/btrfs-progs	to use btrfs filesytem"
+	elog " sys-fs/cryptsetup	to use encrypted devices with dm-crypt"
+}
diff --git a/sys-cluster/ceph/files/ceph-0.79-libzfs.patch b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
new file mode 100644
index 000000000000..6d79c178d43e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.79-libzfs.patch
@@ -0,0 +1,13 @@
+diff --git a/src/os/Makefile.am b/src/os/Makefile.am
+index 252c678..c28ad0a 100644
+--- a/src/os/Makefile.am
++++ b/src/os/Makefile.am
+@@ -61,7 +61,7 @@ noinst_HEADERS += \
+ 
+ if WITH_LIBZFS
+ libos_zfs_a_SOURCES = os/ZFS.cc
+-libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS}
++libos_zfs_a_CXXFLAGS = ${AM_CXXFLAGS} ${LIBZFS_CFLAGS} -I/usr/include/libzfs -I/usr/include/libspl
+ noinst_LIBRARIES += libos_zfs.a
+ noinst_HEADERS += os/ZFS.h
+ endif
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index 350ee821ff70..a51b0a656879 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -15,6 +15,8 @@ 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='libxfs'>Add xfs support</flag>
+	<flag name='libzfs'>Add zfs support</flag>
 	<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 	<flag name='radosgw'>Add radosgw support</flag>
 </use>