Use prune_libtool_files and backport updates from 0.7.58 to 0.7.56.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 14 insertions, 9 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index fa431ea0bdd1..a5ff77501443 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmediainfo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.48 2012/06/09 00:09:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.49 2012/06/15 09:34:26 radhermit Exp $
+
+  15 Jun 2012; Tim Harder <radhermit@gentoo.org> libmediainfo-0.7.56.ebuild,
+  libmediainfo-0.7.58.ebuild:
+  Use prune_libtool_files and backport updates from 0.7.58 to 0.7.56.
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> libmediainfo-0.7.58.ebuild:
   inherit eutils for edos2unix
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.56.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.56.ebuild
index 4d832d121288..182cdaae12b0 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.56.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.56.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-libs/libmediainfo/libmediainfo-0.7.56.ebuild,v 1.2 2012/05/05 08:02:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.56.ebuild,v 1.3 2012/06/15 09:34:26 radhermit Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
 
 src_prepare() {
 	pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null
@@ -35,8 +35,8 @@ src_prepare() {
 	# Don't force -O2 by default
 	sed -i -e "s:-O2::" configure.ac
 
-	append-flags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-	append-flags -DTIXML_USE_STL
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+	append-cppflags -DTIXML_USE_STL
 	eautoreconf
 }
 
@@ -62,8 +62,9 @@ src_compile() {
 src_install() {
 	default
 
+	edos2unix ${PN}.pc #414545
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${S}"/${PN}.pc
+	doins ${PN}.pc
 
 	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
 		insinto /usr/include/${MY_PN}/${x}
@@ -78,5 +79,5 @@ src_install() {
 		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 }
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild
index d2ab2fd9b469..0eaaf10b7803 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.58.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-libs/libmediainfo/libmediainfo-0.7.58.ebuild,v 1.2 2012/06/09 00:09:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.58.ebuild,v 1.3 2012/06/15 09:34:26 radhermit Exp $
 
 EAPI="4"
 
@@ -74,5 +74,5 @@ src_install() {
 		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 }