Version bump for makemkv-1.8.13

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

4 files changed, 140 insertions, 10 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 9d5546de6a53..8a39519f3e38 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.45 2014/10/15 20:44:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.46 2014/10/19 21:55:56 mattm Exp $
+
+*makemkv-1.8.13 (19 Oct 2014)
+
+  19 Oct 2014; Matthew Marlowe <mattm@gentoo.org> +makemkv-1.8.13.ebuild,
+  makemkv-1.8.12-r2.ebuild:
+  Version bump for makemkv-1.8.13
 
   15 Oct 2014; Pacho Ramos <pacho@gentoo.org> makemkv-1.8.10.ebuild,
   makemkv-1.8.12-r2.ebuild:
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index de1689b81560..70763c1570f6 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -9,16 +9,23 @@ AUX makemkv-1.8.8-makefile.linux.patch 346 SHA256 3822bd6fb206e96803a2883e68a56f
 AUX makemkv-1.8.9-makefile.linux.patch 346 SHA256 2db2d41fa522da3c0b61baff2f8f12241b26c6889f8ee8b27f0db12dd6a45cab SHA512 7d84d78e3ea958939e81baa2818b787bae34e60dd3f70db9a5d6d90f38f152e62d7796dc7e052444e2c02e2f5249bd56a4cfac1719758ab99e5f1d4f061c4bb8 WHIRLPOOL e025686e2e9fdd86a927601dbd86d54c7c4b02be5fdca2f638694ce14e3c7d54fcd8f225645aba3a82ea23f5e38bc380c688d82ba7f472aa14a1c7e8e73c8c73
 DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569216da654f4ee6fd3b0278dabc103333 SHA512 cfa5724b413fab608ed15e5977301f9a6fe69d787ae2ad19c3d615ec443bf7250c33f582c252f9ab1c9632d8919d252937922407158d75f8b4295eb23032f374 WHIRLPOOL 44a7df0c38ccb7693938f10f63831828ca9f3e22a627b5d4e7f23a4756f8f6edf0f27e39c75f3678fec8c18c14cf944c126eba60c211c2b5e590b029593774c5
 DIST makemkv-bin-1.8.12.tar.gz 12228591 SHA256 54af3d514dfcbf73ef5095b62e962f44ede15412dbf8bb7e17ca75824522a51e SHA512 ce00428630e2f12c3fe3c12a1555099fe5bfcd1c09efad7098e91ac56d1ced0cef541e8a154f14b159b056382621b240ff2135da00af9856ea62614e3092428d WHIRLPOOL 44d8125828e46507d1c1fe14afa365b4593197728cb6f4f1f7db86e12954b25709abf662b85778d5b968efa332585e2a583d5eea73e9af5c8de103e7c293fdcd
+DIST makemkv-bin-1.8.13.tar.gz 12229854 SHA256 86cbfb530f284e5f7975ee9331458233dfecb909aa380495440f8a8bdbade5a6 SHA512 19f473fd100aed6e7af72ee4b52d723d82ef4687492661e9817034c439a4fe198412b49a25e3596f2bfc9b9c949b31017c1ac6afc0159fb6f6d623ebbf0b6886 WHIRLPOOL 9e6ad435683936886bbafe06f85a788994700c3a8322433fd61553a264456e6681243b13e4606e3bd3b327e7ebcdddced2491f3cb2ffbc404c3b84a5047618bb
 DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
 DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cdc67cd3b3bcd8aebbdc3e6970fbfeaf SHA512 10870dbecf5924946e633ac1958abf7572cdc65191398b2e2e297233274f65e547d9f5cef243de434cf8d8b31fe5240ff02e8c67f7fc135ee1c7150fee30116c WHIRLPOOL 11d0248587009d31cb03493fc2110f55a99e7109aaa89db7d989059cdfdcce3ac5c6eee24b20ab343b96afa77806e06343fa7900d4c1d71635252b7a2e3d6ae1
+DIST makemkv-oss-1.8.13.tar.gz 4215928 SHA256 1c15e3c2a25d81bb12af7a86b0d2022f9d10644e7bd26dc8bf6366b635460d4e SHA512 7196e853d25512475b19dd9cca94e1b0718483598636838429f63f6157368aafcf17ec82377243961d1f98f568249df91bca836cef818c48738f071edc6b75b5 WHIRLPOOL 3de9b9aa74959132135674b41627b87092b8298eff22b22988c45de142b0a3150fc742afb6806659faa1bc37275575a96705d7dc5df8e3d906c4fa38f4b37f02
 EBUILD makemkv-1.8.10.ebuild 3047 SHA256 4664ef63c4f48f2de8bd25650a2f2995ac47360b8e5bac387df2730171a75946 SHA512 130bea1e8890f754062e364927c02295440d6c1ffad0175c767c1c9c03093ac458d2bc603ecf41c52bd96ba9c08ae20ccb1ffef61db2ae39fb949942f3a7fb48 WHIRLPOOL 67935a513e9ff0272fc032bd78f7152f0a597e5713f48196b77a76aee0a38a22eea498ed4007d6e783f664681bc9d162bd4018402d37d0e4f93c72081ecef2e8
-EBUILD makemkv-1.8.12-r2.ebuild 3169 SHA256 c2abb917f8f4a3fe5f7357fa018dbb2ea330bb72a82b9898613a7cd046f59105 SHA512 eb4acca6cf194ba5d8d1afa3836e4982b235d141b25e227c4147f24f178e6c98f42ec07425f584b179465061a12b7cf0caf4b10f61098d07ac1b1589571b61e3 WHIRLPOOL b3768be623cae407f21f45ec1e131a2ef83dbcbfb805d982e8a184d32f90695c9bef48eebb0ffb257582f67d8d2a991ab7335b5bf0e3187a5dc4f825383980e6
-MISC ChangeLog 9585 SHA256 6efc261bfe3512c2e115e1e262ab469912b5351359e6f2974df3d837e22ac1a5 SHA512 ee7c23bedb37e79212041ac8fc4d3785295602bd8dcb9dfc89fc2cb6be57999e9fd5259344fbd7d5ddea1e347a795e6e46af3943a98bbc1348a9a1c064780ad8 WHIRLPOOL 83e74321ce96c908e960c1256b160479ee0ebb6d5094fe5da65d7a4ce04611a97388ee4f948c81cc3c05b4693776cb402cf453687924991de20afb44de50afa1
+EBUILD makemkv-1.8.12-r2.ebuild 3177 SHA256 639c5706372863226f56c5866a6d6ce9d2cac04e3c299ef8e91c3c1267fcd1f8 SHA512 3542e3e0f45507132eab0d5946f9d48b189cac50e77ef302db7f3db558663849d9f27273b985e50454e3b7164e6af152040491635ec9dc59d51f601b95524206 WHIRLPOOL 4a5259d2b3c0d5201b31f64c81d78dc284eb3b59a43ee9c61c6fcff9a8a9364c3f5798aee6faa86615c3604384791ba4476ce76dfe3cd00767b1b09d98d6f6a4
+EBUILD makemkv-1.8.13.ebuild 3141 SHA256 28727458f6625741481e13aed0b6cab96f45ac39bd1b6f273daefae2c3876cf9 SHA512 67ac904e807565b2a0c50714e6fea98664f97bfb96611f3d0f19f384dceda0b4a83800682bf0890ccf294d02487b21226d0fd9b00fd4b5bb1107ab4e7acea42b WHIRLPOOL 615d48947af49d636843c283f18e8d4fe400446d5c9a0a246e34f68320ea687e68dc3166b7b343171b040c1ae6ea760816c19a0c63431c8151d86df40b8ad681
+MISC ChangeLog 9753 SHA256 ce9691bcaf8b58a2a45163fc39eace31bb64dc2e66d1362c9f6c52462d7020a3 SHA512 68583c9e98d9628fabc18628c563191408c21f32c4aa0ca1980df8285b2e338969df09b1f1a98d22b9cfba3608c8e1573dc98b85c207880d1930952d6f8d49b8 WHIRLPOOL 978eba25225f3d97d523131c672f06901ffdcfb9d759ef5f80317beda53537bfb9b966438ccbda61c315a225aa2de03129e35252791a160deb44b238ffda933c
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlQ+3LMACgkQCaWpQKGI+9TfkgCeMGvJP71lFlHIzJ7oPJJgdQsU
-gmYAn0VIoWbWgOqD2at80GeKcXbmKC8e
-=OR6h
+iQEcBAEBCAAGBQJURDNzAAoJEC1LWXx4YDeni+YH/3LKSNEjm/HOFZOeBVFpHMRx
+V3L+3Fv5fiFBhv+vpTaEX8VOUHNuLdaWuY59T9tfkbPLIyoEQ03WzTeunAofrO1R
+WKS/9mlvz1I67mc3Jm0tlA8LdLOJC0WvVe7RTPNNFqu5+kLVQl2FiS1To5v/urI6
+03I1RU8NdXVwiEzvH7z4Y1LzR/iLJ5DDSysvoYoFiEJKdbY8x2WCiQW+2dAvU7VA
+i/npf6qolslcS64KByFkp4AmombSyY+O8lFE7lD+li0XXqHrQYuumlScXW7unQYa
+l/huHb2RoTdwixpKB+vETIZwe8bMF4wQjFJs8gCVN6bSu8xjrM2gPoJLTtKSRZI=
+=xYOr
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/makemkv-1.8.12-r2.ebuild b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
index 8e61a6a429d8..5dad24267170 100644
--- a/media-video/makemkv/makemkv-1.8.12-r2.ebuild
+++ b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/10/15 20:44:34 pacho Exp $
+# $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
@@ -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.13.ebuild b/media-video/makemkv/makemkv-1.8.13.ebuild
new file mode 100644
index 000000000000..18e46b2dea4f
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.8.13.ebuild
@@ -0,0 +1,117 @@
+# 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; }