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)

1 files changed, 17 insertions, 17 deletions

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
 }