Makemkv-1.8.6 changed makefile/configure files slightly, updated patch.

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

3 files changed, 19 insertions, 24 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 845af28c54f0..972771814b91 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.29 2013/11/22 01:06:57 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.30 2013/11/22 03:16:14 mattm Exp $
+
+  22 Nov 2013; Matthew Marlowe <mattm@gentoo.org>
+  files/makemkv-1.8.6-makefile.linux.patch:
+  Makemkv-1.8.6 changed makefile/configure files slightly, updated patch.
 
   22 Nov 2013; Matthew Marlowe <mattm@gentoo.org> makemkv-1.8.6-r1.ebuild:
   Adjusted S variable to reflect how upstream unpacks hotfix.
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 8339961ea46a..a7c826dfe243 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -11,7 +11,7 @@ AUX makemkv-1.8.1-makefile.linux.patch 580 SHA256 042ed2dae43a2210fd0f1f3e5c5198
 AUX makemkv-1.8.3-makefile.linux.patch 580 SHA256 c6e5864255c718a71046466ea76ade73d7156165cf56cca3b937504ac9654fc9 SHA512 877de80095b40e7a46d1ead79bd347aaee683f54166b6474b3118bc5625d69ec65da4c60672a7a38b9bfd638bdeee38393379256ca036f1d7596cfa0544d8fbf WHIRLPOOL 70a997723e9611149ed7b1410ad06f054bce2efac7cfc5e6edceb1d6561dd4a6d9d952861381634838b44a218b61bb2467c233bad46beab331e67b46fecbfa83
 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 580 SHA256 87e0c56c1573a9da91525a9c6aa58a9df0626179ef42b29a1d251fd14141dbb8 SHA512 ce984365196fb9ae00a55ee278493abb4af9a746291416e3dad485439e9fa3e7f53f1bb0cc473c7a96b512288c17ebd41ab08f5160dd6d1a7ead259f9fedb4cb WHIRLPOOL 48abc53819f9a8a63a58d2571375814874b5e04ddc92fbea269d10a0893c8064a9e2ff03fdc4102e019ae067ac3de341f11386baae602a90abee6b6679168f8b
+AUX makemkv-1.8.6-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
@@ -21,16 +21,16 @@ DIST makemkv-oss-1.8.6-cfg01.tar.gz 4230274 SHA256 582c4a9ed33a012534a5c9fca0151
 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 2882 SHA256 14748dc2d611005ff848fcb7cb34594c4eb6eee0c2eb6688d145f5331e5426b6 SHA512 23efcf514bff6ab40be7ef6b09899293d792961c4039b23b3f6be148d0853debcfb1dd319813357ca3f9ddd5b3c9a8e0dea7fd9eb15d70eba99b4505e876a64d WHIRLPOOL ac75b35f6a797b76107ebd0873b3c8c12d6bc6d7710af5d33390e33a39093a1461caacc00076e825dfac3601dac7eb72b0dbf0d5a67b6e7ab9a7cc4d0b66507f
-MISC ChangeLog 5847 SHA256 4339ccf138eceef75ddd9167af48ff3097fadf51a2d193e9542b05eefb16dd43 SHA512 6a04330552c1cacfd334a0d97bfcc63b5a2943ef1645d931775fbbc290b0d1532221591ff4d3a669670ac316f1670434f0e791fdcd6d434df4f78cbe849430cc WHIRLPOOL 6d34b1fc4b924326c23fcc68ea2b1ebcd09e4f0766743186e3a13082c2ed984aa3e1a27ee04b66c50e75baaf74e7bb14a446d79c257f21bb3cbbda427f7529d3
+MISC ChangeLog 6016 SHA256 31abbcba5645f300763a44d39db9a297c1b2d144e0db28b1d2e08b72fb1bb30d SHA512 b2f25ca6ef5179fcbb75a06fd993ba709df5d421bd9976b6a4c584a08c316be7217e2d16e03a90aa73fa0ca524f19a376f41b3afa5b3bee6801b0b863731dfbe WHIRLPOOL 89998a877e263b2c3f506e2d1db96ea3444b995ee5af81ed10f3377d36405282bfeefa8e757855445b3d29f304095735b2f34130fce4d08d8c7a4f714d94bd6d
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSjq42AAoJEC1LWXx4YDens50IAIInBM7vyL5Jd5zS3QHTsEVg
-FKyo/+v0AA8TTFLqYJUs3aQjy0NVNnszJa67rvjga0K+YLTCIKvM3rNr3VovfNy2
-reQRDuSiwWRwubm9KjJ8k01eqQ3vd7gbbjFoTtE66WBzdz4w3pGcMTAj0rsZUphx
-IdreSFxyOdtyldJgL8DGpYbkOg9EBau81HqgHXWhU1zV5itatWuefO6A9BnFPtX2
-ZckaddQKwCkbcGHbkpHOiTb/MZI5OPtTPb5zEBSG2L8KHfOQmJ/Bkye24eUd4Dzr
-fwuptTeevK3Sv1cG26/GtETZdoo1cc3DpGsOozRkqxXWrKjvCQs2r0tcK8+GhnE=
-=ckx/
+iQEcBAEBCAAGBQJSjsyDAAoJEC1LWXx4YDenZhoIAKhV0OypcU4E7EQfm7wnDBHN
+Vc9nx1K6+XGAB7ap0a0yaYc4ucZ9ULOhB/95jvlvpMt3I5Ac8c1TxLb6LTzIaxvo
+6+wNVCJN4z/vCOj3Qro6xeQzRihzHHD415yUK3cqn6bODWrei7C3TbtTtuP/FWfJ
+B9+qPR+sU7exFI0o8q6rD/gnPr4pMPOCh34O2o9b0HMwPdBm5gpGCVfc5U53eqzP
+TjvqXA2HFdNSz7OcyMPg0pwF0KX4pFDuC/YLjmeXnhxJWL3aRBGZvBhgYcSxihzL
+WpY+MVJP+YLsfSYOKJiqDyygWs6uBJfdTaqCkb6cfi1KVs0P/anYlmMMEing0cE=
+=l3kl
 -----END PGP SIGNATURE-----
diff --git a/media-video/makemkv/files/makemkv-1.8.6-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.6-makefile.linux.patch
index bb3360b29b87..2e4396b5ce20 100644
--- a/media-video/makemkv/files/makemkv-1.8.6-makefile.linux.patch
+++ b/media-video/makemkv/files/makemkv-1.8.6-makefile.linux.patch
@@ -1,20 +1,11 @@
---- makemkv-oss-1.8.6/makefile.linux.orig
-+++ makemkv-oss-1.8.6/makefile.linux
-@@ -8,7 +8,7 @@
- MOC=moc
+--- 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
  
--CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
-+CXXOPTS=-D_GNU_SOURCE -D_linux_
- 
- BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
- BUILDINFO_BUILD_DATE=$(shell date)
-@@ -38,7 +38,7 @@
- 	install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
- 
  out/%: out/%.full
--	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-+	objcopy --discard-all $< $@ 
+-	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
++	$(OBJCOPY) --discard-all $< $@ 
  
  out/libdriveio.so.0.full:
  	mkdir -p out