Bump makemkv-1.8.5, bug 484746, thanks to spam-mails-here@gmx.de

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

4 files changed, 124 insertions, 13 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index cfaaa575a4f9..a0878f78f068 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2013/09/05 04:03:40 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.24 2013/09/13 23:41:07 mattm Exp $
+
+*makemkv-1.8.5 (13 Sep 2013)
+
+  13 Sep 2013; Matthew Marlowe <mattm@gentoo.org> +makemkv-1.8.5.ebuild,
+  makemkv-1.8.4.ebuild:
+  Bump makemkv-1.8.5, bug 484746, thanks to spam-mails-here@gmx.de
 
 *makemkv-1.8.4 (05 Sep 2013)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index b2172f4f4177..945557d7020c 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -14,24 +14,27 @@ DIST makemkv-bin-1.8.0.tar.gz 4843544 SHA256 0c8c4914336c8d864bac81222eb555f37b0
 DIST makemkv-bin-1.8.1.tar.gz 5143565 SHA256 0f0b2b37a6b88240c4b4faf9175b1a6a6d285fed5eb8001b2a101c41deb08403 SHA512 819bbb56a3d698f953b285feb7c698265779b54758e2fc20bce3836f118d0a8178535fd8c41f4d5ffc836b8b7b04a5d02e7f5b7526fef4bcde5bd6e291aa0452 WHIRLPOOL 67d4d338ae46a8eb01b7560920672c36432f4a36d9894cf18d27f19271419d38b11d8be74e4b2b1a84d11b0c34348e6d711e484ae0dfb737f7b796daf860696f
 DIST makemkv-bin-1.8.3.tar.gz 5547213 SHA256 bf72f409542c0157e0a90dcb1c75407b9f367c92c63bf5a7c9e0ce63b0f341a4 SHA512 217a6771e1320b9c0e22879b876e4697094a349859f693e045ffd2b30db09cd3e5ec97f723a7cbab90314d00118fa852199b49f0223fb47abcbd88705a8dc57c WHIRLPOOL a4439f038d5c56837c3f6e82ed4ece20da07a19d8ec203e576fba89554b5ccb01a5e480680c8a550f75f794c9c62e240515f103cfa619329447ac049013b311e
 DIST makemkv-bin-1.8.4.tar.gz 6425078 SHA256 81fa6b95895bd18cf115e3035bd66f0e7198f13c64638b2cc355a1fc741c8786 SHA512 32141d0b173e5e975f5cfcefd280abe558062dc0e2526ee6e76ebec8ac35dc44a22be5e97edc334529265f8c6ec8075da55da63947b311cdc314634bd87a053c WHIRLPOOL 06c0761faad755af6e82fe9c2482c3f6e79782e17e91e4bd3ed2875a9373b087e9b36ab6126df6ef47a1761386363cf20816bedccd2a2b89d66a986e0fe700a6
+DIST makemkv-bin-1.8.5.tar.gz 7949054 SHA256 eab64652580fc976f5107ce0b0b41027876e688ab99903cf1940e426918193db SHA512 d24b387fec62b5e314b02605bad29ced1b8a26cc3512280a7ea1b82a9a0b3368a718dcd6fb3f74171479a619e9b8d461e61454dec300bb0601cb647d1476b884 WHIRLPOOL 91605aa6e24372573c89230a403e22e2229d1d4e4bf7ee20200d1d98f36a7503f6149a38f78b145d2906e5a832051baf8445289cfb50b599dea26edf03cb00f5
 DIST makemkv-oss-1.8.0.tar.gz 4108929 SHA256 636ab28378b6301f4f83a31695877452cc041777bfbdb622889b89ffe7ad414e SHA512 c7db83ceca9d609325abade39f12a8c323091146a0f35abe25f249f5c1887a294828d9b2cddf61302255533a6ebf137dec56158a642ca40d9690b6ccc5ca7187 WHIRLPOOL 7c1223fef4a23b6164db989f2326cf9514fffa990b46a76c3bb79174b1790a60e846e897bca0591aba301554d1f1df756eb2311031425b7a95253ea82b4b191d
 DIST makemkv-oss-1.8.1.tar.gz 4108931 SHA256 af3c619377fa8dc246b1e7022feabb5b324d64e995d00540830d93f0a00f9ff1 SHA512 4c497a63ef79cb1cc3c7a27ffbd043dcf33651ede393834507f258ba6bdcbc58694b12d40cb18957ccaf3cfa154391e5141e996805c5b876f9813447a1eeb517 WHIRLPOOL 774b6680bdbcf5a16638d24a58c1b955c7e7ab2aebe3e6104cd5957f7950b9d6f03421d3294b9f8b30182531b0fcc6b343332a59841256a382e3afc639a49b21
 DIST makemkv-oss-1.8.3.tar.gz 4154814 SHA256 c7c8ce3a7a4644dba232782feb7198c8be876064872fe4b6712d44ca1f788bc3 SHA512 488043aef7037cad2d78d82113750a32804133fdc70347a6ef268fee70032ecf42832c14a0f2a471f0d32113df878dc371c2c81545e4e07ac28dcb17d1ed0a7b WHIRLPOOL 2cc2c84befbce0cddf93697f720af24ecc5fb61ef0d684a7bff23615e4f3f9dd9727ac54bd997d26b1c44f7d5488e14faef7632686e23d9a411899f0d5fe4c57
 DIST makemkv-oss-1.8.4.tar.gz 4151533 SHA256 e01183e8aedf75a576e7feb033da4d23ef93ce3531394585aa5c3e9b69abe524 SHA512 db199037c50e9fd81b13c7fa2f6d9a0ebb5d435681fdd917c446cd5d404424db314655f03eeb7398f3f00fdd72ac5e9e06390691efac8a39ce29d2784c21ff09 WHIRLPOOL f3b0f1fc767a27efafd42cdf5193cfd7f31ac2f9095249774a62a49e40cb732f9f32df8774bd4aa23037906208ad2fc48194979c63cb6ed407a9b5dd9ec6bb4b
+DIST makemkv-oss-1.8.5.tar.gz 4171587 SHA256 5d3a417574d4e61ad77e3df4e6199040c1b557567f9c5034baa71f1e8f83fead SHA512 f4a54d831a3b3375aa22e417b53df357d9fa2969adb517e83ab629eb51e934a2cdcaf9f9d53aa96df92dd9374d77b118338d2588cec29bf1b9f2ab79d12d0016 WHIRLPOOL 298906488ae43c1a7576114ea3689413c72798e2662d01b899b27a1880c06c729b0da4d265882565efb66aad81f99f66839254ffdcccfe12f4b93fd4a584d8ee
 EBUILD makemkv-1.8.0-r1.ebuild 2824 SHA256 884cfa27e11571347ead245155ca2ff8bd5a1c871f57002c929a80a0f868beba SHA512 078b3f90985a55cbc48a934fe4aebef88543794d55f47a03f43d504ee75185a0d8579bd964dba5badb6d60ffaaeec0fc7fb209831adaa8f6157f738d2a6afbff WHIRLPOOL 9e9dcf026043549a146ef2d14ec8cbb6567a5b5a7d53d6fa150aec8537f08978263e0d71f21918568dc8e5e98b7c4b12bf309a9ef17389b957c12bea86b4167d
 EBUILD makemkv-1.8.1-r1.ebuild 2824 SHA256 406f9a1f8254a1b94f435d8397eb775aea5593739d19f43cf9e657126d61d416 SHA512 0895125d6005f2eb4564a59572c0a638502f94dbcef8de45dde87b04828c8e468fbdaa55a9f0dce02138cd690177596604502113265fb7cc0249753352bb6327 WHIRLPOOL 3b841901bfb11f63bd0514f5181099af2c66e4c597c25a010f943f2a88e9541476c014b7d28947ee69147a233b2b2fb324420c89ff525df4121f6904b0187c36
 EBUILD makemkv-1.8.3.ebuild 2821 SHA256 749e4b7c02bfde9ef070ee89159c987c089389cd36b960f4582ff2abf8657d91 SHA512 2e29ffdd35e389e35cc41557b4719f9ef603a5dccee1c1699d0837afa51eed3443b4970f4bb441e6b6e4a0bc0a64ab1740f9e8b30dfaa7603f7288e70f1de37f WHIRLPOOL 4580e867d93458cc9f61e709e24062770f4cb202a1a97f195ade70aaedc0e65b6d45c119357b4cec3950c214befb8f5133d87d82fc1678a31b38ab65031bec3e
-EBUILD makemkv-1.8.4.ebuild 2813 SHA256 2d0e24bbfe091707ce79cf3b4c6b071b3410b0389de53914483d6c9e45a32f7c SHA512 8ec7fd86a8806b0f2f4537fe036fad00afa4c5acd1f71200a06936b762b780cebc2d8458fe5ceac921e5d13c19929804478a3e30dab45305949d5f932c8f4619 WHIRLPOOL 1466cfada96a6fb2c97cdbc4b31e037c301225711bbe61dc904a1805357ad6e9775623f20fd47ae8495054d7dc62673242f8eaa3bb31b54b4e141a55e515ae01
-MISC ChangeLog 4608 SHA256 20996add2b3dbad03d9daca14f58f6c9b875b745494d469177948e427451238b SHA512 8c482941778d3a70980347f0e1ca6084c89b796978eb7b2ed0f1be797ab862f519909f0f0575be617c4428ba369c5e58ed154d1c22eb54e40123854a39b71608 WHIRLPOOL adacfaea7bec64ad54a8d8c1011ca42302b6b928f52527e5b5212e166000074fbab93df04c7f72201011a3cae74cdcde90042954252674612c90f69acc1e3299
+EBUILD makemkv-1.8.4.ebuild 2821 SHA256 aa0f9cfc6b0d3309f9eea35384dfefd7ebc4d78b7389b97596aefc88adc3c22f SHA512 82205b5f80f6e35c64ea8b91022001ad3af397fbcfa2990b6cbe8350943d0a2330146fcb85b2a750e2447a1c7f05096f09251e0a8f3e67d748016e186fd0c950 WHIRLPOOL 83e126344b8dd367cf4cd7bf5036038eab4c1836cde54bf5843438fb52500b1be53799ca3c0d68bd2a85859a28fc98687fd6898d439f2a21a9cc5e53029ef3e3
+EBUILD makemkv-1.8.5.ebuild 2813 SHA256 503fbe705962885691aaba693e8e352c1666167ed05769e7599a28d5096d9bba SHA512 180fbd255551cc5182462dae0f915d5cfc51e50f0b3414ebce50ee6694b9891beca1acaabb9cab0672b5a6034abc93fb60f3efab23fa74e368e843207ad56eaa WHIRLPOOL 6854eeb8081d6f09d12ae4cb06d2b5e7fa334e4e4b35ded0b613980a7dfce311b19829e9e5761afe11e11890ea83ace9b8b063fc65b12e5b6814af25fb63cf31
+MISC ChangeLog 4803 SHA256 3b028252eba339239306d8a66522395f8f1d88d5022f00269e702ef099654cd7 SHA512 ad3ac4002270f8d3c0c2931bc5ea461e99d4cdc1f72cd203c10ffdec9f4a0dfddac7e27720f24164442e70f836ef2cffc5fe10a1fd21701efacce4c0c7e6403d WHIRLPOOL 77ad19e6f8b847defcc8f289781b05d1c1b7343198a5992b2b3a13104d27d0bfe922eb715b7a1866d8ebefa14952f861ff825266467fca4ecfc6a1112f274ebb
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKAKiAAoJEC1LWXx4YDenUbAH/3X8tDTZV0mX2Z/gvhVbvoVp
-zHR/Q36RbWM4i4DT9WPVSfa9ya3CZSDg6KZUCqlAoKMSfRf5nmw/A69GD7cZQssb
-JdurVgzdRl2MwLT5Z6zKnQLtqfUadFjTLZT0Z10B0K/PuVb3CM3f/tnKi+KNwOZQ
-puSbSiMRqZ1yOk+9yRDrziFK+JfpX0uqG8MtRCjRuwVtlB2vS/tnAzNHECRC9sPL
-blljiNLy9uy4fDGuI+A7+GYhZsZdcY5kJhtT84MWokIHv9P67PseZw7hQ6eOfiZr
-xjpkgmlx+vYjYIz2SOhRcB+s4wa18XRxyWT6E3bMGusCBMzONbqfRub4Cb+r/L8=
-=tJew
+iQEcBAEBCAAGBQJSM6KaAAoJEC1LWXx4YDenS90IAKo1opjcKfEZujIZyIo4UmI0
+kCTOsOSwDqvBhdGfUFl3idYOrF7XiMHaHzz2YaYY7wpUPFC7CudNCRRX7+oxNgkW
+fTmt34AOwUvcEP2iD1dRPsaBcSftx9Ly9Af//qANM0ufbI5mKhHQnyeYP7uq265s
+0osR6T4vzI7Gwl3EaIxTR6GPTMhHjJkQXv1t4O89/8JNxKwyu270Mdr91YQwf40Q
+3u4G5MxRcUVQv8pbk7hdENR/21OzjXvrAFoC/XJb1KBiHwXpX8d8jTqEpyF0vVjl
+VgrRBZnEoKzvBsuVO0FAChnyi5Q73uveLqchsRmB0IHVBqP5K1D/myXMXOAJ6nQ=
+=F24Y
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/makemkv-1.8.4.ebuild b/media-video/makemkv/makemkv-1.8.4.ebuild
index 9984f0280364..3a11fe38d010 100644
--- a/media-video/makemkv/makemkv-1.8.4.ebuild
+++ b/media-video/makemkv/makemkv-1.8.4.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.4.ebuild,v 1.1 2013/09/05 04:03:40 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.4.ebuild,v 1.2 2013/09/13 23:41:07 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.5.ebuild b/media-video/makemkv/makemkv-1.8.5.ebuild
new file mode 100644
index 000000000000..c58a595166a5
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.8.5.ebuild
@@ -0,0 +1,102 @@
+# 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.5.ebuild,v 1.1 2013/09/13 23:41:07 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
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.linux.patch
+}
+
+src_configure() {
+	replace-flags -O* -Os
+}
+
+src_compile() {
+	emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" -f makefile.linux
+}
+
+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; }