Install /etc/drbd.conf wrt #351638 by Marcin Mirosław <bug@mejor.pl>, fix implicits

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

3 files changed, 96 insertions, 2 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 45cfa0ecf7b3..2da77e803004 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/drbd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.104 2010/08/25 17:00:58 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.105 2011/01/18 18:55:33 xarthisius Exp $
+
+*drbd-8.3.8.1-r1 (18 Jan 2011)
+
+  18 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> +drbd-8.3.8.1-r1.ebuild,
+  +files/drbd-8.3.8.1-implicits.patch:
+  Install /etc/drbd.conf wrt #351638 by Marcin Mirosław <bug@mejor.pl>, fix
+  implicits
 
   25 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
   -drbd-0.7.24-r1.ebuild, -drbd-0.7.25.ebuild, -files/drbd-0.7.rc,
diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
new file mode 100644
index 000000000000..4e462e31b5d3
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.1 2011/01/18 18:55:33 xarthisius Exp $
+
+EAPI="2"
+
+inherit eutils multilib versionator
+
+LICENSE="GPL-2"
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion heartbeat pacemaker +udev xen"
+SLOT="0"
+
+src_prepare() {
+	# respect LDFLAGS
+	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
+	# respect multilib
+	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
+		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	# correct install paths
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
+		scripts/Makefile.in || die
+	epatch "${FILESDIR}"/${P}-implicits.patch
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-utils \
+		--without-km \
+		--without-rgmanager \
+		$(use_with udev) \
+		$(use_with xen) \
+		$(use_with pacemaker) \
+		$(use_with heartbeat) \
+		$(use_with bash-completion bashcompletion) \
+		--with-distro=gentoo
+}
+
+src_compile() {
+	# only compile the tools
+	emake OPTFLAGS="${CFLAGS}" tools || die
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools || die
+	dodoc README ChangeLog || die
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
+
+	dodoc scripts/drbd.conf.example || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file"
+	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
+	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."
+	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
+}
diff --git a/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch b/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
new file mode 100644
index 000000000000..0fbbb92a2c3f
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
@@ -0,0 +1,12 @@
+drbdadm_main.c:2525:2: warning: implicit declaration of function ‘stat’
+
+--- a/user/drbdadm_main.c
++++ b/user/drbdadm_main.c
+@@ -33,6 +33,7 @@
+ #include <search.h>
+ 
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <sys/socket.h>