Add a drbd-8.3.7 version to match sys-kernel/xen-sources-2.6.34 userland needs. Fix bug #365005. Drop old.

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

4 files changed, 92 insertions, 91 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index f485135a6c51..08702c1d4bcd 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.107 2011/03/26 08:43:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.108 2011/04/29 10:12:47 ultrabug Exp $
+
+*drbd-8.3.7 (29 Apr 2011)
+
+  29 Apr 2011; Ultrabug <ultrabug@gentoo.org> -drbd-8.3.6.ebuild,
+  +drbd-8.3.7.ebuild:
+  Add a drbd-8.3.7 version to match sys-kernel/xen-sources-2.6.34 userland
+  needs. Fix bug #365005. Drop old. Thanks to Luca Lesinigo for reporting.
 
   26 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.9.ebuild:
   Disable global survey by default in example conf file wrt #360483 by robbat2
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 8e03fea3e7fa..42d69a0a6022 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX drbd-8.0.rc 3134 RMD160 aae3109e5f87463e845b53aa2eacbc5e250acb00 SHA1 126494eaabd3a0871b332614f27cfd8cf6834505 SHA256 33337723abd6c095421d9291b97d5dca3f04341e3bc6992abd591ca64f7a29f0
 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.6.tar.gz 457469 RMD160 40c21fdec04e2902662378dded279c81d194ae72 SHA1 6fe52c7b619b52b1a7e164e9df26e3a7ccd0fbbb SHA256 ea1220705845df6f6490624698904f28854fe74caf047a5d01454b9abd892ce3
+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.3.9.tar.gz 497886 RMD160 e01ca8a0c03ac925409b47e88f8cf82a6c9ac734 SHA1 1f1cfc12dc6c3f2f2073fc182d18c53af1096d2a SHA256 ff82ad9250500895092cd7c2cfc945ae1da78d6203052947814e4a27ba298e64
 EBUILD drbd-8.0.16.ebuild 1396 RMD160 22ab1c11355a53988cf3a2b878fd9fcbd2ded74e SHA1 bbc74291e913e0e4d9247f63ae716246d344a990 SHA256 d9d90c543749e557b7de6500bf30c6c96fd8fd541191c15f37537074a6d99c29
-EBUILD drbd-8.3.6.ebuild 1966 RMD160 49beed7df0620247fffd5a60f214fe96b081b6de SHA1 1475ba1541f9136df0f6d00a6da12056d89de282 SHA256 8f34acd83ce8a3f4f78aa676f976acd16b35352d529972cd0e5b3e57f2acbfcf
+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
 EBUILD drbd-8.3.9.ebuild 2103 RMD160 f3a4128d56d897191aec8c331d3d135a451832e0 SHA1 4ed5223e8a438e88611219c2381d76d45b8eab96 SHA256 6b60985bd9e812d1a91ea6113d3bdc6db2ce4d685ca98ee12a786655e58cf8e7
-MISC ChangeLog 17380 RMD160 70d4eee66ee30320e54767ee121050d759465339 SHA1 48515267f1faeef67fddc6de788eff234597c9bd SHA256 fba5d2fd6f2ef23b087a042b593c80312b2cb45e6a853cecea5f15bf0d619885
+MISC ChangeLog 17644 RMD160 fe0de80f6be30d813422b7f613348dfac30c5c07 SHA1 7ec3b3f0d0e6580b067f954efa60ffd9e15d1438 SHA256 15cfdef79c1ee6ffc077e91a87f98845eb1a209dc23c1396233d051ab2ab4c19
 MISC metadata.xml 584 RMD160 38a46e5acabf3eebfaf8f695954236f3ef650a48 SHA1 cd346598b1aa1a0b6b83a94c492e9aaf0f0191fe SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2Npy4ACgkQIiMqcbOVdxQVJgP+MSuXvIJHR5kLdOmFKio1BsI8
-vvZFAlO43kqVBAMijsLVz7IKwTJdDumJVi82V3Lr1NOhMqcHHKT0eQrMQCtTgsh5
-nMYHWzjx0cTExrVmgZeyQZkl8xu16j9tzLplBcwAEVOzraYECMfdRxHwDHSiyAvD
-J0OgUllEiqUVup3SteM=
-=o9RR
+iF4EAREIAAYFAk26jykACgkQKiQSS7ZY+hMIhgEAkE9dxgpbi+xOJiYkBhNHl9Bz
++gmVVavFo4CdNYFobBMBAKnWvpkc8vrWrXXad99YmPVEtZ2dt9JQpjGHB3dDYatz
+=gr66
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-8.3.6.ebuild b/sys-cluster/drbd/drbd-8.3.6.ebuild
deleted file mode 100644
index d3b70831ff48..000000000000
--- a/sys-cluster/drbd/drbd-8.3.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.6.ebuild,v 1.1 2009/11/10 11:46:08 wschlich Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-PDEPEND="~sys-cluster/drbd-kernel-${PV}"
-
-SLOT="0"
-
-src_configure() {
-	# TODO FIXME: add USE flags?
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-udev \
-		--with-xen \
-		--without-pacemaker \
-		--with-heartbeat \
-		--without-rgmanager \
-		--without-bashcompletion \
-		--with-distro=gentoo \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# only compile the tools
-	emake -j1 OPTFLAGS="${CFLAGS}" tools || die "compilation failed"
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die "installation failed"
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# manually install udev rules
-	insinto /etc/udev/rules.d
-	newins scripts/drbd.rules 65-drbd.rules || die
-
-	# manually install bash-completion script
-	insinto /usr/share/bash-completion
-	newins scripts/drbdadm.bash_completion drbdadm
-
-	# install the docs
-	dodoc README ChangeLog
-
-	# it doesnt make sense to install a default conf in /etc,
-	# so we put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.gz 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 ""
-}
diff --git a/sys-cluster/drbd/drbd-8.3.7.ebuild b/sys-cluster/drbd/drbd-8.3.7.ebuild
new file mode 100644
index 000000000000..1e41e2de1b3a
--- /dev/null
+++ b/sys-cluster/drbd/drbd-8.3.7.ebuild
@@ -0,0 +1,77 @@
+# 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.7.ebuild,v 1.1 2011/04/29 10:12:47 ultrabug Exp $
+
+EAPI="2"
+
+inherit 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
+}
+
+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
+
+	# it doesnt make sense to install a default conf in /etc,
+	# so we put it to the docs
+	rm -f "${D}"/etc/drbd.conf
+	dodoc scripts/drbd.conf || 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."
+}