[gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     97fd48ee1056584a50eecf2cd9e495f6e3c46e8b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 22:29:29 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 22:29:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fd48ee

media-video/makemkv: Bump to 1.12.2, remove old 1.12.0

The wget patch was merged upstream and the mmdtsdec binary has gone.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-video/makemkv/Manifest                       |  4 +--
 media-video/makemkv/files/makemkv-wget.patch       | 29 ----------------------
 ...makemkv-1.12.0.ebuild => makemkv-1.12.2.ebuild} | 15 ++++-------
 3 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index b6bf42aa119..234d2b5ca36 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+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

diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
deleted file mode 100644
index 01398469ae6..00000000000
--- 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
similarity index 90%
rename from media-video/makemkv/makemkv-1.12.0.ebuild
rename to media-video/makemkv/makemkv-1.12.2.ebuild
index 530e22a417b..bcc7cf5092e 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