Version bump and remove old.

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

4 files changed, 36 insertions, 102 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index b0d05cdb6f8a..a20420b845c0 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmediainfo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.17 2011/07/06 23:56:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.18 2011/07/15 22:19:11 radhermit Exp $
+
+*libmediainfo-0.7.47 (15 Jul 2011)
+
+  15 Jul 2011; Tim Harder <radhermit@gentoo.org> -libmediainfo-0.7.43.ebuild,
+  -libmediainfo-0.7.44.ebuild, +libmediainfo-0.7.47.ebuild:
+  Version bump and remove old.
 
 *libmediainfo-0.7.46 (06 Jul 2011)
 
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index b08952e06f61..94036ac421b3 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libmediainfo-0.7.41-curl.patch 930 RMD160 a70ba0a8c080b08161f290e1e309cf57ca1c12ae SHA1 c2cedb22b62a85921b512fc4b368b439e3986b9c SHA256 86719d48417b9ce7aea58eb0665e1e1f9f54c3f47a423423b3608ba96407af8f
 AUX libmediainfo-0.7.44-libmms.patch 1576 RMD160 7fb26bbcff85d78018ee8b43de74f42a5fe4a808 SHA1 8535130c38f6b162f1e1df2fe6fd5aab30edc024 SHA256 49bafa2e7a40a7fdf10bd8b1ac319f5fcb6f0c9dd60d93a51986bf9e1284bd52
 DIST libmediainfo_0.7.41.tar.bz2 857972 RMD160 58b59a39f9d2accc873e5a35822b021ff4a8111d SHA1 7d8794542480b920c5f63dcdf84de62bc1184adf SHA256 cd783e4e6e848fc1fa7e36ae936815d385081c9e4e0fae9f434c18e5682e069e
-DIST libmediainfo_0.7.43.tar.bz2 865667 RMD160 0100fde76157eacc7bfa6714eb92ed6469245de0 SHA1 bc8b940737f03f8773f10413a8e0fcb2c69de2e9 SHA256 3edb68e3233adf0d10ed97fa12c0f41f3576c687509e1978a6ef26ce6ca8e0cd
-DIST libmediainfo_0.7.44.tar.bz2 903019 RMD160 5bf5c45383e7790f24ff345a631aa22051c8e97f SHA1 7e924a71aaa61864ecf46b1361216782366919ca SHA256 ed96a9ed81b799afac6b4434fd53f9c88d78034d94af8bb0ed8d4b12d8086b32
 DIST libmediainfo_0.7.45.tar.bz2 898511 RMD160 71420c582c24c3341d750bfdab1f29c530f52ef3 SHA1 822239622d0b816c4f31d94f6965b4574f20d006 SHA256 7e1157341b2684b2b2c80650ed911463d873eecad9a06d4309144d5e4e9defe2
 DIST libmediainfo_0.7.46.tar.bz2 903366 RMD160 13b7afbe8fa9882738d967d3b681b15a24dbfe9e SHA1 1c7c788de25baa2919ccb9f3d671c201682b7030 SHA256 d120296425fac9dc7a15b2b6bc779fa0bf38acb2dd9a8c8ea3980dce55503b9c
+DIST libmediainfo_0.7.47.tar.bz2 907382 RMD160 987cdbd267ab86521a33be3307a58435fcedf20c SHA1 c1f2ed885437562a1d155757fb33b14ef67e1a36 SHA256 f9fdd285265ad4886a7e13ede093809dc0464253c551c7692c364fba0a800766
 EBUILD libmediainfo-0.7.41.ebuild 1980 RMD160 55301d443ae744aed0cbfcc81df015a96db21e9c SHA1 f66fed7ac743a36950a7df51873a599f9d5695e4 SHA256 f98930a6cef864b51eebf9e40952d8e9c326018122929bb63b5635339d7de6c4
-EBUILD libmediainfo-0.7.43.ebuild 1784 RMD160 5bee5eac0f0ebad0b433984c63bae5d449f90f13 SHA1 854c5798d6b32d98545d24fdf762b6b630db10c3 SHA256 4e1a2db565a70bde794ccba0aa0a66ebb677ceb020d4a3ef445421f9a42e3f31
-EBUILD libmediainfo-0.7.44.ebuild 1757 RMD160 d9cf2d94824926a633d79904fbeb172df5f83fe6 SHA1 fd232f41904289035ca9f14861bf37f66ad6581b SHA256 86d35baf27df891a25c030967de6880d588bade74f4bdc3cc3012b26d3dfd9c1
 EBUILD libmediainfo-0.7.45.ebuild 1852 RMD160 60f0591b13ab329ef20b151c704b097f20d1fb74 SHA1 35e752b97763f1f4cdefa7d3c9a3c1291cf4f42b SHA256 cb8b28557d029c365e0864065de3cf443fe8eede898812e8e55a5e43700dca05
 EBUILD libmediainfo-0.7.46.ebuild 1852 RMD160 cd8c914f3634685aa566658e878420ec96a88734 SHA1 0e9f9ef4bc77c5fcd5b2df99fa6991c89b73811b SHA256 d8881a5b74f74d8b02c907e87a0d967465221be97168facc158e00f33256b713
