Remove automagic dependency on curl (fixes bug #366987) and remove old.

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

4 files changed, 18 insertions, 141 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 37ea17a7f8f8..b06dcc2c653f 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.141 2011/04/27 18:24:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.142 2011/05/13 10:05:57 radhermit Exp $
+
+*mkvtoolnix-4.7.0-r1 (13 May 2011)
+
+  13 May 2011; Tim Harder <radhermit@gentoo.org> -mkvtoolnix-4.5.0.ebuild,
+  -mkvtoolnix-4.6.0.ebuild, -mkvtoolnix-4.7.0.ebuild,
+  +mkvtoolnix-4.7.0-r1.ebuild:
+  Remove automagic dependency on curl (fixes bug #366987) and remove old.
 
 *mkvtoolnix-4.7.0 (27 Apr 2011)
 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild
deleted file mode 100644
index 0209375c98a9..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.5.0.ebuild,v 1.1 2011/02/02 07:17:35 radhermit Exp $
-
-EAPI=3
-
-inherit wxwidgets
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="bzip2 debug lzo pch wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.0
-	>=media-libs/libmatroska-1.1.0
-	dev-libs/boost
-	dev-libs/expat
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-
-src_configure() {
-	local myconf
-
-	use pch || myconf="${myconf} --disable-precompiled-headers"
-
-	if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		--disable-qt \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-}
-
-src_compile() {
-	rake || die "rake failed"
-}
-
-src_install() {
-	# Don't run strip while installing stuff, leave to portage the job.
-	DESTDIR="${D}" rake install || die
-
-	dodoc AUTHORS ChangeLog README TODO || die
-	doman doc/man/*.1 || die
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.6.0.ebuild
deleted file mode 100644
index 917af51699c0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.6.0.ebuild,v 1.2 2011/03/14 01:54:52 radhermit Exp $
-
-EAPI=3
-
-inherit wxwidgets
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="bzip2 debug lzo pch wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.0
-	>=media-libs/libmatroska-1.1.0
-	>=dev-libs/boost-1.36.0
-	dev-libs/expat
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-
-src_configure() {
-	local myconf
-
-	use pch || myconf="${myconf} --disable-precompiled-headers"
-
-	if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		--disable-qt \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-}
-
-src_compile() {
-	rake || die "rake failed"
-}
-
-src_install() {
-	# Don't run strip while installing stuff, leave to portage the job.
-	DESTDIR="${D}" rake install || die
-
-	dodoc AUTHORS ChangeLog README TODO || die
-	doman doc/man/*.1 || die
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.7.0-r1.ebuild
index e9c9ab768119..25d02d0d44b0 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-4.7.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-4.7.0-r1.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-video/mkvtoolnix/mkvtoolnix-4.7.0.ebuild,v 1.1 2011/04/27 18:24:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.7.0-r1.ebuild,v 1.1 2011/05/13 10:05:57 radhermit Exp $
 
 EAPI=4
 
-inherit wxwidgets
+inherit wxwidgets autotools
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -33,6 +33,14 @@ DEPEND="${RDEPEND}
 	dev-ruby/rake
 "
 
+src_prepare() {
+	# Disable automagic curl dep used for online update checking
+	sed -i -e '/curl/d' configure.in
+	export CURL_CFLAGS="" CURL_LIBS=""
+
+	eautoreconf
+}
+
 src_configure() {
 	local myconf