projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ced8c5c)
Fix building with automake-1.11.2 wrt #397319 by Alphat-PC <AlphatPC@gmail.com>....
authorKacper Kowalik <xarthisius@gentoo.org>
Tue, 3 Jan 2012 15:47:09 +0000 (15:47 +0000)
committerKacper Kowalik <xarthisius@gentoo.org>
Tue, 3 Jan 2012 15:47:09 +0000 (15:47 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

sys-cluster/ceph/ChangeLog patch | blob | history
sys-cluster/ceph/Manifest patch | blob | history
sys-cluster/ceph/ceph-0.36.ebuild [deleted file] patch | blob | history
sys-cluster/ceph/ceph-0.38.ebuild patch | blob | history
sys-cluster/ceph/files/ceph-issue1869.patch [new file with mode: 0644] patch | blob

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index f3c2fb3769455743a21e13bd56b25a14960c878f..b9f562e074eff82b0a1457787f0be4f0be1947c7 100644 (file)
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/ceph
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.14 2011/11/19 10:06:34 alexxy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.15 2012/01/03 15:47:08 xarthisius Exp $
+
+  03 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/ceph-issue1869.patch, -ceph-0.36.ebuild, ceph-0.38.ebuild:
+  Fix building with automake-1.11.2 wrt #397319 by Alphat-PC
+  <AlphatPC@gmail.com>. Drop old
 
 *ceph-0.38 (19 Nov 2011)
 
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 8407a1c8a6f29a9b59a48540b52f28efba03e0bf..8128ee59ad7bf6afe486bacdff3b9996af210fe0 100644 (file)
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -2,28 +2,27 @@
 Hash: SHA256
 
 AUX ceph-0.26-autotools.patch 738 RMD160 422f48adcc95f1d9900d921998ff536d9ea01254 SHA1 edfd9dce7269c935db5e0aea560642ee91ac4721 SHA256 ea8c32c83d460a8b4e6646896d32ab146b711631d4dac6c179a4a31927732dc0
+AUX ceph-issue1869.patch 680 RMD160 d76f31a6f2e6fadf818da96565b6eb4d9053ccd0 SHA1 aa0e5992c732a452239edf5f7373bf3200f3e1eb SHA256 a094f46dad5e3e2bf083f6110cc47b88c24b79963333bd778e44b0aba1f73bc3
 AUX ceph.confd 225 RMD160 9842eeb3f55453dc6ab96ebb0c4f784c56e5b9d3 SHA1 63e1670ab13e0a957da93d9ad6a17b612219bd88 SHA256 b12f53878a92b5ee70f9d827e321b641618bd267a7fa57a1e53f0ee4d5c830e8
 AUX ceph.initd 400 RMD160 58873ca15a29a81ecd64bda17749eee1ca96af01 SHA1 544beae2d460fa0a44eb4e9eb26a7bbcd96405d7 SHA256 9b957c42c3ab27e3e29f42aaae718396e14cd91256df7f959e212446d2f90618
-DIST ceph-0.36.tar.gz 2858570 RMD160 0331ed1030b1a0be78eaf66ad1fa80274a3ca2d2 SHA1 230a113731fd012148436a328fb3ae6bd28de3a3 SHA256 90f2b86cf4af78054528ddfd86136ff439ab026d1410543c255f2181e9e51916
 DIST ceph-0.38.tar.gz 2900293 RMD160 ac912f56348fdcbd3d71f81324c847f3b2613c86 SHA1 0b62f8e30501f20f1c125e2c698c136ee4993545 SHA256 df98be68f32a64860761ccdb02572de1c98ab3f2a54be57fcb846a0686fef72d
-EBUILD ceph-0.36.ebuild 2065 RMD160 94dcf4255bdc0fe73b06b0672cbb47ab78cd2ab8 SHA1 f7e45e4b6f49b62260441dfe8e702353f64670e8 SHA256 2a4e2e637a3c610f127f19bd9d42a44f7dd1d3d9102beae542741dea88d2c3f4
-EBUILD ceph-0.38.ebuild 2065 RMD160 a3ab7159d739a7175d14f757429e5be3838ee702 SHA1 b005fa808e4d2dce6c607e202c446cd599c25d6c SHA256 e91f3987aa0aa8e9c2cdc2448604b43b529e465a8a826d724422c9de923dcf02
-MISC ChangeLog 2359 RMD160 5f14c7813cfd93f09503f6e26a91c463fe08ee22 SHA1 bbb31f0f95361d615eeda171b2d200a04543eb03 SHA256 8e552ac00c742bcce105b88ae30a4386184f4210c9a1cbea2a2fb1d7adfc9c05
+EBUILD ceph-0.38.ebuild 2109 RMD160 e8ba89e43020e3a1eb0acc53c54ea3ec007095ce SHA1 264baca0cb37834e2dadec7999a2adc8d646beff SHA256 c3e000cccbe1c3f855b7dfdae42f493007de0446a44bd41e4ee7969d93763aab
+MISC ChangeLog 2580 RMD160 9cec63364c2c5b64b121f253c0a5209f6b593bf0 SHA1 cb496857329841a0496ac4ac72c2320621c793f3 SHA256 c982d9b7e28f1af3ed309c09851503592c772d92f4ec3e36a47db3a8dd00072b
 MISC metadata.xml 500 RMD160 8f9c763bbdc181f3137b7ec9072045704a7dbde4 SHA1 79483cf0de883a911745b2152b1b78ff64dcaa37 SHA256 98ecd9596f86ca204850d8c673a93f34c99e7a3eb6f55dbdf5ce56b9164d4407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOx3+WAAoJEOf+E+/4L5LmDxEP/iKeAFbP/L8nb+nYJLoKVrmN
-lHKkZVXMI0A5iRUrIxfySAvfvcglj9awBo6EQpgODHixeaxZSeom881L3paPuq4A
-vYZw05gfprAGLkG+WvtkwEJuAeacmt3+KgTmnIZvUEzNKfn61gKVoTkIxPwaJ5p/
-Y5oyfTw/l+g2qDG4Udwgpam1eIuxRqcyiaF5iSxJU06OeVVMYgylN9L9f7l6ICNH
-Jb72LxxvoZObt9QPSa10EULdu8J/j7eayjtJucRpketOvT7UPbnC4dkWLQxIRANG
-2VRsUSIRqubl/S/k4QcJHhhVRvw3CRKjym2e+pVwJdBydyDPW9LD7H/snY89njyZ
-M/Bmdq7RkMz/p1DOMxWBmOdhp7Wi8MTJYGry2dGfGBOlpp0cXc1jCNAw51yY/xnu
-bE1XAldyN90hiz6mYAaIoS+hd7Q59p4xgXkTCrpRUUWyVovJ1i8Zoe5RqdROracW
-ZhSA022J9bNb6iixMn+99fuP/3gCahxaE5jXEyK+AN4OzZLKK9Xwq0zzH13uK1fb
-3WYuvLLNV47EKXDmCKyK18KtI4uQs288Ipn8XtlLLbXJoxDBI+Ebs5/jqXcMTwwO
-Bs+PTc5i9eSWU0pgPXDLopzPD35Hkegme42ZxHK/54bJhAOr8JLVt9EzaOiwLroI
-npLZIxqXYgGkedJHou+3
-=ARjH
+iQIcBAEBCAAGBQJPAyMIAAoJEF0huFKJUZL5BI8QAKhHyxHWNnzS6GY9v7bl/Tqp
+iindggzhazDcPHnLVP/DEW6w+QvvFtc11tzM5KCE6bmwdd9be2rRvx1owGSVSj90
+797pS1ZOh4Lzc0Jz82Bukg+Qde1sIcd3j13aeoTVkHhf6pK89HIfW8w0ob5e73cn
+zYG6yJOb2e9/rS6BHbtNszcmtOs6hSItC9tHOZFo3VRv7JMcLUzQy9rFIqxwmzLu
+bTM4Bk6ethLIT12SNYfMb58yyVSJnLfg27vYmCr3cEOxDBjc1TBCxvWrva17vYeu
+xaScBQoltz0YVZsRkPaoZbzphoSvIS8SuyeqXmLiR2w8LNwea/R5SCFCytjcg8zE
+qh0ZX1zRSXS4kQ7ifNJoE98SI20MbX6GAmkvwIOKDpc+rBJF402eHeEqgvMaUWVI
+t771uIMELncFu0f429kVZEo+MjgDPqGRmx0l6S1zMu1SMoHo+SMDKa/8zXUGIACk
+iUOv8648Q0y3yXg7VySszW6vXiyXIE4bjcS76LKRiJtz74p3G5fsCQmN2NgQzZIw
+RXPCziqH2/KfMJFaIhl59ZncqQ/l1Ht1I1i8ba/jXcF8KZa3WVu4ADCJFFfTEBe6
+sJ9IAtvM4UCiMCaWIVULwisFX8yhzOIWTQxRFhkoM2MbZQMVbds/w4igfUQT1kEb
+lVHXopgQzOveNdtgnX+A
+=WUke
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.36.ebuild b/sys-cluster/ceph/ceph-0.36.ebuild
deleted file mode 100644 (file)
index 7bbc1fb..0000000
--- a/sys-cluster/ceph/ceph-0.36.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.36.ebuild,v 1.1 2011/10/05 19:22:12 alexxy Exp $
-
-EAPI="3"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.newdream.net/"
-SRC_URI="http://ceph.newdream.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fuse gtk libatomic radosgw static-libs"
-
-CDEPEND="
-       dev-libs/boost
-       dev-libs/libedit
-       dev-libs/crypto++
-       sys-apps/keyutils
-       fuse? ( sys-fs/fuse )
-       libatomic? ( dev-libs/libatomic_ops )
-       gtk? (
-                       x11-libs/gtk+:2
-                       dev-cpp/gtkmm:2.4
-               )
-       radosgw? (
-                               dev-libs/fcgi
-                               dev-libs/expat
-                       )
-       "
-DEPEND="${CDEPEND}
-       dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
-       sys-fs/btrfs-progs"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-src_prepare() {
-       sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \
-               -i src/logrotate.conf || die
-       sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
-       # disable testsnaps
-       sed -e '/testsnaps/d' -i src/Makefile.am || die
-       epatch "${FILESDIR}/${PN}-0.26-autotools.patch"
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --without-hadoop \
-               --without-tcmalloc \
-               --docdir=/usr/share/doc/${PF} \
-               --includedir=/usr/include \
-               $(use_with debug) \
-               $(use_with fuse) \
-               $(use_with libatomic libatomic-ops) \
-               $(use_with radosgw) \
-               $(use_with gtk gtk2) \
-               $(use_enable static-libs static)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       find "${D}" -type f -name "*.la" -exec rm -f {} \;
-
-       rmdir "${D}/usr/sbin"
-
-       exeinto /usr/$(get_libdir)/ceph || die
-       newexe src/init-ceph ceph_init.sh || die
-
-       insinto /etc/logrotate.d/ || die
-       newins src/logrotate.conf ${PN} || die
-
-       chmod 644 "${D}"/usr/share/doc/${PF}/sample.* || die
-
-       keepdir /var/lib/${PN} || die
-       keepdir /var/lib/${PN}/tmp || die
-       keepdir /var/log/${PN}/stat || die
-       keepdir /var/run/${PN} || die
-
-       newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-       newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-}
diff --git a/sys-cluster/ceph/ceph-0.38.ebuild b/sys-cluster/ceph/ceph-0.38.ebuild
index c448f27a779ed3cced3a75f013032ebc06c7b0cd..fb4576a426c9515ec7efdec92143f91869a165d9 100644 (file)
--- a/sys-cluster/ceph/ceph-0.38.ebuild
+++ b/sys-cluster/ceph/ceph-0.38.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.38.ebuild,v 1.1 2011/11/19 10:06:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.38.ebuild,v 1.2 2012/01/03 15:47:08 xarthisius Exp $
 
 EAPI="3"
 
