Install all the required files, and to correct locations, and actually add LICENSE info for them, see ChangeLog

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

3 files changed, 28 insertions, 30 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index b9bcd39813a5..8542b5917d86 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,13 +1,11 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.10 2012/07/04 09:08:02 ssuominen Exp $
-
-  04 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> makemkv-1.7.6.ebuild:
-  Stop installing the EULA to the filesystem.
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.11 2012/07/04 09:23:46 ssuominen Exp $
 
   04 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> makemkv-1.7.6.ebuild:
   Install hicolor icons and update icon cache. Use virtual/opengl instead of
-  media-libs/mesa.
+  media-libs/mesa. Missing LICENSE information from file headers; LGPL-2.1,
+  MPL-1.1 and openssl. Install translation files. Install mmdtsdec utility.
 
   03 Jul 2012; Matthew Marlowe <mattm@gentoo.org>
   files/makemkv-1.7.6-makefile.linux.patch:
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4a4b5ac25fee..dfdd7fdf5020 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -9,17 +9,17 @@ DIST makemkv-oss-1.7.6.tar.gz 482065 RMD160 62301e0fb27755b7fe16fc85d6cfb5065b58
 DIST makemkv_v1.7.4_bin.tar.gz 6691976 RMD160 12bbd1a5e50b843168eb85d7cb81010abdc42831 SHA1 ee6bf1452b75e4d16c4974879437c4781dc327f3 SHA256 0d0c14243fc8936792f0768d0c67682a071f79af489457f6a53826b543ad502a
 DIST makemkv_v1.7.4_oss.tar.gz 480897 RMD160 c3d327f8723743c28804c27749581f1536906304 SHA1 d53603799936c1c351d806ec97544e39b3e3365d SHA256 14be0175cce35fae31d2e175db5789b561b1859f125b2cd52af77ba180ec2ba1
 EBUILD makemkv-1.7.4-r1.ebuild 2792 RMD160 0a0603610b59a0a20e10298cad848e9d28a14e36 SHA1 1e3206b94eb71183099286c104496d9b3d9b589f SHA256 4415b7f5e60a78976a80805f91da564a8c6d95d37a94891916c73bc3d78f69c3
-EBUILD makemkv-1.7.6.ebuild 2630 RMD160 716e73ec23e47c09b15068775d42d9ab30a5dfc0 SHA1 5b3e83e1226e9c6b89c76fca72dd85fb8ddbd8ca SHA256 363cd6711671334bc62870877cc43dd46c317e914efb535de24bac7701a2ce7a
-MISC ChangeLog 2079 RMD160 e2e82c7aa47685d1a7d993dcc7d8ac206280e934 SHA1 b47437ac704371794cb58f3bea5666f92ff7032a SHA256 20ce9e206c2d2ca225842abbb4320f96074964c22df6a3477eb972ae7d3d3d2f
+EBUILD makemkv-1.7.6.ebuild 2732 RMD160 7232797edf470fa8d9ec2b86cce5a7d205885fd0 SHA1 c455865434cca6afe9338688bcde6f62245280dd SHA256 8565b87da9ebc7700efc60859e6ac3cab3f695515c13f196ee1c5c61d9c73e6d
+MISC ChangeLog 2089 RMD160 b06036fccfcb973486294055ee5466a3a5565762 SHA1 0d98fa7b7716851154e81c32ce57ff795f53db13 SHA256 baad24ba16cea280f04e725f7b9e41decbf5305eb473d17d95a17efa2838890d
 MISC metadata.xml 260 RMD160 2cfb583c5df98eb9a274ae051562f67b584730fc SHA1 0262c9db67ad475dcd4d2bf94619a7bc22e5d18c SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9AasAAoJEEdUh39IaPFN//sH/R/Ky0fk2LW9US5D0yJMTlmL
