Fix bug 494264 to address upstream changing src_url for prior release.

Version Bump to 1.8.7 which was requested in bug 494324 .

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

5 files changed, 142 insertions, 13 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 045182b09a4c..22db54a2fda9 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.33 2013/11/22 09:52:39 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.34 2013/12/17 19:52:57 mattm Exp $
+
+*makemkv-1.8.7 (17 Dec 2013)
+
+  17 Dec 2013; Matthew Marlowe <mattm@gentoo.org>
+  +files/makemkv-1.8.7-makefile.linux.patch, +makemkv-1.8.7.ebuild,
+  makemkv-1.8.6-r1.ebuild:
+  Fix bug 494264 to address upstream changing src_url for prior release. Version
+  Bump to 1.8.7 which was requested in bug 494324 .
 
   22 Nov 2013; Matthew Marlowe <mattm@gentoo.org> makemkv-1.8.6-r1.ebuild:
   Keywording makemkv-1.8.6-r1 ~amd64 and ~x86
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 3fcb56b59e18..32fb5ba100bd 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -12,25 +12,29 @@ AUX makemkv-1.8.3-makefile.linux.patch 580 SHA256 c6e5864255c718a71046466ea76ade
 AUX makemkv-1.8.4-makefile.linux.patch 580 SHA256 36c7a138e53042f68567d95631a038aab00c18e1e419c61cd71dfad5c3a355ef SHA512 4c09d6c58e850eacbb66d76a581613dbdfd9320cda07c2503395690b8503626823691238a5d02ce4f94e8f9001452612359f5899b7966e19e0e53ffb5b4112d6 WHIRLPOOL ffc92695a5305cbf916880e5854ea54f73bfffe99076c4ab87bf703d72df009208738410c61cc682557d06beb8af13542cf05cec344339de077c08b01d988bab
 AUX makemkv-1.8.5-makefile.linux.patch 580 SHA256 cafaec6bca6243779e09f2a34b3245d75a03e4c3bd76ca5184c32c6ad06ed1a0 SHA512 ecf39cebffeb03384f13a8c62144f47ba554a71ff63625e963133a03f23b73f2a178e884c1c0aae2ea92fcef742b41fefe33ce651364b9a0419f05d6a87c416c WHIRLPOOL 4d56146bbeadfd770d1f926057bc9204c113d79712fe27895e71c041eb18d2b6cb4d2c66b66f5d4b4e31ca2e7c09bef04a218b6987d9aa5c4f86c372e00713d1
 AUX makemkv-1.8.6-makefile.linux.patch 346 SHA256 4135bca8320311892fb81737396d97a3c6623546737b640ab6e4d62801846a07 SHA512 c223c6f052deaf4f833f73540d0752617bf81337d4c0e341cb374d0dd058ff72f92b8e69ba9d8a16e4e6aec40d0c52e24c98e16de77ef89e4d09c6edc3d10113 WHIRLPOOL 8a453faf20b87657005883ddd236eb5231ab00d26ce8bded364becc778f05da7f01ecdedcc82677123cb4bc456993252e2132009b5ad3f71d78f8beda3995af7
