Extend multilib fixes wrt bug 407961 by Robin Johnson <robbat2@gentoo.org>

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

5 files changed, 42 insertions, 19 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 0c2959226fd8..a940a0697ec3 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.116 2012/01/04 17:42:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.117 2012/03/12 20:47:00 xarthisius Exp $
+
+  12 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.12.ebuild,
+  drbd-8.3.8.1-r1.ebuild, drbd-8.4.0.ebuild:
+  Extend multilib fixes wrt bug 407961 by Robin Johnson <robbat2@gentoo.org>
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> drbd-8.3.11-r1.ebuild:
   x86 stable wrt bug #396207
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index cf46830fb023..a28c72bf14d2 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX drbd-8.0.rc 3142 RMD160 76eeebb512522c83f117677125487e30a6fd02c5 SHA1 48ab646f47880bd2b08016b4761dfbff4659adb8 SHA256 52844735effc91bdcde18d15c98de0353dd8832d1acde0022a78e4b9e7a46b47
 AUX drbd-8.3.11-kernel3.patch 762 RMD160 b6eb80aa419a799cbc83f32b1a16feb86a23c5bb SHA1 7c3c9b58e8e05fed30e577a6e213e271bbfbf43c SHA256 cec36f41078c6c5824733731c82532cfbc0cdbff97f1995345e8266b755985b5
@@ -14,17 +14,27 @@ DIST drbd-8.4.0.tar.gz 650733 RMD160 1d128cf42f6a2a32d82d6976467284b5f938dd3e SH
 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-r1.ebuild 2064 RMD160 2a21b54393cd405318261bef1f6a4421540a5054 SHA1 7f2c72c662c64d0d984ab65809b16aae1e6266e5 SHA256 0cb205d355b4a7f0923f88c22784aa5364730d588e43f7282e08db0006d4e2d2
-EBUILD drbd-8.3.12.ebuild 2061 RMD160 3199a3e9364466e890a782986ce5601d52a07557 SHA1 d7a82bb23abb71e55ef80e85b931ca95875baf74 SHA256 548a60f2353c3283c68d58102aa97ae0d318df1d2e95f4209a11110d5a0af6da
+EBUILD drbd-8.3.12.ebuild 2215 RMD160 2ce4f4091a6dbeccbdf3fe1b23ed5c6cd8e7b62e SHA1 c0dff0fff44563755c9cd65aa3698ca3bb37482c SHA256 17121bdf649d1c304b202352d272e1525a50eb5363dee85e4a11be4485d1e279
 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-r1.ebuild 2178 RMD160 1f2cc3bb9a84b0aa0b971d528b7bd395af4b76f2 SHA1 f9acde3e3f73894c3454403374794307fcc88d67 SHA256 04b1d8456776396b8961c12c551a1efee838156aef1ea0b34a4ac46a6606d1b1
 EBUILD drbd-8.3.8.1.ebuild 2073 RMD160 f5e66a8a70d356d015c5eccbb6783e4f6b5db304 SHA1 ad2c52dac581e09aefa87a2134f4e51765b700e9 SHA256 bd73c0884df20eceee446c2bf93a226c7b93463f5b2e33d43d6a68193eb40826
