commit:     235cb0563c3bb04cab45b7182292594364c4b9c5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 13:21:19 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May  8 16:26:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235cb056

media-video/makemkv: Install everything to /usr, not some to /opt

makemkvcon looks for files in ../share/MakeMKV. Installing them to
/opt/share/MakeMKV is a bit weird and using /opt requires patching so
it's not exactly supported by upstream.

This means installing prebuilt binaries to /usr but we were previously
having to install a freshly-built binary to /opt so we're screwing FHS
either way. ;)

Package-Manager: portage-2.2.28

 media-video/makemkv/makemkv-1.9.10.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
index 57fd31d..cb90134 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
 REQUIRED_USE="?? ( qt4 qt5 )"
 
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
 DEPEND="
        sys-libs/glibc[multilib?]
@@ -116,7 +116,6 @@ src_install() {
        dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
        dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
        dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
-       into /opt
 
        if use qt4 || use qt5; then
                dobin out/makemkv
@@ -165,9 +164,9 @@ pkg_postinst() {
        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/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
+       elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+       elog "is no longer necessary and you should delete it from there to"
+       elog "avoid warning messages."
        elog ""
        elog "MakeMKV can also act as a drop-in replacement for libaacs and"
        elog "libbdplus, allowing transparent decryption of a wider range of"

Reply via email to