Fix install. bug #481250

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xF82F92E6

4 files changed, 41 insertions, 17 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 488b19d94065..219a17077e22 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.40 2013/08/16 16:35:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.41 2013/08/18 18:57:39 alexxy Exp $
+
+*ceph-0.61.7-r1 (18 Aug 2013)
+
+  18 Aug 2013; Alexey Shvetsov <alexxy@gentoo.org> +ceph-0.61.7-r1.ebuild,
+  +files/ceph-0.61.7-install.patch, -ceph-0.61.7.ebuild:
+  Fix install. bug #481250
 
 *ceph-0.67 (16 Aug 2013)
 *ceph-0.61.7 (16 Aug 2013)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 4c6aab8afa93..df68e9edf59f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ceph-0.61.7-install.patch 380 SHA256 12bf7caa3561401fd7ceb4323d58544319f0d8296facdd53c165ae8eae1b27b4 SHA512 68966c29f8ef27be1c422f35568d62a98fc60c03acdb834558eeb42fe9101413040a6d802813afac5985f275b4ae25756cf01eb52a35baab2ecdf4ada3b09b54 WHIRLPOOL 7394431ead772cb5c681cb495837617407fea79ac6e3b6fda567b973011c166c5ee10cd6b79341650fa57462e54b54ca47ad472b35530cb950f96092b9aa01a1
 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
@@ -13,25 +14,25 @@ EBUILD ceph-0.56.3.ebuild 2381 SHA256 94920bc6603dbec975b98985d42287fd6405ab112b
 EBUILD ceph-0.56.4.ebuild 2386 SHA256 a780b9692d4b36d3f4c49262761170f5e4bd2bd9e3a20f3a853f864d34560c82 SHA512 203544e17b6241099f21ab0c9b96dbf0d3c651f36f1f4e4321c2ef417ebb229eddaa7c1d50fadc498fb60516e66e310e182eada65512d6310fec8656c29be763 WHIRLPOOL 6b81c9a404a39ab2e8145a1348b7907f2a6e67f3d91686d67081d4cdb99c784334e3e948224cdaf18c92d933635fbbb1357601a21b03823ac766237f60590a96
 EBUILD ceph-0.56.5.ebuild 2386 SHA256 b15d09939ff77a42b1b5b3a21196af89e1cb6f532955327c3c027def0bb28485 SHA512 0135e1294f506c84ec85e8843180d541f719699aa4c5d7a0804e4300dde948abcdf0107783fc7afc9abb0b2a1f55660384904384767061d06df349a0b1bec613 WHIRLPOOL 713877691bf0b45403e00e888565463d8c0b6a7e31257b2744f218187187032c5bbfe6727ddd4fd5d1feb67158580e273e30ae8b6be8f75d2162837702b22b2e
 EBUILD ceph-0.61.1.ebuild 2433 SHA256 4b115a71581ddecdb1fe83e569e64b9af0fc1e7925a3805ff90a3caacdb0b08e SHA512 8b6b6df78cc9d99d04fc011e28a8981dc111c7901a1ab4b3d1c1bdfb92c69305b8fea3ea19e814bc685ac013b723be632104d61fc2f9f302fa1aebd9ea38d0a7 WHIRLPOOL 9e576ac87af6374cae4403789d1f1720e96495e37bd26fbcc9c9d384d6eb7004874aff39c0c1f264cfccca990322d31fc39d56de443277e986416e11366d4097
-EBUILD ceph-0.61.7.ebuild 2433 SHA256 7c37d394dda565f3f34d09734e5dc8bccb7d42e3070c4a2b49a31e1517f1b4b5 SHA512 4e8026d0267eb71d7cdf9d4ac6156aa418a8dd4f141242ad4a019c482c2d9bae630eda65a807550a8c5c28c15e7c43dd3688fc4e0f7fd5b588e1b9da87d85808 WHIRLPOOL 542e893c8a36db826ea595acf61c6b0cc6e12131c3e048679e2d1ee2670e29be54c410681c066c8c4def7eedb3be4a55dcee31917caa56d2be9c0863bdf706cc
+EBUILD ceph-0.61.7-r1.ebuild 2483 SHA256 7354292370f2ce1f42d0f1fc70043a74081151a39746eb6e4a5cad81e678062d SHA512 fe96a1f3001bc62e7c296dcacf27728426704df126f101a05c6f7409363ae0acfa6f7dbc223336a3d57f0e3240b8347a4e0e98ea2ef6d858ae255bcfde6bf673 WHIRLPOOL f70cba1212cff7ef50eb3cc22500b1739abdc688723da74faa01284065a8283effa221f9f03d271bfe0d4b28eddc09ff886c0c95d05d9baa1081ee62edda76e5
 EBUILD ceph-0.67.ebuild 2431 SHA256 48f722b17ee19722b346d90028215d3e02b20448d0fe9ee7e406b94fb6963915 SHA512 9b4aa65546882f28213ef53cc2cf0848031605ffc62cfd06ac0677fc3ed787ced523c7044f7f105a8095b374a4efa003ce15423ac0e9ad9b7b3e08121970a64c WHIRLPOOL 1f822851fae31800c85e73ba5985004a347285a83b9bc0c4eaef449013f0ac2cc39140c40ad52d6c27a962ee6d88b281e0d072334aba6e6d1fdd0673f8d4aea4
 EBUILD ceph-9999.ebuild 2431 SHA256 838ae7c201f62b06b1bc4ce84cddc7284b14841e8ffa00d926c2c754bddaff62 SHA512 fc180a1cd63eb977982b683021bde8f263a912087ace01139e02c65158ec109530813d9911965d874d84d94864f1812045d160642710b84654e3df7b4169f111 WHIRLPOOL 8457e692ba829923d91f7691ada3130ac78b34cb4b888d50a781098ef9d7336e0e02c4c4d532ce7298b755945d675c031bf8f323f019eff86a5ce6c6debb8dbb
-MISC ChangeLog 6742 SHA256 aa971ef0e83cc78e35151bca6bc199559384dea7d555f258f5c0be3137cc2fae SHA512 1ca49159f71e9eb3d7e4cbaef128bacc342a30eb94d853f05965370960d647be5d6bc8d6bf309e5d4a319dc7f2d22f1fa85a9c8808eb0d9f0ba126034eee1bb4 WHIRLPOOL 73253894a9a2bc43f14eb824eb471f959678cbdec16531bc27010f8ea6c0298270de7dbe3e9bbde019a575148024a7a8baf1d94d99c1e600d801cadfb78e1116
+MISC ChangeLog 6933 SHA256 423ec98b0a80b32aa1db80ce5ad30ba4a6bbbed335ccc53764d5d24cd136137c SHA512 07c680523302bf34602ef4741ef6d09e124722949332e4152a6cd00e580a12c900b6fe042c18badce761fa6501e5802121afacc08d21d9cc71743bfdb7886cc0 WHIRLPOOL 33822d01baff07ab210a96f6ac0ce0629436ec51b6b848682ecc5e2ab6043356df5bed130579e6b6388e065869a86803429e605c2d45b594b1620671a2d3659d
 MISC metadata.xml 500 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407 SHA512 ecb262b3c942a347291496583730bc59599950983d66f1497110a459a16f5366e79273376c1967d5f59fa245c2cd64c93c11be7d16b7e85428a277bd81ac3984 WHIRLPOOL 21976221c15b97596c1ff94a80040adc5b29012afe9f80c12cd7e60fd3857947ada817d0ef83dcf533df287be0e6925596d4604e9522a0ccdcb844610373089a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSDlTPAAoJEOf+E+/4L5Lm4IsP/354c+qB4sl1B8nYd1C2m+c2
