summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dibb <beandog@gentoo.org>2011-12-03 00:32:01 +0000
committerSteve Dibb <beandog@gentoo.org>2011-12-03 00:32:01 +0000
commit3d5223f2655af409004cb5fd7927648006abb648 (patch)
treeff49053b24eb688b51725f7dc2cec6ba4683203d /media-video/makemkv
parentVersion bump. (diff)
downloadgentoo-2-3d5223f2655af409004cb5fd7927648006abb648.tar.gz
gentoo-2-3d5223f2655af409004cb5fd7927648006abb648.tar.bz2
gentoo-2-3d5223f2655af409004cb5fd7927648006abb648.zip
Add sys-libs/zlib dependency, cleanup QA variables, install into /opt
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-video/makemkv')
-rw-r--r--media-video/makemkv/ChangeLog6
-rw-r--r--media-video/makemkv/files/makemkv-1.6.16-makefile.linux.patch2
-rw-r--r--media-video/makemkv/makemkv-1.6.16.ebuild10
3 files changed, 11 insertions, 7 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/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