USE="static-libs" and empty dependency_libs of libdvnet.la instead of removing it wrt #409125

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

3 files changed, 34 insertions, 11 deletions

diff --git a/dev-libs/dvnet/ChangeLog b/dev-libs/dvnet/ChangeLog
index c2477abfd9cb..e96d0021e0d5 100644
--- a/dev-libs/dvnet/ChangeLog
+++ b/dev-libs/dvnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dvnet
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvnet/ChangeLog,v 1.20 2011/03/25 18:20:18 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvnet/ChangeLog,v 1.21 2012/03/21 10:09:44 ssuominen Exp $
+
+  21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> dvnet-0.9.24.ebuild:
+  USE="static-libs" and empty dependency_libs of libdvnet.la instead of
+  removing it wrt #409125
 
 *dvnet-0.9.24 (25 Mar 2011)
 
diff --git a/dev-libs/dvnet/Manifest b/dev-libs/dvnet/Manifest
index 131d28166d9a..6628281df91f 100644
--- a/dev-libs/dvnet/Manifest
+++ b/dev-libs/dvnet/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST dvnet-0.9.21.tar.gz 588421 RMD160 4760d3649549bc3075b16a9242b63c6ffc5142e7 SHA1 7d3ea2816a50b586b6fd58b3ccd9793a677c0ecc SHA256 12cb100c19ee85a7353e7aa42b596964c94292412ae8fd33468ac94856bfd9f3
 DIST dvnet-0.9.24.tar.gz 921801 RMD160 e7565f5c28b82bad948f339c17eb2d69ff19e756 SHA1 8446d6dbc62b4b5ea805052c75f617a4529335ca SHA256 128175df84d793b4634481fae40ba9be89d154bdb499559ca7d9eddae44bd28c
 EBUILD dvnet-0.9.21.ebuild 828 RMD160 3d9761c72ac99c6209fa81b94666553c3a5f8253 SHA1 f60e3f97cc3b2b633f578281f304b1e7a0842633 SHA256 124c6658b4af91a6d7f1085e216b9c8431fcafc2f758ce4d6771c3ce8844c344
-EBUILD dvnet-0.9.24.ebuild 843 RMD160 2f0c559f13871d3ea69d33bcd5e0c6ac5521033b SHA1 a3949dd6d5d5c8ab135bc414db773d747ac186c5 SHA256 64368d3d6321f4aed667deb079e670deccfd28c883bb994c7147c8501d94190f
-MISC ChangeLog 3052 RMD160 9809ca36a7951fbd581694c1b0702a7f16b9b332 SHA1 1190dfab0b84e93829eca1518e1d9a6e67b22eb3 SHA256 125408362dd6ab037132f1cd1dc82a9a67c250594431424fd65ade3fe41367de
+EBUILD dvnet-0.9.24.ebuild 989 RMD160 af19b4cbf2cd77236a1950d5d5e3fcf50393571e SHA1 5fc290828ecf5cd6e2043c4eac78ab7f28b28b62 SHA256 903408f7c484475db340b81bdea12c82b46ac3bd7d0532a344e9577ff5b464b0
+MISC ChangeLog 3226 RMD160 da4aea94f791277f35ab9951741b49121fbd01e6 SHA1 6714cead97b9260125a073b51dd9856c0e35c6a8 SHA256 c1cc4b1b6a5f3ae0387da6759a399209fe4e02040d2bf5f4af7b3e3fcc5c931a
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPaajoAAoJEEdUh39IaPFNG8MIAJBWNvyDMRApie5Ca22kgEl4
+AkJDZENp6B2SbNxvX8LYo+6OoZI943u7xDL1cMPn72z93RK26QtHrBuSkFlqG2v8
+nGAI1AckBV3+WFHbfd/GP8NR/nM8xCz8jH11snXtHVW4hqPo4OdZDBYVC4EbbSI4
+Z4pB+clnyUyutkzrHMVIDUjLTyshwHwYH2f23NsvMobRSjt969RkOf5tsjrV2Qkh
+OQs87zSU2JxnhJmBGa/WasyimC/zhgvSiXZwaEp6eJPQd0YThVae0TZWglLgUrAs
+CYBfgbBWR9SDPW9WDS/DCJ2jiLo2145YB80cOk5LQIpASbMhTI9U6WYmMc8BUD4=
+=7vrz
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/dvnet/dvnet-0.9.24.ebuild b/dev-libs/dvnet/dvnet-0.9.24.ebuild
index cd2d18ca914a..7924c2138d70 100644
--- a/dev-libs/dvnet/dvnet-0.9.24.ebuild
+++ b/dev-libs/dvnet/dvnet-0.9.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvnet/dvnet-0.9.24.ebuild,v 1.2 2011/03/25 18:29:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvnet/dvnet-0.9.24.ebuild,v 1.3 2012/03/21 10:09:44 ssuominen Exp $
 
 EAPI=4
 
@@ -11,20 +11,25 @@ SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc" # no USE static-libs -> dev-libs/dvssl, let only rdep work by default
+IUSE="doc static-libs"
 
-RDEPEND="dev-libs/dvutil"
+RDEPEND=">=dev-libs/dvutil-1.0.10-r2"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog" # NEWS and README are useless
-}
+DOCS="AUTHORS ChangeLog" # NEWS and README are useless
 
 src_prepare() {
 	sed -i -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' Makefile.in || die
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
 	default
 	use doc && dohtml doc/html/*
+
+	# Keeping .la files in purpose, see: http://bugs.gentoo.org/409125
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 }