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

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

9 files changed, 42 insertions, 415 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/Manifest b/media-video/mkvtoolnix/Manifest
index fc480215814e..6b4bacd84309 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,19 +1,22 @@
-AUX mkvtoolnix-4.0.0-qt4.patch 446 RMD160 3044bccd8c22cd607b43476c90a09cdf7730dbcd SHA1 a7b28c83bd4ae1d4509c502bed91a4f880b30c02 SHA256 fbbb6da36e5c35eac2ca5e1e87022eb02627a20178a123e26cc9bf14848f6ac3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST mkvtoolnix-2.9.9.tar.bz2 1116610 RMD160 5bc4599d66c55298ca901b21fdcd0ef0bae88906 SHA1 3e41855c95dd30a22f353cebb0d8ae1d9ee2c138 SHA256 0df4ee19c7b4961af0ec027b54b31a84bffd8f7bae2f98145df48c4a520dbb7a
-DIST mkvtoolnix-3.2.0.tar.bz2 1384155 RMD160 d4dd843ddfbb741339080dbb729938eedf2505d8 SHA1 e5d2137402ef6731ee019a472527b77935d301b1 SHA256 2b247053f48ccb8f2ba3e165d3751c82f7ede4948224383ce9b62f2b7ba746aa
-DIST mkvtoolnix-3.3.0.tar.bz2 1369940 RMD160 8a3d9b0990815ce058ed9e1d317a01dcbeece091 SHA1 6e6cf694f6b887c6027ea2dcdd4aed704cdcab9f SHA256 a24fb6fbcd6779f02f8146ee448abfc6dab9ac23ed15b685b37e6a71e340a5f4
 DIST mkvtoolnix-3.4.0.tar.bz2 1484414 RMD160 44c3a6f2213319a14931417d1fbd5042f4de9a87 SHA1 ec29960fa5d23d3a090882c70806c34c50548a4f SHA256 6e259a1b34e4cdd5fe61dbde12dfddde792609708c6a325ad3f27cb750ac1e12
-DIST mkvtoolnix-4.1.1.tar.bz2 1762815 RMD160 e49cecca4dd880856c0b78958d48dcd645f88d59 SHA1 8105585c6dd5ec0054cb88100024be1459e9f01e SHA256 8e4cb8f396a8270c1ca4fe15e8cc14fe66d1c640887eb7217c82dc097e883ee8
-DIST mkvtoolnix-4.2.0.tar.bz2 1767048 RMD160 b95e86ee90ae7ab093dabb0e0b5d08fa7753961a SHA1 afa101267882c1c9fe89b6e75b5818ebec4d2209 SHA256 51880e29debd7a93273681ad4083dc82b6b8ac3674cca2f1b11b4acbefc38b85
-DIST mkvtoolnix-4.3.0.tar.bz2 1815867 RMD160 c55a126da2bcf5e36de61113bb64672d5fb44af4 SHA1 70ae0d5769d65b032c15eedc01e914be3245779e SHA256 f98cb220495f23985c3b9f883ee9573c7fa38705ace94b025578feebfcdfcd1f
 DIST mkvtoolnix-4.4.0.tar.bz2 1773026 RMD160 85370a9ebd75b66b857c30edef1b22d8c0dce880 SHA1 c5e6cbc2fb522ba6653124a2eef6b416bafc488a SHA256 d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a
 EBUILD mkvtoolnix-2.9.9.ebuild 1758 RMD160 401f97f9a5fe733c3ad75fe13e7d1f9e19c5d417 SHA1 2eecb7146514532e9b9d29044a503258e898af2e SHA256 4072f09aa64725551dc711f7109685f3de7968f6bb8bf1bac826bc39ee6cc50a