-MISC ChangeLog 3114 RMD160 a3b28498e12d7688434d87dd8da46b46832d77dc SHA1 54dab3d3818f03b42ce9717099f17eadd28e0240 SHA256 d8a0516fc06460c664fbf3574a786f4b2b2eb3fbfea91cd8f83b4938cf4692f5
+EBUILD libmediainfo-0.7.47.ebuild 1852 RMD160 76c9513b78093f565fe930f5d026a94b4dbbfe2d SHA1 de5363f8825924a57a94aacf0486fc4c1d534502 SHA256 954ce7402c0a5ca622c37b2c070b2ebd46f916300404c60f1ae0ec8b1125b643
+MISC ChangeLog 3320 RMD160 e0c29f23e4b90c19caebe9bf89d615f5f52a5551 SHA1 b4de7d6e9ba570dcfc09984b2aa326a202c84bf3 SHA256 79928a5db83b900036e3eef91c9b090b49ebbe7fc345c80ba1c52feb2b053086
 MISC metadata.xml 341 RMD160 fdfe7b44e753ea7571e619dd8566cafbcf4eb5ec SHA1 6605883a3ff2065f65794950f03b369b3d425cbc SHA256 1a88f8af2a22f2bd6207cee41a53337b452f6caace96b0b475aace50f27461a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOFPYsAAoJEEqz6FtPBkyjtgAH/iX8jcduJsydiuNq868C+iJG
-/tKn4PZebApNikYBOAFNtrBZTltxXbjvovPiypQGejA0fJUhYkyYsY46Irykkiyk
-8c0aNN/OBsiNcai6/KLBC4whJHpRTHT2+rUeIQjmFwVMPqoctbo47IHcObLhAlBU
-/33elNh/qsfd98A/+g1n2vGn0+Z6LaCeh3bYZIjIcmeziCGxpOtQ4bCQibNdA25h
-cyZcBHrI8tkoMvh8FSmpZPnmeafrNdrlaD0NS6gUF1e3oEB5vIsrsR4fa5U1vY+W
-ka5N7z96P4oCCZcTI2m4dpq/JXxTsI+vZuLeKwjDMkS55GRhCaGu8bFw5ucCr5Y=
-=NTC5
+iQEcBAEBCgAGBQJOILzoAAoJEEqz6FtPBkyjaNAH/1++BlKWwQNWojy+tUL4Gmn+
+dyHgie7yY53FlL2LKUaJM1s8vCWbMaTtWd5io1VR2y49+X3gZ6MYtz7f31Bv6oGn
+iWxlHCStDnLjzNrDeOpJCvPQxPg0ICnlLPvHl8JpunBubeCmfvkQ0uO0lwktvgWR
+vqA4UCNM/nA0SWp2DQiBpVNDHLh7QXKnkRNNrSVbSbKKwzOCjJIXPUhFdSoka1f3
+TM9Gvbnkj8r6WkTxlx2Fx47ZwbyfrZGLsh21aumKYhkwNxSr78SNJaH25HtwO6tb
+RECm9DVjKhD42Y3r6utGuW+74WtRHkdOs1HEMe65jv7+ZvCCgz0mugC0Iv8vDKc=
+=f4rm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild
deleted file mode 100644
index 57f4cb4083a9..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild,v 1.1 2011/03/28 19:00:24 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools-utils multilib eutils
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc libmms static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.18[static-libs=]
-	curl? ( net-misc/curl )
-	libmms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
-
-src_prepare() {
-	# Fix linking problem for bug #343125
-	EPATCH_OPTS="-p1 -d ${WORKDIR}/${MY_PN}Lib" epatch "${FILESDIR}"/${PN}-0.7.41-curl.patch
-
-	# Don't force -O2 by default
-	sed -i -e "s:-O2::" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs
-	myeconfargs=(
-		$(use_with curl libcurl)
-		$(use_with libmms)
-		$(use_enable static-libs staticlibs)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${S}"/${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-}
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.47.ebuild
index aeb89f4514ea..5bb579d69675 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.47.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.44.ebuild,v 1.2 2011/06/01 08:24:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.47.ebuild,v 1.1 2011/07/15 22:19:11 radhermit Exp $
 
 EAPI="4"
 
-inherit autotools-utils multilib eutils
+inherit autotools multilib eutils
 
 MY_PN="MediaInfo"
 DESCRIPTION="MediaInfo libraries"
@@ -17,20 +17,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="curl debug doc libmms static-libs"
 
 RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.18[static-libs=]
+	>=media-libs/libzen-0.4.20[static-libs=]
 	curl? ( net-misc/curl )
 	libmms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
 S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
 
 src_prepare() {
 	pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null
-	epatch "${FILESDIR}"/${P}-libmms.patch
+	epatch "${FILESDIR}"/${PN}-0.7.44-libmms.patch
 	popd > /dev/null
 
 	# Don't force -O2 by default
@@ -40,17 +38,18 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs
-	myeconfargs=(
-		$(use_with curl libcurl)
-		$(use_with libmms)
+	econf \
+		--enable-shared \
+		$(use_with curl libcurl) \
+		$(use_enable debug) \
+		$(use_with libmms) \
+		$(use_enable static-libs static) \
 		$(use_enable static-libs staticlibs)
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	default
+
 	if use doc; then
 		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
 		doxygen Doxyfile || die
@@ -58,7 +57,7 @@ src_compile() {
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins "${S}"/${PN}.pc
@@ -68,8 +67,13 @@ src_install() {
 		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
 	done
 
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
 	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
 	if use doc; then
 		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
 	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }