Fix overzealous sed that doesn't apply for <8.4.0 wrt bug 409981 by Marcin Mirosław <bug@mejor.pl>

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

4 files changed, 26 insertions, 21 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index a940a0697ec3..efe8a326dda7 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.117 2012/03/12 20:47:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.118 2012/03/28 14:07:24 xarthisius Exp $
+
+  28 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.12.ebuild,
+  drbd-8.3.8.1-r1.ebuild:
+  Fix overzealous sed that doesn't apply for <8.4.0 wrt bug 409981 by Marcin
+  Mirosław <bug@mejor.pl>
 
   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:
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index a28c72bf14d2..87a5c62ea8db 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -14,27 +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 2215 RMD160 2ce4f4091a6dbeccbdf3fe1b23ed5c6cd8e7b62e SHA1 c0dff0fff44563755c9cd65aa3698ca3bb37482c SHA256 17121bdf649d1c304b202352d272e1525a50eb5363dee85e4a11be4485d1e279
+EBUILD drbd-8.3.12.ebuild 2205 RMD160 a5f96bb841459cfb7057c46ba674575bb705fdc6 SHA1 e746c933f3b0dac1060d4acef5ae97d143436529 SHA256 38ca6a114ab559090574d61d846b85055a3dd0afd3abea5eb599c69de097d737
 EBUILD drbd-8.3.7.ebuild 2076 RMD160 16bc5f418604ae7a2580c27268775ce100d8c76d SHA1 bf9daa3035fc7e4fc60cbf92c1ebd7b010b37415 SHA256 76f34c9ad9a17b60d43bee1211502470a42b88c557503435f324d6060c93a188
-EBUILD drbd-8.3.8.1-r1.ebuild 2178 RMD160 1f2cc3bb9a84b0aa0b971d528b7bd395af4b76f2 SHA1 f9acde3e3f73894c3454403374794307fcc88d67 SHA256 04b1d8456776396b8961c12c551a1efee838156aef1ea0b34a4ac46a6606d1b1
+EBUILD drbd-8.3.8.1-r1.ebuild 2168 RMD160 d96556b9b4b968942f100bcac7a9c3c9b99e503f SHA1 85a0714eee2c0c65e684616f66f89b4989eb64b6 SHA256 9f7739f3a05c220105bbbefadab63aab7e5d459c5ad41b0a147c78c6af091dbe
 EBUILD drbd-8.3.8.1.ebuild 2073 RMD160 f5e66a8a70d356d015c5eccbb6783e4f6b5db304 SHA1 ad2c52dac581e09aefa87a2134f4e51765b700e9 SHA256 bd73c0884df20eceee446c2bf93a226c7b93463f5b2e33d43d6a68193eb40826
 EBUILD drbd-8.4.0.ebuild 2214 RMD160 a8a0939dfc96f429b42e421e5a6e39359ec9ba84 SHA1 b39cd1efd646e1c2d18c48f124d1e8121155303c SHA256 b1b5f1381929a670206990093af9e4eca501ed3c18bc591c3793e3cd11a3851e
-MISC ChangeLog 19016 RMD160 afc633d4fda131da65adb82c49ed5291ba562b94 SHA1 8b514b7b7ce5daaa43b531411d0e00f08f480ae0 SHA256 866f6ca8a7cf23822f7e85f1915134156010bf376d3b608538c6afae01c3a4ef
+MISC ChangeLog 19221 RMD160 e4b2a28b4f22a3015f5bf1b33bcdd76a191a2a83 SHA1 7cb620e5803d4510d57899838a9cc84667133a21 SHA256 379c9356340b7eeccf328380ff81787b892b075c66000a24c97ece6b9294578e
 MISC metadata.xml 584 RMD160 38a46e5acabf3eebfaf8f695954236f3ef650a48 SHA1 cd346598b1aa1a0b6b83a94c492e9aaf0f0191fe SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJPcxsrAAoJEF0huFKJUZL5WbMP/jBYkVI6voCna6hgaIpX0/0Q
+qy3RsATFeZ2STdIjmEJcTT3Lc1CooSPrVaYKk8rEnKXBbyp4jtzQr560WHnRVJow
+ADJKMjVeyY8onxzMVVCzjoGdcQHa3mO9WyWMCTPmUd4scfyAmuGChxYJij+VOL+2
+PbsrTh6el6gsCCAMwBuh+Qo+QIMau7ZRu79Seo+4D3l8yviKhJOwo0evGfoKMare
+ZzR8PycDWPnzaGNgA9uqpw10LWrEgwEMussudh36CSpL8QbThz/TZVVOwtnLlFmT
+NQ7XCmw27Y27Wx2otkhs6dLcAKLT1WSBgGMujxqa9XYJbv+3v0s69K8OSOCxcSXt
+46WC/CSfph8Li/V0H4SP9FVELj/M/bw+7WuF3WkCPfu3YJC/ky44qM8/Vz8VLxq2
+1YHOuFNLidwshugfN0RBxmqhJYMXJQXtKfvqfNTYE66h1T6vQPgRu9tnkHGNgQDF
+kZM24ZMjlzpn19snbnOtc0lKwKy3L+BVhyyK9ngU6LkcQbfUTPTsZ7lAV7XTgAag
+08EGN+recc8Pma0sN751Q+KntcYvdgEWYPN3d+EqY3/10McOUhd0rWyImlqrCNLn
+SpvNIJw5wr8RJYhDPQ96GYk12pWoDRN1aB36c5tTHcMSa3xiHXblLu8Tb8DAmb6k
+NUJjEIhvXMClpa0OZsg7
+=yTJN
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
index 7806c795b8a2..3e276c408b80 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-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.2 2012/03/12 20:47:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.12.ebuild,v 1.3 2012/03/28 14:07:24 xarthisius Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ src_prepare() {
 		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
+		-i user/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 5e720b4eadad..e6f718dc1735 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-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.2 2012/03/12 20:47:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.3 2012/03/28 14:07:24 xarthisius Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ src_prepare() {
 		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
+		-i user/Makefile.in || die
 	# correct install paths
 	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
 		scripts/Makefile.in || die