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

Package-Manager: portage-2.2.0_alpha94/cvs/Linux x86_64

6 files changed, 110 insertions, 27 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/Manifest b/dev-db/ctdb/Manifest
index 707baac03b1f..b65748e3cc79 100644
--- a/dev-db/ctdb/Manifest
+++ b/dev-db/ctdb/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX autoconf-2.62-fix.patch 524 RMD160 843a8adb134376259485fba22deceeebf453abea SHA1 2adfe8d3a5ea32971c67305fc047f39e5c03ba76 SHA256 0b9b80b52899154f6526d4864218742c2ec836d44a8a4045e091b3bb40449171
 AUX ctdb-1.0.114_p1-functions.patch 1573 RMD160 c338f6043d4710ad515f34d5dcb2df8180fca286 SHA1 7ff23b032a55f7bda3f5c310eecf4b62b1d758cf SHA256 cf7994d562d9cbc2852dd32706134ad204f930b3a8535d8bfa9e3a2d89d30be5
+AUX ctdb-1.13-ldflags.patch 749 RMD160 3e2b611a84a15553658f14982b39b025a8ae7a19 SHA1 cf11b5948e844e039e873d258412052ecec5e857 SHA256 a07b6f4557fd10aaca47988267a2918565c15da98b27b5f29f22e0f7e85b1592
 AUX ctdb-41.httpd_gentoo.patch 368 RMD160 2ce987bfccaf1b44dbc7b43bb1ef5eca9f6009ab SHA1 c3e0959d1f0584cdccc4277121b0f387c920c0ed SHA256 84400fe5c6e289c05cc1ceeefcb2eab0a7ecb3d7076af747cd9eaa5a558499a5
 AUX ctdb-50.samba_gentoo.patch 534 RMD160 ac980344bce4f87fd8a3ffabc8525def326f136b SHA1 619480bd2fe9d1037e36c6cba224d754478b0c3d SHA256 91e6869bc45613bd003834e1024ceba07765205f09dea05357041776c76e209e
 AUX ctdb-functions.patch 1717 RMD160 41053379ad72c61c253bf865fbab7dacf14f9846 SHA1 caa6a25b2542230550f8c320eea02d983823a79b SHA256 db642eb8c77a651559a9a41c2d1eae7ee6663e3b695a623a90b4f9e863e84367
@@ -10,18 +11,28 @@ AUX ctdb.initd 3059 RMD160 363bbd02a4f4b1f58c49deabeaa583f4f2d64342 SHA1 f298bd5
 DIST ctdb-1.0.114-1.src.rpm 836695 RMD160 a52c0bf19be916a0c1400af86f5447a767542fca SHA1 acf734cfd51f1d68b7aa0c06253ffff64df02a28 SHA256 66c3eb72f6ba2c9787484d8796e5fb59083a1b1bf45c6c96c32c31952d4ad1ce
 DIST ctdb-1.0.73.tgz 627095 RMD160 b716d91031ee2953091be10bcc5cf4be87f0124f SHA1 b400d08bfcc78f54d7c4e138fd2d77897ae28abd SHA256 348779e2414c364cb84b6bb2659fa50d0a001315a2ca82ed944cce7f0851c14d
 DIST ctdb-1.0.88.tgz 681220 RMD160 78fe1241adba4fa55fdb4e7999c8ac601e48681a SHA1 9de3d4e9b669c2cc27b942983e3f3ec48e787a01 SHA256 d9b0cc07b83334caeaf7852162fb54861bb79577682c2e6936770572ede68e32
-EBUILD ctdb-1.0.114_p1.ebuild 1852 RMD160 77848eb67921572f9acfccd97b905b2c1a984212 SHA1 3089eeb8da0ff5aca2e28cf5200598d48c870fa9 SHA256 f12f1d9426e54f32893b34124ac96fe5f137088043f003c9d5913640329e6841
+DIST ctdb-1.13.tar.xz 736004 RMD160 6badb7d06e57b71bf14933d05d7d93b4e4ec593f SHA1 2f66eca5e6959056a89365ae253beae4b2fc4b55 SHA256 c43693877cbc7d047d8b11b01a101bee69df6a871ab397214cc68d8f6f8c98c7
+EBUILD ctdb-1.0.114_p1.ebuild 1854 RMD160 708b051010571f34b880d6c4b829f8046541d5f2 SHA1 b9adb2bf4b40c7905776f25d5b0293223fabe1f2 SHA256 354755d7c20456338ead6fe5645a7eb673aa6dd54ea3a6574e575664083e7196
 EBUILD ctdb-1.0.73.ebuild 995 RMD160 14fa16d6aa09d97ab613e4e765592b3a14ca599e SHA1 914cdc2680870904e1d1c3290b749a01f8bc0da4 SHA256 8602d5783a56296906e74bfde0c50c105be082229db458234dd46c79d5b6ef85
 EBUILD ctdb-1.0.88.ebuild 1295 RMD160 9eb64d0a1b85e396b47d9b2a0d148b925fff6a18 SHA1 91172a41d7b376a28fbd83121f447981b3c99f78 SHA256 7b972b7e0a73ba906a05723ce071efeb8a7fc0fc26b76d191530369dea062d83
