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

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

6 files changed, 198 insertions, 13 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/Manifest b/sys-cluster/drbd/Manifest
index b9aa51a1aae1..d881f74060d0 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -2,24 +2,29 @@
 Hash: SHA256
 
 AUX drbd-8.0.rc 3134 RMD160 aae3109e5f87463e845b53aa2eacbc5e250acb00 SHA1 126494eaabd3a0871b332614f27cfd8cf6834505 SHA256 33337723abd6c095421d9291b97d5dca3f04341e3bc6992abd591ca64f7a29f0
+AUX drbd-8.3.11-kernel3.patch 762 RMD160 b6eb80aa419a799cbc83f32b1a16feb86a23c5bb SHA1 7c3c9b58e8e05fed30e577a6e213e271bbfbf43c SHA256 cec36f41078c6c5824733731c82532cfbc0cdbff97f1995345e8266b755985b5
 AUX drbd-8.3.8.1-implicits.patch 288 RMD160 33a2520b6c327f014a8d1f9018f2eab2fa5317ca SHA1 1b2b726fd658664cc379bd37e39cccc7539ac8d4 SHA256 f45801ebdeb0a2de56b9ee0adf296d5271f644648208587aa32adab6cc6ae148
 DIST drbd-8.0.16.tar.gz 322758 RMD160 7df7766e5fb96c6aa9130b03e3d1257394ad0c07 SHA1 379ce0b4664468b779dd16f90853f91da4a85e59 SHA256 3bdb662663d308da9d871cc66ddc9e807a10ad5ab510a33b62877231150bc059
 DIST drbd-8.3.10.tar.gz 521798 RMD160 8c6123503289ed5a7f0dbb6347ec2551628fc791 SHA1 82ab92339bc68a1593f407d6e0cf2b6c2260b284 SHA256 5dd0e4bda615784bc45b8078c4d44b2d4b4b074f12e98c9bdfd7d40b13f2511a
 DIST drbd-8.3.11.tar.gz 526056 RMD160 86b404024264bd2a5b38cffb6342f0a2c90e4c65 SHA1 e765cc70a1e7461b6c1a594a057acf7e6e55b9c5 SHA256 bb5d3d0740788e779ba3b3a78c21362969dd0648eaced3ff37d9e52fff1df883
+DIST drbd-8.3.12.tar.gz 530923 RMD160 2225ca61b56f639af847d71dc2cedb669a6f7b2e SHA1 5255922ae2ed1d61890857898ae476710480a426 SHA256 7385f941bafaebb18da1dadb07e2a8ee06117322bc37fc60a6c35b05f6f91087
 DIST drbd-8.3.7.tar.gz 462659 RMD160 519299838add3131f0af1ad5de424ad65d303c10 SHA1 d637494ec10dcf98db04083285d9ed65f259f15d SHA256 a01a07df88ebdbc20891fcb45c4d0e89b617a89dc19d5cbc8d0bd62bd562d36a
 DIST drbd-8.3.8.1.tar.gz 482582 RMD160 619234b3e612534c9560acae819596fdd24b4aff SHA1 d35c00bcdbf034984507ef7dc1440f67d2689818 SHA256 2b7e8a3895e89824d41d7dce8d55d127baba857c509bc2477925b0aecaf5689b
+DIST drbd-8.4.0.tar.gz 650733 RMD160 1d128cf42f6a2a32d82d6976467284b5f938dd3e SHA1 7c9f939bae4088ba1b2ae34b0e5ed26d435089f9 SHA256 6f1f91ba2c296258c07cdb67552050cb64604d6606f7978aa076f32b3b97d624
 EBUILD drbd-8.0.16.ebuild 1396 RMD160 22ab1c11355a53988cf3a2b878fd9fcbd2ded74e SHA1 bbc74291e913e0e4d9247f63ae716246d344a990 SHA256 d9d90c543749e557b7de6500bf30c6c96fd8fd541191c15f37537074a6d99c29
 EBUILD drbd-8.3.10.ebuild 2048 RMD160 cb7a5c66fb545264ed36ebe94ee361a5bf8cad96 SHA1 77fade055a75a3fb87e26f39d7a450a9fc23fa1d SHA256 faff4b7720576ddfd264d78b72001d7c5669ea98964b83b28a913e7e72a62948