-SQ4D3yIjq+xvysn9k5MUVJwVvD2t/1zx4WW5E5nladYwzGoOJoNuOFyezJNcbQ+T
-aWfLYOKbvHwjTKAD3KydzII4u1K5p8h3FUSeoHpZ05r47ZYmHqVE0V56tCrBqMGR
-c6sqe+96fT9dys0ljo0Na2cyOaU8zxjrU0Tmu5hT5kzsei+kXMXQddII7xNANFm/
-9a3Z/9i+j5yiYUKxzqkqiq1hK0Jhvn80KgiGdxIPHzXrocz2AwY1FoQYWWyzd1+B
-S3Yt29nuyKHTTj2O/0woZWAPlxzpal/kswFY8CdjPQkbT0Cqx0nbuFZflLqedb3U
-BcT7FAJ2OnHHHx+Du9Vy5AacVcFhAacY0AWEgsWdsbWHkwqXKN462wlXLUEZFZEI
-KrCTE5zn4Q1/IWXlB+ewpdZFdoU7A1lr4R13yGsBH1oPgfGwfZODLbE7/vwhB4oC
-xF+WAIHlEm+qNVE3wiLd5vxPrZKT+rxcjZNHrcmkS826dUZCCpuiUnlcpaNKGx5f
-2DNUPOnvHW8pwtoxomlgku46Xow/rxPRtBOskyvTVmzWOv16zlYX3OMKc4gIeY9L
-2F+1VMJqZ8lXOPhDp2DJLrtKNx8N7g6zz+KyNynHNPWX2L0eDfwLzxlRi0hZ00M9
-DNJlPVLQiDrjMzvOju3P
-=jnm4
+iQIcBAEBCAAGBQJSERkeAAoJEOf+E+/4L5LmIG8P/jE6IWpi0oGg9CmcuT+n+nnt
+3nidvHX+6IifNu+oPfmPm8KxTf3Is4UiPaYxWigkez3fX52Ozj68jU4pQiukBxyv
+mA7EpfMagekSqDLG8U64px+RmQITqc/0ARaDXstzv3xg88ZzvqdSoWLheFtkBVR1
+fYlVHwnsoFAHq0wwABvQhqs/xm55ZbfbS+tk4smygGF2nqVO/X/C0MK3ajkCJ68o
++2dFMx0XMmCwyiZBtqvHJKmewK0h/DtcckcTIfERaHJYWieQJl1Kx9dqig6mdTVe
+oupOf0EPwoW9PgRAKY5NbOIDptVrt4ICI1cTYoMCfV1pXpJvjKsigwcGfgAQUeGO
+sIfHp16VDQP85CCZuNvmwNJ5fD2ifBhXdewLlBuaSV3uKgTOrKnb3CXSTRBeZj1l
+oLEOZqZSxwY264uCcwTyjGq2/JaDo6hiskTFFLCJspgZOsYpfWXA+eD+aJZVTgpX
+UH8Rh7ZsJDb6cgYS1irRR2OcIigdRuzY1b4EVg+y4v/si/aoC+wROoLplXj7bE1k
+LOE0+V7hdbuviHr8Au8O3cmaNepc6D7jC1hrUn4my+mi88SDOCD0OXSHMwCVxYh9
+/C9rk7B6KX7sOoT9Zdnjg3qgiM/lSdt3SXBXXLNamUNENOcaNM99DPG1ux/7kpuK
+C55sVyWNeLZgmOi4BWN6
+=lB9f
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.61.7.ebuild b/sys-cluster/ceph/ceph-0.61.7-r1.ebuild
index 7dafd82ccd4d..e80d81719cf0 100644
--- a/sys-cluster/ceph/ceph-0.61.7.ebuild
+++ b/sys-cluster/ceph/ceph-0.61.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.61.7.ebuild,v 1.1 2013/08/16 16:35:31 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.61.7-r1.ebuild,v 1.1 2013/08/18 18:57:39 alexxy Exp $
 
 EAPI=5
 
@@ -55,6 +55,10 @@ RDEPEND="${CDEPEND}
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+)
+
 src_prepare() {
 	if [ ! -z ${PATCHES[@]} ]; then
 		epatch ${PATCHES[@]}
diff --git a/sys-cluster/ceph/files/ceph-0.61.7-install.patch b/sys-cluster/ceph/files/ceph-0.61.7-install.patch
new file mode 100644
index 000000000000..ad2b72ad7c49
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.61.7-install.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index de76078..932851d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,7 +28,7 @@ bin_PROGRAMS =
+ bin_DEBUGPROGRAMS =
+ sbin_PROGRAMS =
+ # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
+-ceph_sbindir = $(prefix)$(sbindir)
++ceph_sbindir = $(sbindir)
+ ceph_sbin_SCRIPTS = \
+ 	ceph-disk \
+ 	ceph-disk-prepare \