Version bump. Closes bug #546002. Added noexecstack flag to Makefile

patch to avoid QA warning on makemkv binary. This cannot be fixed
"correctly" because the problem lies in a binary blob. Upstream will
be notified. Also removing old version because newer glibc versions
are stable now.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

6 files changed, 51 insertions, 146 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 17a52219da4a..3f4df2d85fd2 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,16 @@
 # 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.49 2015/03/08 10:55:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.50 2015/04/10 09:27:52 chewi Exp $
+
+*makemkv-1.9.2 (10 Apr 2015)
+
+  10 Apr 2015; James Le Cuirot <chewi@gentoo.org> +files/makemkv-makefile.patch,
+  +makemkv-1.9.2.ebuild, -files/makemkv-1.8.10-makefile.linux.patch,
+  -makemkv-1.8.10.ebuild, -makemkv-1.9.1.ebuild:
+  Version bump. Closes bug #546002. Added noexecstack flag to Makefile patch to
+  avoid QA warning on makemkv binary. This cannot be fixed "correctly" because
+  the problem lies in a binary blob. Upstream will be notified. Also removing
+  old version because newer glibc versions are stable now.
 
 *makemkv-1.9.1 (08 Mar 2015)
 
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index c59ac3c3f0a8..9a2d5a1d2395 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,32 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX makemkv-1.8.10-makefile.linux.patch 348 SHA256 b60e13131f64c60d51b7c044ab42528f07d9179815d7b4e83d27a87c859229f9 SHA512 521f20110929d0b84f63b50ed82286132797d8181f86f00dbae6cb76e502ae1d31990d672048371c7cb89c12768d69ab2af34537aa4eedc8ba93adde2d3559f7 WHIRLPOOL 85658159c4954b2807f264cc13405eb9a9bbb18060fdf875dffced2602db0bda0c959cdcc022bba6069cd9a24dadee9ca1ca87ca8d901ee2cc9943d56576a746
+AUX makemkv-makefile.patch 602 SHA256 ba0afa639b4f8f699c089025273ce449820bf7c7edb4803c328cc8a2ebf353e3 SHA512 0121a76fe8d82227470039f0b1e0416eed686648ee1e5ec19b196e30bc4a6fa8982080aafa10a064087d6ac5a2eec474838c46f4af377263e004e129e231f461 WHIRLPOOL 9a4621d6aa1500a418ccb95853a4402951cd5cb58479339c941a93349e4d6cee9348634eee374693892e48d3f9df347d104e00cfd8f30b4e50ef0a9d09aeb901
 AUX makemkv-path.patch 373 SHA256 e282fb2c74fb98ea642a2294fd01cff6c15edb1b87ed8f48752679ffde2d305c SHA512 d9c26a4663f09f290a722c2d6473809fe063742a87f21ee94786a24c23399e2e899feba169ccd4e224d5593db74494142b5654b133014ccdc6369cbeb6690fc8 WHIRLPOOL f9efcb2fb1014819ea4c8ae89fc572ae7a0e68cc289d54186a8618e9c5736aa0ca750448b7adf7cb67851115e557da115d8c08c290dddb5413ef83242149456d
-DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569216da654f4ee6fd3b0278dabc103333 SHA512 cfa5724b413fab608ed15e5977301f9a6fe69d787ae2ad19c3d615ec443bf7250c33f582c252f9ab1c9632d8919d252937922407158d75f8b4295eb23032f374 WHIRLPOOL 44a7df0c38ccb7693938f10f63831828ca9f3e22a627b5d4e7f23a4756f8f6edf0f27e39c75f3678fec8c18c14cf944c126eba60c211c2b5e590b029593774c5
-DIST makemkv-bin-1.9.1.tar.gz 5051390 SHA256 d88a08ee6b188db94ef8d366ae8aa3c65eab8a2993f549b847989808198da810 SHA512 ab64351acd260fd3fa36eadf9a4335283a7fd08f7fb8a673570a7321065b3a37af6789486046fe616c3d1d8c656f97abb1fa88222887c6df1dbe077f6a6821ee WHIRLPOOL 218ccc33f693adad84687a525333855cf7ea8b4016e643f68858fe04e738c1796b3c1ab7da8ec64315ceab683d0befc3d533244491b4400a91c101399d6b7693
-DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
-DIST makemkv-oss-1.9.1.tar.gz 4217346 SHA256 22677e16a1fadda80f9b0961a114c396aa0d8a105fe62f66722f0d24469795f4 SHA512 19d0a766f53e564c9a6f11964baf7a250e08ea4957205e19c7d8d49b5c666134df6f4fa8392e994a010de69dc43c912a9d9ac34d41e69c62b0dac8c807e8a402 WHIRLPOOL 6e488753b7ec9e4121cd15128b3e5d5b0571e240cb3214fa32ac81e75c0918b11fabdfdd288c3c6301a175c70f424d5e337db13af13dcae6126ffdc909d66e4c
-EBUILD makemkv-1.8.10.ebuild 3047 SHA256 4664ef63c4f48f2de8bd25650a2f2995ac47360b8e5bac387df2730171a75946 SHA512 130bea1e8890f754062e364927c02295440d6c1ffad0175c767c1c9c03093ac458d2bc603ecf41c52bd96ba9c08ae20ccb1ffef61db2ae39fb949942f3a7fb48 WHIRLPOOL 67935a513e9ff0272fc032bd78f7152f0a597e5713f48196b77a76aee0a38a22eea498ed4007d6e783f664681bc9d162bd4018402d37d0e4f93c72081ecef2e8
-EBUILD makemkv-1.9.1.ebuild 3486 SHA256 a59ddded84763cbdc4c60df07e760e0742082aa5d38aee064079ac2f43ee8f3f SHA512 4515cee38c9765e0e92e6b54d979936da5e1a648869532c710d7e17a79d5d53a98c914dd27026ed882ce736bee8bdf7962337190ec225b0a8759933b7b64bb25 WHIRLPOOL 5be09d2cdc026ac915bd4ac3f2bc414293dea886250ef87c0b698f9a189a6bcd79661f10b659c2f198f077438792aa95063aa854523db7d49965f1b49fd5ecaa
-MISC ChangeLog 10852 SHA256 a5943fd394c576febc9561b3b8f7551d79f57f02622e808b51117415062789a5 SHA512 a48f47bdc97a98651738a075140c9271cf84ef72a8a82d3f67f9b6d72b6ad6032c9e2115864eb181505bf8f230f64e15b68b0c689ffec419e3ebb01f3dec7d87 WHIRLPOOL f922350b1d88bdb1333d3723d6b349b17b15c5305b9b34a00a663e897e70a9e7e01b8f40446333aa94b075aaf37e81ed6db9b17dabed0b2a57898c3a6976f85d
+DIST makemkv-bin-1.9.2.tar.gz 5148005 SHA256 72aea4a5254de9e07430ae6237fc60551cfa890d882a64a0783a2959e3f14b42 SHA512 f1ee3e027c6b9c38e2154003df43181a656c57cd9b5042c5f6fc4c56436c3348462bbe870cf13c4ffc2b55d8c77375bfba606f3c34d5ce78d9d8c1efd8cab45f WHIRLPOOL 50c5a794cf51938f66383d658ab62de3efb8bae32a5d473522ba25560d264a13d6a756a7265751d2b9d455950c2f2ca3d02d5ad8dfae2976977f1f4a9180b29d
+DIST makemkv-oss-1.9.2.tar.gz 4217396 SHA256 6687eba7ea772d017ccdf165369edb3d1a0609c12822b1eab75e9681be639a1c SHA512 eeb52e7be402f8e5b0a83845bfbae16314452bc992089e1f0955e0f342edbcb3163a26010673f9034821fd9f7c981d92252be393a630ee26fa83f02d215b34e4 WHIRLPOOL 7ca0c6a9b1c18ae4f795a04cbb7ac18a4f1fd48e08abf3826b8f1ce600add01cc212f72aa2b43bf34267a8805405aca903774658cc18d413484910bf9a00b0dc
+EBUILD makemkv-1.9.2.ebuild 3473 SHA256 e822062355f4bbd7a8945a77b166613ea2c29ed884643cc744aefe7a85b114e5 SHA512 5a506b4588ab7cc36addb4973a1a42dc890cc391e3cb0f39edccad2058b6287a682f9d4d450e5afdd8142ea59de45a4ff15a8f9cfe5cebc8d8b290f2ce467350 WHIRLPOOL baae8d1822720529246c687a3db7584cf24a74bc75e7402a237ee50986636b99431aa56d2ac5b77138beff66f3d4ee6c43f6403cc675fd6d780a285079bfc58c
+MISC ChangeLog 11378 SHA256 e3b393c8e81098c6a8e753a929fae91a58a90c290d37c52e154f0b1b8b5eb139 SHA512 ab6c627c0a71a1b6026b05daebe77220550d5ece3e4344538bad6106f298b8cabc1663fd55bae797e3b3118faeb01f0532b0857e167eb93996a7f6cbdd1f94a7 WHIRLPOOL 1d8a90c956c747a914e9f1c87d5f52e6e01ddb4a29e2bfedb705220f59c54e700c6811f478fb909004fa8288febaab3b88fc592f4faa0217e42f3ffc95bdf1c3
 MISC metadata.xml 1207 SHA256 3574b93229ad949eceda6e938a850dc0135aabbd6a8dbf72e65c6ddd292a8bfd SHA512 4af05c0aa9fd165894d4d47966f53df767e74b5c93af59f2194a070c824041ae1ee7eae4a117dfdfec807de898b721fded3f124bccef05fcb3a5074ce3f9911a WHIRLPOOL bcb4a806883cc8d795b8dd7389e9b1da26181ae2acca0a5e760a73c49212e598abdece28b28a2639f9913ef21c55df135534e81b97d19f6df185c9331fbb40e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU/CrUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVJ5eyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kTLQQAKCHeIoWCdeheU8wTIEkWZxa
