net-misc/autoupnp: Version bump. Install dummy libraries for alternate ABIs (and...

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

svn path=/sunrise/; revision=11296

diff --git a/net-misc/autoupnp/ChangeLog b/net-misc/autoupnp/ChangeLog
index 8672aa537e6e91372ce19c1d3ec34da677d6c25c..c85c58a61dad3ce0187a0f41d4b13a31bcee2e5d 100644 (file)
--- a/net-misc/autoupnp/ChangeLog
+++ b/net-misc/autoupnp/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*autoupnp-0.4.4 (08 Sep 2010)
+
+  08 Sep 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+  -autoupnp-0.4.3-r1.ebuild, +autoupnp-0.4.4.ebuild:
+  Version bump. Install dummy libraries for alternate ABIs (and setuid
+  fallback if not installing setuid).
+
 *autoupnp-0.4.3-r1 (25 Aug 2010)
 
   25 Aug 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>

diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index 89dee4828d219dcf31c2252a1597922e632afb22..1734d73e60cb92a773a2989bc63805f5750cb7e3 100644 (file)
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,4 +1,14 @@
-DIST autoupnp-0.4.3.tar.bz2 9381 RMD160 4e8795ebe53a78eab49e229b564732de2f119857 SHA1 074aaf5c9e1d3afe7057ba29d0433439ba8dc4d1 SHA256 a339655b53b51d210be9749fb9d0727627378dfcc5cde4d60027a79ad7fcde08
-EBUILD autoupnp-0.4.3-r1.ebuild 1662 RMD160 0c083cb6fb347e8dcdcc078df2dd5daf4f1068bf SHA1 9911c88b7777d581a163499a86a23c6c98e63476 SHA256 a1e098d9c8b22517830fc389f4f9525f3f4a4c7bffadd4e2b9fe947beb7007c3
-MISC ChangeLog 1218 RMD160 4c73ba0b17d3cd18c19694166872a2325141e71b SHA1 c93d10210ff36e7591cf773cfa58ec9588b4805f SHA256 986e8b135f696a3d1105c8b115685f40f0f243baa5b1083dd48fd3860ab8044d
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 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
+-----END PGP SIGNATURE-----

diff --git a/net-misc/autoupnp/autoupnp-0.4.3-r1.ebuild b/net-misc/autoupnp/autoupnp-0.4.4.ebuild
similarity index 50%
rename from net-misc/autoupnp/autoupnp-0.4.3-r1.ebuild
rename to net-misc/autoupnp/autoupnp-0.4.4.ebuild
index 671fea0665a76bc7e56f423ff0cfd0273981d29c..84f9f2520cc4034959683a2a947e16053ce685c4 100644 (file)
--- a/net-misc/autoupnp/autoupnp-0.4.3-r1.ebuild
+++ b/net-misc/autoupnp/autoupnp-0.4.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EMULTILIB_PKG=true
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Automatic open port forwarder using UPnP"
@@ -11,7 +12,7 @@ SRC_URI="http://github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify suid"
+IUSE="libnotify multilib suid"
 
 RDEPEND="net-misc/miniupnpc
        libnotify? ( x11-libs/libnotify )"
@@ -19,27 +20,35 @@ DEPEND="${RDEPEND}"
 
 src_compile() {
        tc-export CC
-       emake WANT_LIBNOTIFY=$(use libnotify && echo true || echo false) || die
+       emake LIBPREFIX= \
+               WANT_LIBNOTIFY=$(use libnotify && echo true || echo false) \
+               all $(use suid || echo dummy) || die
 
-       # In order to run setuid, we need not to provide the full path.
-       # Otherwise, we shall do that to avoid ld.so complaining.
-       local libpath
-       if use suid; then
-               libpath=${PN}.so
-       else
-               libpath=/usr/$(get_libdir)/${PN}.so
+       if has_multilib_profile && use multilib; then
+               local abi
+               for abi in $(get_install_abis); do
+                       multilib_toolchain_setup ${abi}
+                       if ! is_final_abi; then
+                               einfo "Building the dummy lib for ${abi}"
+                               mkdir "${S}"/${abi} || die
+                               cd "${S}"/${abi} || die
+                               emake -f ../Makefile DUMMYLIB=${PN}.so dummy || die
+                       fi
+               done
        fi
-
-       # Generate the clean wrapper script.
-       sh ./autoupnp cleanup ${libpath} "${T}"/${PN} || die
 }
 
 src_install() {
-       dolib ${PN}.so || die
-       if use suid; then
-               fperms ug+s /usr/$(get_libdir)/${PN}.so || die
+       emake LIBPREFIX= DESTDIR="${D}" LIBDIRNAME=$(get_libdir) \
+               $(use suid && echo install-suid || echo install-dummy) || die
+
+       if has_multilib_profile && use multilib; then
+               local abi
+               for abi in $(get_install_abis); do
+                       ABI=${abi}
+                       is_final_abi || dolib ${abi}/${PN}.so || die
+               done
        fi
-       dobin "${T}"/${PN} || die
 
        dodoc NEWS README || die
 }
@@ -56,5 +65,14 @@ pkg_postinst() {
 
                # 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
+       fi
+
+       if has_multilib_profile && use multilib; then
+               elog
+               elog "A dummy libraries were installed for your additional ABIs. They will"
+               elog "silence the ld.so complaints when running alternate ABI applications"
+               elog "but won't bring real UPnP support to them."
        fi
 }