diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-12 20:14:28 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-12 20:14:28 +0000 |
| commit | 48a01a51f277467fe6c69f69f144987bbd3b85e7 (patch) | |
| tree | 8335723c755e1098374bacf6ca1072b7ff3252a8 /dev-db | |
| parent | Fix installation for Prefix, based on patch by Hugh Nowlan, bug #512838 (diff) | |
| download | gentoo-2-48a01a51f277467fe6c69f69f144987bbd3b85e7.tar.gz gentoo-2-48a01a51f277467fe6c69f69f144987bbd3b85e7.tar.bz2 gentoo-2-48a01a51f277467fe6c69f69f144987bbd3b85e7.zip | |
Multilib the live ebuild as well.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/ctdb/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/ctdb/ctdb-9999.ebuild | 25 |
2 files changed, 20 insertions, 10 deletions
diff --git a/dev-db/ctdb/ChangeLog b/dev-db/ctdb/ChangeLog index 39830afe25d2..e62ae54472af 100644 --- a/dev-db/ctdb/ChangeLog +++ b/dev-db/ctdb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/ctdb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.38 2014/06/12 20:06:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ChangeLog,v 1.39 2014/06/12 20:14:28 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> ctdb-9999.ebuild: + Multilib the live ebuild as well. *ctdb-1.13-r1 (12 Jun 2014) diff --git a/dev-db/ctdb/ctdb-9999.ebuild b/dev-db/ctdb/ctdb-9999.ebuild index cc958c52e6d3..c3ab1cf36c9d 100644 --- a/dev-db/ctdb/ctdb-9999.ebuild +++ b/dev-db/ctdb/ctdb-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 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.4 2012/03/23 10:55:46 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-9999.ebuild,v 1.5 2014/06/12 20:14:28 mgorny Exp $ -EAPI=4 +EAPI=5 EGIT_REPO_URI="git://git.samba.org/ctdb.git" -inherit autotools eutils git-2 +inherit autotools eutils git-2 multilib-minimal DESCRIPTION="A cluster implementation of the TDB database used to store temporary data." HOMEPAGE="http://ctdb.samba.org/" @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="" IUSE="" -DEPEND="dev-libs/popt" +DEPEND="dev-libs/popt[${MULTILIB_USEDEP}]" RDEPEND="${DEPEND}" src_prepare() { @@ -31,15 +31,22 @@ src_prepare() { eautoconf ${AT_M4DIR} } -src_configure() { +src_prepare() { + epatch "${PATCHES[@]}" + epatch_user + + # custom, broken Makefile + multilib_copy_sources +} + +multilib_src_configure() { econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --localstatedir="${EPREFIX}/var/lib" \ --with-logdir="${EPREFIX}/var/log/${PN}" } -src_install() { - default - +multilib_src_install_all() { + einstalldocs dohtml web/* doc/*.html } |