Remove old.

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

3 files changed, 5 insertions, 98 deletions

diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog
index ec8bab06e78f..a9a1e756464b 100644
--- a/media-libs/libmediainfo/ChangeLog
+++ b/media-libs/libmediainfo/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2011/07/21 10:39:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.22 2011/07/21 23:14:57 radhermit Exp $
+
+  21 Jul 2011; Tim Harder <radhermit@gentoo.org> -libmediainfo-0.7.41.ebuild,
+  -files/libmediainfo-0.7.41-curl.patch:
+  Remove old.
 
   21 Jul 2011; Markus Meier <maekke@gentoo.org> libmediainfo-0.7.45.ebuild:
   amd64/x86 stable, bug #375515
diff --git a/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch b/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch
deleted file mode 100644
index a03c47bcd53c..000000000000
--- a/media-libs/libmediainfo/files/libmediainfo-0.7.41-curl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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.41.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.41.ebuild
deleted file mode 100644
index 0bee76cfd520..000000000000
--- a/media-libs/libmediainfo/libmediainfo-0.7.41.ebuild
+++ /dev/null
@@ -1,73 +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.41.ebuild,v 1.4 2011/07/17 16:00:46 pacho Exp $
-
-EAPI="3"
-
-inherit autotools 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 mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.14[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-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}"/${P}-curl.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use debug && myconf="${myconf} --enable-debug"
-	use curl && myconf="${myconf} --with-libcurl"
-	use mms && myconf="${myconf} --with-libmms"
-	use static-libs && myconf="${myconf} --enable-staticlibs"
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-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
-}