-EBUILD ctdb-9999.ebuild 1070 RMD160 9441d69a6fed04129cff6184c65eddecfa1a0846 SHA1 c6af2e9884f2c5fef1a52ceb7d02830f844bddc9 SHA256 4e9a643447ec488c0f00ce269e3f7ea37a630e5564967f8575f462642c86e5da
-MISC ChangeLog 3436 RMD160 a50f41e082d2357b006c2983b08e2110285dc905 SHA1 6d385c4e9991da45ad69686665c8a02d47f89c78 SHA256 34868bfe9a996add6b9e6335fcf80ab408dd8ed1f017a68d9fb840d9b2125095
+EBUILD ctdb-1.13.ebuild 949 RMD160 5b7e702dc7c2a3664850195bbe549b1ffe16b6de SHA1 8fb8cfa58324897931c093a0e4e908b3c91c3dec SHA256 76ac07a41bb9a62baaaf3ce22251b234e22568b5b70c441cf53afafd831f0364
+EBUILD ctdb-9999.ebuild 1137 RMD160 6ed43c6eec3066850cd047da446a1000059d5eb5 SHA1 68458957ef9784ca7dfe30fe50b6fe67d13fdc2d SHA256 6b21664cb88f9aacabd243ce951e285e3cf5de5d06f48e162d014f4ad2def2e2
+MISC ChangeLog 3748 RMD160 eff53d0e4ead18945e273ff2e91fb868816ca460 SHA1 97f49c77c158c8b90b4e62f953b3f599e5c03b39 SHA256 702651c2ef746f40f5908bb1c1e4f30774333776ac468b6b32006bee049ad3b3
 MISC metadata.xml 158 RMD160 9f86563998c883dd327d4fa7a6c23f95dbf2a139 SHA1 3d17a291c1dcf571169ff3a7c1e064a96014f270 SHA256 d96140a5870e6f49fd382f26aaade7bf71d767243bfc3ac1ad6a986718386a38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk55pZQACgkQfXuS5UK5QB2LowP9GzFTiDUsY+T4Kv19+djG2v+s
-TEZ2dQfl6QCfLYen/IKpSrPpan/CNFSftLkLYF5QZ9l29P7whRr4DJPnPc0H+bY9
-UB6DFL9yYES8DQfMrQi1he4XVUdTtHkZXe+tmcMlfAp4VXFBTCWXrHTti44zfycH
-9dXMkKw/6KKfektDlZ4=
-=mDJx
+iQIcBAEBAgAGBQJPbFbVAAoJEOSiRoyO7jvoZbUP/3DaWQrnF9Iq641CsMqVtTcA
+/Ie3QhpLNTcEnvoi6Z3vwarQfx3esYIOxOBc1bVYAgTjrpEhI49MCa+W9Op0wf8y
+957NgZWDSc17HMokQixqki5gfzCWKqWp6RRpIMCgBP3WwlSNDqrKmYheZVsG3e3K
+VaCow/y6ayElt18YsYz/xd2nj22fJTmI3yAzd3KkA3YZdk5p2DrLa+OEk5AWbpsi
+TC62IHF3YNQWuef9MDt9zZjnta8RBzBWblugFBFVHwmSaMSFMGgWazX/MYF925eg
+z8C5Rp9s3p1Sc+ORengDzWnDln+5llK9CJKVEZrSMdIs0tMKoRxFlupCKS+QtTmw
+jymZx+e3fUzbE6GsjGRfW+YIuarSqlWtc88cBaJQTnXFESN3eBaSsWpX5uk0x9wN
+YLbRE6hDq8QPd48Rhy/ujrMx0mJtv2757Jm6w3RwmvUav1nrBT6K1UZ8KUIG/+7x
+AxhN3BXZp1kX/S+o2YP1CzpmFgthklGK2sC+9oueOFuOwh7sFHckwJuIRhbIh1QW
+msxMmtsuHERpyi6817vRmLfav4LvdV4s/VSu9sU7Vcs3+oRjHR22xICJvkwgzB1f
+onHE5STOnh2FgOyjerg3DeqXkmP1il1B8TACM/sPZC3kckwpLaAoVGJHzZ+bEAdc
+008jtB7+Psp4e8PmEaAH
+=1R/b
 -----END PGP SIGNATURE-----
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 $@