gentoo resync : 02.05.2018

3 files changed, 8 insertions, 43 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index abee8c1888f3..ad8f88fc83fd 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-AUX makemkv-wget.patch 1013 BLAKE2B 123152789d07f8fd0497e5fbd3f3f54108434991242a5a7665920b6007c653c5ffdb2f66467ab8ed3e1f23b7257906340cdc26282d6ba2a087b3f4632ca57f6f SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f
-DIST makemkv-bin-1.12.0.tar.gz 9157789 BLAKE2B 5534250c6d217824de4f0eac9b17f1e61e24a82e40d01b42c3df856be24b0d5f9421e52433840b50e9dc4134fab09bfb8fd2c0e3e45fac1afd2fa8026d299ce4 SHA512 039a60308b90434c9aa39a18c03078cd67c8f5594ea20578dcc2c2eb75fbf2bc1918f976cb35b97c977c3380cbef27c5cb819593276343b6357cd0b384ac6c22
-DIST makemkv-oss-1.12.0.tar.gz 4572233 BLAKE2B 1eb14296180e4c2e13dab12414c5a7087069b43d19ef93a0ece0824d5187069fd78be750712f3fd76da2393d2717ced1fe5e26abfe3879bb6465a0bfeea275be SHA512 36c6f1e447081e2bd003fb75e6b70eaac4c6ed5ea2b39615bf81599664c66631c3ae84dcb04448ac8877724fdc4112b351af8c16aa3d1463ce8a7ac871524469
-EBUILD makemkv-1.12.0.ebuild 2994 BLAKE2B dcc6eaad1968992daf019758e4084fcb2942c76d92ee9a642c7fab0a45d157ba65b3f3228676024ac52badb70c633d29ab15ad48f07d9b04b18854cf7c6984b8 SHA512 120d52121787d0df4ae85b3ce83ec99ed62f53b0b7fcbb8fb47dffbe93f98d03d77882c29d8f39dfe0e6ea4a836d003a769dae1beaf8bb1ff83703066872e922
+DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94
+DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980
+EBUILD makemkv-1.12.2.ebuild 2859 BLAKE2B fc304b3cc80241f3a2f07e020291ca76dca99b85b028b92a1833cde011fdbadc45b9a908371fc77f5c5f050f2a116599b0754d659f4bb4eac6c25e80d616fba6 SHA512 d8d8b25018297ecee548e46bc364953d2db2fe41cbe970b74933ec18400d03ab7317e2b5fe5606cce73de0bb31560b6bd17dbb3169f88807a9a7383de19f010c
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
deleted file mode 100644
index 01398469ae6d..000000000000
--- a/media-video/makemkv/files/makemkv-wget.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://www.makemkv.com/forum2/viewtopic.php?f=3&t=15885
-
-diff -Naur a/libabi/src/httplinux.cpp b/libabi/src/httplinux.cpp
---- a/libabi/src/httplinux.cpp	2017-03-26 16:33:04.000000000 +0100
-+++ b/libabi/src/httplinux.cpp	2017-03-26 20:31:04.630357491 +0100
-@@ -29,8 +29,8 @@
- int HTTP_Download(const char* Url,const char* Agent,void* Buffer,uint32_t* Size)
- {
-     int     pipe_fd[2],err;
--    char*   argv[10];
--    char    argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4];
-+    char*   argv[12];
-+    char    argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4],argv8[4],argv9[16];
-     char    *lagent,*lurl;
-     ssize_t rd;
- 
-@@ -53,8 +53,10 @@
-     strcpy(argv5,"20"); argv[5]=argv5;
-     strcpy(argv6,"-U"); argv[6]=argv6;
-     argv[7]=lagent;
--    argv[8]=lurl;
--    argv[9]=NULL;
-+    strcpy(argv8,"-o"); argv[8]=argv8;
-+    strcpy(argv9,"/dev/null"); argv[9]=argv9;
-+    argv[10]=lurl;
-+    argv[11]=NULL;
- 
-     err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp());
- 
diff --git a/media-video/makemkv/makemkv-1.12.0.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild
index 530e22a417b7..bcc7cf5092ec 100644
--- a/media-video/makemkv/makemkv-1.12.0.ebuild
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild
@@ -16,12 +16,12 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav multilib"
+IUSE="+gui libav"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
 DEPEND="
-	sys-libs/glibc[multilib?]
+	sys-libs/glibc
 	dev-libs/expat
 	dev-libs/openssl:0[-bindist(-)]
 	sys-libs/zlib
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
 
 src_configure() {
 	# See bug #439380.
@@ -66,13 +66,8 @@ src_install() {
 
 	cd "${WORKDIR}"/${MY_PB} || die
 
-	# install prebuilt bins
-	if use x86; then
-		dobin bin/i386/{makemkvcon,mmdtsdec}
-	elif use amd64; then
-		dobin bin/amd64/makemkvcon
-		use multilib && dobin bin/i386/mmdtsdec
-	fi
+	# install prebuilt bin
+	dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
 
 	# install profiles and locales
 	insinto /usr/share/MakeMKV