-EBUILD mkvtoolnix-3.2.0.ebuild 1947 RMD160 03c311ffc41e58c535dbad8da52b7fd6888a2e52 SHA1 3a1e1d1cab19aa7eb9f9d7e9d5e607e9c7ea423f SHA256 4a3c7aff1082ba209463f393253205c80b3fd3671a7b3140df90e08546a428e2
-EBUILD mkvtoolnix-3.3.0.ebuild 1949 RMD160 cb1a28743ec759eaab9d415abec315ecdeb3f824 SHA1 615356a5c38c4cf6c72f15f27749495fe379cc9e SHA256 bfa8413ae1b62225bfabe2008300fe223730e0e21db89e0a4acb731650a1270a
 EBUILD mkvtoolnix-3.4.0.ebuild 1947 RMD160 209d467f1ca449b06931324b279f43f0cf3dab3d SHA1 ebe58d040c4d10d0793bc83b41e3241d604a2f1c SHA256 1d0feabb65114001fdf2063a466a4a59e0b84ff9ee0b50855be1ce0849f71e0c
-EBUILD mkvtoolnix-4.1.1.ebuild 2025 RMD160 3e1b9ecfb765845415398ddc4ef6cf1267f23036 SHA1 f796dcfd35ac00468e9c60edc5c14eab2a37634a SHA256 4b3a29986a2b7d39f127254e17a8cc692e6446b13c2d11d103aeb142549c5955
-EBUILD mkvtoolnix-4.2.0.ebuild 2025 RMD160 82f789124f7e2c93c18842ad68e3cb2145f1ebcc SHA1 b0ee0af51620b496ded65e41117ef54423d96d2d SHA256 e5b51b45efc29abd40452a824cf8aba3548f49bacd66b59d6c009a35ca4dd3e2
-EBUILD mkvtoolnix-4.3.0.ebuild 1541 RMD160 3445a70629f09cb657f7a392fef686aeeb4d8ff4 SHA1 13042d022dfa4809eea96cb1ab06a1f2bd9e7c05 SHA256 ea20cfd3ef787dabee6a27ca804d3e7e23e929a68e6acf25be30e88db2b66ed1
-EBUILD mkvtoolnix-4.4.0.ebuild 1541 RMD160 5298d8d503f416ba961751918d0c73216ccdc048 SHA1 8a925047b826f71c219c792ddeffa2f4a57cb3c8 SHA256 f6e4546cc62be67aab349c75f4f20ce00b13325e2e79a041cb74eb5c0a10aec5
-MISC ChangeLog 19758 RMD160 ef2e9a207f9ac9ecb8372eb5049fa601dc8194dc SHA1 873da22bed3cafc517b2d35cb7e6de77e3a0af8a SHA256 6cf69537693419e39c1fbcf955f58dc2694b81d27e6aa0674fe53769ed89ae7d
+EBUILD mkvtoolnix-4.4.0.ebuild 1574 RMD160 883d4994f89d378023e4f7697b913ce5f2be4eda SHA1 e83651f015f1930512d9d8904635891c565d5d34 SHA256 469e4da915e6eb91091c9dc8d7085a6813092104c3ab8eb96590fcf251b18842
+MISC ChangeLog 20089 RMD160 b94222b994b67e3c082008652908113021ba4ef7 SHA1 c2d23360f7523ed417547c8cba029582dfb9962c SHA256 21cc35041d4c8d92f0bfcd67b9cacc04460cb5c50a9104d8bd8d4aebc4e85308
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCgAGBQJNOce1AAoJEAWF714uGAc6rooH/3juSdI3fZRxo9kC4zGgGOJ4
+676OyywWaC1P8DAdH4XUpuZ3/wOvagU/dTmKPLCFN9GK3yRVkTWbzSm3y4ghub6f
+H1X6EUCcu0kCBfDnYRIVYM/sNglLznjT/u4rmlWBWrD8brY47fyiSTo+fhTlTnxQ
+DdeKSuC6EcUbk75ipLcj18NafFungAVc9fgsmfKv4nwULrzHMmYAj6R66PrXcnnB
+s0M7A+7fGzjnaVJRWc/sxJWHh5efAYrs+UxmBKFf6hd5K+3j7ylsxcgs9zhywHKX
+goLeiaUP8ilb3Fwd4JeBNWEbdHSlHqwLXnaphT/ZGeR4YpFYviKZcBUapiQKf+k=
+=yhTb
+-----END PGP SIGNATURE-----
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
 }