Add doc USE flag, fix html documentation installation (path moved), install missing manpage, properly die on failure. Remove old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 18 insertions, 152 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 867d5e15ef0c..b5c0c48d8da9 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.124 2010/02/24 20:04:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.125 2010/03/18 13:03:03 spatz Exp $
+
+  18 Mar 2010; Dror Levin <spatz@gentoo.org> -mkvtoolnix-3.0.0.ebuild,
+  -mkvtoolnix-3.1.0.ebuild, mkvtoolnix-3.2.0.ebuild:
+  Add doc USE flag, fix html documentation installation (path moved), install
+  missing manpage, properly die on failure. Remove old.
 
   24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   mkvtoolnix-2.9.9.ebuild, mkvtoolnix-3.0.0.ebuild, mkvtoolnix-3.1.0.ebuild,
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.0.0.ebuild
deleted file mode 100644
index f72b6772b140..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-3.0.0.ebuild
+++ /dev/null
@@ -1,70 +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.0.0.ebuild,v 1.2 2010/02/24 20:04:17 ssuominen 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="wxwidgets flac bzip2 lzo qt4 debug"
-
-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
-
-	# 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
-	doman doc/man/mkv{merge,extract,info}.1 doc/man/mmg.1 || die "doman failed"
-	dohtml doc/mkvmerge-gui.html
-	docinto images
-	dohtml doc/images/*
-	docinto examples
-	dohtml examples/*
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild
deleted file mode 100644
index c6499a98f03c..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-3.1.0.ebuild
+++ /dev/null
@@ -1,72 +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.1.0.ebuild,v 1.2 2010/02/24 20:04:17 ssuominen 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="wxwidgets flac bzip2 lzo qt4 debug"
-
-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
-	doman doc/man/mkv{merge,extract,info}.1 doc/man/mmg.1 || die "doman failed"
-	dohtml doc/mkvmerge-gui.html
-	docinto images
-	dohtml doc/images/*
-	docinto examples
-	dohtml examples/*
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild
index 3ab5ecc22fb7..079e2e5318c4 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/02/24 20:04:17 ssuominen Exp $
+# $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
@@ -12,7 +12,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="wxwidgets flac bzip2 lzo qt4 debug"
+IUSE="bzip2 debug doc flac lzo qt4 wxwidgets"
 
 DEPEND=">=dev-libs/libebml-0.7.7
 	>=media-libs/libmatroska-0.8.1
@@ -62,11 +62,14 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" STRIP="true" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/mkv{merge,extract,info}.1 doc/man/mmg.1 || die "doman failed"
-	dohtml doc/mkvmerge-gui.html
-	docinto images
-	dohtml doc/images/*
-	docinto examples
-	dohtml examples/*
+	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
 }