Version bump and remove old.

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

2 files changed, 35 insertions, 27 deletions

diff --git a/media-video/mediainfo/ChangeLog b/media-video/mediainfo/ChangeLog
index 67f9ae002e4a..66f97bb5b26d 100644
--- a/media-video/mediainfo/ChangeLog
+++ b/media-video/mediainfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mediainfo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/ChangeLog,v 1.17 2011/03/24 08:47:22 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/ChangeLog,v 1.18 2011/03/28 19:07:05 radhermit Exp $
+
+*mediainfo-0.7.43 (28 Mar 2011)
+
+  28 Mar 2011; Tim Harder <radhermit@gentoo.org> -mediainfo-0.7.36-r1.ebuild,
+  +mediainfo-0.7.43.ebuild:
+  Version bump and remove old.
 
   24 Mar 2011; Thomas Kahle <tomka@gentoo.org> mediainfo-0.7.41.ebuild:
   x86 stable per bug 357575
diff --git a/media-video/mediainfo/mediainfo-0.7.36-r1.ebuild b/media-video/mediainfo/mediainfo-0.7.43.ebuild
index 1d91a34c564a..67ff22956577 100644
--- a/media-video/mediainfo/mediainfo-0.7.36-r1.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.43.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.36-r1.ebuild,v 1.3 2011/02/10 23:30:44 hwoarang Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.43.ebuild,v 1.1 2011/03/28 19:07:05 radhermit Exp $
 
+EAPI="4"
 WX_GTK_VER="2.8"
-inherit autotools wxwidgets multilib
+
+inherit autotools-utils wxwidgets multilib
 
 DESCRIPTION="MediaInfo supplies technical and tag information about media files"
 HOMEPAGE="http://mediainfo.sourceforge.net"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/source/${PN}/${PV}/${PN}_${PV}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="curl debug libmms wxwidgets"
 
 RDEPEND="sys-libs/zlib
@@ -23,6 +23,8 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 S="${WORKDIR}/MediaInfo"
 
 pkg_setup() {
@@ -31,41 +33,41 @@ pkg_setup() {
 }
 
 src_prepare() {
-	for x in ${TARGETS}; do
-		cd "${S}/Project/GNU/${x}"
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}/Project/GNU/${target}"
+		sed -i -e "s:-O2::" configure.ac
 		eautoreconf
 	done
 }
 
 src_configure() {
+	local target
 	for target in ${TARGETS}; do
-		cd "${S}/Project/GNU/${target}"
-		local myconf=""
-		[[ ${target} == "GUI" ]] && myconf="${myconf} --with-wxwidgets --with-wx-gui"
-		econf \
-			${myconf} \
-			--disable-dependency-tracking \
-			--enable-shared \
-			$(use_enable debug)
+		ECONF_SOURCE="${S}/Project/GNU/${target}"
+		[[ ${target} == "GUI" ]] && local myeconfargs=( --with-wxwidgets --with-wx-gui )
+		autotools-utils_src_configure
 	done
 }
 
 src_compile() {
-	for x in ${TARGETS}; do
-		cd "${S}/Project/GNU/${x}"
-		emake || die "emake failed for ${x}"
+	local target
+	for target in ${TARGETS}; do
+		ECONF_SOURCE="${S}/Project/GNU/${target}"
+		autotools-utils_src_compile
 	done
 }
 src_install() {
-	for x in ${TARGETS}; do
-		cd "${S}/Project/GNU/${x}"
-		emake DESTDIR="${D}" install || die "emake install failed"
-		dodoc "${S}/History_${x}.txt" || die
-		if [[ "${x}" = "GUI" ]]; then
-			newicon "${S}/Source/Ressource/Image/MediaInfo.png" "${PN}.png"
-			make_desktop_entry "${PN}-gui" "MediaInfo" "${PN}" "AudioVideo;GTK;"
+	local target
+	for target in ${TARGETS}; do
+		ECONF_SOURCE="${S}/Project/GNU/${target}"
+		autotools-utils_src_install
+		dodoc "${S}"/History_${target}.txt
+		if [[ ${target} == "GUI" ]]; then
+			newicon "${S}"/Source/Ressource/Image/MediaInfo.png ${PN}.png
+			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
 		fi
 	done
 
-	dodoc "${S}/"*.html || die
+	dodoc "${S}"/*.html
 }