[gentoo-commits] gentoo-x86 commit in media-video/mkvtoolnix: ChangeLog mkvtoolnix-3.2.0.ebuild mkvtoolnix-3.1.0.ebuild mkvtoolnix-3.0.0.ebuild

[gentoo-commits] gentoo-x86 commit in media-video/mkvtoolnix: ChangeLog mkvtoolnix-3.2.0.ebuild mkvtoolnix-3.1.0.ebuild mkvtoolnix-3.0.0.ebuild

[Dror Levin (spatz)]

spatz       10/03/18 13:03:04

  Modified:             ChangeLog mkvtoolnix-3.2.0.ebuild
  Removed:              mkvtoolnix-3.1.0.ebuild mkvtoolnix-3.0.0.ebuild
  Log:
  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)

Revision  Changes    Path
1.125                media-video/mkvtoolnix/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.124&r2=1.125

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog	24 Feb 2010 20:04:17 -0000	1.124
+++ ChangeLog	18 Mar 2010 13:03:03 -0000	1.125
@@ -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,



1.3                  media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild?r1=1.2&r2=1.3

Index: mkvtoolnix-3.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-3.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mkvtoolnix-3.2.0.ebuild	24 Feb 2010 20:04:17 -0000	1.2
+++ mkvtoolnix-3.2.0.ebuild	18 Mar 2010 13:03:03 -0000	1.3
@@ -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 @@
 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_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
 }