Add pch USE flag to avoid breakage on hardened (bug 352185). Bump to EAPI 3. Drop old.

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

8 files changed, 26 insertions, 402 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 1f4bac58f3ea..91f33c1d6099 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mkvtoolnix
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.134 2010/11/04 18:00:27 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.135 2011/01/21 17:51:38 spatz Exp $
+
+  21 Jan 2011; Dror Levin <spatz@gentoo.org> -mkvtoolnix-3.2.0.ebuild,
+  -mkvtoolnix-3.3.0.ebuild, -files/mkvtoolnix-4.0.0-qt4.patch,
+  -mkvtoolnix-4.1.1.ebuild, -mkvtoolnix-4.2.0.ebuild, -mkvtoolnix-4.3.0.ebuild,
+  mkvtoolnix-4.4.0.ebuild:
+  Add pch USE flag to avoid breakage on hardened (bug 352185). Bump to EAPI 3.
+  Drop old.
 
 *mkvtoolnix-4.4.0 (04 Nov 2010)
 
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch b/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch
deleted file mode 100644
index b79f668d1e1a..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/info/qt_ui.cpp.orig	2010-06-08 07:03:31.000000000 -0600
-+++ src/info/qt_ui.cpp	2010-06-08 07:04:05.000000000 -0600
-@@ -260,7 +260,7 @@
-                 int64_t position,
-                 int64_t size) {
-   if (!g_use_gui)
--    console_show_element(level, text, position);
-+    console_show_element(level, text, position, size);
- 
-   else if (0 <= position)
-     gui->add_item(level, Q(create_element_text(text, position, size).c_str()));
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild
deleted file mode 100644
index 079e2e5318c4..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild,v 1.3 2010/03/18 13:03:03 spatz Exp $
-
-EAPI="1"
-inherit eutils wxwidgets flag-o-matic qt4 autotools
-
-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 doc flac lzo qt4 wxwidgets"
-
-DEPEND=">=dev-libs/libebml-0.7.7
-	>=media-libs/libmatroska-0.8.1
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/expat
-	sys-libs/zlib
-	dev-libs/boost
-	wxwidgets? ( x11-libs/wxGTK:2.8 )
-	flac? ( media-libs/flac )
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	qt4? ( x11-libs/qt-gui:4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		$(use_with flac) \
-		$(use_enable qt4 qt) \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-
-	# Don't run strip while installing stuff, leave to portage the job.
-	emake STRIP="true" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-	doman doc/man/*.1 || die "doman failed"
-
-	if use doc; then
-		dohtml doc/guide/en/mkvmerge-gui.html || die "dohtml failed"
-		docinto html/images
-		dohtml doc/guide/en/images/* || die "dohtml failed"
-		docinto examples
-		dodoc examples/* || die "dodoc failed"
-	fi
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.3.0.ebuild
deleted file mode 100644
index 5f6c1ff59d8e..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-3.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.3.0.ebuild,v 1.1 2010/03/25 13:51:53 beandog Exp $
-
-EAPI="1"
-inherit eutils wxwidgets flag-o-matic qt4 autotools
-
-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 doc flac lzo qt4 wxwidgets"
-
-DEPEND=">=dev-libs/libebml-0.7.7
-	>=media-libs/libmatroska-0.8.1
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/expat
-	sys-libs/zlib
-	dev-libs/boost
-	wxwidgets? ( x11-libs/wxGTK:2.8 )
-	flac? ( media-libs/flac )
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	qt4? ( x11-libs/qt-gui:4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		$(use_with flac) \
-		$(use_enable qt4 qt) \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-
-	# Don't run strip while installing stuff, leave to portage the job.
-	emake STRIP="true" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-	doman doc/man/*.1 || die "doman failed"
-
-	if use doc; then
-		dohtml doc/guide/en/mkvmerge-gui.html || die "dohtml failed"
-		docinto html/images
-		dohtml doc/guide/en/images/* || die "dohtml failed"
-		docinto examples
-		dodoc examples/* || die "dodoc failed"
-	fi
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.1.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.1.1.ebuild
deleted file mode 100644
index 02ba8b9fc9e4..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.1.1.ebuild,v 1.1 2010/07/23 19:54:05 beandog Exp $
-
-EAPI="1"
-inherit eutils wxwidgets flag-o-matic qt4 autotools
-
-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 doc flac lzo qt4 wxwidgets"
-
-DEPEND=">=dev-libs/libebml-1.0.0
-	>=media-libs/libmatroska-1.0.0
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/expat
-	sys-libs/zlib
-	dev-libs/boost
-	wxwidgets? ( x11-libs/wxGTK:2.8 )
-	flac? ( media-libs/flac )
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	qt4? ( x11-libs/qt-gui:4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		$(use_with flac) \
-		$(use_enable qt4 qt) \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-
-	# Don't run strip while installing stuff, leave to portage the job.
-	emake STRIP="true" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-	doman doc/man/*.1 || die "doman failed"
-
-	if use doc; then
-		dohtml doc/guide/en/mkvmerge-gui.html || die "dohtml failed"
-		docinto html/images
-		dohtml doc/guide/en/images/* || die "dohtml failed"
-		docinto examples
-		dodoc examples/* || die "dodoc failed"
-	fi
-}
-
-pkg_postinst() {
-	use qt4 && elog "Qt GUI is unsupported by upstream, and may be removed
-	soon."
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.2.0.ebuild
deleted file mode 100644
index cd20b10ede1b..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.2.0.ebuild,v 1.1 2010/07/29 22:33:18 beandog Exp $
-
-EAPI="1"
-inherit eutils wxwidgets flag-o-matic qt4 autotools
-
-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 doc flac lzo qt4 wxwidgets"
-
-DEPEND=">=dev-libs/libebml-1.0.0
-	>=media-libs/libmatroska-1.0.0
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/expat
-	sys-libs/zlib
-	dev-libs/boost
-	wxwidgets? ( x11-libs/wxGTK:2.8 )
-	flac? ( media-libs/flac )
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	qt4? ( x11-libs/qt-gui:4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		$(use_with flac) \
-		$(use_enable qt4 qt) \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-
-	# Don't run strip while installing stuff, leave to portage the job.
-	emake STRIP="true" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-	doman doc/man/*.1 || die "doman failed"
-
-	if use doc; then
-		dohtml doc/guide/en/mkvmerge-gui.html || die "dohtml failed"
-		docinto html/images
-		dohtml doc/guide/en/images/* || die "dohtml failed"
-		docinto examples
-		dodoc examples/* || die "dodoc failed"
-	fi
-}
-
-pkg_postinst() {
-	use qt4 && elog "Qt GUI is unsupported by upstream, and may be removed
-	soon."
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.3.0.ebuild
deleted file mode 100644
index e92c154a6be6..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-4.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.3.0.ebuild,v 1.3 2010/10/01 23:29:03 beandog Exp $
-
-EAPI="1"
-inherit wxwidgets autotools
-
-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 wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.0.0
-	>=media-libs/libmatroska-1.0.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 )
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
-	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
-
-	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
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
index b3a18f5abdf4..e9700a1e9068 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild
@@ -1,9 +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-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild,v 1.1 2010/11/04 18:00:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.4.0.ebuild,v 1.2 2011/01/21 17:51:38 spatz Exp $
 
-EAPI="1"
-inherit wxwidgets autotools
+EAPI=3
+
+inherit autotools
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -12,7 +13,7 @@ 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 wxwidgets"
+IUSE="bzip2 debug lzo pch wxwidgets"
 
 RDEPEND="
 	>=dev-libs/libebml-1.0.0
@@ -26,25 +27,22 @@ RDEPEND="
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	lzo? ( dev-libs/lzo )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 "
 DEPEND="${RDEPEND}
 	dev-ruby/rake
 "
 
-pkg_setup() {
-	WX_GTK_VER="2.8"
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-}
-
 src_prepare() {
 	eautoreconf
 }
 
-src_compile() {
-	use wxwidgets && myconf="--with-wx-config=${WX_CONFIG}"
+src_configure() {
+	local myconf
+
+	use pch       || myconf="${myconf} --disable-precompiled-headers"
+	use wxwidgets && myconf="${myconf} --with-wx-config=${WX_CONFIG}"
+
 	econf \
 		$(use_enable lzo) \
 		$(use_enable bzip2 bz2) \
@@ -55,7 +53,9 @@ src_compile() {
 		--with-boost-regex=boost_regex \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system
+}
 
+src_compile() {
 	rake || die "rake failed"
 }
 
@@ -63,6 +63,6 @@ src_install() {
 	# Don't run strip while installing stuff, leave to portage the job.
 	DESTDIR="${D}" rake install || die
 
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/*.1
+	dodoc AUTHORS ChangeLog README TODO || die
+	doman doc/man/*.1 || die
 }