-KENlRebtxbJyMakkMlXvKywWJ/pA3XkQHu/j0WCSOnZEtGyEhVWMpa+rBAnwgMbR
-UO63PhQ4VMzgfvV1iA7fQvmCcH76A7NL9CjI5wEHqN/vd/UolcmyvkeHRY9RyTHE
-6SjLBQIcJawF10HhAfAtOP3Aa3MHaGy5jNkLOVxe4dwj41FF6OHNcT7R7eTa47FD
-jKnHxhGZwqNtSjulS1L9QooK22o1t3/u04NnFIPwNE7fBQ3U8HthPzwUDDNnhEPO
-8Va+pXgF9Ay97/eJtPM6MoqWK9mqO48gp4gwMa8YH7yQAv+IBe0TMmWZ0heSDQs=
-=mTi7
+iQEcBAEBAgAGBQJP9ApcAAoJEEdUh39IaPFN64sH/RBATvcCslTivxQ8UBv785UD
+hyjrBOhsTDB6DTM/vHS9proSHpN2rsxoo93z6DSPBFKelbLiNeJZN115oaazQsWV
+BycC8PHp71yyBunxbFODEdY6qd4LIqAKdkiQsFZuCHqa/aIP2cRj7FFcb36szy99
+6lnF82c0i1+BP0EXoGLjxfXtGlnLeakKX/0ZgJRVuhO/zCQTiK3NnU7CFK9ZSZ87
+70M1mqqlfhSnCQAFo94o9Ux3aZn4iReiC4ahKpWo2HsGU3Np71HQXFSe5DKd+TXz
+PHoVFCqT9i+b4DBrcfO9aN/xtLmgdeStcYSXnrGflI/C0RYdCd4P1otVTIhQRc8=
+=023c
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/makemkv-1.7.6.ebuild b/media-video/makemkv/makemkv-1.7.6.ebuild
index 34eca1d67bc1..6b5c142dc453 100644
--- a/media-video/makemkv/makemkv-1.7.6.ebuild
+++ b/media-video/makemkv/makemkv-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.7.6.ebuild,v 1.3 2012/07/04 09:08:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.7.6.ebuild,v 1.4 2012/07/04 09:23:46 ssuominen Exp $
 
 EAPI=4
 inherit eutils gnome2-utils multilib
@@ -13,26 +13,25 @@ HOMEPAGE="http://www.makemkv.com/"
 SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 	http://www.makemkv.com/download/${MY_PB}.tar.gz"
 
-LICENSE="MakeMKV-EULA"
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="multilib"
 
-QA_PREBUILT=opt/bin/makemkvcon
-RESTRICT=mirror
+QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
+RESTRICT="mirror"
 
 RDEPEND="dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
 	virtual/opengl
 	x11-libs/qt-dbus:4
-	x11-libs/qt-gui:4"
+	x11-libs/qt-gui:4
+	multilib? ( app-emulation/emul-linux-x86-baselibs )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-DEFAULT_PROFILE=default.mmcp.xml
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.linux.patch
 }
@@ -62,16 +61,17 @@ src_install() {
 	# install bin package
 	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
 	if use x86; then
-		dobin i386/makemkvcon
+		dobin i386/{makemkvcon,mmdtsdec}
 	elif use amd64; then
 		dobin amd64/makemkvcon
+		use multilib && dobin i386/mmdtsdec
 	fi
 	popd >/dev/null
 
 	# install license and default profile
-	pushd "${WORKDIR}"/${MY_PB}/src >/dev/null
-	insinto /usr/share/${PF}
-	doins share/${DEFAULT_PROFILE}
+	pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null
+	insinto /usr/share/MakeMKV
+	doins *.{gz,xml}
 	popd >/dev/null
 }
 
@@ -88,10 +88,10 @@ pkg_postinst() {
 	elog ""
 	elog "Note that beta license may have an expiration date and you will"
 	elog "need to check for newer licenses/releases. "
-	elog ""
-	elog "If this is a new install, remember to copy the default profile"
-	elog "to the config directory:"
-	elog "cp /usr/share/${PF}/${DEFAULT_PROFILE} ~/.MakeMKV/${DEFAULT_PROFILE}"
+#	elog ""
+#	elog "If this is a new install, remember to copy the default profile"
+#	elog "to the config directory:"
+#	elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
 }
 
 pkg_postrm() { gnome2_icon_cache_update; }