Add sys-libs/zlib dependency, cleanup QA variables, install into /opt

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 14 insertions, 10 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 0f8425bd2d63..101fc2cd8ca8 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.1 2011/12/02 20:32:19 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.2 2011/12/03 00:32:00 beandog Exp $
+
+  03 Dec 2011; Steve Dibb <beandog@gentoo.org> makemkv-1.6.16.ebuild,
+  files/makemkv-1.6.16-makefile.linux.patch:
+  Add sys-libs/zlib dependency, cleanup QA variables, install into /opt
 
 *makemkv-1.6.16 (02 Dec 2011)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 1ad66d4b9eb5..a690e9d07474 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,6 @@
-AUX makemkv-1.6.16-makefile.linux.patch 579 RMD160 453bb183983c69e97754b8f6e57be37c98bffaa1 SHA1 d2f71b520cbe28c922c54b7bf6506f8714bc1add SHA256 3a9e523f244afb4456757f6664c63db2f106e7923a129c6b6e9a9c5f68449859
+AUX makemkv-1.6.16-makefile.linux.patch 579 RMD160 2757c09928bcded8fa385eb906ec19acf56e7bd3 SHA1 b05913e83d079bec55ee1e8e0705eefc1dc9c26f SHA256 ebf3085044c4d1b6c1a06e48de5ab7d601944de42835d421484d6ddb5d15f535
 DIST makemkv_v1.6.16_bin.tar.gz 5877692 RMD160 9b22f4d4d2aa14d8cefae5070c35fe4955aef2f9 SHA1 fa5e26439a9c0bb238ceb53a84a2900a262dcca0 SHA256 0f0b2df68b7fc294834d7cbeda21d54884caf9e13a9b0190921dae27d7418309
 DIST makemkv_v1.6.16_oss.tar.gz 438026 RMD160 0fca584fe4a574a2a6a420cb88db687a60b0358c SHA1 009e6e21e0f270255f9b1087b70f8c46c95520ed SHA256 2cff47e51f465259704b0840717433f90e938d13fd7e18a01d674174b747f85b
-EBUILD makemkv-1.6.16.ebuild 2087 RMD160 7d8e47d738b7d00c4c1866a529e1adfaab0e4441 SHA1 5e6d9e16b8b6437aa558d3278f818779ff8a588b SHA256 1c70ea376ce6cdee6731018a1ab0d15cdaa0844072531cc38d91798fc4660ec0
-MISC ChangeLog 377 RMD160 1bdb848dd03518820b5242b1feaad05b9d18653e SHA1 f9d49857aa1134e08d38f144cc54238a0968171d SHA256 f05c2ed75df146c1e53c2c502b67b50c8747f6d2bf18213f9db574f6cff2b8fa
+EBUILD makemkv-1.6.16.ebuild 2064 RMD160 d030435bb0c33dc0ae0be8972474c25a801ad9da SHA1 bcd2eb5ab0b279c119b0bd2862c7138bdccc1350 SHA256 2a50702bb7852dc4f9b48609596d6f6009e48961560cf3fff4697f0824e9a505
+MISC ChangeLog 565 RMD160 ee511074b25bcb1bb970ab63c768831a9cc2c4b7 SHA1 54d9d0abb83ed802493a341ce4a8796d9d575a93 SHA256 b2ecbd71bd6149412e18c19472f190051c88135d5f4ed51705bd5f55a15f8d89
 MISC metadata.xml 224 RMD160 71a1b9f875b9de0f7a9f0dd00557874d936c5021 SHA1 2bca68cdbca3845abaaa36497a91b789eb1a89d0 SHA256 98cfdec9b1c16d801783412e122d81d3a42627c9b9595f5f8d0d8bf5ecb33e32
diff --git a/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch
index 72faa15faa98..4bef0bcd6f72 100644
--- a/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch
+++ b/media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch
@@ -1,5 +1,5 @@
 --- makemkv_v1.6.16_oss/makefile.linux.orig	2011-12-02 15:26:10.997323145 -0700
-+++ makemkv_v1.6.16_oss/makefile.linux	2011-12-02 16:28:26.966323351 -0700
++++ makemkv_v1.6.16_oss/makefile.linux	2011-12-02 17:24:34.058323537 -0700
 @@ -8,7 +8,7 @@
  MOC=moc
  endif
diff --git a/media-video/makemkv/makemkv-1.6.16.ebuild b/media-video/makemkv/makemkv-1.6.16.ebuild
index 65be47056f51..c776e252d363 100644
--- a/media-video/makemkv/makemkv-1.6.16.ebuild
+++ b/media-video/makemkv/makemkv-1.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.3 2011/12/02 23:32:34 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.4 2011/12/03 00:32:00 beandog Exp $
 
 EAPI=3
 
@@ -24,11 +24,11 @@ IUSE=""
 DEPEND="x11-libs/qt-gui:4
 	dev-libs/openssl:0
 	media-libs/mesa
-	x11-libs/qt-dbus:4"
+	x11-libs/qt-dbus:4
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-QA_PRESTRIPPED="/usr/bin/makemkvcon"
-QA_EXECSTACK="usr/bin/makemkvcon"
+QA_PREBUILT="opt/bin/makemkvcon"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-makefile.linux.patch"
@@ -47,7 +47,7 @@ src_install() {
 	dolib.so out/libmakemkv.so.1 || die "dolib.so out/libmakemkv.so.1 died"
 	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} || die "dosym libdriveio.so.0 died "
 	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} || die "dosym libmakemkv.so.1 died"
-	into /usr
+	into /opt
 	dobin out/makemkv || die "dobin makemkv died"
 
 	newicon makemkvgui/src/img/128/mkv_icon.png ${PN}.png