Fixed bug #184720 thanks to Natanael Copa <natanael.copa@gmail.com>.

(Portage version: 2.1.2.2)

5 files changed, 11 insertions, 94 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 6298508aee88..4c40eb9c23e7 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.70 2007/08/09 08:46:40 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.71 2007/08/16 16:34:22 xmerlin Exp $
+
+  16 Aug 2007; Christian Zoffoli <xmerlin@gentoo.org> -drbd-0.7.23.ebuild,
+  drbd-0.7.24.ebuild, drbd-8.0.5.ebuild:
+  Fixed bug #184720 thanks to Natanael Copa <natanael.copa@gmail.com>.
 
 *drbd-8.0.5 (09 Aug 2007)
 
diff --git a/sys-cluster/drbd/drbd-0.7.23.ebuild b/sys-cluster/drbd/drbd-0.7.23.ebuild
deleted file mode 100644
index b8bc0a2fe203..000000000000
--- a/sys-cluster/drbd/drbd-0.7.23.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.23.ebuild,v 1.2 2007/05/05 19:55:16 xmerlin Exp $
-
-inherit eutils versionator linux-mod linux-info
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc 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}/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-0.7.22-nodevfs.patch || die
-	epatch ${FILESDIR}/${PN}-0.7.22-scripts.adjust_drbd_config_h.sh.patch || die
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	einfo ""
-	einfo "Your kernel-sources in /usr/src/linux-${KV} must be properly configured"
-	#einfo "and match the currently running kernel version ${KV}"
-	einfo "If otherwise -> build will fail."
-	einfo ""
-
-	if kernel_is 2 6; then
-		emake -j1 KDIR=${KERNEL_DIR} || die "compile problem"
-	else
-		cp -R /usr/src/linux-${KV} ${WORKDIR}
-		emake -j1 KDIR=/${WORKDIR}/linux-${KV} || die "compile problem"
-	fi
-}
-
-src_install() {
-	emake PREFIX=${D} install || die "install problem"
-
-	# gentoo-ish init-script
-	newinitd ${FILESDIR}/${PN}-0.7.rc ${PN} || die
-
-	# needed by drbd startup script
-	#keepdir /var/lib/drbd
-
-	# docs
-	dodoc README ChangeLog COPYING
-	dodoc documentation/NFS-Server-README.txt
-
-	# we put drbd.conf into docs
-	# it doesnt make sense to install a default conf in /etc
-	# put it to the docs
-	rm -f ${D}/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-	dodoc upgrade_0.6.x_to_0.7.0.txt upgrade_0.7.0_to_0.7.1.txt || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	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 ""
-}
diff --git a/sys-cluster/drbd/drbd-0.7.24.ebuild b/sys-cluster/drbd/drbd-0.7.24.ebuild
index 97b20d27c8bb..82665a07acb0 100644
--- a/sys-cluster/drbd/drbd-0.7.24.ebuild
+++ b/sys-cluster/drbd/drbd-0.7.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24.ebuild,v 1.2 2007/06/28 18:38:42 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-0.7.24.ebuild,v 1.3 2007/08/16 16:34:22 xmerlin Exp $
 
 inherit eutils versionator linux-mod linux-info
 
@@ -40,10 +40,10 @@ src_compile() {
 	einfo ""
 
 	if kernel_is 2 6; then
-		emake -j1 KDIR=${KERNEL_DIR} || die "compile problem"
+		emake -j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT} || die "compile problem"
 	else
 		cp -R /usr/src/linux-${KV} ${WORKDIR}
-		emake -j1 KDIR=/${WORKDIR}/linux-${KV} || die "compile problem"
+		emake -j1 KDIR=/${WORKDIR}/linux-${KV} O=${KBUILD_OUTPUT} || die "compile problem"
 	fi
 }
 
diff --git a/sys-cluster/drbd/drbd-8.0.5.ebuild b/sys-cluster/drbd/drbd-8.0.5.ebuild
index 54ff767a1566..069a2cc77574 100644
--- a/sys-cluster/drbd/drbd-8.0.5.ebuild
+++ b/sys-cluster/drbd/drbd-8.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.0.5.ebuild,v 1.1 2007/08/09 08:46:40 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.0.5.ebuild,v 1.2 2007/08/16 16:34:22 xmerlin Exp $
 
 inherit eutils versionator linux-mod linux-info
 
@@ -39,10 +39,10 @@ src_compile() {
 	linux_chkconfig_present
 
 	if kernel_is 2 6; then
-		emake -j1 KDIR=${KERNEL_DIR} || die "compile problem"
+		emake -j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT} || die "compile problem"
 	else
 		cp -R /usr/src/linux-${KV} ${WORKDIR}
-		emake -j1 KDIR=/${WORKDIR}/linux-${KV} || die "compile problem"
+		emake -j1 KDIR=/${WORKDIR}/linux-${KV} O=${KBUILD_OUTPUT} || die "compile problem"
 	fi
 }
 
diff --git a/sys-cluster/drbd/files/digest-drbd-0.7.23 b/sys-cluster/drbd/files/digest-drbd-0.7.23
deleted file mode 100644
index 9a5801523c19..000000000000
--- a/sys-cluster/drbd/files/digest-drbd-0.7.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3600d689e4e9bb45108c0c185a1e85c5 drbd-0.7.23.tar.gz 296960
-RMD160 140b0ea1cdcce54a42084dc376b21872f6f5679d drbd-0.7.23.tar.gz 296960
-SHA256 6aab0b7beb859071bd85571b1a018ffb9e7261084c6fafa78b694dbc0b1303f5 drbd-0.7.23.tar.gz 296960