gentoo resync : 25.11.2020

4 files changed, 22 insertions, 17 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 43ad13ee5c5f..0faa9d140be4 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,6 @@
-AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.15.2.tar.gz 8506031 BLAKE2B 515760761a0ff7753b9006b293e9d09d72b04d6778069fc706736244c47a4c7edec912b93b5ec6f516520c96b5821f300d3057b401edd257a9b0de2550cbedd4 SHA512 ee3230ba97e5087601f4277dfc57cc9cbc6188ae490b2a6be8f07beee6c24cb1b04b23ecce308be034bc21f80d9dfc7a86500b44fb51c7322ad97a1460b0e79c
-DIST makemkv-oss-1.15.2.tar.gz 6404814 BLAKE2B a7273539742e51142cf2f951b679d1667339127d592f593dfabfb7f5b279d2bd6dfea255d40fcb9f3b8a73bd1b22dd118a0a3fbaf6d6096ddc1d4d7532b14bea SHA512 d697a70b530e07629b0da170350e6c9eb74c76370634bb512817d54941d13038a89afe547f793375a1fda181b0dc23b120197d21564f745be4c6f9ab227a42cb
-EBUILD makemkv-1.15.2.ebuild 2965 BLAKE2B c34e43aaa120a3d7e90b733546824fde1c911987d86954bb625b3b071345eb55e9816b4e590234906659d4f1a2e539320710421bd7f17e66b9ae813af34b5b0e SHA512 cc76eb6b15106d32ff911750a43116ea16a32bc0ab5b6c84b6ebbae13521250acbffbff4599789ef66f6a3b08bcf1b080fc3a7d76c48ef2ba2bcaf5c2209f75c
+AUX 1.15.3-configure-CXXFLAGS-quoting.patch 356 BLAKE2B d342f54821634f8a36d200ae9a3f54ad8400f9c7a68ad5af3a9992fdf62e2029be0cc5bd39a8da6713dec5f08972f79ae411ddabc294e48760005ef46860fbf8 SHA512 56da4d54a44805a21c35b2fae1aff1dedafd3b08782174ab140b0ead5e551d673593d652cddfbe3b0d778660f3134755cf97abf457d648b0ba739ddefd039270
+AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
+DIST makemkv-bin-1.15.3.tar.gz 8664187 BLAKE2B 37f026306a0601709659cfc2478e59251dd7fc1567f8b43326ddbefa55c9bfee77dc8f0f81d3e8e111e78ad9da0f4b32613d5ffbcae542a8978c49467be80db6 SHA512 4555c1fbb609b3b6d842fced374a8a6fab0bc69952f4349a1c6636964d7384001d1e6e7a91fae3715c4cf468cbfbd713f89d17e53eef6c5d69edfa158e47d8bd
+DIST makemkv-oss-1.15.3.tar.gz 6403409 BLAKE2B c02881c13236d65eba5bbc66d9191ba4b2da53e1d776c502427a02ee8b18091db90643d7e8c3f94be5b5c80c40dfc5df282daee6f69c42d32383937aba33e700 SHA512 11248f4d35a16793a13a94c92f8eef060206e95d2383da06ce7adeadcd445dc12d09bad79142169cc32e514594b2c6cacf9ab216d446eece531c849a8803f13a
+EBUILD makemkv-1.15.3.ebuild 3021 BLAKE2B ef64035d9c61bfa5ecd180a496a1714aa346ad01c0e2c1154a9bf1eb5f4682ab49b847016292c5b7fa2d72f4643327395e3b51ca384b41a6a116ae33d85f1e11 SHA512 bc44e4529fe32491b32fb82774168d7fd33b769702bbdf922e69a02c8e8cc7bb15d6f6e4f9c0a4fd82827a8ef3db0a75981901ddcaf612ef7ca5168ceaa61702
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
new file mode 100644
index 000000000000..3dfe508a24a4
--- /dev/null
+++ b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
@@ -0,0 +1,12 @@
+diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
+--- makemkv-oss-1.15.3~/configure	2020-10-01 13:59:27.000000000 +0000
++++ makemkv-oss-1.15.3/configure	2020-10-03 20:49:45.588257151 +0000
+@@ -11726,7 +11726,7 @@
+ ENABLE_DEBUG=$enable_debug
+ 
+ 
+-if test -z $CXXFLAGS; then
++if test -z "$CXXFLAGS"; then
+     CXXFLAGS='-std=c++11'
+ fi
+ 
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch
index 7c66849b3234..6a3b3cf8dee8 100644
--- a/media-video/makemkv/files/makemkv-path.patch
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -1,15 +1,3 @@
-diff -Naur makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp makemkv-oss-1.9.10/libabi/src/httplinux.cpp
---- makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp	2016-04-15 21:35:36.000000000 +0100
-+++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp	2016-05-08 10:52:42.481501963 +0100
-@@ -45,7 +45,7 @@
-     lurl = (char*)alloca(strlen(Url)+1);
-     strcpy(lurl,Url);
- 
--    strcpy(argv0,"/usr/bin/wget"); argv[0]=argv0;
-+    strcpy(argv0,"wget"); argv[0]=argv0;
-     strcpy(argv1,"-q"); argv[1]=argv1;
-     strcpy(argv2,"-O"); argv[2]=argv2;
-     strcpy(argv3,"-"); argv[3]=argv3;
 diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp
 --- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp	2016-04-15 21:35:36.000000000 +0100
 +++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp	2016-05-08 13:51:48.761885862 +0100
diff --git a/media-video/makemkv/makemkv-1.15.2.ebuild b/media-video/makemkv/makemkv-1.15.3.ebuild
index 4d94806d84df..3c81c3d3988b 100644
--- a/media-video/makemkv/makemkv-1.15.2.ebuild
+++ b/media-video/makemkv/makemkv-1.15.3.ebuild
@@ -47,7 +47,11 @@ BDEPEND="
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-path.patch
+	"${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
+)
 
 src_configure() {
 	# See bug #439380.