-EBUILD drbd-8.3.11.ebuild 2050 RMD160 f9e5ffb7f1673b41da679637e105c1c133cfcca2 SHA1 656678e2ae3cb4cb0ceb3b1880f743eb56226a5c SHA256 a909e17ddad9749ae1794c13a4f13ab1bb7cb0dbf85b6a0002c0c6de91c78b04
+EBUILD drbd-8.3.11-r1.ebuild 2064 RMD160 426b5d7d4aac63c49f1293a55fc08bb5a074ab69 SHA1 60dcb6ddfe4c9c69946dd937e19f9fa8a5f78195 SHA256 6af9b13ddcb42643bf7621071e877d351a00f88d770d4a30678e7f2c37c43e19
+EBUILD drbd-8.3.12.ebuild 2061 RMD160 3199a3e9364466e890a782986ce5601d52a07557 SHA1 d7a82bb23abb71e55ef80e85b931ca95875baf74 SHA256 548a60f2353c3283c68d58102aa97ae0d318df1d2e95f4209a11110d5a0af6da
 EBUILD drbd-8.3.7.ebuild 2076 RMD160 16bc5f418604ae7a2580c27268775ce100d8c76d SHA1 bf9daa3035fc7e4fc60cbf92c1ebd7b010b37415 SHA256 76f34c9ad9a17b60d43bee1211502470a42b88c557503435f324d6060c93a188
 EBUILD drbd-8.3.8.1-r1.ebuild 2026 RMD160 90c4e25286838e271b55030a635733ec096e2924 SHA1 914a14cbc9a334e2022e397ffb4dd132281cdfc5 SHA256 f13774321579bcde2d62324255f06f0d3e5d265b8bb03bce8393f4c2b9f75fa3
 EBUILD drbd-8.3.8.1.ebuild 2073 RMD160 f5e66a8a70d356d015c5eccbb6783e4f6b5db304 SHA1 ad2c52dac581e09aefa87a2134f4e51765b700e9 SHA256 bd73c0884df20eceee446c2bf93a226c7b93463f5b2e33d43d6a68193eb40826
-MISC ChangeLog 18152 RMD160 2a9af3735d37326168681e6994ca82a17c464486 SHA1 fae08ebb716a3bed8fc28a56ea828cce4ca59e4a SHA256 37c09ac9cb06235d9e09f482155506221ce17c5f63665f102c67fb428a1decde
+EBUILD drbd-8.4.0.ebuild 2060 RMD160 a70707f8d58900a572969a5b3454d7e3bc77dc25 SHA1 0a08e03d0075bf3b31f45367d8fd7d8f96e7cb70 SHA256 bbf207134b9ef5498d19b34d10e6c2d294c0f0867638d698bd7d017751dc5c2e
+MISC ChangeLog 18490 RMD160 9c02d2dbb15138eec58a43a6e2280e8b45eeaa84 SHA1 47516976b1be3aeff162851e609e3ba375c02c03 SHA256 9167afd65f13f6edeb105fd1d8a768d87f8caac4c550122e4216750e2325cbcb
 MISC metadata.xml 584 RMD160 38a46e5acabf3eebfaf8f695954236f3ef650a48 SHA1 cd346598b1aa1a0b6b83a94c492e9aaf0f0191fe SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6SsAAACgkQKiQSS7ZY+hMOmwEAxEraGiFH76GeppqsRk5LWrW+
-ITuubhQF5FshOT49LMcA/iDMJs5N60DgBvlXr5Vag/uR0+wJZGOy6pRHKSFYQqN5
-=qrh7
+iF4EAREIAAYFAk6yli8ACgkQKiQSS7ZY+hO1igD8CCGKKgR66WbQqLhA7rrkXclV
+CFRRSvSMwtoLTBZD5DsA/jeJNehPYbP8FV1k6GxFzkXmQxnCCAm1Z6OF9WpQZhHc
+=5QR4
 -----END PGP SIGNATURE-----
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