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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 34 insertions, 158 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/Manifest b/media-video/mkvtoolnix/Manifest
index 4d869824371d..fb81317a09ec 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST mkvtoolnix-2.9.9.tar.bz2 1116610 RMD160 5bc4599d66c55298ca901b21fdcd0ef0bae88906 SHA1 3e41855c95dd30a22f353cebb0d8ae1d9ee2c138 SHA256 0df4ee19c7b4961af0ec027b54b31a84bffd8f7bae2f98145df48c4a520dbb7a
-DIST mkvtoolnix-3.0.0.tar.bz2 1117727 RMD160 9052bccb35fb46e5757f14a954cd9253cff0413f SHA1 69b4951640e2b0e5fcb27394444ffac24c001b54 SHA256 6450de85d63c657230363ab82ce1f5423427a6a0073e7fd18bff4f48f3b8b5a8
-DIST mkvtoolnix-3.1.0.tar.bz2 1364401 RMD160 938613f0d2e1daf0cde4f90a55e46ce4e8fde828 SHA1 e6aa12d18531f7857caef4be1be074b84a63376d SHA256 872fa40b8cb084fcbfd16b0a0e24a58488a0d42f80988cd512daa659d94eb4a9
 DIST mkvtoolnix-3.2.0.tar.bz2 1384155 RMD160 d4dd843ddfbb741339080dbb729938eedf2505d8 SHA1 e5d2137402ef6731ee019a472527b77935d301b1 SHA256 2b247053f48ccb8f2ba3e165d3751c82f7ede4948224383ce9b62f2b7ba746aa
 EBUILD mkvtoolnix-2.9.9.ebuild 1758 RMD160 401f97f9a5fe733c3ad75fe13e7d1f9e19c5d417 SHA1 2eecb7146514532e9b9d29044a503258e898af2e SHA256 4072f09aa64725551dc711f7109685f3de7968f6bb8bf1bac826bc39ee6cc50a
-EBUILD mkvtoolnix-3.0.0.ebuild 1761 RMD160 ab1bf54f87184462e59407322bc038594775c8e8 SHA1 f79b1dcbcd6c4cb0a76c615dc204b344f036760b SHA256 3115118f2bf0801b9c88b47a20637ec4326cd5b08fbbac8e6dd83c68c0f3ab50
-EBUILD mkvtoolnix-3.1.0.ebuild 1843 RMD160 fa7d8dcaa5adf0c8b7fdb3330a786ef6252f1347 SHA1 64f0a4dc2d718c08e113ad26b61b5831457d3aaa SHA256 c31a921310e0d1c273329df58ba17d8a0b0adb8cabe7a6371794345c92f27e09
-EBUILD mkvtoolnix-3.2.0.ebuild 1843 RMD160 2d58c628ace80459043234861b5e13bd293615a2 SHA1 6c778c3e0fa42533fb730a6914b7ee58e72db059 SHA256 56e957af36e1b79d779384b627ccea2eb30227fc9b6b82ad57867b860f6c77a5
-MISC ChangeLog 18231 RMD160 8ab087a7c18571154cad20bfcec0231f761c508f SHA1 d02013fd71b2fc07fd143e4a29a01c092bb01ff8 SHA256 5e200547cfe6088f3c55610925d58b41dfbd8964098568ac790a9ed199cd4cd3
+EBUILD mkvtoolnix-3.2.0.ebuild 1947 RMD160 03c311ffc41e58c535dbad8da52b7fd6888a2e52 SHA1 3a1e1d1cab19aa7eb9f9d7e9d5e607e9c7ea423f SHA256 4a3c7aff1082ba209463f393253205c80b3fd3671a7b3140df90e08546a428e2
+MISC ChangeLog 18486 RMD160 b3640ffd2fd918dbeec533a37740d30bc2600f29 SHA1 dc1b1cc43821aab75acff7d81b139dd46b0e309e SHA256 2764ba831e4e3f600964c9ece4ce7db491761c889bcfbb48c286feb62e64f2ea
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLoiSTAAoJEAWF714uGAc6eGAH/18U6ciakqcyTM27r5bDhIDJ
+hLrgTFFTQvnIL4xMXcyT+Znha2gx7tsRBPtQ5OhtDDSWC1a/ssRFbW3Sbn2T5sqK
+URGskAXMWKidFgZR5o1+zqLBPhxgfKiTgZXIBwinqF57RFM/7JdqJJ2p1vnH8i+L
+nS3gHVUxCYdpatIo43p0rkodJrGV+UvWx+XifQqP+5Md+W3RbH4aMD/llEeSi+8L
+YP1iXmR71gy/UkWAywSMDDnux34QUuDknl4mk0IqlnZx1lvDMYnc+ir5jttPeCf5
+HUNZWwfd4pG1QQRsvvoZ+70XFSOY/itQ4BIuzoqZhaZZHGYx1BVSGYH5h0yYNGo=
+=RJZV
+-----END PGP SIGNATURE-----
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
 }