Version bump to 1.13 and clean up the live ebuild. The ldflag patch was not upstreamed and the thing still needs an initscript.

(Portage version: 2.2.0_alpha94/cvs/Linux x86_64)

5 files changed, 89 insertions, 17 deletions

diff --git a/dev-db/ctdb/ChangeLog b/dev-db/ctdb/ChangeLog
index b28d969a65e2..d485ed73a239 100644
--- a/dev-db/ctdb/ChangeLog
+++ b/dev-db/ctdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/ctdb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.24 2011/09/21 08:49:14 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.25 2012/03/23 10:55:46 scarabeus Exp $
+
+*ctdb-1.13 (23 Mar 2012)
+
+  23 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> +ctdb-1.13.ebuild,
+  +files/ctdb-1.13-ldflags.patch, ctdb-1.0.114_p1.ebuild, ctdb-9999.ebuild:
+  Version bump to 1.13 and clean up the live ebuild. The ldflag patch was not
+  upstreamed and the thing still needs an initscript.
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> ctdb-9999.ebuild:
   Migrate to git-2.
diff --git a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
index 2f1dd08e660b..53be4bb1838b 100644
--- a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
+++ b/dev-db/ctdb/ctdb-1.0.114_p1.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/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.8 2011/08/27 11:25:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.9 2012/03/23 10:55:46 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/dev-db/ctdb/ctdb-1.13.ebuild b/dev-db/ctdb/ctdb-1.13.ebuild
new file mode 100644
index 000000000000..8c065b72743f
--- /dev/null
+++ b/dev-db/ctdb/ctdb-1.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.1 2012/03/23 10:55:46 scarabeus Exp $
+
+EAPI=4
+
+inherit base eutils
+
+DESCRIPTION="A cluster implementation of the TDB database used to store temporary data."
+HOMEPAGE="http://ctdb.samba.org/"
+# upstream is too sexy for releases, grab tags from:
+#    http://git.samba.org/?p=ctdb.git;a=summary
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/popt"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--localstatedir="${EPREFIX}/var/lib" \
+		--with-logdir="${EPREFIX}/var/log/${PN}"
+}
+
+src_install() {
+	default
+
+	dohtml web/* doc/*.html
+}
diff --git a/dev-db/ctdb/ctdb-9999.ebuild b/dev-db/ctdb/ctdb-9999.ebuild
index 88fa0a013679..cc958c52e6d3 100644
--- a/dev-db/ctdb/ctdb-9999.ebuild
+++ b/dev-db/ctdb/ctdb-9999.ebuild
@@ -1,12 +1,13 @@
-# 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/dev-db/ctdb/ctdb-9999.ebuild,v 1.3 2011/09/21 08:49:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-9999.ebuild,v 1.4 2012/03/23 10:55:46 scarabeus Exp $
 
-EGIT_REPO_URI="git://git.samba.org/tridge/ctdb.git"
+EAPI=4
 
+EGIT_REPO_URI="git://git.samba.org/ctdb.git"
 inherit autotools eutils git-2
 
-DESCRIPTION="A cluster implementation of the TDB database used by Samba and other projects to store temporary data."
+DESCRIPTION="A cluster implementation of the TDB database used to store temporary data."
 HOMEPAGE="http://ctdb.samba.org/"
 LICENSE="GPL-3"
 SLOT="0"
@@ -16,24 +17,29 @@ IUSE=""
 DEPEND="dev-libs/popt"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	git-2_src_unpack
-
-	epatch "${FILESDIR}/autoconf-2.62-fix.patch"
+src_prepare() {
+	AT_M4DIR="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
+	AT_M4DIR+=" -I lib/talloc -I talloc -I ../talloc"
+	AT_M4DIR+=" -I lib/tdb -I tdb -I ../tdb"
+	AT_M4DIR+=" -I lib/popt -I popt -I ../popt"
+	AT_M4DIR+=" -I lib/tevent"
 
 	rm -rf autom4te.cache
 	rm -f configure config.h.in
 
-	AT_M4DIR="-I ${S}/lib/replace -I ${S}/lib/talloc -I ${S}/lib/tdb -I ${S}/lib/popt -I ${S}/lib/events"
 	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
 	eautoconf ${AT_M4DIR}
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--localstatedir="${EPREFIX}/var/lib" \
+		--with-logdir="${EPREFIX}/var/log/${PN}"
+}
 
-	dodoc "${D}/usr/share/doc/ctdb/README.eventscripts"
-	rm -rf "${D}/usr/share/doc/ctdb"
+src_install() {
+	default
 
 	dohtml web/* doc/*.html
 }
diff --git a/dev-db/ctdb/files/ctdb-1.13-ldflags.patch b/dev-db/ctdb/files/ctdb-1.13-ldflags.patch
new file mode 100644
index 000000000000..d5662cadf0c0
--- /dev/null
+++ b/dev-db/ctdb/files/ctdb-1.13-ldflags.patch
@@ -0,0 +1,21 @@
+diff -urN ctdb-1.13.old/Makefile.in ctdb-1.13/Makefile.in
+--- ctdb-1.13.old/Makefile.in	2012-03-23 11:30:03.321735210 +0100
++++ ctdb-1.13/Makefile.in	2012-03-23 11:37:03.131704144 +0100
+@@ -151,7 +151,7 @@
+ 
+ bin/ltdbtool: tools/ltdbtool.o @TDB_OBJ@
+ 	@echo Linking $@
+-	@$(CC) $(CFLAGS) -o $@ $+
++	@$(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS)
+ 
+ bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
+ 	@echo Linking $@
+@@ -173,7 +173,7 @@
+ 
+ bin/ping_pong: utils/ping_pong/ping_pong.o
+ 	@echo Linking $@
+-	@$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o
++	@$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
+ 
+ bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
+ 	@echo Linking $@