EAPI4, fix kernel >=3.1 detection thanks to Ivan Dorna, drop old, fix #379765.

(Portage version: 2.1.10.32/cvs/Linux x86_64)

5 files changed, 188 insertions, 8 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index b1c53053652e..4dfa7e3e12aa 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.112 2011/10/10 08:42:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.113 2011/11/03 13:24:53 ultrabug Exp $
+
+*drbd-8.4.0 (03 Nov 2011)
+*drbd-8.3.12 (03 Nov 2011)
+*drbd-8.3.11-r1 (03 Nov 2011)
+
+  03 Nov 2011; Ultrabug <ultrabug@gentoo.org> -drbd-8.3.11.ebuild,
+  +drbd-8.3.11-r1.ebuild, +files/drbd-8.3.11-kernel3.patch,
+  +drbd-8.3.12.ebuild, +drbd-8.4.0.ebuild:
+  EAPI4, fix kernel >=3.1 detection thanks to Ivan Dorna, drop old, fix
+  #379765.
 
 *drbd-8.3.11 (10 Oct 2011)
 
diff --git a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
new file mode 100644
index 000000000000..affeafd08294
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.11-r1.ebuild,v 1.1 2011/11/03 13:24:53 ultrabug 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" \
+		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
+	# 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.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
new file mode 100644
index 000000000000..34dd1f38d9c4
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.3.12.ebuild
@@ -0,0 +1,76 @@
+# 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.12.ebuild,v 1.1 2011/11/03 13:24:53 ultrabug 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" \
+		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
+	# 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.3.11.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild
index 33fd41554c3e..25554893f3cc 100644
--- a/sys-cluster/drbd/drbd-8.3.11.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.0.ebuild
@@ -1,8 +1,8 @@
 # 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.11.ebuild,v 1.1 2011/10/10 08:42:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.0.ebuild,v 1.1 2011/11/03 13:24:53 ultrabug Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils multilib versionator
 
@@ -17,6 +17,7 @@ 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
@@ -45,18 +46,18 @@ src_configure() {
 
 src_compile() {
 	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
+	emake OPTFLAGS="${CFLAGS}" tools
 }
 
 src_install() {
 	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
+	emake DESTDIR="${D}" install-tools
+	dodoc README ChangeLog
 
 	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
+	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
 
-	dodoc scripts/drbd.conf.example || die
+	dodoc scripts/drbd.conf.example
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch b/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
new file mode 100644
index 000000000000..1eeca1b1b0ff
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
@@ -0,0 +1,17 @@
+--- a/drbd/Makefile	2011-07-07 12:55:39.000000000 +0200
++++ b/drbd/Makefile	2011-11-03 12:56:42.280603057 +0100
+@@ -77,9 +77,12 @@
+     endif
+   endif
+ 
++  KDIR_Makefile_VERSION = $(shell test -e $(KDIR)/Makefile && grep "^VERSION = " $(KDIR)/Makefile | cut -d " " -f 3)
+   KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+-  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+-    $(error "won't compile with this kernel version")
++  ifneq ($(KDIR_Makefile_VERSION),3)
++    ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
++      $(error "ici won't compile with this kernel version")
++    endif
+   endif
+ 
+   .PHONY: drbd.o default all greeting clean kbuild install dep tags