Don't install broken .so symlinks (this forced linkage with libpcap.a), bug #312895...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 58ec134f7ea415f8873f4a91c42179fea7f48229..485f85ed8ad1ae644b93bfbb179e3ba0112bbc57 100644 (file)
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.135 2010/04/02 05:58:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.136 2010/04/04 07:30:38 pva Exp $
+
+*libpcap-1.1.0-r1 (04 Apr 2010)
+
+  04 Apr 2010; Peter Volkov <pva@gentoo.org> -libpcap-1.1.0.ebuild,
+  +libpcap-1.1.0-r1.ebuild:
+  Don't install broken .so symlinks (this forced linkage with libpcap.a),
+  bug #312895, thank Davide Pesavento for report.
 
 *libpcap-1.1.0 (02 Apr 2010)
 

diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index d6de72a3853361c791ac4ce3958d88702dc305b5..1a3b2ef2cd102ca64b586682e97aae07f14ef551 100644 (file)
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -25,6 +25,6 @@ EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769
 EBUILD libpcap-1.0.0-r2.ebuild 1742 RMD160 c8cfe56d24f6ec5f36db1e5d7a78db07601067fc SHA1 8b5f1ff186e1c70d5c7fa3156bbadf71a6e5df1d SHA256 54d954551f24a905f5a1c7be53e9da380fe98f0757af51e1a7d1fd37d5e55de6
 EBUILD libpcap-1.0.1_pre20090708.ebuild 1803 RMD160 094bab78977034a4ed4b0d6e7c3fdb240fe64a59 SHA1 03aff6a3ddb8d1e95bcc88052a36eb14fe3ca970 SHA256 cf80f44afc13d3f19dacfbcd32ad45e4598c4b8a8f2f7359e650171c29c88969
 EBUILD libpcap-1.0.1_pre20090812.ebuild 1985 RMD160 674a3e2bc35b129633b9b9a926af6d0af174c48e SHA1 1912b6bfcba993ebf75ba329880539e3ede4021f SHA256 d05afaa7104e00abc5789e386ec1bf4c8c52ffaddb86c55391cbeb55633c6536
-EBUILD libpcap-1.1.0.ebuild 1776 RMD160 a38ce3d3847c27474261f918650d633bc108957f SHA1 1dce5f5a87c63d94d98d195034924ca1d5088598 SHA256 3c2b8f1c142d565ae276d390e5d9101f929066cf4de1186df56839a0c8cc4c18
-MISC ChangeLog 18253 RMD160 7d95f08b1fe5c8a0dd32fa83953f6a19556d34c3 SHA1 2147e7c64b1d3d77b8df081141266b90730d048d SHA256 87049ba42417d5802688d4cd85166bd347c8b06aeda5d3fc55f69f33ad04562c
+EBUILD libpcap-1.1.0-r1.ebuild 1609 RMD160 5b9ba9a5cea5d18e9b97e6edb44d27a345ba7c74 SHA1 058070d12058bee17b853a46b5b02c6bd222d949 SHA256 6983e08ffc79b23153c0252b1269171091aae1bdaa5e9acdc8afd4ba667f2c7f
+MISC ChangeLog 18507 RMD160 54eab657d400aa10d916d147c9f9bab0ed09b491 SHA1 129057172d2b3b3d64c81f36dddbac0c6f62bc1d SHA256 f3dc15249317fe5ad12e3bf40086c27b29f230003810acb2d92f60e3d179c563
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0

diff --git a/net-libs/libpcap/libpcap-1.1.0.ebuild b/net-libs/libpcap/libpcap-1.1.0-r1.ebuild
similarity index 84%
rename from net-libs/libpcap/libpcap-1.1.0.ebuild
rename to net-libs/libpcap/libpcap-1.1.0-r1.ebuild
index 8772c5a1998cf105a696dc7aa3681ab16de8e1e9..446c7afcdcff4fdd4139b2d6a096e25276971502 100644 (file)
--- a/net-libs/libpcap/libpcap-1.1.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.0.ebuild,v 1.1 2010/04/02 05:58:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.0-r1.ebuild,v 1.1 2010/04/04 07:30:38 pva Exp $
 
 EAPI=2
 inherit autotools versionator eutils multilib toolchain-funcs
@@ -41,10 +41,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install install-shared || die "emake install failed"
-
-       dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname 1)
-       dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname)
+       emake DESTDIR="${D}" install || die "emake install failed"
 
        # We need this to build pppd on G/FBSD systems
        if [[ "${USERLAND}" == "BSD" ]]; then