4 files changed, 91 insertions, 85 deletions
diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index 9a45491ea784..a3bdcd9b73b9 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.12 2011/03/24 08:48:01 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.13 2011/03/28 19:00:24 radhermit Exp $
+
+*libmediainfo-0.7.43 (28 Mar 2011)
+
+  28 Mar 2011; Tim Harder <radhermit@gentoo.org>
+  -libmediainfo-0.7.36-r1.ebuild, +libmediainfo-0.7.43.ebuild:
+  Version bump and remove old.
 
   24 Mar 2011; Thomas Kahle <tomka@gentoo.org> libmediainfo-0.7.41.ebuild:
   x86 stable per bug 357575
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index e01d0deea5c6..261328575f1d 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,18 +2,22 @@
 Hash: SHA1
 
 AUX libmediainfo-0.7.41-curl.patch 930 RMD160 a70ba0a8c080b08161f290e1e309cf57ca1c12ae SHA1 c2cedb22b62a85921b512fc4b368b439e3986b9c SHA256 86719d48417b9ce7aea58eb0665e1e1f9f54c3f47a423423b3608ba96407af8f
-DIST libmediainfo_0.7.36.tar.bz2 769124 RMD160 0a4fb76ac99992b00d0222c2b3e70249e711ccb2 SHA1 5b5327955094b7e0e1890fece51931f54ca1855d SHA256 eb604dd39f7ab44032f34d2ec5a30c1b1b4111e197e0b1b0a3c90f9334b0cb53
 DIST libmediainfo_0.7.41.tar.bz2 857972 RMD160 58b59a39f9d2accc873e5a35822b021ff4a8111d SHA1 7d8794542480b920c5f63dcdf84de62bc1184adf SHA256 cd783e4e6e848fc1fa7e36ae936815d385081c9e4e0fae9f434c18e5682e069e
 DIST libmediainfo_0.7.42.tar.bz2 862947 RMD160 8f0a34532be565916dace3c436ed8cba13bb4bd0 SHA1 6a89dd0129a86f54042f970e229124b55e5b52ce SHA256 42b377f9b8487d7e0ac68606d0be6a00b2280d2a4c4f814d42a46689b39affef
-EBUILD libmediainfo-0.7.36-r1.ebuild 2085 RMD160 16e61109ffabc69d7085fd1e598ccbab460a8fd5 SHA1 7332ddeeeade956848984d502689b715bde25592 SHA256 45ef2e3fd6a2b36b6a55353e402ab955b72fba07912027ec6b55f9e22529547a
+DIST libmediainfo_0.7.43.tar.bz2 865667 RMD160 0100fde76157eacc7bfa6714eb92ed6469245de0 SHA1 bc8b940737f03f8773f10413a8e0fcb2c69de2e9 SHA256 3edb68e3233adf0d10ed97fa12c0f41f3576c687509e1978a6ef26ce6ca8e0cd
 EBUILD libmediainfo-0.7.41.ebuild 1980 RMD160 55301d443ae744aed0cbfcc81df015a96db21e9c SHA1 f66fed7ac743a36950a7df51873a599f9d5695e4 SHA256 f98930a6cef864b51eebf9e40952d8e9c326018122929bb63b5635339d7de6c4
 EBUILD libmediainfo-0.7.42.ebuild 1784 RMD160 f80a8a6887ca560b3cda053b0e634329d819562e SHA1 ef61ccc52e934e8a3a41515eccaa8bc0a2e643f9 SHA256 aa3085938b43ac2c939db076264848a6d3172928571f245cd64040b188b29488
