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

Package-Manager: portage-2.1.2.2

6 files changed, 26 insertions, 117 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/Manifest b/sys-cluster/drbd/Manifest
index 799442272fbd..abf5476886ab 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -25,32 +25,24 @@ AUX drbd-8.0.rc 2982 RMD160 38044e973e12545781cb6838d12fb172c8fcf1fd SHA1 df40a5
 MD5 342ba71b8133e15c02289719e284f069 files/drbd-8.0.rc 2982
 RMD160 38044e973e12545781cb6838d12fb172c8fcf1fd files/drbd-8.0.rc 2982
 SHA256 47c0c39794b370bed7152eea1227c115d7b961ecb469d8cb9a3220c9dc543e12 files/drbd-8.0.rc 2982
-DIST drbd-0.7.23.tar.gz 296960 RMD160 140b0ea1cdcce54a42084dc376b21872f6f5679d SHA1 f52f086381ce6fd7ac73954d9879ecb9c0992b63 SHA256 6aab0b7beb859071bd85571b1a018ffb9e7261084c6fafa78b694dbc0b1303f5
 DIST drbd-0.7.24.tar.gz 292132 RMD160 3f8e5540e1040ec30926c1f7e114c56c499151e2 SHA1 b38846eb3cbb8aa356e3c28ebf4c4da6e971b06d SHA256 bdeec861bdab2b9a43eda2da743f3e7fd3974126d589f853ed2b22e1f27da5e4
 DIST drbd-8.0.5.tar.gz 489834 RMD160 dfb4ceb8b1ed4364d49f1fb323ffe70fe6725121 SHA1 348514a2e91f91f074085400b30c0275e44465cf SHA256 162e7994968c15235a7ae7a8bc53276fc8b4d4485c6a72716b0f83feda2e63ad