-EBUILD drbd-8.4.0.ebuild 2060 RMD160 a70707f8d58900a572969a5b3454d7e3bc77dc25 SHA1 0a08e03d0075bf3b31f45367d8fd7d8f96e7cb70 SHA256 bbf207134b9ef5498d19b34d10e6c2d294c0f0867638d698bd7d017751dc5c2e
-MISC ChangeLog 18819 RMD160 6d47602170ebe981fbc38bf47390a072d4d1394c SHA1 a78ef886aef4add06913a917f3f319db2d030f0b SHA256 b7a5f55232f0eb44e1421fc4eebd03d26d45b272494f838264b26c3afcfe02ec
+EBUILD drbd-8.4.0.ebuild 2214 RMD160 a8a0939dfc96f429b42e421e5a6e39359ec9ba84 SHA1 b39cd1efd646e1c2d18c48f124d1e8121155303c SHA256 b1b5f1381929a670206990093af9e4eca501ed3c18bc591c3793e3cd11a3851e
+MISC ChangeLog 19016 RMD160 afc633d4fda131da65adb82c49ed5291ba562b94 SHA1 8b514b7b7ce5daaa43b531411d0e00f08f480ae0 SHA256 866f6ca8a7cf23822f7e85f1915134156010bf376d3b608538c6afae01c3a4ef
 MISC metadata.xml 584 RMD160 38a46e5acabf3eebfaf8f695954236f3ef650a48 SHA1 cd346598b1aa1a0b6b83a94c492e9aaf0f0191fe SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8Ej6AACgkQuUQtlDBCeQIGSgCfSQ0hEvgq7MGLRhEFTNRixhhm
-QO4AniVqO6Rd+wRaAMwpved8fGsLsYPf
-=i8AV
+iQIcBAEBCAAGBQJPXmDOAAoJEF0huFKJUZL5KzMQAI9KwKX2Ils1BiH7WVWqBzHY
+KHVu3GEkfLriIRhRKNPZAjV1KS8xkqaw0DzTkCUdZmwoCRZQ+z7YuPUFFpawvARe
+rK5llcgzOwNOEZ+vGP376EyJgHap54kpt/scULoqpV+oSTuPAlEhTszvsFRyEybm
+G/Xxav1kenMNqnDghw0EN4olWvJENYUOaffMLnu8/HdZ0H2fSkkCimUZxkHUDKUk
+8ApGF9WbErFHYUbeE5JXvqlen5NOEsWxTuuYQrKzbcQ6IePZrvDCyg9eWEH9EwLW
+CfHZsPKHf3pNoTBXm/KesCcRdgpFeGxUFWMXUtQc3OW1cCLw8yTfufSQCqFslz3V
+wboH6KJz1nM5KvgFmIbnZwmjkEk7XPoJjNfr/K7aGEWz8uiWwCF57MYW1LwHz3zF
+d8IjJGy/CiTdLgP3Ca/kZV9f323tvCxyZogtOCnHG3ypVDUl0n9dF0zNIK79GnaN
+pbAHm386lgwgxUw3fh6PIXzMZOdKdZx8Lcevn05Lw85IE/758ixoOn8kLJJ6P/iT
+wkxUm2DdaOjGMgD/FhNKK80OQCYp0h8awAAW+GQ65BYQ4bIEdN+tgWOEtPCB4Ge3
+iIX55O0+uFFwHbGCAYcId3XFI1GK9dAf3hdgMIRQVuTzgZFaLkBKLxF6leWMp1Bg
+lqPMak8gu4upgEAelMwX
+=7RXA
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
index 34dd1f38d9c4..7806c795b8a2 100644
--- a/sys-cluster/drbd/drbd-8.3.12.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.12.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $
 
 EAPI=4
 
@@ -22,7 +22,10 @@ src_prepare() {
 	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
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/{,legacy/}Makefile.in || die
 	# correct install paths
 	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
 		scripts/Makefile.in || die
diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
index 4e462e31b5d3..5e720b4eadad 100644
--- a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.1 2011/01/18 18:55:33 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $
 
 EAPI="2"
 
@@ -21,7 +21,10 @@ src_prepare() {
 	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
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/{,legacy/}Makefile.in || die
 	# correct install paths
 	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
 		scripts/Makefile.in || die
diff --git a/sys-cluster/drbd/drbd-8.4.0.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild
index 25554893f3cc..bfca13b6de18 100644
--- a/sys-cluster/drbd/drbd-8.4.0.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.0.ebuild,v 1.1 2011/11/03 13:24:53 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.0.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $
 
 EAPI=4
 
@@ -22,7 +22,10 @@ src_prepare() {
 	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
+		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
+	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
+		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
+		-i user/{,legacy/}Makefile.in || die
 	# correct install paths
 	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
 		scripts/Makefile.in || die