-MISC ChangeLog 2288 RMD160 202c0a766cfa61b05af2a452dd8f2f2a2f9c77ba SHA1 d81004595f8c9c68f6866fdc906ca869554d57b6 SHA256 5db7b50ae9de8e73f791c86d25df8b70a9f820aa989d637e466a9da43d0b7dc6
+EBUILD libmediainfo-0.7.43.ebuild 1784 RMD160 5bee5eac0f0ebad0b433984c63bae5d449f90f13 SHA1 854c5798d6b32d98545d24fdf762b6b630db10c3 SHA256 4e1a2db565a70bde794ccba0aa0a66ebb677ceb020d4a3ef445421f9a42e3f31
+MISC ChangeLog 2472 RMD160 dca715df4dd21dad978398c5b1c4931195784ce3 SHA1 89896e493c0f0864da6e63ff8a996e1d2efe5d06 SHA256 1c0d39149559d6f8228d4569cea92bc4eed169fe1e6d8528877ce5df1016345d
 MISC metadata.xml 341 RMD160 fdfe7b44e753ea7571e619dd8566cafbcf4eb5ec SHA1 6605883a3ff2065f65794950f03b369b3d425cbc SHA256 1a88f8af2a22f2bd6207cee41a53337b452f6caace96b0b475aace50f27461a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2LBaIACgkQnZsgo/h8kNZReQCgiOhV3ra7jhdg7FtS1Bxvks/X
-mzgAn08SvI5UC3wKmENQ8mguHWW+ZVsN
-=9WSd
+iQEcBAEBAgAGBQJNkNrSAAoJEEqz6FtPBkyjOTcH/jVY8BTEYqQ/qLSgYj1iciyv
+a7aMDcKB7F/9sUuqpI0rHOF2CZXpCthlmpG69sIK2aa1grL/n0UmbYci5B6wSvM1
+OUFA9BAJ2DRfhs+0cjN8MRB8ZEZRKyR86Ixm+4gdl2Dy6mz1KAn5ZVoFycQX/vxx
+CmIprhjE+Gh7zmnWsStxrXtyQz60sfIvpSFaoFXWyHzW15vwNSJAxmwIXTdPK2Wi
++1zFn+5Ez53lgPlR9hCdwUvcv2xW4aE+/vG+DLCBx8A3Y18cc6GRvv5pw1Z+iG0Y
++9w3kyNUXF+g+lUsU4hwlCA49HwqbXHN1RnSH9qXrP+hj+J/iUfRXmb8pdX0jdE=
+=KmDW
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.36-r1.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.36-r1.ebuild
deleted file mode 100644
index 63c121ba753c..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.36-r1.ebuild
+++ /dev/null
@@ -1,78 +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.36-r1.ebuild,v 1.3 2011/01/31 19:06:53 fauli Exp $
-
-EAPI="2"
-
-inherit autotools multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediainfo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mediainfo/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
-
-S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl debug doc libmms static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.14[static-libs=]
-	curl? ( net-misc/curl )
-	libmms? ( >=media-libs/libmms-0.4 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# https://bugs.launchpad.net/libmms/+bug/531326
-	sed -i -e 's/mmsx/mms/g' \
-		"${WORKDIR}/${MY_PN}Lib/Source/MediaInfo/Reader/Reader_libmms.cpp" \
-		|| die "sed failed"
-
-	# Fix linking problem for bug #343125
-	sed -i -e "s:\(#define LIBCURL_DLL_RUNTIME\)://\1:" \
-		"${WORKDIR}/${MY_PN}Lib/Source/MediaInfo/Reader/Reader_libcurl.cpp" \
-		|| die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-shared \
-		$(use_enable debug) \
-		$(use_with curl libcurl) \
-		$(use_with libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd "${WORKDIR}/${MY_PN}Lib/Source/Doc"
-		doxygen Doxyfile || die "doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins "${PN}.pc" || die
-
-	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 || die
-	done
-
-	dodoc "${WORKDIR}/${MY_PN}Lib/"*.txt
-	if use doc; then
-		dohtml "${WORKDIR}/${MY_PN}Lib/Source/Doc/Documentation.html" || die
-		dohtml -r "${WORKDIR}/${MY_PN}Lib/Doc" || die
-	fi
-}
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild
new file mode 100644
index 000000000000..57f4cb4083a9
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.43.ebuild
@@ -0,0 +1,74 @@
+# 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
+}