Fix as-needed error introduced in previous commit. Fixes bug #413171 by Harris Landgarten

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

3 files changed, 23 insertions, 18 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index bfa17ca00321..ff4ec8a69976 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.42 2012/04/21 05:29:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.43 2012/05/22 15:01:19 xarthisius Exp $
+
+  22 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  files/multipath-tools-0.4.9-build.patch:
+  Fix as-needed error introduced in previous commit. Fixes bug #413171 by Harris
+  Landgarten
 
   21 Apr 2012; Mike Frysinger <vapier@gentoo.org>
   multipath-tools-0.4.9-r3.ebuild:
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 831e63a46f67..69027699dc5c 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX init.d-multipath-0.4.8-r1 990 RMD160 7ae4a8decafaa6fe226a37b658e7e88a9be04aea SHA1 4af4d8242116835eeb4627eb10087b3e1b3eb3e2 SHA256 4b6e4d09828c58fbe7394c33d7950a54ecd2ae48064594e2117516367119f677
 AUX multipath-start.sh 763 RMD160 ed533183995bdd24c7f0118c2bc7a25ad9c064b3 SHA1 e571a7e60587df14960db6d0c327730532ef3b73 SHA256 523398049d7c2f640355d7552c2fefe064b9026f8796e4ffe8b71acdca80a01c
@@ -10,29 +10,29 @@ AUX multipath-tools-0.4.8-r1-kpartx.patch 7076 RMD160 a5933b1a143fb7817e991a4a26
 AUX multipath-tools-0.4.8-socket-cve-2009-0115.patch 848 RMD160 4e4298b87c60546b0d9ffad54f2070f386e34625 SHA1 2dbc4afd69df4d5227d9090e00e5b7d041eb1ae9 SHA256 2ed8234f7d37fbc4cd77dcf77e71de3bdbcca2bef6726e1f1a99d46878ac3a04
 AUX multipath-tools-0.4.8-udev-scsi_id-changes.patch 4125 RMD160 e7f6feca014bf462c0580caabedc73152e423e3c SHA1 bd8b5f30b0cbda8a3d15b3a2383812d58a5d7ced SHA256 dca166caf506ea496f7cb883a98d1b5b1c77f5a91afa343e1ddc27d2a89ef0e3
 AUX multipath-tools-0.4.9-buffer-overflows.patch 993 RMD160 095c502f5df6bc11d933a73c4b01e22ec039b5b5 SHA1 713c5238c0953ea52c2577357eb4928c5f574ff0 SHA256 1f9ca1d26fee69dc7d5c1b65a835d23e1b8dd8de6fd3678faf3e7b499611d15d
-AUX multipath-tools-0.4.9-build.patch 5564 RMD160 54a9d46cee18a819656b31767e3c973b10b3b6b3 SHA1 d919648196917e8f86589bd217d32a5fb33f16ad SHA256 bc1bcfe564ba8a59667d2262fc6f87cc0fee7727fcba0102a6b8890a386e170c
+AUX multipath-tools-0.4.9-build.patch 5564 RMD160 57363d433f3bc43761251585b0d5467ccb3df1b8 SHA1 9730695328dd131ac3e0da90454a8e5e94bf9fb7 SHA256 2a412dad4ce65fa554799fea3dad70fdd0bd26dad850e6890474ea4cd1016d83
 AUX multipath.rc 622 RMD160 8c0ac06f0d6cf18dfe499487120a7e963bc82444 SHA1 54eb3e4f1aaefe7e5b32a78d7f97cecdc6b1996e SHA256 9b68396afda8114610058d456318dc201a4d8799fb1d0504538e34966a7fd3d8
 AUX rc-multipathd 517 RMD160 9963ca90fa08c6631b7768df7fb99414de53343d SHA1 a2c7c8c8836360ca208bfa82c406419c16045be2 SHA256 d96e3d7ca1edbbbc92f1336d4c340f1b516e71c49c85e990e3f4063c1b5db241
 DIST multipath-tools-0.4.8.tar.bz2 160706 RMD160 18a6f2c8180516c67bc7c634133218213cfa7dfc SHA1 aadc7c7ed072c3df2e32c64a2ab1ba7fac850d7a SHA256 b76d93d244f51e328969203366939d4336c89bd572e275d6a0d50d0bc8b4cd23
 DIST multipath-tools-0.4.9.tar.bz2 169180 RMD160 54b178ad23cefceb6b42131bd7079c226c568a0d SHA1 e2263033934f9073962e7e54b42824355291f19f SHA256 8d44c8815144b5589cc3e604cb3fc16c76a028aef08aa1bec334ff70bf9ac712
 EBUILD multipath-tools-0.4.8-r1.ebuild 2779 RMD160 a55cc868ed8b8f5828fbb0933de6a3292fbd8db3 SHA1 6e4e825ff7789a36ec617edd45634bf5404d2418 SHA256 caa5b8d68141b82919d29cb05f1af70c48c7e6ccba5c5931c08ea19886925c0f
 EBUILD multipath-tools-0.4.9-r3.ebuild 2129 RMD160 c05f3c08c249b0e27a25b75dacb9e556e0c1ceaf SHA1 ab33f30ab4645e691ff4b9b6600d55459d28babc SHA256 5d54a15911cce8e39351d5de50ab9e23acaadf95c5faaf59b9e4b5e63fc7d6a5
