Version bump and remove old. Bump to EAPI 3 and fix configure flag usage.

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

4 files changed, 63 insertions, 23 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index c3376e65c4a4..13bad69c759a 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmediainfo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.7 2010/12/02 12:49:57 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.8 2011/01/30 22:52:22 radhermit Exp $
+
+*libmediainfo-0.7.41 (30 Jan 2011)
+
+  30 Jan 2011; Tim Harder <radhermit@gentoo.org> -libmediainfo-0.7.37.ebuild,
+  +libmediainfo-0.7.41.ebuild, +files/libmediainfo-0.7.41-curl.patch:
+  Version bump and remove old. Bump to EAPI 3 and fix configure flag usage.
 
   02 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
   libmediainfo-0.7.36-r1.ebuild:
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 44bd94d267ed..aaacd0358722 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.37.tar.bz2 815280 RMD160 815c4ef6616aa6a813ebeee85a363c1de08cef12 SHA1 26a4a9c54c783fe81c009e826c2d7c99fd45a410 SHA256 aece9d7c79c860e49df3f2e0015491d1ee0a6ad1ef0e32a72cd0a0aafcff1e1d
+DIST libmediainfo_0.7.41.tar.bz2 857972 RMD160 58b59a39f9d2accc873e5a35822b021ff4a8111d SHA1 7d8794542480b920c5f63dcdf84de62bc1184adf SHA256 cd783e4e6e848fc1fa7e36ae936815d385081c9e4e0fae9f434c18e5682e069e
 EBUILD libmediainfo-0.7.36-r1.ebuild 2089 RMD160 db96b1e455c38feb86096efbd76d82e448661b51 SHA1 972a5c763141f2c7c1764a2feaeb40c8c740bde1 SHA256 afdc6395f9c166098cafdf571d76cc8ab07c0a693ccb0e2f73cac6e861e0e089
-EBUILD libmediainfo-0.7.37.ebuild 2088 RMD160 19f1c168e3b64c4b1fbcbb4951152cf0749536cb SHA1 c53270817958f404f9b3e09f53a025a3e3e27edd SHA256 485fac3aaccd620c698dbb1cee17cd6cf195fbcaab8b3f0d8eac5c268ffda3bd
-MISC ChangeLog 1458 RMD160 eda0113546b6ec43d6c5b56a40eabc0afc56b51d SHA1 8a5389c875da81f47a7f160be56304aefdf32127 SHA256 fa6fa30d8e510f57b982a81bf9d6d61fee6aa9e6e0f999eb592848a79b213249
+EBUILD libmediainfo-0.7.41.ebuild 1986 RMD160 cda5706f52f5d76d73a986f146b94715b3848c9d SHA1 08c9ddd64af2c71d2b7c5f8a36e1e065c919ee2e SHA256 b7468d9507fce41ef19ea342775887a0afd4064dd2825352a61fe847980a0c98
+MISC ChangeLog 1720 RMD160 564afc76d09b79c95a8e76ecc44f3de7e4e6b097 SHA1 621b279738dedfe4155f9e4bfda9005c9522d4f4 SHA256 1f26b6561850c7183e2b9766142f951048271a9758ec378dad8d84ea52ecf0f9
 MISC metadata.xml 341 RMD160 fdfe7b44e753ea7571e619dd8566cafbcf4eb5ec SHA1 6605883a3ff2065f65794950f03b369b3d425cbc SHA256 1a88f8af2a22f2bd6207cee41a53337b452f6caace96b0b475aace50f27461a8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNReuvAAoJEEqz6FtPBkyjZ3QH/2f5qQ5Juv9+EzA55CM9ODXm
+PMJoaXkVCfyKuj+OClrGWhdbRVgZYOANI/nEcLBxSNdUZAb0EGwfYUfsVa//z8oj
+1/NKlI6skscbno0HkFsPOV2FOCA/rX0LhefxX0gvh083/T+VFhPxP6hJBw6s8tT+
+axLHuc2Sqae6ab6KoGID+wEZQG+HZ4ZlPChZyFOoulhUic/a0MvQYCI1K1Y6HVc/
+SsNzsndfqHLTb5ESnyUrwjqY0oydQypp6F/CbtESsva/hDLEQ3aG3LHzmvyX277E
+HS5Z1r4JOPmopkeG5dCOHF9rJYjdHvHAOiO+pEKGL1i6LTF75n7U80TU2HjYHaY=
+=ZLT2
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch
new file mode 100644
index 000000000000..a03c47bcd53c
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch
@@ -0,0 +1,24 @@
+--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp.orig
++++ MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp
+@@ -35,7 +35,7 @@
+ //---------------------------------------------------------------------------

+ 

+ //---------------------------------------------------------------------------

+-#define LIBCURL_DLL_RUNTIME

++//#define LIBCURL_DLL_RUNTIME

+ #include "MediaInfo/Reader/Reader_libcurl.h"

+ #include "MediaInfo/File__Analyze.h"

+ #if defined LIBCURL_DLL_RUNTIME

+@@ -182,8 +182,10 @@
+ //---------------------------------------------------------------------------

+ size_t Reader_libcurl::Format_Test(MediaInfo_Internal* MI, const String &File_Name)

+ {

+-    if (libcurl_Module_Count==0)

+-        return 0; //No libcurl library

++    #if defined LIBCURL_DLL_RUNTIME

++		if (libcurl_Module_Count==0)

++			return 0; //No libcurl library

++	#endif

+         

+     //Configuring

+     curl_data Curl_Data;

diff --git a/media-libs/libmediainfo/libmediainfo-0.7.37.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.41.ebuild
index b6670207dd8e..9c6b3269b3ae 100644
--- a/media-libs/libmediainfo/libmediainfo-0.7.37.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.41.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.37.ebuild,v 1.1 2010/11/27 05:43:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.41.ebuild,v 1.1 2011/01/30 22:52:22 radhermit Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit autotools multilib
+inherit autotools multilib eutils
 
 MY_PN="MediaInfo"
 DESCRIPTION="MediaInfo libraries"
@@ -19,7 +19,7 @@ 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 )"
+	libmms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -27,28 +27,23 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library"
 
 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"
-
+	EPATCH_OPTS="-p1 -d ${WORKDIR}/${MY_PN}Lib" epatch "${FILESDIR}"/${P}-curl.patch
 	eautoreconf
 }
 
 src_configure() {
+	local myconf
+	use debug && myconf="${myconf} --enable-debug"
+	use curl && myconf="${myconf} --with-libcurl"
+	use libmms && myconf="${myconf} --with-libmms"
+	use static-libs && myconf="${myconf} --enable-staticlibs"
+
 	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)
+		${myconf}
 }
 
 src_compile() {