-+cwyMZiPF1nSa3hKdrUzhcxKSBiWinn0ZuT9TcBVufQZqErkKcvdBuhC6o95qOMg
-44YjcGKo7XSb7MlQ6QK/2lisWpZaOVKsh4bQiL2fT8Akw/Z7s/T/HoWyuXwF9QNC
-Yq4Wd918DnDiU4ZapRBJD4daMi0EvbaeiBK6V2jDDIi/4inWau7/Tv73ql02s1UM
-aB5mmmkdoSrpb+nmGW3wyLiyPJ/c+tgXDWclIwqkBa1vh/fp1ug4M6WKrcI/ny3Y
-CnjDa6V94unAZExzb5S4Vj7CAt5ZwqspsEzRX6gn8krE9Z/AwX3LOgn16/+k33lD
-3iLJ34weGyyoNffv84e4UnQbvtFRpkLLi73iJjxtV6CiIjgoPpm2zccjj3IwLZek
-zLLQ6JeAfG961UdzatTVpLlDzxzpXZtb2k1hLP1DdedxfZhN5USxiBJIcpxr5EYi
-QzAa963cxj3PwfdWlzZkBbryXzzsr3fTzBzgBezPZUReDgIu/Qx2pW+aCG8abGgb
-4QQ11V0C35JcaVWuESwHFrEqbwHt5MQ7Z3GshwOTTh/7M1GXh1yRD3yEytk6YU/U
-L6+ymsRxvpvPiPiWl0mYGfeinGZpTiM9nPfUGnfi+P29hKUIsDqN6OMEK000qX38
-34XxgKgtfzdKTP8efSP7
-=YIWd
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kBZEQAI0a25K1V+z2qp9WedPMJ8Gz
+T01Z9yYBaFvsUAi+VX4eXBXRRFwqHjSyv9jPwNrjx07wX8sYXYWn6qzqBOEforT8
+w50dwaiwDBbCJzyt0CJk763BqynCczFU/KzeHWXFHtV6mt9CNrgTto+YLqOH2ApL
+5S2mL5ABMJVPmaXLYrcOJLQjNS2/wPUlGyKTaO368OtiWD9wHvPiHfoUsnoWpN7m
+HOTO/Dm9zvu9dkR49NGCT+OVV3W7Ws9bnCh35fDGHiGpAgwL7qvcfHE+bHWm7aw2
+pYjkatPlQmFjixewTi0MfFfAxi/53669EecoDqV1+r7ulrU3BPSmJlhbpKbKj5ON
+SbSTdpwkS6ApYcZ03S6RDWdTeoEFn/+nu/iI/cPNmQBPOpDe8NWWP3uy0zGbj5jq
+b3o2jJBVATd5busdUItZZDQ9kkYlHdccbi4eXdL3jYmHkZ3mrJqdu+dm3NHDK9OM
+U0nDdn2JgYOzyPW8B3o9IURq5zpfsCJ0tcP91we1JxphzTAvjSqDkjQ5YRZYcqJz
+54sLQ1JwZGAVZKakfYkRxurr7bmO9ZHxlsF+DPGoG9D7M93edjk9AoBY7yKacTLa
+NHVRLgaf388kpvZ/RR11a3HGhhdcnenGjwGil2ZHvufSK6MffVA+7G8yWATdQLyB
+4hRiBaFrJk1fekiaHM5+
+=sI5d
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch
deleted file mode 100644
index 0c7e41e97c4c..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.10/Makefile.in.orig	2014-04-25 09:25:24.558767575 -0600
-+++ makemkv-oss-1.8.10/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-makefile.patch b/media-video/makemkv/files/makemkv-makefile.patch
new file mode 100644
index 000000000000..f3db0819c95d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-makefile.patch
@@ -0,0 +1,19 @@
+--- makemkv-oss-1.9.2/Makefile.in.orig	2015-04-07 14:28:32.000000000 +0100
++++ makemkv-oss-1.9.2/Makefile.in	2015-04-09 22:00:26.821163836 +0100
+@@ -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
+@@ -94,6 +94,6 @@
+ 
+ tmp/image_data.o : makemkvgui/bin/image_data.bin
+ 	mkdir -p tmp
+-	$(LD) -r -b binary -o $@.rw $<
++	$(LD) -r -b binary -z noexecstack -o $@.rw $<
+ 	$(OBJCOPY) --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
+ 
diff --git a/media-video/makemkv/makemkv-1.8.10.ebuild b/media-video/makemkv/makemkv-1.8.10.ebuild
deleted file mode 100644
index 19694d3e51f0..000000000000
--- a/media-video/makemkv/makemkv-1.8.10.ebuild
+++ /dev/null
@@ -1,110 +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.10.ebuild,v 1.3 2014/10/15 20:44:34 pacho 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"
-
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
-
-RDEPEND="
-	sys-libs/glibc[multilib?]
-	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 )
-"
-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
-	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
-	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; }
diff --git a/media-video/makemkv/makemkv-1.9.1.ebuild b/media-video/makemkv/makemkv-1.9.2.ebuild
index fc971cc04b5f..bebb1408c82d 100644
--- a/media-video/makemkv/makemkv-1.9.1.ebuild
+++ b/media-video/makemkv/makemkv-1.9.2.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.9.1.ebuild,v 1.1 2015/03/08 10:55:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.9.2.ebuild,v 1.1 2015/04/10 09:27:52 chewi Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/makemkv-oss-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{1.8.10-makefile.linux,path}.patch
+	epatch "${FILESDIR}"/${PN}-{makefile,path}.patch
 }
 
 src_configure() {