-MISC ChangeLog 8084 RMD160 8fc782813ec3ebbde1c35565cfd6f09711e3a16a SHA1 82baa4cae61f6851bb3e878b4f801df518f5d3ee SHA256 e366d071d7d1a46c22f8ef355aa85745524f42b93530059a711f201a54077d78
+MISC ChangeLog 8280 RMD160 759d21cbf102ad15dc1edd5b01da113346ee5cea SHA1 3b293759614a030555437c7299c0f5310ab387ef SHA256 e9b5cb8eb79a6bbd236a5afb86bde27718ecf56cfb8d3ad69ec86c4809e0e9ca
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPkkYWAAoJELEHsLL7fEFWKs8P/0KejkNVQQiogCJgh9P/JZn8
-upYCMHgpN7ac3FKwVjswiTtceIkjIFNSFR0nt9BIv7poWvCL115cVoFC4nt9QFWU
-Mnp/yXZZfa8OL7vrviB5GnWLy1+ZIx35hT5AtI3Zy7ntB+O6vZGQfT58tr8V9uwq
-RPcvpSgURv5TFsaDpa43Zi3YIDm9WuVbkaDxZgzSxnPYsD0SRaf9PgeDCtaYcjWe
-6BuM0TscMCj+Xe94TtCiColxjBr0Bi+ruSEDUqhqcGOd6oLo8tQMklaQA/3KL8k4
-bm/yawufz0/1Jd7iYJeqUWCREurMvM3PldTKJhBiUNhJYD7BBoowc7eIEhl/0LrX
-pQKTN6B4kHGaK3IHxuTWIgSUvD5RiCM2DGD/hPg2uReH+QRBCfzrm7m8BiTQhLas
-3PHTZIUx4zL/TruxhZXTV6LHL7tTSLbRn6s7xGLYBz6SyX4svc8XLFsi+UV0O+jA
-xsJEUntdydP/IJlaUv42bXb+q9CZsUvcs+FE/Ycz7jBBjbVZrCl4lYFFU6VLHKKt
-bd2viOv4ITPsQe6An09DYx20NHWZcOsWacRDInvM1csXbHryO/3Oxn8u1Px4QQNn
-f9ALhopTAGP0WfP3sqtKj/hOJ+p4bq98oufkWJKZfc5Lwp8ZjHXNqUGdzPzYUKDu
-1l8LBaDNOTKbXRM9g5qW
-=Jpz/
+iQIcBAEBCAAGBQJPu6paAAoJEF0huFKJUZL5ffgQAIgqy+VE6IncbKyRfxeT5OXH
+k/UgqtFoaAWol+o/3jzddXybxXUcgEuNYdCflxBeSWIWndOfYoxm0e4PG2EIoDaG
+zmo+uhSa5nnu4LdwTuju33LSjA6pJ041RH8ZFU8uDu575CJRSeadwvzEP5jwm1HA
+5J2GXLJLa6PTtBmLHsR4xvYj7aJyaLDwfSfr+PvdMl0jlQnWJ1YgCq/CXNZ9yYeN
+cMKzl/SoRP8igqxU38XqUuUtFredUgq4vlisvfVtah3CCgyCCw/I1tIvSoPRvTV3
+63eMvo5EbziQJksAZDmt29mFn92+eLk63OBF3HBESoOaSZZzjwsINiCqrHi1nWUU
+PsiXzJRR4naxqWk6gYWD9ag+NIhD/9KX9SG6zmbOj9TWxL4DvFugGmkgzRHua1kY
+9Jb40a63U9fqOD5R1g1gu5/XCUFwVFwee9k/mdt/dz1u6RD10uJC++ismkyzF3N8
+JjrLt1WKk+hNsWbTp4wOkw+UrzkyqQKlQHmpVCEij/xhPkmE2GKdmqDznaqrMBP8
+xL8IlHinQ76e8FPTji7Q5X/4AqYTqG4pFYigBab2mPtKITFBVg6WCE06eTaedFLj
+oykspujYqjCrtmKQnazXNT8MFafpSpEa+0s6AtjyxXWHjjm7bW1IRyibyDNPiMBw
+7YKu1PIbE+OLkpG092qI
+=17UB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
index 60faba149fea..11636b4eb68d 100644
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
@@ -145,7 +145,7 @@
  
  $(LIBS): $(OBJS)
 -	$(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
  	ln -sf $@ $(DEVLIB)
  
  install: