EAPI bump. Clean up patch. Add USE=static-libs.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 24 insertions, 32 deletions

diff --git a/net-libs/libsmi/ChangeLog b/net-libs/libsmi/ChangeLog
index 76690e1a0e84..38b8ee576eca 100644
--- a/net-libs/libsmi/ChangeLog
+++ b/net-libs/libsmi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsmi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.40 2013/01/22 05:47:42 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/ChangeLog,v 1.41 2014/07/18 15:31:52 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> libsmi-0.4.8-r1.ebuild,
+  files/libsmi-0.4.8-CVE-2010-2891.patch:
+  EAPI bump. Clean up patch. Add USE=static-libs.
 
   22 Jan 2013; Mike Frysinger <vapier@gentoo.org> libsmi-0.4.8-r1.ebuild:
   Mark s390/sh stable.
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index c9aec1598c09..4811a2cb60bb 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libsmi-0.4.8-CVE-2010-2891.patch 589 SHA256 eba2a999d777c7c377bd231ae230e80a8291c65a1d70b8917f06109ff770aba8 SHA512 21bd65516de561df8ed0f9f35baa40979d0752e2aa1633f96238d3d10d9d950e34257de034f8e938ccfc576ca15e03bb1021a122aa9a283b0fd01fac1dca24e8 WHIRLPOOL 5d496c24ea0bd3aceffa8d3a07a7d71ec925ad0142faa42c6c765699576c7ecff9bd47af19961a2c564c9247f424d45bf98637f1c4178743aadb265f14ef0af6
-DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849
-EBUILD libsmi-0.4.8-r1.ebuild 1108 SHA256 b6277ebc70bb777dbff021d311ed66afd1ba313c11d43290468aa05210edaf88 SHA512 d41c101e9cda61c598caf825185927e7bf7aa6e0db05b55a4f89a204442f093e59f957341db32e40cb92fa1938c2dc8289bdee3e4a3a28a844feb3616f96412d WHIRLPOOL 4c354b220cd376790ffb94a276dd16d0f0bf39776ff37f39822f81931fa100ef44140742d79dceded531d3ac92bfaae712e05c0e772fea08ee6f24a1a2051b58
-MISC ChangeLog 4662 SHA256 02e38c47a495fd061e8bcf4859dbacce25568a8e170215a2b4a82a2f2478bebf SHA512 5de8e074ed8c19897db1afebe709a0f3126aef18626dd1d49ddf0f3d82b0d814ca430a34b5337f8c3f8cd898799b8f09cca661fae83dc19a50ebaa16cdc9f481 WHIRLPOOL 6651c06a026033c0a7d8a59262756cce11f943bd94a2c56075bc5e2863125ef079136ff656ad9372e21cde6a1a2ea80f6708ce59621f52888d811c7466a4a9c7
+AUX libsmi-0.4.8-CVE-2010-2891.patch 476 SHA256 1ac2b62d079d88e9543e903bc407f42e9dbf21ec72b195a4be06415a99ea21fc SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f WHIRLPOOL f120c2beb35aa416c1c39c352c8d346de46047b7fa13d776a9c7e0115bccfb2018c4d994f210be18060fa52a5366bfdebc98bf2c96b223a278e9a16766ee5b48
+DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863 WHIRLPOOL 33523c5aca6792c3ec08be748ce976046693188e61770db99c01a030b66442a387729c99196729efcd5a03c778f0263452a833a40add7173d65c4a9f51a6d842
+EBUILD libsmi-0.4.8-r1.ebuild 1095 SHA256 f36119600a6ef35ba8c68fcafc5678c525c202828913fc6e399323abc92fd972 SHA512 1a3bb3cec0717173ea5c30cbeaf5069243442e5d203a5ecddd548ba296fd6e328e0a61d3119d1ba3f90dc0c852cfa27cea9d8c2b7657587363f49ac3f53a96f8 WHIRLPOOL d6e11a2c2c6d1cd909422de4f1e998c3c373f016365ed6c252cc901002480554556ab0703f1fdb141e02706210e4106b8a761c7122a22c4e51b634a911639809
+MISC ChangeLog 4823 SHA256 8a1399e15b88402605b6312e93f285125babe4b83e8398d67c7ff7068af3daf0 SHA512 fa2e2d664cd56db6a9b6fb99ab94389288f82a9fa30d1f76951aad9e4d2428feb178dda28d7612cbd9026bfd89875620cf5ec615ba478526d0180298971b30c9 WHIRLPOOL 177289f04c95cf5eb75d559aca506dff5ee3fc4eb34875e43436fdde31ee5a809ede049415e78b93e8360c906e0a709bf8d0a5bd985083ef0575c0f80220e4ba
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQ/ij0AAoJELEHsLL7fEFW1igP/ijXXzHOMzg5csczGYvvMm1e
-poboVO2i8nh31vX8HXlxSevnjpwvvLhLzs9glAC93SfBVeyuWCfVu4vr2h0fwgYN
-QgrW3exzU7/H8nagnbMG6EmDUMc7AEDuJEbQdKzJ5OxlOm+Ks55EnUTujKWT9FzC
-Bf9FlrRf0MfVPa2DSKWdsjHVkqdJg32E5fKmGTUtxVcw3dUyrDOo/f8rUGaJsTmD
-ex1uvareHo7cdsfHxfxBSailNYCcIFJ3ICnTJmMY/xZcu6m0/fnsFqrdAowOYDSs
-l7zfluBTePQUIA+wI53HRVXOQF9rf5ecsMRyMp2WXZkaxxjixNdc4z0WaU7lyFNx
-OZ1aqtqulTUpLnhtIX5M/2XEJNmyph2hjDovm+zT3VQdet0pX6YFSWzLU06kJ/Oy
-ZJ/zgjW/0omh+S35nkujYPrV0QLuouPtKtNb8XCHZLd/gpISDeFVBJk1L46pCDz+
-DCQZDP6n+lA9vdomFW9v38BE2ikz5fME1cAyvoKZhn/Nb0G3eiMuTqdN3Q0Gv181
-7pdtWUTIO3zJdRCx96r8g6CA2yzj4NMU2T3301XKAJ8ruqTj44m/EdTzWnQ1e+CI
-9JVBld9CzotRkO9UgJ3uc/7constoFDxj1ug5hkXtUnwGjXvaPceehjjlaDXdpA8
-h3UcR3Dsb6sKmxDD8pZ2
-=B3IU
+iEYEAREIAAYFAlPJPeoACgkQVWmRsqeSphMXcwCeL3kMGC1ZPtUIrjJ7NfQiJpHg
+BL0An27WsB6GO9MthOHZOOH/F/u35T16
+=7dgJ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
index 114431d00e31..8c5e2f97dbf4 100644
--- a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
+++ b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
@@ -1,7 +1,5 @@
-Index: lib/smi.c
-===================================================================
---- lib/smi.c	(revision 29144)
-+++ lib/smi.c	(working copy)
+--- a/lib/smi.c
++++ b/lib/smi.c
 @@ -1793,10 +1793,15 @@
      }
  
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 129bc6289d05..f4a4bce05833 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.10 2013/01/22 05:47:42 vapier Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsmi/libsmi-0.4.8-r1.ebuild,v 1.11 2014/07/18 15:31:52 jer Exp $
 
+EAPI=5
 inherit eutils flag-o-matic
 
 DESCRIPTION="A Library to Access SMI MIB Information"
@@ -13,7 +12,7 @@ HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
@@ -21,18 +20,19 @@ src_prepare() {
 
 src_configure() {
 	replace-flags -O? -O2
-	econf
+	econf $(use_enable static-libs static)
 }
 
 src_test() {
 	# sming test is known to fail and some other fail if LC_ALL!=C:
 	# http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
 	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
-	LC_ALL=C emake -j1 check || die "Make check failed. See above for details."
+	LC_ALL=C emake -j1 check || die
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die
+	default
 	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
 		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+	prune_libtool_files
 }