4 files changed, 29 insertions, 91 deletions
diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index f3c2fb376945..b9f562e074ef 100644
--- 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/ceph-0.36.ebuild b/sys-cluster/ceph/ceph-0.36.ebuild
deleted file mode 100644
index 7bbc1fb0d292..000000000000
--- 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 c448f27a779e..fb4576a426c9 100644
--- 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
index 000000000000..bf8749cf1ed5
--- /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