Fixed bug #179603.

Package-Manager: portage-2.1.2.2

4 files changed, 33 insertions, 14 deletions

diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 6606464197cf..920a776d643a 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cman
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.34 2007/05/12 13:18:52 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.35 2007/05/26 13:27:34 xmerlin Exp $
+
+  26 May 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/cman-1.04.00-qdisk-makefile.patch, cman-1.04.00.ebuild:
+  Fixed bug #179603.
 
   12 May 2007; Christian Zoffoli <xmerlin@gentoo.org>
   +files/cman-1.03.00-qdisk-makefile.patch, cman-1.03.00.ebuild,
diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest
index 1c49cd368fd9..7c2c7ae8552b 100644
--- a/sys-cluster/cman/Manifest
+++ b/sys-cluster/cman/Manifest
@@ -9,6 +9,10 @@ AUX cman-1.03.00-qdisk-makefile.patch 436 RMD160 ede2efd2ee3a99eb2e26a49985e6867
 MD5 2e3ffd9bdafc7e3267d5a06bc30b9351 files/cman-1.03.00-qdisk-makefile.patch 436
 RMD160 ede2efd2ee3a99eb2e26a49985e6867390ab2085 files/cman-1.03.00-qdisk-makefile.patch 436
 SHA256 14fd3e70d294cb1777b2c3004f3861cda1a0cda8b5a40318cb7a874a5dc5a042 files/cman-1.03.00-qdisk-makefile.patch 436
+AUX cman-1.04.00-qdisk-makefile.patch 450 RMD160 26f537d88d07bd3874d9691577f569df9f170ba7 SHA1 9611a2945e56e0dfa0b42db7a05579efc16910e1 SHA256 b3dfb8f46a6307e5a756e8209ff00a0456e7d71c54b729ead626e3ce34ab3cb5
+MD5 e73e1e177996a08027d2fce74be13f61 files/cman-1.04.00-qdisk-makefile.patch 450
+RMD160 26f537d88d07bd3874d9691577f569df9f170ba7 files/cman-1.04.00-qdisk-makefile.patch 450
+SHA256 b3dfb8f46a6307e5a756e8209ff00a0456e7d71c54b729ead626e3ce34ab3cb5 files/cman-1.04.00-qdisk-makefile.patch 450
 AUX cman.conf 1009 RMD160 e0ed101a6a891b9f985b86ad1b43caeb4a9815cf SHA1 4f1e6600a502d125fd240e14f705e9c3e80a6f5f SHA256 7baeb20aba4dd74484813e3702d64b0200ba8d07e86bb69ae480c00970623d86
 MD5 b10ff12664efd9eae78d46c0e57b1ddf files/cman.conf 1009
 RMD160 e0ed101a6a891b9f985b86ad1b43caeb4a9815cf files/cman.conf 1009
@@ -33,14 +37,14 @@ EBUILD cman-1.03.00.ebuild 1271 RMD160 fd49165b279335f50abf61c5e0dca102c1c9d959
 MD5 c7a833ae305405663ff9db9b1855c3d2 cman-1.03.00.ebuild 1271
 RMD160 fd49165b279335f50abf61c5e0dca102c1c9d959 cman-1.03.00.ebuild 1271
 SHA256 3bc8f4e98da6fb34243c52d7184b510203e270d2cd29049298aea1b5c93fd0c8 cman-1.03.00.ebuild 1271
-EBUILD cman-1.04.00.ebuild 1271 RMD160 55a42167fde794cfc5b3c7393913df074b64fc6a SHA1 3a73a78d14e5fcb0cd72a266c80bc647971a581d SHA256 93741643c77f99e1b80d284ea2b0ed094e6e164c003097c20304f0c08c5e9f4c
-MD5 19cc095bccedf550fd3a9abc823ca965 cman-1.04.00.ebuild 1271
-RMD160 55a42167fde794cfc5b3c7393913df074b64fc6a cman-1.04.00.ebuild 1271
-SHA256 93741643c77f99e1b80d284ea2b0ed094e6e164c003097c20304f0c08c5e9f4c cman-1.04.00.ebuild 1271
-MISC ChangeLog 4201 RMD160 7c553d5e1cea2368f3b7fb721b53fc308635105d SHA1 1c89d3cca7a6f756038791f027f76fc85a234f22 SHA256 d1e4be68d56c45cddd33fd052b5398e32f1799902904c50b950f3af027bdc269
-MD5 ace561271b6ef3355ece7bd030fd2336 ChangeLog 4201
-RMD160 7c553d5e1cea2368f3b7fb721b53fc308635105d ChangeLog 4201
-SHA256 d1e4be68d56c45cddd33fd052b5398e32f1799902904c50b950f3af027bdc269 ChangeLog 4201
+EBUILD cman-1.04.00.ebuild 1262 RMD160 dd7513369b8aad1cc35eabce0c6f4fdf3e75aed9 SHA1 84381def0babfac7ed196d5c3d90765a41a22115 SHA256 3ace9320ad836585a9d7d750ef379a2cee43c4ac0830eea5e093a20d53d4266b
+MD5 495a7d5471b0cfbd1c56d2b93b8fbe5a cman-1.04.00.ebuild 1262
+RMD160 dd7513369b8aad1cc35eabce0c6f4fdf3e75aed9 cman-1.04.00.ebuild 1262
+SHA256 3ace9320ad836585a9d7d750ef379a2cee43c4ac0830eea5e093a20d53d4266b cman-1.04.00.ebuild 1262
+MISC ChangeLog 4342 RMD160 657966908a1e33fd421af007fc25f65ea0e75bb9 SHA1 2bd5d0f57de8b9f7879483322321caa8a57652f4 SHA256 b84af278d1adeb626ea0532deb2ce16a4a67b12583f9c3a24823078928bbbef9
+MD5 bb66826923c44058bd68ae8b2b6db704 ChangeLog 4342
+RMD160 657966908a1e33fd421af007fc25f65ea0e75bb9 ChangeLog 4342
+SHA256 b84af278d1adeb626ea0532deb2ce16a4a67b12583f9c3a24823078928bbbef9 ChangeLog 4342
 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f
 MD5 58f295ba7477091e41340647670f3231 metadata.xml 229
 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e metadata.xml 229
@@ -57,7 +61,7 @@ SHA256 358be21a647dcb0388ec46ddf8044de17a3fdb8c57b0f63e5bcc6340eb476d31 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGRb7EgMUyd/cdjWsRAhYvAJ9koiyi2Sj95h2U1DWrdoWozBaECACfQenT
-Jen7tg/dsmVmjvzSrFQRF5I=
-=scB5
+iD8DBQFGWDXOgMUyd/cdjWsRAigzAJ0aRGfLjeoMtsqPWI1OF0wq23YvDACdHfT/
+7SHuhkPA5kOJer+WHsY3E9g=
+=4Qyq
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cman/cman-1.04.00.ebuild b/sys-cluster/cman/cman-1.04.00.ebuild
index 27db3ee34811..6f7628b52980 100644
--- a/sys-cluster/cman/cman-1.04.00.ebuild
+++ b/sys-cluster/cman/cman-1.04.00.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/cman/cman-1.04.00.ebuild,v 1.3 2007/05/12 13:18:52 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-1.04.00.ebuild,v 1.4 2007/05/26 13:27:34 xmerlin Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/cman-1.03.00-compile-hack.patch || die
-	epatch ${FILESDIR}/${PN}-1.03.00-qdisk-makefile.patch || die
+	epatch ${FILESDIR}/${P}-qdisk-makefile.patch || die
 }
 
 
diff --git a/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
new file mode 100644
index 000000000000..fe5dada4a426
--- /dev/null
+++ b/sys-cluster/cman/files/cman-1.04.00-qdisk-makefile.patch
@@ -0,0 +1,11 @@
+--- cluster-1.04.00/cman/qdisk/Makefile.orig	2007-05-26 15:23:03.000000000 +0200
++++ cluster-1.04.00/cman/qdisk/Makefile	2007-05-26 15:23:23.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ qdiskd: disk.o crc32.o disk_util.o main.o score.o bitmap.o clulog.o \
+ 	gettid.o proc.o daemon_init.o ../lib/libcman.a
+-	gcc -o $@ $^ -lpthread -L../lib -lccs
++	gcc -o $@ $^ -L$(libdir) -lpthread -L../lib -lccs
+ 
+ mkqdisk: disk.o crc32.o disk_util.o \
+ 	 proc.o mkqdisk.o