@@ -44,7 +44,8 @@ src_prepare() {
        sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path
        # disable testsnaps
        sed -e '/testsnaps/d' -i src/Makefile.am || die
-       epatch "${FILESDIR}/${PN}-0.26-autotools.patch"
+       epatch "${FILESDIR}/${PN}-0.26-autotools.patch" \
+               "${FILESDIR}"/${PN}-issue1869.patch
        eautoreconf
 }
 
diff --git a/sys-cluster/ceph/files/ceph-issue1869.patch b/sys-cluster/ceph/files/ceph-issue1869.patch
new file mode 100644 (file)
index 0000000..bf8749c
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-issue1869.patch
@@ -0,0 +1,18 @@
+Fix invalid docdir_SCRIPTS usage with >=automake-1.11.2
+
+https://bugs.gentoo.org/show_bug.cgi?id=397319
+http://tracker.newdream.net/issues/1869
+
+Patch written by "Alphat-PC" <AlphatPC@gmail.com>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -769,8 +769,7 @@ EXTRA_DIST = $(srcdir)/verify-mds-journal.sh $(srcdir)/vstart.sh $(srcdir)/stop.
+ # NOTE: this won't work on suse, where docdir is /usr/share/doc/packages/$package.
+ docdir ?= ${datadir}/doc/ceph
+ 
+-doc_DATA = $(srcdir)/sample.ceph.conf
+-doc_SCRIPTS = sample.fetch_config
++doc_DATA = $(srcdir)/sample.ceph.conf sample.fetch_config
+ 
+ sample.fetch_config: fetch_config
+       cp -f $(srcdir)/fetch_config ./sample.fetch_config
Unnamed repository; edit this file 'description' to name the repository.