Missing sys-devel/libtool dependency for libltdl. Empty dependency_libs in libtool files to ensure they don't cause overlinking. Stop building static copies of the plugins.

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

3 files changed, 27 insertions, 13 deletions

diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index 30e29b941c3b..a1e504c6bb35 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/camserv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.25 2012/05/24 03:41:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.26 2012/05/24 03:44:58 ssuominen Exp $
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> camserv-0.5.1-r2.ebuild:
+  Missing sys-devel/libtool dependency for libltdl. Empty dependency_libs in
+  libtool files to ensure they don't cause overlinking. Stop building static
+  copies of the plugins.
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org> camserv-0.5.1-r2.ebuild:
   Use libv4l1-videodev.h from media-libs/libv4l to build libvideo_v4l.so
diff --git a/media-video/camserv/Manifest b/media-video/camserv/Manifest
index 6539d0cfba38..50f82a6df179 100644
--- a/media-video/camserv/Manifest
+++ b/media-video/camserv/Manifest
@@ -6,17 +6,17 @@ AUX camserv-0.5.1-libtool.patch 2936 RMD160 d88a835753194167cd91d6c9482a8ed9c94f
 AUX camserv-0.5.1-memcpy.patch 382 RMD160 db3d8fcf080bf32051701444d3589cb859162484 SHA1 15eb11db8b4233a5dc60fce9c21bb8f927f0a15b SHA256 6c105afe1f44fed8717dd095866bb3104938c3a5bb0f56a87dfbba2f7fe76132
 AUX camserv.init 553 RMD160 892e90e073c20615ac44f4f4be679ebae54147b9 SHA1 b1a5a9342d46d78556fccac66e839b4a264375e6 SHA256 f0abc4ef202d1bc24acfba85103e46b4aba3712a3f39bdd6a4558199d0163fb1
 DIST camserv-0.5.1.tar.gz 487645 RMD160 053f54f96cbb387f8657a424ab5775d158cd80ba SHA1 660e3aa127a042c9be3dd9ec768098834e6dce06 SHA256 034c08aac228587a1c46d35e345e1be653f5149bb4648b3e5ef937ccd5e5b24f
-EBUILD camserv-0.5.1-r2.ebuild 1128 RMD160 fb8e7fa9aff653573df95b29fb2e4be9bc44b169 SHA1 63f44396183d72252e9d69a9a665c0482667e343 SHA256 f7c962d9f413202fd04c70164308e6befcae54e782067b86a54f8f8205029539
-MISC ChangeLog 3854 RMD160 35453a0ad169b5fdfb1c604a01a4478a0a4d4cb7 SHA1 f87a19fef5836ad329b6333ba6943c39d3bc1b31 SHA256 9ade76a725b0c3b7f4e1511b41ec796519de5d64a8ba19c206332e35d83c84b0
+EBUILD camserv-0.5.1-r2.ebuild 1330 RMD160 4a97b952331bb894d99a237a4e0ba108f48cf641 SHA1 ada023653e36e3ea5d432e217a413fc788ff035b SHA256 f3fcd8eeefd36d20c24731081bd1a3925934abbbda9af7e83c0cb5b2aa4debde
+MISC ChangeLog 4113 RMD160 4134ac32109cd20231b68229f3819368883b7fc6 SHA1 acbef892c7d8e7bc9edad4291ced35d6e4800a9b SHA256 455eadf6ffe776f1e1eb62816bb93834e57a56d76e1845a895c6e56e2aa590fa
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPva3vAAoJEEdUh39IaPFNdvsH/3c/76Xj4D7IzGksJd28/8Nq
-MDVHUXfU2CrQOCQdqsWKYQIiRTF03g2rqO36TlQnMeqwZiIgroN/jyCjPaQgbiCa
-QT+pQ7jml/4CU2RYAlu5t5B8EBbhc0i4Y2lrAe7c58DrqJ/iLnbER3tkV/Dm+9CX
-yhzFFk/MMzOCI6KCHs4cNXq/J3+tcOWvtdiO61uiQ+O6SShH0Q6rPtJAj28IbCUS
-s1/mDEdQAVjLX1wGtTBNR1fmFTWUOjPlAwhWYwCirlXJ+WolHbeN8aoYzs9KDWi7
-pJ1KJFrdxvk0HAjcHK4WZA6hbEO3GuME+ebgLrUfKTqV/yJO2hXolmAohgRk14A=
-=lSfl
+iQEcBAEBAgAGBQJPva6/AAoJEEdUh39IaPFNKEoIAJAvA5+/pNsbKw4YPpvDXrcY
+6FdlvstX2fuiPtB9/s+t3o9YrBViNrtS9CdG763UO/Ue74baTA/EdxF4lWDBrNaR
+xcTSZLehuHMuY3+Qe7Hqj7TUdTHsibdIs3SxkwtnYmXDMFiKN9v0jvNser0k9z55
+xEQ9G2sAPwcShco8N6yZhf3fgho8Aa9T05ekz2olMe6E2UNPhGwsKxEQZStq8TnN
+9Z0QPtad+iXk7Tw0s6MnuIwHTOgiwOiFBz+OwKL5J0HSdIuuALi+UGk7f0v134uA
+im49GzVPPcj5HzDbXnR/pVWd+MNcuEgVfYxiorQvSN5CToBBgzuaDazyp0yFSrI=
+=S1PO
 -----END PGP SIGNATURE-----
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index 801504a0a76d..2eec954acb12 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.16 2012/05/24 03:41:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.17 2012/05/24 03:44:58 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="virtual/jpeg
-	media-libs/imlib2"
+# libtool's libltdl is used for loading plugins
+RDEPEND="media-libs/imlib2
+	>=sys-devel/libtool-2.2.6b
+	virtual/jpeg"
 DEPEND="${RDEPEND}
 	media-libs/libv4l" # libv4l1-videodev.h wrt #396635
 
@@ -37,7 +39,14 @@ src_prepare() {
 	AT_M4DIR=macros eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
 	default
+
 	newinitd "${FILESDIR}"/camserv.init camserv
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
 }