Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/
Date: Sun, 08 May 2016 16:28:17
Message-Id: 1462724811.235cb0563c3bb04cab45b7182292594364c4b9c5.chewi@gentoo
1 commit: 235cb0563c3bb04cab45b7182292594364c4b9c5
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 8 13:21:19 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun May 8 16:26:51 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235cb056
7
8 media-video/makemkv: Install everything to /usr, not some to /opt
9
10 makemkvcon looks for files in ../share/MakeMKV. Installing them to
11 /opt/share/MakeMKV is a bit weird and using /opt requires patching so
12 it's not exactly supported by upstream.
13
14 This means installing prebuilt binaries to /usr but we were previously
15 having to install a freshly-built binary to /opt so we're screwing FHS
16 either way. ;)
17
18 Package-Manager: portage-2.2.28
19
20 media-video/makemkv/makemkv-1.9.10.ebuild | 9 ++++-----
21 1 file changed, 4 insertions(+), 5 deletions(-)
22
23 diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild b/media-video/makemkv/makemkv-1.9.10.ebuild
24 index 57fd31d..cb90134 100644
25 --- a/media-video/makemkv/makemkv-1.9.10.ebuild
26 +++ b/media-video/makemkv/makemkv-1.9.10.ebuild
27 @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
28 IUSE="libav multilib qt4 qt5"
29 REQUIRED_USE="?? ( qt4 qt5 )"
30
31 -QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
32 +QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
33
34 DEPEND="
35 sys-libs/glibc[multilib?]
36 @@ -116,7 +116,6 @@ src_install() {
37 dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
38 dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
39 dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
40 - into /opt
41
42 if use qt4 || use qt5; then
43 dobin out/makemkv
44 @@ -165,9 +164,9 @@ pkg_postinst() {
45 elog "Note that beta license may have an expiration date and you will"
46 elog "need to check for newer licenses/releases. "
47 elog ""
48 - elog "If this is a new install, remember to copy the default profile"
49 - elog "to the config directory:"
50 - elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
51 + elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
52 + elog "is no longer necessary and you should delete it from there to"
53 + elog "avoid warning messages."
54 elog ""
55 elog "MakeMKV can also act as a drop-in replacement for libaacs and"
56 elog "libbdplus, allowing transparent decryption of a wider range of"