+AUX makemkv-1.8.7-makefile.linux.patch 346 SHA256 4135bca8320311892fb81737396d97a3c6623546737b640ab6e4d62801846a07 SHA512 c223c6f052deaf4f833f73540d0752617bf81337d4c0e341cb374d0dd058ff72f92b8e69ba9d8a16e4e6aec40d0c52e24c98e16de77ef89e4d09c6edc3d10113 WHIRLPOOL 8a453faf20b87657005883ddd236eb5231ab00d26ce8bded364becc778f05da7f01ecdedcc82677123cb4bc456993252e2132009b5ad3f71d78f8beda3995af7
 DIST makemkv-bin-1.8.0.tar.gz 4843544 SHA256 0c8c4914336c8d864bac81222eb555f37b0f5aa4755767618176c5b25b2e86b8 SHA512 f20332d7cebb140611e8209ccdd99eaec6c04d57df2eb4e0b02c24126447a99bbaf1f422b01c2fad951bcec82dd7770f8f1915be31b64b0c4321eb67193959da WHIRLPOOL bedd7f23a19dda25f8053516c9c12279a958aa610fdf64c7f4261964b82dd954a9862063e65c813c0b39cb081a3027359ace83372c1037bcef161354b6097251
 DIST makemkv-bin-1.8.5.tar.gz 7949054 SHA256 eab64652580fc976f5107ce0b0b41027876e688ab99903cf1940e426918193db SHA512 d24b387fec62b5e314b02605bad29ced1b8a26cc3512280a7ea1b82a9a0b3368a718dcd6fb3f74171479a619e9b8d461e61454dec300bb0601cb647d1476b884 WHIRLPOOL 91605aa6e24372573c89230a403e22e2229d1d4e4bf7ee20200d1d98f36a7503f6149a38f78b145d2906e5a832051baf8445289cfb50b599dea26edf03cb00f5
 DIST makemkv-bin-1.8.6.tar.gz 12126141 SHA256 72b7bf571b63658933c75d054748743f182d52fa679727568e22b8091bedd5df SHA512 ec400c2dd2d09e8db6879b12a906e9b74d4d0fad28d5f7353a50f5d2d45a1513547a9e3dc1e9695fd2e22eabc233d1d16c69a588abf70dca472ca23df05590b9 WHIRLPOOL dd7ba77cfef41c9fb3f656be8900e923c7516364faab111803712cc38109b37598a52cd5b485f92a589980a81f6c3f4f3962f2f82be40f18ad83b7888310ae5c
+DIST makemkv-bin-1.8.7.tar.gz 12115593 SHA256 6614e79aa7e668654fcee3d61316262b4a1ab628768a1cfe68f7d039ad289901 SHA512 27d75bfe12037e97ddc024541626334068e1b8d4c41e1920ff312f5561abc2a36ba72b45908d72fd99daaaf1b22eca01cae8997bc4f0093beec19334ef02b25d WHIRLPOOL 33571ba4b54b5722cc5d729084ef9bad92b61c8e057128fa630f242617cb9588b8f957e8aa2b27ead2846b8816776516a9f80ba9af21d70ebc82a0ab28280760
 DIST makemkv-oss-1.8.0.tar.gz 4108929 SHA256 636ab28378b6301f4f83a31695877452cc041777bfbdb622889b89ffe7ad414e SHA512 c7db83ceca9d609325abade39f12a8c323091146a0f35abe25f249f5c1887a294828d9b2cddf61302255533a6ebf137dec56158a642ca40d9690b6ccc5ca7187 WHIRLPOOL 7c1223fef4a23b6164db989f2326cf9514fffa990b46a76c3bb79174b1790a60e846e897bca0591aba301554d1f1df756eb2311031425b7a95253ea82b4b191d
 DIST makemkv-oss-1.8.5.tar.gz 4171587 SHA256 5d3a417574d4e61ad77e3df4e6199040c1b557567f9c5034baa71f1e8f83fead SHA512 f4a54d831a3b3375aa22e417b53df357d9fa2969adb517e83ab629eb51e934a2cdcaf9f9d53aa96df92dd9374d77b118338d2588cec29bf1b9f2ab79d12d0016 WHIRLPOOL 298906488ae43c1a7576114ea3689413c72798e2662d01b899b27a1880c06c729b0da4d265882565efb66aad81f99f66839254ffdcccfe12f4b93fd4a584d8ee
 DIST makemkv-oss-1.8.6-cfg01.tar.gz 4230274 SHA256 582c4a9ed33a012534a5c9fca0151fc0e71755c5d3bb96bc96466b5306959024 SHA512 cc1f44379c0576db316a47ed348d2772436c5be9539dea040d02185bb53dcfd296325010e931f252136e78dba4a176e1775bbff3d880e11b8799a06da01653e4 WHIRLPOOL 2524aa38798c0a176aa62fcbb73fd61203ada637f9d7c67da306fa25090e665121b2378b1f8222b1123b9e2051a356b00b6c29a4578bac221c13b3806a652f70
