[gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/files/, sys-cluster/drbd-utils/

[Robin H. Johnson]

commit:     8911d4e381715f088ddd2a760f039d089c74bdf6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:56:39 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 19:01:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8911d4e3

sys-cluster/drbd-utils: bug #548800, support IPv6 addresses in init.

Package-Manager: portage-2.2.28
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 95 +++++++++++++++++++++++
 sys-cluster/drbd-utils/files/drbd-utils-8.0.rc    |  2 +-
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
new file mode 100644
index 0000000..c81e9c1
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib udev versionator
+
+LICENSE="GPL-2"
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="heartbeat pacemaker +udev xen"
+SLOT="0"
+
+DEPEND="heartbeat? ( sys-cluster/heartbeat )
+	pacemaker? ( sys-cluster/pacemaker )
+	udev? ( virtual/udev )
+	!!sys-cluster/drbd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+	# respect LDFLAGS, #453442
+	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+		-i user/*/Makefile.in || die
+
+	# respect multilib
+	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/*/Makefile.in || die
+
+	# correct install paths (really correct this time)
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
+		scripts/Makefile.in || die
+
+	# don't participate in user survey bug 360483
+	sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+	epatch "${FILESDIR}"/run-lock.patch
+
+	autoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--without-rgmanager \
+		$(use_with udev) \
+		$(use_with xen) \
+		$(use_with pacemaker) \
+		$(use_with heartbeat) \
+		--with-bashcompletion \
+		--with-distro=gentoo
+}
+
+src_compile() {
+	# only compile the tools
+	emake OPTFLAGS="${CFLAGS}" tools
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools install-doc
+	dodoc README ChangeLog
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+	dodoc scripts/drbd.conf.example
+
+	dosym /usr/sbin/drbdadm /sbin/drbdadm
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
+	einfo "and edit it to your needs. Helpful commands:"
+	einfo "man 5 drbd.conf"
+	einfo "man 8 drbdsetup"
+	einfo "man 8 drbdadm"
+	einfo "man 8 drbddisk"
+	einfo "man 8 drbdmeta"
+	einfo
+	elog "Remember to enable drbd support in kernel."
+}

diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
index 8944c1d..6f2f74c 100644
--- a/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.0.rc
@@ -64,7 +64,7 @@ adjust_with_progress() {
 		else echo -n ".. ";
 		fi
 		IFS=$IFS_O
-		$CMD || {
+		eval $CMD || {
 			echo 
 			eend 20 "cmd $CMD failed!"
 			return 20