12 files changed, 59 insertions, 310 deletions
diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 592b3de32d34..17a52219da4a 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.48 2015/02/01 23:11:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.49 2015/03/08 10:55:49 chewi Exp $
+
+*makemkv-1.9.1 (08 Mar 2015)
+
+  08 Mar 2015; James Le Cuirot <chewi@gentoo.org> +files/makemkv-path.patch,
+  +makemkv-1.9.1.ebuild, -files/makemkv-1.8.11-makefile.linux.patch,
+  -files/makemkv-1.8.12-makefile.linux.patch,
+  -files/makemkv-1.8.13-makefile.linux.patch,
+  -files/makemkv-1.8.7-makefile.linux.patch,
+  -files/makemkv-1.8.8-makefile.linux.patch,
+  -files/makemkv-1.8.9-makefile.linux.patch, -makemkv-1.8.12-r2.ebuild,
+  -makemkv-1.8.13-r1.ebuild, -makemkv-1.8.13.ebuild, metadata.xml:
+  Taking over maintainership. Version bump (bug #528698) and removal of old
+  versions except 1.8.10, which supports older glibc versions. Patch to fix path
+  for libaacs/libbdplus emulation and inform users about how to use this feature
+  (bug #509838).
 
 *makemkv-1.8.13-r1 (01 Feb 2015)
 
diff --git a/media-video/makemkv/files/makemkv-1.8.11-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.11-makefile.linux.patch
deleted file mode 100644
index 899005ff50a3..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.11-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.11/Makefile.in.orig	2014-04-25 09:25:24.558767575 -0600
-+++ makemkv-oss-1.8.11/Makefile.in	2014-04-25 09:25:44.930534931 -0600
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-1.8.12-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.12-makefile.linux.patch
deleted file mode 100644
index 518287acd0df..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.12-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.12/Makefile.in.orig	2014-04-25 09:25:24.558767575 -0600
-+++ makemkv-oss-1.8.12/Makefile.in	2014-04-25 09:25:44.930534931 -0600
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-1.8.13-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.13-makefile.linux.patch
deleted file mode 100644
index f407548ce391..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.13-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.13/Makefile.in.orig	2014-04-25 09:25:24.558767575 -0600
-+++ makemkv-oss-1.8.13/Makefile.in	2014-04-25 09:25:44.930534931 -0600
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch
deleted file mode 100644
index 2959383f76a3..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.7/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
-+++ makemkv-oss-1.8.7/Makefile.in	2013-11-21 19:05:22.319663127 -0800
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-1.8.8-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.8-makefile.linux.patch
deleted file mode 100644
index f4828895eb50..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.8-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.8/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
-+++ makemkv-oss-1.8.8/Makefile.in	2013-11-21 19:05:22.319663127 -0800
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-1.8.9-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.9-makefile.linux.patch
deleted file mode 100644
index d3368dc1e1e9..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.9-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.9/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
-+++ makemkv-oss-1.8.9/Makefile.in	2013-11-21 19:05:22.319663127 -0800
-@@ -50,7 +50,7 @@
- endif
- 
- out/%: out/%.full
--	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	$(OBJCOPY) --discard-all $< $@ 
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch
new file mode 100644
index 000000000000..88f44a9d4ceb
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -0,0 +1,13 @@
+--- makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp.orig	2014-04-13 14:01:36.000000000 +0100
++++ makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp	2014-05-08 00:09:52.863784998 +0100
+@@ -36,9 +36,7 @@
+ }
+ 
+ static const char* const app_locations[]={
+-    "/bin",
+-    "/usr/bin",
+-    "/usr/local/bin",
++    "/opt/bin",
+     NULL };
+ 
+ const char* const* ApGetAppLocations()
diff --git a/media-video/makemkv/makemkv-1.8.12-r2.ebuild b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
deleted file mode 100644
index 5dad24267170..000000000000
--- a/media-video/makemkv/makemkv-1.8.12-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r2.ebuild,v 1.3 2014/10/19 21:55:56 mattm Exp $
-
-EAPI=5
-inherit eutils gnome2-utils multilib flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/old/${MY_P}.tar.gz
-	http://www.makemkv.com/download/old/${MY_PB}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib qt4"
-
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
-
-RDEPEND="
-	sys-libs/glibc[multilib?]
-	dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	qt4? (
-		virtual/opengl
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	>=sys-libs/glibc-2.12.0
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	local args=""
-	use qt4 || args="--disable-gui"
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf $args
-	fi
-}
-
-src_compile() {
-	emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
-}
-
-src_install() {
-	# install oss package
-	dolib.so out/libdriveio.so.0
-	dolib.so out/libmakemkv.so.1
-	dolib.so out/libmmbd.so.0
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	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; then
-		dobin out/makemkv
-
-		local res
-		for res in 16 22 32 64 128; do
-			newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
-		done
-
-		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
-	fi
-
-	# install bin package
-	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
-	if use x86; then
-		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/share >/dev/null
-	insinto /usr/share/MakeMKV
-	doins *.{gz,xml}
-	popd >/dev/null
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
-	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/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
-}
-
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/makemkv-1.8.13.ebuild b/media-video/makemkv/makemkv-1.8.13.ebuild
deleted file mode 100644
index 18e46b2dea4f..000000000000
--- a/media-video/makemkv/makemkv-1.8.13.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.13.ebuild,v 1.1 2014/10/19 21:55:56 mattm Exp $
-
-EAPI=5
-inherit eutils gnome2-utils multilib flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
-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="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib qt4"
-
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
-
-RDEPEND="
-	sys-libs/glibc[multilib?]
-	dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	qt4? (
-		virtual/opengl
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
-	replace-flags -O* -Os
-	local args=""
-	use qt4 || args="--disable-gui"
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf $args
-	fi
-}
-
-src_compile() {
-	emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
-}
-
-src_install() {
-	# install oss package
-	dolib.so out/libdriveio.so.0
-	dolib.so out/libmakemkv.so.1
-	dolib.so out/libmmbd.so.0
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	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; then
-		dobin out/makemkv
-
-		local res
-		for res in 16 22 32 64 128; do
-			newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
-		done
-
-		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
-	fi
-
-	# install bin package
-	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
-	if use x86; then
-		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/share >/dev/null
-	insinto /usr/share/MakeMKV
-	doins *.{gz,xml}
-	popd >/dev/null
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
-	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/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
-}
-
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/makemkv-1.8.13-r1.ebuild b/media-video/makemkv/makemkv-1.9.1.ebuild
index 34a9daebc9e7..fc971cc04b5f 100644
--- a/media-video/makemkv/makemkv-1.8.13-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.13-r1.ebuild,v 1.1 2015/02/01 23:11:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.9.1.ebuild,v 1.1 2015/03/08 10:55:49 chewi Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -8,7 +8,7 @@ inherit eutils gnome2-utils multilib flag-o-matic
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
 
-DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
+DESCRIPTION="Tool for ripping and streaming Blu-Ray, HD-DVD and DVD discs"
 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"
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/makemkv-oss-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.linux.patch
+	epatch "${FILESDIR}"/${PN}-{1.8.10-makefile.linux,path}.patch
 }
 
 src_configure() {
@@ -113,6 +113,12 @@ pkg_postinst() {
 	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 ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
 }
 
 pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 2f49c27b9921..767b0076a3cd 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>mattm@gentoo.org</email>
-    <name>Matthew Marlowe</name>
-  </maintainer>
-  <herd>video</herd>
+	<maintainer>
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription>
+      MakeMKV is your one-click solution to convert video that you own
+      into free and patents-unencumbered format that can be played
+      everywhere. MakeMKV is a format converter, otherwise called
+      transcoder. It converts the video clips from proprietary (and
+      usually encrypted) disc into a set of MKV files, preserving most
+      information but not changing it in any way. The MKV format can
+      store multiple video/audio tracks with all meta-information and
+      preserve chapters. There are many players that can play MKV
+      files nearly on all platforms, and there are tools to convert
+      MKV files to many formats, including DVD and Blu-ray discs.
+
+      Additionally MakeMKV can instantly stream decrypted video
+      without intermediate conversion to wide range of players, so you
+      may watch Blu-ray and DVD discs with your favorite player on
+      your favorite OS or on your favorite device.
+</longdescription>
 </pkgmetadata>