-EBUILD drbd-0.7.23.ebuild 2157 RMD160 b33c9c319dd0eefe224dad46faefe1a31c10761d SHA1 f2f1e0595df461d4f0130083fde0863e0746a02f SHA256 bc7ffaf2e74423a328e783cc040fe4c5766713e8c7b6db05839b276a8071de51
-MD5 da7657531c0446cbd5c5023f5ff446b5 drbd-0.7.23.ebuild 2157
-RMD160 b33c9c319dd0eefe224dad46faefe1a31c10761d drbd-0.7.23.ebuild 2157
-SHA256 bc7ffaf2e74423a328e783cc040fe4c5766713e8c7b6db05839b276a8071de51 drbd-0.7.23.ebuild 2157
-EBUILD drbd-0.7.24.ebuild 2157 RMD160 0bd06a75ee1df3785778cbc604bf6672480488d4 SHA1 547872965320266a13b645fa2f9713e14a84e1e3 SHA256 77c856b51de8887ec8639c42ceee9e1f479a42d52509a74afce06abd87799f28
-MD5 ed559b688aa19b62a69c5c59a334bfc7 drbd-0.7.24.ebuild 2157
-RMD160 0bd06a75ee1df3785778cbc604bf6672480488d4 drbd-0.7.24.ebuild 2157
-SHA256 77c856b51de8887ec8639c42ceee9e1f479a42d52509a74afce06abd87799f28 drbd-0.7.24.ebuild 2157
-EBUILD drbd-8.0.5.ebuild 2024 RMD160 26c71ba87062d8b9914cd29c845c67f477c13def SHA1 306f4de14f875639275192ac19abc2a148c4fcff SHA256 95752a2cadac927b0dbcc7cd14cdf791f06d1cb834f312ca79fe660d8346124d
-MD5 48a23d91e782330e39e1e69f0018479b drbd-8.0.5.ebuild 2024
-RMD160 26c71ba87062d8b9914cd29c845c67f477c13def drbd-8.0.5.ebuild 2024
-SHA256 95752a2cadac927b0dbcc7cd14cdf791f06d1cb834f312ca79fe660d8346124d drbd-8.0.5.ebuild 2024
-MISC ChangeLog 11788 RMD160 086a83f1fa0a799092c8022c3ef4f77a23389a29 SHA1 fa89a4e419b91702bb803a175dc7444b9c944ba0 SHA256 9af1d304762f8c946adf0beb357e2459526fe397006768464dfc34fd932fd914
-MD5 129964acd1a0694d31905795d44f94ae ChangeLog 11788
-RMD160 086a83f1fa0a799092c8022c3ef4f77a23389a29 ChangeLog 11788
-SHA256 9af1d304762f8c946adf0beb357e2459526fe397006768464dfc34fd932fd914 ChangeLog 11788
+EBUILD drbd-0.7.24.ebuild 2195 RMD160 541038c2b217e65ef1b07a7388797feb396e51b5 SHA1 3018fab14413a2353867b340896dd7d260ee54e7 SHA256 8edf332642f99fc12930f2d44e174a1e6b292f986405d871917f8b779256d807
+MD5 0594821870a668d9b4b2af325fb577cb drbd-0.7.24.ebuild 2195
+RMD160 541038c2b217e65ef1b07a7388797feb396e51b5 drbd-0.7.24.ebuild 2195
+SHA256 8edf332642f99fc12930f2d44e174a1e6b292f986405d871917f8b779256d807 drbd-0.7.24.ebuild 2195
+EBUILD drbd-8.0.5.ebuild 2062 RMD160 d4ab76ba202e273b27646f9cd30d05f8e66264e0 SHA1 b80d27ed4c1077e39a3d78df1b0094660c916d40 SHA256 9d41716de4023c19cfaacbb3c1c3afd885de58b263b527bba7fa45ef1481a56a
+MD5 deaedd3f2f015abc90caa7c969dbc9a2 drbd-8.0.5.ebuild 2062
+RMD160 d4ab76ba202e273b27646f9cd30d05f8e66264e0 drbd-8.0.5.ebuild 2062
+SHA256 9d41716de4023c19cfaacbb3c1c3afd885de58b263b527bba7fa45ef1481a56a drbd-8.0.5.ebuild 2062
+MISC ChangeLog 11976 RMD160 7ac24a8e30b4b6792a0bbc5e646aa6c4441135bc SHA1 e8c90608c958bed4f3d3b009fe644cbdcdc2e932 SHA256 aab02f55f3362476b6da9751da53106882dcec7bbff27bb45f9da4c39ed8f7bd
+MD5 2b03d47ade07b1337be3aae87e153cd4 ChangeLog 11976
+RMD160 7ac24a8e30b4b6792a0bbc5e646aa6c4441135bc ChangeLog 11976
+SHA256 aab02f55f3362476b6da9751da53106882dcec7bbff27bb45f9da4c39ed8f7bd ChangeLog 11976
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 MD5 58f295ba7477091e41340647670f3231 metadata.xml 229
 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e metadata.xml 229
 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f metadata.xml 229
-MD5 31f98d1b2c690014a7f2a2ec87f52c86 files/digest-drbd-0.7.23 235
-RMD160 d5f5caa79a7f14a50501273ecc99a7b1759122d6 files/digest-drbd-0.7.23 235
-SHA256 0339e7534391d2d45f52de0bb6e4d2ae666dd55225033f0f839d558267736931 files/digest-drbd-0.7.23 235
 MD5 5ff557fadf6bbe693af99d358eefaafa files/digest-drbd-0.7.24 235
 RMD160 3d1e9213c4fe0109b053491a430df78882a699c3 files/digest-drbd-0.7.24 235
 SHA256 53454684c2af8ede86225ea14988be403c5cc5032eb2dc4d559a23430bd5dcd4 files/digest-drbd-0.7.24 235
@@ -60,7 +52,7 @@ SHA256 75b90d2a74d1a85dadfc355c449048b45bac838fa256e4cddd088bffab6625a0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGutR5gMUyd/cdjWsRApDMAKCIOe/PM135o25zAlVq+G4JzCJ5jQCfW4/u
-v+54uTBaTxGC68dSdV1QLD8=
-=fuRe
+iD8DBQFGxHyXgMUyd/cdjWsRAm3sAKCP/GaJMb4LI0CBmRhXV0I5Jw+tKwCfRRhI
+mZYCBM4LOixngihJiQFz0CE=
+=1Ql7
 -----END PGP SIGNATURE-----
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