Make static library optional and remove libtool archive. Move to eapi4.

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

3 files changed, 44 insertions, 18 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index d5984c64407b..1fd4021137bf 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdv
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.81 2008/01/03 14:02:26 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.82 2011/09/09 17:58:55 scarabeus Exp $
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libdv-1.0.0-r2.ebuild:
+  Make static library optional and remove libtool archive. Move to eapi4.
 
   03 Jan 2008; Alexis Ballier <aballier@gentoo.org> libdv-1.0.0-r2.ebuild:
   Keyword ~x86-fbsd, working fine here
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index c9225b4b07ca..c5cdb64eced0 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libdv-0.99-2.6.patch 439 RMD160 507326ff0fbc305bf63c67790736f2251a98ce74 SHA1 5b3818eec80cfe36b30cabb0544ecc1a09446b5a SHA256 7199ef39770c41be92e845e767800fd7b21979408d0466d4f05f33e734f32b81
 DIST libdv-1.0.0-pic.patch.bz2 9771 RMD160 a0995597413609ac938f68086a6aac9ef6e2ab37 SHA1 074687289dd78adb60c2423e270125bd48479d1f SHA256 474a50d373e39dd8a0dac0b22f089e957d752145712f97f987ad18028f6d6a5e
 DIST libdv-1.0.0.tar.gz 574565 RMD160 a8d3ae083340cec411d5294db7197ea72c8b3c4f SHA1 2e5ba0e95f665d60e72cbebcf1c4989e0d6c92c8 SHA256 a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba
-EBUILD libdv-1.0.0-r2.ebuild 1178 RMD160 f01d6099191c72c4d84743adb2eacedc3dc5f840 SHA1 b21a17ff58d95bb773416c876d82a4e8e7daca9c SHA256 2df72780850440abcd3350e62e7c6b11cbcbd864716d56a8c0d06f754987358f
-MISC ChangeLog 10798 RMD160 cdfd4419351255ed6e2573b176c1ae48e3600447 SHA1 5fadf8077adcbfd10a68bd0ca4e4345e804e03eb SHA256 5f7c4a0c3a08b963e08495a86e58e9f2e7c56206a3e8290ed9442001638d899d
+EBUILD libdv-1.0.0-r2.ebuild 1135 RMD160 cb0ed40710594e40b679ff9551e04fba29b0ddd8 SHA1 2186c906c1bbd5a921ef3e0071a99315bd91b3b0 SHA256 e2bfaa11280d43501ac94c219f012cdda631c940d7680c28d839e2b07025ba18
+MISC ChangeLog 10952 RMD160 4778f8f9566db5b27a947ec42adcbff76bb3f2d7 SHA1 8cf0c8496e82c0fee6e5b4936b2dcd515da979e0 SHA256 2db223f65e0d83201dfcd422dd5a7b2f048af822c05105dec2484e269a46b93f
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOalPqAAoJEOSiRoyO7jvoMr4QAKvwUIcjQiu35OLRpamdPuM3
+bd7xH56z9DL2Swrq4uvi6ciwnsz8mi7UhAZUaknJayP+ctCFeq+uQEWzhGADD59p
+1yRxQ4sn/7WY5S+q+jIPI1IW4ksRtx1Y1hyNr2GvgCSPywsjMNFh32t30bkDWome
+ZFNXL6apT+nZm1E++CZumHNP+t/n0nGLmk5oXBi09GX/h+i8fqZ/cT5Hq6N3sYwc
+tocClfXCGe5QfeWAPz7yTH7dTnfUuHNY9t/Oet4dqoog+t8Gt0f01mKUZ+B2RfZj
+xtH7Z9PDjEl0FGWLXBszjBs/9svLpVGnRS56gPup+YaLJSPJhQWsfbupjMFN9qut
+5dTQndtJQzEY3NdUX25MZmFxIkVabeRSvcxgWXlIvGi2R4hpCGSgIIuMu4nJeXqn
+WZSrU1IhaYerWmmdAqS1+ZlVejdGRnTNHh0vCsLMpNuWPSMjimUlzd3FqB8Rgd5h
+ss/Su9bDbUlLrACW7zbpNEN6eIFJZb7TDoLKiOduhok/WF/mGVshX3m8oxv8bWOn
+x/Sv6mQ1yQNfZTLmLS+5tlnHfFCQKCTUD0nsswuWxxyTaDXba672EkDszvTUYNNr
+0n5j5TBFJDF0QVRkwHgD4kXKqe6qRDmjhtWSSRD/izFruQls0if5sSnYUTuVN5iP
+83H5RcG/sskZota3xUQa
+=AqLv
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdv/libdv-1.0.0-r2.ebuild b/media-libs/libdv/libdv-1.0.0-r2.ebuild
index dd1e5c806b7e..66907b682230 100644
--- a/media-libs/libdv/libdv-1.0.0-r2.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-1.0.0-r2.ebuild,v 1.10 2008/01/03 14:02:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-1.0.0-r2.ebuild,v 1.11 2011/09/09 17:58:55 scarabeus Exp $
 
-inherit eutils flag-o-matic libtool
+EAPI=4
+
+inherit eutils libtool
 
 DESCRIPTION="Software codec for dv-format video (camcorders etc)"
 HOMEPAGE="http://libdv.sourceforge.net/"
@@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug sdl xv"
+IUSE="debug sdl static-libs xv"
 
 RDEPEND="dev-libs/popt
 	sdl? ( >=media-libs/libsdl-1.2.5 )
@@ -20,26 +22,27 @@ RDEPEND="dev-libs/popt
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO )
+
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
 	epatch "${WORKDIR}"/${PN}-1.0.0-pic.patch
 	elibtoolize
 	epunt_cxx #74497
 }
 
-src_compile() {
+src_configure() {
 	econf \
+		$(use_enable static-libs static)
 		$(use_with debug) \
-		--disable-gtk --disable-gtktest \
+		--disable-gtk \
+		--disable-gtktest \
 		$(use_enable sdl) \
-		$(use_enable xv) \
-		|| die "econf failed."
-	emake || die "emake failed."
+		$(use_enable xv)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }