append-lfs-flags wrt #328875 by Richard C.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 31 insertions, 18 deletions

diff --git a/media-libs/libdca/ChangeLog b/media-libs/libdca/ChangeLog
index 62744f49e770..93943792355b 100644
--- a/media-libs/libdca/ChangeLog
+++ b/media-libs/libdca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdca
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/ChangeLog,v 1.28 2010/01/15 09:31:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/ChangeLog,v 1.29 2010/07/24 11:13:18 ssuominen Exp $
+
+  24 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libdca-0.0.5-r2.ebuild:
+  append-lfs-flags wrt #328875 by Richard C.
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   libdca-0.0.5-r2.ebuild:
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index f2bb492e89f7..d88d8360ec9a 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,6 +2,6 @@ AUX libdca-0.0.5-cflags.patch 492 RMD160 7919b4b95f0b55adfe8f272286b91cd204ff70e
 AUX libdca-0.0.5-tests-optional.patch 508 RMD160 c8a492bb62bff2c84ba5c4265b4be366126cddb6 SHA1 2402bdb42b4e90db168d51a6970b7fa776ba6a29 SHA256 030207f93f253bac405c61dd6eb779c943d34fb2a801d046cc253074f849c7d2
 DIST libdca-0.0.5-constant.patch.bz2 3424 RMD160 91c045c1a8c5d6e4fe3d1c0945c58bac5a4a8de6 SHA1 b5efaddecfa0de8d2eed3b250e10a7568ba0e132 SHA256 d8923ad6a61b3e5219e83842e1499e08cace8eabc4b8a9ae23db2ee00939cc5d
 DIST libdca-0.0.5.tar.bz2 393291 RMD160 979ef56b7484e6542db035d03258f5fba63b9302 SHA1 3fa5188eaaa2fc83fb9c4196f6695a23cb17f3bc SHA256 dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642
-EBUILD libdca-0.0.5-r2.ebuild 1227 RMD160 bf02603f0f3bf3ddb0bdba96ccbc914804ff929a SHA1 e702198cb6383307da0567974c64bd5ddbb3fca7 SHA256 f30fd75a7ccaa7c683677ac4ad04f077c2f3fc9048d469bc422ae9f02f31ee8c
-MISC ChangeLog 3775 RMD160 f36fdbea85b19cefb0b1d495b622090180065d01 SHA1 23c5251ace2097708ea94b3007b527e8ed89e2a3 SHA256 db330355a0aefeb49a9678e81e021932fbd910f1d329d3384542eb754fa5b89b
+EBUILD libdca-0.0.5-r2.ebuild 1383 RMD160 8d9554898ad63261a5ee9ac652fc064d8c2e4db8 SHA1 be00cd6bfd521820d381e42a97414b89c3e6af8e SHA256 ccd66693f2be1ac4c5d0794b5cce01a9a0ee78d33bc2b80a95e90c895d53b02f
+MISC ChangeLog 3905 RMD160 6c6e93950ed17f21be43b80c7bde52050920b1d2 SHA1 03dee5c8e8f8232148b9aac5ccedd76f1314e761 SHA256 041c80aefe15e1fac4c58c25e0d3afb5f815187807d4308c7ca6e8bb69a92027
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/libdca/libdca-0.0.5-r2.ebuild b/media-libs/libdca/libdca-0.0.5-r2.ebuild
index aceda4d4d97e..47c581650147 100644
--- a/media-libs/libdca/libdca-0.0.5-r2.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/libdca-0.0.5-r2.ebuild,v 1.9 2010/01/15 09:31:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdca/libdca-0.0.5-r2.ebuild,v 1.10 2010/07/24 11:13:18 ssuominen Exp $
 
-inherit autotools base
+EAPI=3
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="library for decoding DTS Coherent Acoustics streams used in DVD"
 HOMEPAGE="http://www.videolan.org/developers/libdca.html"
@@ -12,29 +13,37 @@ SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="oss debug"
+IUSE="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts"
+DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-tests-optional.patch \
+		"${WORKDIR}"/${P}-constant.patch
 
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-tests-optional.patch
-	"${DISTDIR}"/${P}-constant.patch.bz2 )
-
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable oss) $(use_enable debug)
+src_configure() {
+	append-lfs-flags #328875
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable oss)
+}
 
-	emake OPT_CFLAGS="" || die "emake failed."
+src_compile() {
+	emake OPT_CFLAGS="" || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt
+
+	find "${ED}" -name '*.la' -delete
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libdts.a
 }