version bump 0.80.1, fix bug #510396, #507956, thanks @babykart, @Changyuan Yu, @LeeL

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

8 files changed, 142 insertions, 47 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 1cfe90b81c5a..87e95aadae2e 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.50 2014/05/21 07:43:24 dlan Exp $
+
+*ceph-0.80.1 (21 May 2014)
+
+  21 May 2014; Yixun Lan <dlan@gentoo.org> -ceph-0.79.ebuild,
+  +ceph-0.80.1.ebuild, ceph-9999.ebuild, +files/ceph.confd-r1,
+  +files/ceph.initd-r1, +files/ceph.logrotate, metadata.xml:
+  version bump 0.80.1, fix bug #510396, #507956, thanks @babykart, @Changyuan
+  Yu, @LeeL
 
 *ceph-0.79 (17 Apr 2014)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index fd0ae7d4c08c..8a94cf840751 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -4,32 +4,35 @@ 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.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
 AUX ceph.initd 435 SHA256 9a8c879187e03f10b57a879b9ad71a84a05e5b37fd802b18e2ef8c8fe88aa098 SHA512 16fafcca88f6b1996d6465581729d0c078c00a0ba6494ff17425307c4c61b9384dd0f7b08ade8118e49432c8a04c2e2ca036a637b5701e18bf44552aea652608 WHIRLPOOL e00cd54db6186dc7ecdc06d06e308208cecc4cc770a446f288187f6d77a9c52ff894ece94f6bbeef1468a88d96e84a16ea8b95bbe43911ba42c132d84870ad2e
+AUX ceph.initd-r1 877 SHA256 343c247f1231f49246065ce050a477c75923a89cc4f42db48165754f3dd010fc SHA512 bf72cf6ea8e39c037b8c2956a956a5d0c599d3913a8999f1ce303b46a56e01622aae04a6fa374f133bcafcc211582be9e5602cb4495d701f66740a0ddc6c995c WHIRLPOOL 38f2206fbaced3c2b0b4e8f6248bd9ad582338e6ad5f0ca04395024cb6416cc2481a51133584b154ac840d9f1ce7d0e9c75d6ece71be28fd79063bb0350d835b
+AUX ceph.logrotate 491 SHA256 85f0b0c73a2c400bfff49609db45d995a2b2a2a0e64a88569deb3c353aa0b9d6 SHA512 7212fd04fd46ad2f86410cde145722ae15ca50ef1374d9c50fa8c980e869c1d2c9f68acbea94280223a489686f939d2ecc94dcf5607d8786671e8456a3174a3d WHIRLPOOL 88a04b5928da2a5461209f8799192f7970fed16cfd32891b98d825ecbbae850704ca4ff4dba560e92b2fb8189e36777430c391cfb2599d57f2a3318a0a8cce89
 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.79.tar.bz2 4054516 SHA256 fd24ad1578cc90c65a754b26b7183706f2aa678844e85944e761ed44094037d2 SHA512 df1ecb7ef168f70ffac7fcd5df48e72fe94711b406a607c10f996865b1fa40feca4e84711ad1bd8ecee85c2fdc9759f05c205781d2de82383828030baa7f4a78 WHIRLPOOL 55745eaf9b88711082e7300e7eeb9ae56a1dfa1fbeae56965db83e1b50b80d8517d46d550e6792e6ccb919c6d0e808df883d44f9cb24acc414fd228ba3bee75a
+DIST ceph-0.80.1.tar.bz2 4091018 SHA256 9b5ff063689034c9e111be045707adc98badec6dfa97d84cb027168bd90c1594 SHA512 3a5ff60ff46764e6f826fd1ce4c76601fcb3143065fe0cbfaabf9c65ab7488d25a3f0d97cafaf79142d867832b07cff70a7fefad853499ade6a3a73a419bacb0 WHIRLPOOL 8bf0d58fdf69769349b0fe12e07b9945c894c29b709c88e256a47bb98007e2d05e60fdc2f13a1b4437157f1e53b506ed2f1f017e41dd1eaa6d5a8de19884de8e
 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.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
+EBUILD ceph-0.80.1.ebuild 3419 SHA256 9b2e96a54b5765c41bad2a2b795118637af80827bc251ffe4c1039b840c5bcf2 SHA512 c3261f775c23d8e66e6d0f10ba50eaa329b25554bc9107a4ebd232b27943ec253b811cdf4e3304e163084e968bb175e4cab388e8476dba6eaa3f484b73c634fc WHIRLPOOL 5b289d0c01ad020c3e0fc8dccf33dac8373234b695ce2e1eb6295b8c118c1aeb03b0375396d8004bd7fdf32ce5c30226e6faf8be93e2b5c22916a47b67144da5
+EBUILD ceph-9999.ebuild 3326 SHA256 26f6906fc97de239bfc7741c17dc72a79ba76911c0b1e048e73f4e1098d4d497 SHA512 7f4b2df666cc77647ec78167af1f45ee52d01321afe584c7c7bf4a51658aeeb2d0aa5fda1d42ad525423cc9c3cf00b191012f95e6e140253de92384653b51c52 WHIRLPOOL fd66c53e7b7c95538b0433e97fe4b422b1ad00868d570347ad848f82af683ec3fec055e487bb8f9c9a3e879e4478582d981e47d01085911a2ae3b66605c7b20d
+MISC ChangeLog 9210 SHA256 41fc25560a0a2a57d59df4bd889c528109f6974c864fb4c9a075b7a74a419392 SHA512 2fed4e56ad35721a2afff9eda525541ed1a0c76c09d4d89a349e633c24ab5db2db8a8227b30303502ac9a6a068e7b7f4d345791c9717a8fdf1615d80fcf100f8 WHIRLPOOL 34cf5a2405931b064e6ac4858e97a89fffd42e70efb91455c0cd365aa1fb1b01de3b008d66255690a659e2d958cf807e48f993c8defae42a5fc8a381bb9e2686
+MISC metadata.xml 948 SHA256 72989673dd794fc1d9e83509d15991407862cd2c4817bcad130018442ca4b866 SHA512 4bd4189f1f5f181c915a7afac73dd774a877aae27026cd5c2ad32a89591ec6dcc0deb4ca1fb572d5f517d1cfa1edb94a345c6b0c03a39b1904ab8882e972ff5c WHIRLPOOL a89a309c10b0422e5045b7a1e62561efeda3125e35172fb33feea87fb44c14ae08cdf4810bb0acdc8eda8f856987d11ed77c157809635fe0a984764ee3b73ce8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJTfFbRAAoJEJIMDbyqvv1V4FYP/2g7Yq3dDiJTjr7yc/0kE5+a
+XvffGTQvJK8m/I9NN2fzqvEHMQDPRBu3TXN9EbZ1qXfj0Qr71omsF5LA8mB07Y7d
+5HQi00IrRBkkpNknUbtSG1SvlCrqoWjEfw0tmcBXQFCRf+09s+aEPSmI8JvfRwi1
+6JZO9S4H4DQLpQtCeQtOjKCszAvTE5vFvJgwn5HCMzvbSE93EjB/cv+15vMuF4y9
+TCpTnYQvVrxjJ8TLvAOpmZDgHVB/4bsw6WqTizfvvtXPPiIQvSYzwuBuuGi17FHU
+hCYUwJAOcwPdi8+XdbTCr/izyW0BpZWkkeIBacV6RVRWGBRCnYn4evjhm+DOdYJS
+KB9IeaYe8sqE7cyzhWxSi/tJCDfxlMxpXMIP0ahnnLx7n04lFdPUVVRb5x4QgMoW
+AIo/BLKJgMpDmqb4ZXI7bt7JZXZ/7qwyHIpvsHgzeqwWJpymgh7yJqsAVVHUO4z0
+u7IAuVGQFpXiQ9lhyOFg1NxLYxWaspvyv7A1vkq6omubWXcwciMRFob1NM1aWh4e
+je98/CAJvuy4OqmKx8z++t0dOVbhMGLkEm6SRitA2+x9SFP16bubkNdL8DiY4Wbe
++nnIaMwSt1LYbmbGTHGJqlgQiVrhCEBXIDGwGCFRkUi9foPxIGhWYddQ5Yy9Yj0h
+sK0xxwkHeqhZLHV72PUy
+=f77e
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.79.ebuild b/sys-cluster/ceph/ceph-0.80.1.ebuild
index bbca4bba03b2..14d01b0a3b8e 100644
--- a/sys-cluster/ceph/ceph-0.79.ebuild
+++ b/sys-cluster/ceph/ceph-0.80.1.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.79.ebuild,v 1.1 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.1.ebuild,v 1.1 2014/05/21 07:43:23 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,7 @@ if [[ $PV = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 fi
 
 inherit autotools eutils multilib python-any-r1 udev ${scm_eclass}
@@ -24,7 +24,7 @@ HOMEPAGE="http://ceph.com/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="cryptopp debug fuse gtk libatomic +libaio libxfs libzfs +nss radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,8 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
-	libxfs? ( sys-fs/xfsprogs )
-	libzfs? ( sys-fs/zfs )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -74,7 +74,7 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-gnustack.patch
-	"${FILESDIR}"/${P}-libzfs.patch
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
 
 pkg_setup() {
@@ -84,9 +84,6 @@ pkg_setup() {
 src_prepare() {
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-
 	epatch_user
 	eautoreconf
 }
@@ -106,8 +103,8 @@ src_configure() {
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
-		$(use_with libxfs) \
-		$(use_with libzfs)
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -119,7 +116,7 @@ src_install() {
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -127,8 +124,8 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
 	_python_rewrite_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
@@ -144,4 +141,12 @@ pkg_postinst() {
 	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"
+	elog ""
+	elog "To have many daemons of one type, create your own script:"
+	elog ""
+	elog "cd /etc/init.d"
+	elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
+	elog "  ln -s ceph ceph-${dmn};"
+	elog "  rc-update add ceph-${dmn} default;"
+	elog "done"
 }
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index 1c47eb6aaaf6..045d94161e3f 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.9 2014/04/17 23:51:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.10 2014/05/21 07:43:23 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 libxfs libzfs +nss radosgw static-libs tcmalloc"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
 
 CDEPEND="
 	app-arch/snappy
@@ -40,8 +40,8 @@ CDEPEND="
 	dev-libs/libxml2
 	fuse? ( sys-fs/fuse )
 	libatomic? ( dev-libs/libatomic_ops )
-	libxfs? ( sys-fs/xfsprogs )
-	libzfs? ( sys-fs/zfs )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
 	gtk? (
 		x11-libs/gtk+:2
 		dev-cpp/gtkmm:2.4
@@ -79,9 +79,6 @@ pkg_setup() {
 src_prepare() {
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-	sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \
-		> "${T}"/${PN}.initd || die
-
 	epatch_user
 	eautoreconf
 }
@@ -101,8 +98,8 @@ src_configure() {
 		$(use_with gtk gtk2) \
 		$(use_enable static-libs static) \
 		$(use_with tcmalloc) \
-		$(use_with libxfs) \
-		$(use_with libzfs)
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
 }
 
 src_install() {
@@ -114,7 +111,7 @@ src_install() {
 	newexe src/init-ceph ceph_init.sh
 
 	insinto /etc/logrotate.d/
-	newins src/logrotate.conf ${PN}
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
 
 	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
 
@@ -122,8 +119,8 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
-	newinitd "${T}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
 	_python_rewrite_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
@@ -139,4 +136,12 @@ pkg_postinst() {
 	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"
+	elog ""
+	elog "To have many daemons of one type, create your own script:"
+	elog ""
+	elog "cd /etc/init.d"
+	elog "for dmn in mds.a mon.a osd.0 osd.1 osd.2; do"
+	elog "  ln -s ceph ceph-${dmn};"
+	elog "  rc-update add ceph-${dmn} default;"
+	elog "done"
 }
diff --git a/sys-cluster/ceph/files/ceph.confd-r1 b/sys-cluster/ceph/files/ceph.confd-r1
new file mode 100644
index 000000000000..3bdb8b485ed8
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.confd-r1
@@ -0,0 +1,4 @@
+# Example
+
+# default ceph conf file
+#ceph_conf="/etc/ceph/ceph.conf"
diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1
new file mode 100644
index 000000000000..f3bc87fd1de5
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r1
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+
+ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
+extra_commands="reload"
+type=${RC_SVCNAME:5:3}
+id=${RC_SVCNAME:9}
+id=${id:-"0"}
+command="/usr/bin/ceph-${type}"
+pidfile="/run/ceph/${type}.${id}.pid"
+command_args="-i ${id} --pid-file ${pidfile} -c ${ceph_conf}"
+
+depend() {
+	after net
+	before netmount
+}
+
+is_type_valid() {
+	case ${type} in
+		mon|mds|osd) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+        checkpath -d -q $(dirname ${pidfile})
+}
+
+start() {
+	ebegin "Starting Ceph ${type}.${id}"
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+	fi
+	${command} ${command_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Ceph ${type}.${id}"
+	start-stop-daemon --stop --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading Ceph ${type}.${id}"
+	start-stop-daemon --signal 1 --pidfile ${pidfile}
+	eend $?
+}
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
new file mode 100644
index 000000000000..16028aea78c6
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.logrotate
@@ -0,0 +1,22 @@
+/var/log/ceph/admin.log
+/var/log/ceph/ceph.log
+/var/log/ceph/ceph-mon.*
+/var/log/ceph/ceph-mds.*
+/var/log/ceph/ceph-osd.*
+{
+    rotate 7
+    daily
+    compress
+    sharedscripts
+    prerotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >&1
+	done
+    endscript
+    postrotate
+	for dmn in $(cd /run/ceph && ls *.asok); do
+		ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >&1
+        done
+    endscript
+    missingok
+}
diff --git a/sys-cluster/ceph/metadata.xml b/sys-cluster/ceph/metadata.xml
index a51b0a656879..ef955205b372 100644
--- a/sys-cluster/ceph/metadata.xml
+++ b/sys-cluster/ceph/metadata.xml
@@ -15,9 +15,9 @@ 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>
+	<flag name='xfs'>Add xfs support</flag>
+	<flag name='zfs'>Add zfs support</flag>
 </use>
 </pkgmetadata>