Bump. Also fix cosmetic bug #219280 that rmmod of a static kernel returns a false error on stop.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 174 insertions, 8 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index efe8a326dda7..3bfd8f963052 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/drbd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.118 2012/03/28 14:07:24 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.119 2013/01/17 19:09:05 robbat2 Exp $
+
+*drbd-8.4.2 (17 Jan 2013)
+*drbd-8.3.15 (17 Jan 2013)
+
+  17 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +drbd-8.3.15.ebuild,
+  +drbd-8.4.2.ebuild, files/drbd-8.0.rc:
+  Bump. Also fix cosmetic bug #219280 that rmmod of a static kernel returns a
+  false error on stop.
 
   28 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.12.ebuild,
   drbd-8.3.8.1-r1.ebuild:
diff --git a/sys-cluster/drbd/drbd-8.3.15.ebuild b/sys-cluster/drbd/drbd-8.3.15.ebuild
new file mode 100644
index 000000000000..7689297b7c0f
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.3.15.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.15.ebuild,v 1.1 2013/01/17 19:09:05 robbat2 Exp $
+
+EAPI=4
+
+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() {
+	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
+	# 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" \
+		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
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
+		scripts/Makefile.in || die
+	# don't participate in user survey bug 360483
+	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
+}
+
+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
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools
+	dodoc README ChangeLog
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
+
+	dodoc scripts/drbd.conf.example
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.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/drbd-8.4.2.ebuild b/sys-cluster/drbd/drbd-8.4.2.ebuild
new file mode 100644
index 000000000000..1917016ee4ee
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.2.ebuild,v 1.1 2013/01/17 19:09:05 robbat2 Exp $
+
+EAPI=4
+
+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() {
+	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
+	# 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" \
+		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/{,legacy/}Makefile.in || die
+	# correct install paths
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
+		scripts/Makefile.in || die
+	# don't participate in user survey bug 360483
+	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
+}
+
+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
+}
+
+src_install() {
+	# only install the tools
+	emake DESTDIR="${D}" install-tools
+	dodoc README ChangeLog
+
+	# install our own init script
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
+
+	dodoc scripts/drbd.conf.example
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please copy and gunzip the configuration file:"
+	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.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/files/drbd-8.0.rc b/sys-cluster/drbd/files/drbd-8.0.rc
index 48f9e19feeee..d5ce7d8e3205 100644
--- a/sys-cluster/drbd/files/drbd-8.0.rc
+++ b/sys-cluster/drbd/files/drbd-8.0.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v 1.7 2011/12/04 13:07:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/files/drbd-8.0.rc,v 1.8 2013/01/17 19:09:04 robbat2 Exp $
 
 extra_started_commands="reload"
 
@@ -117,12 +117,12 @@ stop() {
 	if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then
 		if [ -e ${PROC_DRBD} ]; then
 			${DRBDADM} down all
+			ret=$?
 			sleep 3
-         if grep -q '^drbd' /proc/modules ; then
-			   ${RMMOD} drbd
-         fi
+			if [ -e /proc/modules ] && grep -q '^drbd' /proc/modules ; then
+		 	      ${RMMOD} drbd
+         	fi
 		fi
-		ret=$?
 		eend $ret
 		return $ret
 	else