net-misc/autoupnp: Reverse the library install paths to match ld.so search path order.

(Portage version: 2.2_rc79/git/Linux x86_64, signed Manifest commit)

svn path=/sunrise/; revision=11302

diff --git a/net-misc/autoupnp/ChangeLog b/net-misc/autoupnp/ChangeLog
index c85c58a61dad3ce0187a0f41d4b13a31bcee2e5d..bb90345a25d92a9d7609429442d7147981c7bd0e 100644 (file)
--- a/net-misc/autoupnp/ChangeLog
+++ b/net-misc/autoupnp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Sep 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  autoupnp-0.4.4.ebuild:
+  Reverse the library install paths to match ld.so search path order.
+
 *autoupnp-0.4.4 (08 Sep 2010)
 
   08 Sep 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>

diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index 1734d73e60cb92a773a2989bc63805f5750cb7e3..a59a1060a795cc232b63e3c5f0a535253fa817eb 100644 (file)
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST autoupnp-0.4.4.tar.bz2 9477 RMD160 e0a0dd330a989000543d815d586aa2ce7aabe0c9 SHA1 1d674f8a54b0e435e3d496325b21f3ff37521f00 SHA256 ecec483b25ff1cce966c53e75115dbd4cd46d2d883bac02d695d2a5af3ce7982
-EBUILD autoupnp-0.4.4.ebuild 2253 RMD160 43d1fea45d99535327ff8e0f2063af5b9ccbc949 SHA1 84e6492b694a246e60562a6c32fc6d290c19152c SHA256 83f4dfc3c7d8f252a979d70737b05914085aaeaab212aaa703b72357f4ab6cea
-MISC ChangeLog 1476 RMD160 59189abe6bfd69c84e7b1019f80a190a3399c73a SHA1 62d26d78303e783e0b9feecf081f310154b48fe4 SHA256 a88b858bd25a439f7b50bee8b1e52e62fd820391d9361e47fc262b2119a18c62
+EBUILD autoupnp-0.4.4.ebuild 2285 RMD160 10df7c963ac0470e4b82e5718d2ddf71a9edaa47 SHA1 feb05ea34b70f22cc0e774f0f9f740a4bb623d31 SHA256 ab4c84104b05cd631883b1bbd0c8756d53f3c3e77f2515c5f60e19a202288f47
+MISC ChangeLog 1636 RMD160 cb674ec22c54d611037350811804da075c599278 SHA1 c48c3b2cee7be45d4affcd672b6898faa815a02a SHA256 0ee5689d52eda79f9ad665d40301c8b3110fc027187ebee1f2acdb5d24baef3f
 MISC metadata.xml 377 RMD160 7635edaed612fe9ecc5b01fe986d5d60b27c055d SHA1 bd0de857fd4e40fbc5937f6118a9a5558d487997 SHA256 9338d81428ef9dc8fa32fe5f0f3da699513c74abc17a82bf9030157a1c01c7bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyH0tgACgkQnGSe5QXeB7vuTQCdH+x9BRaHRbvLuTpXjRB0xWUX
-7ccAoOW3KhYc8Z4b1bIlfvZeA/cBXZGT
-=uQZM
+iEYEARECAAYFAkyMlowACgkQnGSe5QXeB7vFIQCgn8EYcfmnbMFMU1aaNRmbETO5
+NesAn3Gh1jNtPm9DnOzH2BRKwB1ekU+j
+=XarM
 -----END PGP SIGNATURE-----

diff --git a/net-misc/autoupnp/autoupnp-0.4.4.ebuild b/net-misc/autoupnp/autoupnp-0.4.4.ebuild
index 84f9f2520cc4034959683a2a947e16053ce685c4..ec2d7b082c9eedbe1b45ab042a9699f439bf2ae2 100644 (file)
--- a/net-misc/autoupnp/autoupnp-0.4.4.ebuild
+++ b/net-misc/autoupnp/autoupnp-0.4.4.ebuild
@@ -39,7 +39,8 @@ src_compile() {
 }
 
 src_install() {
-       emake LIBPREFIX= DESTDIR="${D}" LIBDIRNAME=$(get_libdir) \
+       emake LIBPREFIX= DESTDIR="${D}" \
+               LIBDIR=/$(get_libdir) DUMMYLIBDIR=/usr/$(get_libdir) \
                $(use suid && echo install-suid || echo install-dummy) || die
 
        if has_multilib_profile && use multilib; then
@@ -64,9 +65,9 @@ pkg_postinst() {
                ewarn "is discouraged in the terms of security. You have been warned."
 
                # need to work-around Portage behavior to make ld.so happy (bug #334473)
-               chmod o+r "${ROOT}"usr/$(get_libdir)/${PN}.so || die
-       else
                chmod o+r "${ROOT}"$(get_libdir)/${PN}.so || die
+       else
+               chmod o+r "${ROOT}"usr/$(get_libdir)/${PN}.so || die
        fi
 
        if has_multilib_profile && use multilib; then