+DIST makemkv-oss-1.8.7.tar.gz 4223036 SHA256 6a933eb027528aa9248e56f004c9c1fd9266f0810d9563e41ca6dd968381ed6f SHA512 f09beb204a17132d057768774a12a9888f9ee06a440b525cd7870d57bd4bd9a6fb7c8956cdf6729f2ca882083beae0d77a0d94b6d40d6740abddf827ae13dfff WHIRLPOOL 321372fd7c8c04b2f5335b00ad7663168f173662f2836447d83c99184b230a2354ac2570ce22f84344bb38b43cfd2dc1ae3e1703dcdd69b000bef3fde98ddb1a
 EBUILD makemkv-1.8.0-r1.ebuild 2824 SHA256 884cfa27e11571347ead245155ca2ff8bd5a1c871f57002c929a80a0f868beba SHA512 078b3f90985a55cbc48a934fe4aebef88543794d55f47a03f43d504ee75185a0d8579bd964dba5badb6d60ffaaeec0fc7fb209831adaa8f6157f738d2a6afbff WHIRLPOOL 9e9dcf026043549a146ef2d14ec8cbb6567a5b5a7d53d6fa150aec8537f08978263e0d71f21918568dc8e5e98b7c4b12bf309a9ef17389b957c12bea86b4167d
 EBUILD makemkv-1.8.5-r1.ebuild 2824 SHA256 2e0580dc935f08e6f55667db540ae29ef25ffbbb7d5e140441654b136fd081be SHA512 9a372cbef404a9a0cb17526cbb3dfa013da729fde4406671652c12ea8a79d690bbc41681108752fbcf0b70d37135a4ece04583d6dc0c026c8852b5eff3bffed6 WHIRLPOOL fb24ccb9a8fce5a23cbf8f53f8830b1afc9688601c3801dba0a6b6581dabc17a4c488bc1b57c3366c6110d7ab776e432cf25c22115e2bf3fd7f928290e738969
-EBUILD makemkv-1.8.6-r1.ebuild 2958 SHA256 d45211919a315b285f16607ee7e44e3fd1d27ea03c1db62392dfcd3fea2c9706 SHA512 6cf6ce6713f2d8a8776de8a30a361d91c5cc32924e8ad2c70ada6cb26c6a5b8e3c04e9eee2c451278e3646f52710c80e02ceea72fde7e8ecfca97d2065f6a2b7 WHIRLPOOL 7746f3ae5850345f8793b33cf0d810cf26c35171244ef99eeb69bf879399628ceb626347b6907dff38db6a92e35471a71777572f4ebf8bd27e61ea38a8787418
-MISC ChangeLog 6449 SHA256 dcdd17982550e39f945326bed4589b39a18d3210c2c5fa3b304eeb4d345b7ce8 SHA512 092ed26433fe4bbf5b6d183991d6f7d86c7ac32d070412fa264570f0e78a2980bc5406d5779388ca350838c98a42afef3f2bc00478aeb52bdd72933748a2dfe1 WHIRLPOOL 805ffcdcff0d3f6799075094e983097ccdf94e9db0dad9f4bad0968d99022e03e1296ef6925af11b879be04bb29e764fbdb8ec5281d831aee95b70298845e78c
+EBUILD makemkv-1.8.6-r1.ebuild 2966 SHA256 310d3070cafe8078ab7970f5ecbb1fcc0cad37b178e8fe920f0941289b3591ee SHA512 b30cccd75499eab28bcb4cfec36e349a2732f922ac27ddec3df3ad3bed82a72342375e0ac34dc38715ec89826dac8705ed6a704b61cdf4c40c607749c7880dc0 WHIRLPOOL 1e6e922211e962c2639b69369be5cd8057df3055c1c8c35ab3d6a5496989eff2016831ef45acc0e3949f79d4b44856119c5a6dc0a10d7392357f6ca15ac586a3
+EBUILD makemkv-1.8.7.ebuild 2949 SHA256 e0ca4d4f17dfd7b7152c4f3a456d5387d2eb9fbf3731fe6e6b88758bcb9d1ec7 SHA512 3ac2196cdb212cc5fe5337e5a118c010a900a4677cd65bac006435954a8ac04bc7e66d9ae14bb68063e4ecef01674083ea4331d3c9d74c9e7c7cf2631b5892f6 WHIRLPOOL 62d8fa15db12989fd12ee6dd187c328fb58f6727df74c2475d65ecf8bf4a27325530f87017d81ea61a3515929763209d49ac57ef6ec9464ca0b0496343b5ae29
+MISC ChangeLog 6758 SHA256 d017aeebe3f35e62650ea041dd7fa7d51b5b760867db144745ebff55105a96fe SHA512 4b8fb7d5f556b93a60fd274ce3a3b4dca48540d5ac120fac0dcef450311806fc670321c8e87995520fc28a49f89a48c9d94cbc8762f5ed788dd7cf87f6211b0c WHIRLPOOL dab20ecf822cbb46002db84f0a907a4cde6941d191191f52b3b850829eed591314c60ebedbab24a4a885887c711b7bc91434b53bbd7e69a7ca9fe0e5b23621bc
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSjyluAAoJEC1LWXx4YDen2SoIAKmXvoMaeJXjQdMLI7mMCk6B
-H4XizZe83AJWa5249fCLAZ4o/FTJ2bi079KXRixnc2AHR64bd/EwdqwJJlW9cS9p
-aHTJV+hDuNbzCbaThNokjm4kLp3XbsdchGmlwebojXjXnvK185o9Qi9vlgdeaZhP
-MHabqSYk7gNhzHgyD2BN3Od292V//BSHM+R6WSczn67pHUCuklZrDKyUBSJopEmV
-vIB74EBO3c8LEwgz1B0klfop75MiYGiwrYBfTj2e3l8+hJFSW1kmll7XzxbuSNL6
-80zWH9SDgxkQUgBHtKHeXhPmOv5cbYas17CkzyZUjL/w09MmEg/tiSGBYQCIfpo=
-=mv9q
+iQEcBAEBCAAGBQJSsKukAAoJEC1LWXx4YDenx9wH/34ecp+ok9UkedCoeYN9W+LM
+maLZ4Fa9pqDZcG63AHAgmEognB5shXrOvWsiY8DHlGkZg5/UTZQdp+zbqu93CXxj
+tDr2/LShl/uTq1PoDN4WOxjhpWpAKbsAuh7kUjN8HZJBMBf2x0I9flp1yzAVMTb1
+vyHvR/fd28jSP8mDWOCZLwJqOVX5X1qeDBoRw7n+lXnXktx8zwXqgR4LqKtCYEYS
+PgdeQQQQfj/QclpoDel2AECeWdX11rLL+Q3liiH3f/NhcivMaGMEnZbv8p3qHhvd
+Ch4jXEtro2UUwclejkcZ9Fs/KOpJmHGpiMS8Q3oLHogrCiOQvCEwiMB/3lrjq5g=
+=q3cx
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..2e4396b5ce20
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-1.8.7-makefile.linux.patch
@@ -0,0 +1,11 @@
+--- makemkv-oss-1.8.6/Makefile.in.orig	2013-11-20 19:48:33.000000000 -0800
++++ makemkv-oss-1.8.6/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/makemkv-1.8.6-r1.ebuild b/media-video/makemkv/makemkv-1.8.6-r1.ebuild
index 3357edd00a45..ed6409c1ed94 100644
--- a/media-video/makemkv/makemkv-1.8.6-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.6-r1.ebuild,v 1.5 2013/11/22 09:52:39 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.6-r1.ebuild,v 1.6 2013/12/17 19:52:57 mattm Exp $
 
 EAPI=4
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -10,8 +10,8 @@ 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"
+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"
diff --git a/media-video/makemkv/makemkv-1.8.7.ebuild b/media-video/makemkv/makemkv-1.8.7.ebuild
new file mode 100644
index 000000000000..0201855fc3e2
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.8.7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.7.ebuild,v 1.1 2013/12/17 19:52:57 mattm Exp $
+
+EAPI=4
+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"
+
+QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/expat
+	dev-libs/openssl:0
+	sys-libs/zlib
+	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 )
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/makemkv-oss-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.linux.patch
+}
+
+src_configure() {
+	replace-flags -O* -Os
+	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
+		econf
+	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
+	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
+	into /opt
+	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'
+
+	# 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; }