Use prune_libtool_files and backport updates from 0.7.58 to 0.7.56.

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

4 files changed, 25 insertions, 16 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/Manifest b/media-libs/libmediainfo/Manifest
index c466a79e4867..d605221b34f4 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libmediainfo-0.7.48-system-tinyxml.patch 3262 RMD160 110d8b59369009f5f41c09cb75b4b709eea3d418 SHA1 5aad73e8e1c326d0f2ab2090f8b09eec7cfb534c SHA256 5d677a4cb0c772f7ac5bf6ce2fccab3186977ddaabdab5ef8d4cb37bd58399ce
 AUX libmediainfo-0.7.54-system-tinyxml.patch 569 RMD160 2a7cf14e12c68571af88a5742dcad2984ab39017 SHA1 5482d0ce53313a99b70cdad9615134900c8c23eb SHA256 984f26a749f119aedf633f453970256472cc14600f3e8d55506cf00709e1e002
@@ -7,14 +7,18 @@ DIST libmediainfo_0.7.51.tar.bz2 893997 RMD160 d1ce2ac37de6a33889e9baaf758e7fd27
 DIST libmediainfo_0.7.56.tar.bz2 946819 RMD160 74e4584a2018264d5fc1d27f14c089fe6df3fc05 SHA1 742723207cc89048ae414ee07516cc56a567f6f3 SHA256 4aafbb10c568798b5eebc436499b7a327c54bc0a258f470ce8b00d86121f12cf
 DIST libmediainfo_0.7.58.tar.bz2 939422 RMD160 811a2087b596f62dd76713d5f372fb3fd73a0e61 SHA1 fe0bee778e04969fcb60be0ebaee3dd81dcd7f69 SHA256 b1df0cdf4ac7abf7efd32bafd0136a46998365e4c1228007d9a5a49cbaf09ae4
 EBUILD libmediainfo-0.7.51.ebuild 1948 RMD160 8efec6113bf3b6371892fa7f293a9e4cda352db1 SHA1 3bbe5f4d7466a9a8c214c4ab4faca83a04bb4825 SHA256 58e27338d72f41592797e2c2e63d228773cfcec291878599ac752d9ab9056e5f
-EBUILD libmediainfo-0.7.56.ebuild 1972 RMD160 414d44500fbf057beeeef154dfe4c5a7c00f4907 SHA1 d0df9e5181f4e8f7d47071fe6083c4a82193fc27 SHA256 8b7246eba5b5584b937174c2163c2a2cc35b55308ab1019401f5318b5b335795
-EBUILD libmediainfo-0.7.58.ebuild 1835 RMD160 d917f7b8ad2b30f6384ea786df948d44feb46842 SHA1 47112aea49278cb2a162baf07ee062093ec8ccc9 SHA256 6c73fc959347a35695f091899bb15b01c55d76e18894be50a723113bc4ca3ca5
-MISC ChangeLog 7782 RMD160 db973eabacf0b49c5f4d4fbe6e4cfae6ebadb646 SHA1 ec6e22cb7271dfe10c244c72f63b27775790bdf3 SHA256 bf88e574fa8f50ddc0687b1b5c5ff100683853dac992fe402dee309d4c232084
+EBUILD libmediainfo-0.7.56.ebuild 1977 RMD160 fc274fb7846249736f3306c2df317a7ee84a2468 SHA1 2d12ccd5682db35b35a943d68debac397010b185 SHA256 d804221c19195a9607c1b0d5d80c7a053cb2f2cc45c14fa3285035912235335b
+EBUILD libmediainfo-0.7.58.ebuild 1814 RMD160 ce541e1d61ded2f781a5f21f83fe27be29d9cf51 SHA1 41c7ea8b20e6be6d36630ce19fb8507114fb34c3 SHA256 4b71bed648da375e2d7a4211756a77005c7c6f1a93d7543d0dc118abe25328e6
+MISC ChangeLog 7962 RMD160 c5edd65d05b69689f6257092805368025aadbfa6 SHA1 026c0586e9b117f50fb668bd28119af365e4d83f SHA256 7e8ffa49bba2771c04d25106b678f5795ab70e72f9d33c193bcddacc771cbeae
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/SlEcACgkQ/ejvha5XGaNcCgCeI8yQyAC1/rOvZvsNsZTF/EKZ
-O4oAoJM1VbJEvWdc37YZekz6g3hQNX1P
-=Vg/c
+iQEcBAEBCgAGBQJP2wGoAAoJEEqz6FtPBkyj6CsH/jo1KUew6AVfYfWJcyS+iOlN
+s1ZNHIwuwyZ/nkAVR118AcocnM7p6DTEOUWmiGIJGgH38H5CivAgOsKXpfWaXiNc
+nNkAicvwHri4/LJFw/fziMowlV2EJ954hTOFaWYOOnt4e5VqJ7hLKXWRj6eBl36W
+SGbiZAuPcZEyQJJBzlyBrQXHub8CII1RKoCIjgKZ9r2aBSMX6dDHCZfuXzvNG40L
+HuLrrkPfIwCU6pU/WlGBPAdN34HbwotCSGGUC6FgdhxHBVruPbQC4RBXpSZMuDxA
+EO4bvbErHsY4Rt9RwoDuk21A8Ed5V5UmD7sMb4Jv16KvmGtJgGBoiTUEfiRIM/E=
+=gXvt
 -----END PGP SIGNATURE-----
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
 }