media-video/makemkv: Version bump to 1.10.5, remove old 1.10.4

Unfortunately upstream didn't use my automake conversion but he did at
least apply all the other fixes, negating the need for most of the
patches. The new wget patch is to stop the creation of wget-log files.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

8 files changed, 43 insertions, 181 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4a90670cfaf1..2f966c0ca5ce 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.4.tar.gz 8315649 SHA256 bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa SHA512 00482428a6374e37912e0537c1e876b478a5eb9e0a26476b01f74f93c0605ed7aa3547599287211f17dd2d511e5bebf60605e05d0064f501816fdfccd964b98c WHIRLPOOL 29dfa3dcc1f36511bd153ae1c43ca54b6fb2d8cfa8d62960e7605ca460a182d4d1feec05baa9d01dfba5f80734cae4c085b8b9f0ac5d0b0910c58fa766e351f8
-DIST makemkv-oss-1.10.4.tar.gz 4421220 SHA256 bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4 SHA512 6a792703ae4ab978ebe7a71e9d9f2c298e230168c2701fd2f7fab724f31a1c83388bae408c253a75504c73b9e25f9fb0ba48d5697cfa1f7ae39df133444983c4 WHIRLPOOL 099f0d5d76ec97e3bf3bfa0a0e1ffceb5c539584ca05f9d204b241960d579f9eaabb8dfc8df2a35feec253fa597d9c97ed28c7cef95928f699a6a74bed146bee
+DIST makemkv-bin-1.10.5.tar.gz 8394804 SHA256 dd50b4b4e42d5f107356ecd637015b3cbf6c7ce3cdfc450d0995a8e785a95e02 SHA512 b44bfb79ecf51419c0d234f5ff70f4571a9ee3fe323ef6f1df9a8388a24294766153c60615f318dad20097d759a3d64a66fce4643aebdf0dbda24ed20dd8aa69 WHIRLPOOL 847ddb134e8f7ef597a1b6679ba7c4d4720895326088ef22ab7f525160f6c4c9d0a69c419e421e9b0ce049f35e566e6ed7027dc9d540f5523e09d909c0e6c97b
+DIST makemkv-oss-1.10.5.tar.gz 4569597 SHA256 4aed3caa587dc206529a2cc00a25bf33e006d7f4854ac2282f5627002b90564d SHA512 b102d211a94078d1b5c6b5b37ca7993935b7e1d784437fd9a56738a7ce8cd8f24debce976a42a5d2e3cf3cbe3deb0bb4a22696f3e47c35d92e20cba30539b9b0 WHIRLPOOL 8e54c4f8a112eddd7aaf8325543debf92d20b20c7277de05e86f887f3125fd5b27bcf27d68ec24b2a4c7142016c8a998da713d164f09c45d3f970dbba7218724
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
deleted file mode 100644
index f88bde00e651..000000000000
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur a/Makefile.in b/Makefile.in
---- a/Makefile.in	2016-12-11 16:14:27.000000000 +0000
-+++ b/Makefile.in	2016-12-17 23:13:03.227251463 +0000
-@@ -2,9 +2,11 @@
- include makefile.common
- 
- GCC=@CC@
-+GXX=@CXX@
- MOC=@QT_MOC@
- 
- CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-+LDFLAGS=@LDFLAGS@
- DESTDIR=@DESTDIR@
- PREFIX=@prefix@
- ENABLE_GUI=@ENABLE_GUI@
-@@ -51,13 +53,13 @@
- 
- out/libdriveio.so.0.full:
- 	mkdir -p out
--	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
-+	$(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
- 	-fPIC -Xlinker -dy -Xlinker --version-script=libdriveio/src/libdriveio.vers \
- 	-Xlinker -soname=libdriveio.so.0 -lc -lstdc++
- 
- out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
- 	mkdir -p out
--	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
-+	$(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
- 	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) $(LIBDCADEC_DEF) \
- 	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
- 	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) $(LIBDCADEC_SRC) \
-@@ -67,16 +69,16 @@
- 
- out/libmmbd.so.0.full:
- 	mkdir -p out
--	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
-+	$(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
- 	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
- 	-fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
- 	-Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
- 
- out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
- 	mkdir -p out
--	$(GCC) $(CFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
-+	$(GXX) $(CFLAGS) $(LDFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
- 	$(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
--	-DHAVE_BUILDINFO_H -Itmp \
-+	-std=c++11 -DHAVE_BUILDINFO_H -Itmp \
- 	@QT_INC@ -lc -lstdc++ \
- 	@QT_LIB@ -lpthread -lz -lrt
- 
diff --git a/media-video/makemkv/files/makemkv-makefile.patch b/media-video/makemkv/files/makemkv-makefile.patch
deleted file mode 100644
index bc057caba91f..000000000000
--- a/media-video/makemkv/files/makemkv-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- makemkv-oss-1.10.3/Makefile.in.orig	2016-12-11 16:14:27.000000000 +0000
-+++ makemkv-oss-1.10.3/Makefile.in	2016-12-22 23:11:24.248995344 +0000
-@@ -6,11 +6,12 @@
- 
- CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
- DESTDIR=@DESTDIR@
--PREFIX=@prefix@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
- ENABLE_GUI=@ENABLE_GUI@
--LIBDIR=$(PREFIX)/lib
--BINDIR=$(PREFIX)/bin
--DATADIR=$(PREFIX)/share
-+LIBDIR=@libdir@
-+BINDIR=@bindir@
-+DATADIR=@datadir@
- FFMPEG_CFLAGS=@ffmpeg_CFLAGS@
- FFMPEG_LIBS=@ffmpeg_LIBS@
- INSTALL=@INSTALL@
-@@ -47,7 +46,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
-@@ -91,5 +90,5 @@
- 
- tmp/image_data.o : makemkvgui/bin/image_data.bin
- 	mkdir -p tmp
--	$(LD) -r -b binary -o $@ $<
-+	$(LD) -r -b binary -z noexecstack -o $@ $<
- 
diff --git a/media-video/makemkv/files/makemkv-qt4.patch b/media-video/makemkv/files/makemkv-qt4.patch
deleted file mode 100644
index cbc2fa08f1ad..000000000000
--- a/media-video/makemkv/files/makemkv-qt4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- makemkv-oss-1.9.8/configure.orig	2015-12-20 16:22:19.000000000 +0000
-+++ makemkv-oss-1.9.8/configure	2015-12-26 23:59:44.601387071 +0000
-@@ -5048,6 +5048,7 @@
- if test "$enable_gui" != "no"; then
- 
- 
-+: '
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt5" >&5
- $as_echo_n "checking for qt5... " >&6; }
-@@ -5105,6 +5106,7 @@
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$qt5_PKG_ERRORS" >&5
-+'
- 
- 
- 
-@@ -5271,6 +5273,7 @@
- 
- fi
- 
-+: '
- else
- 	qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
- 	qt5_LIBS=$pkg_cv_qt5_LIBS
-@@ -5283,6 +5286,7 @@
-     QT_MOC="$qt5_host_bins/moc";
- 
- fi
-+'
- 
- QT_INC=$QT_INC
- 
diff --git a/media-video/makemkv/files/makemkv-qt5.patch b/media-video/makemkv/files/makemkv-qt5.patch
deleted file mode 100644
index 58b5e4145a4b..000000000000
--- a/media-video/makemkv/files/makemkv-qt5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- makemkv-oss-1.9.8/configure.orig	2015-12-20 16:22:19.000000000 +0000
-+++ makemkv-oss-1.9.8/configure	2015-12-27 00:05:18.659860655 +0000
-@@ -5108,6 +5108,7 @@
- 
- 
- 
-+: '
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
- $as_echo_n "checking for qt4... " >&6; }
-@@ -5257,7 +5258,9 @@
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
-+'
-       as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
-+: '
- 
- else
- 	qt4_CFLAGS=$pkg_cv_qt4_CFLAGS
-@@ -5270,6 +5273,7 @@
-       QT_MOC=`$PKG_CONFIG --variable moc_location "QtCore" 2>/dev/null`;
- 
- fi
-+'
- 
- else
- 	qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
diff --git a/media-video/makemkv/files/makemkv-sysmacros.patch b/media-video/makemkv/files/makemkv-sysmacros.patch
deleted file mode 100644
index 9f4edebeda11..000000000000
--- a/media-video/makemkv/files/makemkv-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- makemkv-oss-1.9.10/libabi/src/sys_linux.c.orig	2016-04-15 21:35:36.000000000 +0100
-+++ makemkv-oss-1.9.10/libabi/src/sys_linux.c	2016-05-08 10:34:07.988650837 +0100
-@@ -20,6 +20,7 @@
- */
- #include <lgpl/sysabi.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <dirent.h>
- #include <string.h>
diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
new file mode 100644
index 000000000000..01398469ae6d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-wget.patch
@@ -0,0 +1,29 @@
+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.10.4.ebuild b/media-video/makemkv/makemkv-1.10.5.ebuild
index 77565b1ecb7a..e7eeb0b8c6be 100644
--- a/media-video/makemkv/makemkv-1.10.4.ebuild
+++ b/media-video/makemkv/makemkv-1.10.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils gnome2-utils multilib flag-o-matic
+inherit gnome2-utils flag-o-matic
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -23,7 +23,7 @@ QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 DEPEND="
 	sys-libs/glibc[multilib?]
 	dev-libs/expat
-	dev-libs/openssl:0
+	dev-libs/openssl:0[-bindist(-)]
 	sys-libs/zlib
 	qt5? (
 		dev-qt/qtcore:5
@@ -43,21 +43,7 @@ RDEPEND="${DEPEND}
 	net-misc/wget"
 
 S="${WORKDIR}/makemkv-oss-${PV}"
-
-src_prepare() {
-	PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros,flags}.patch )
-
-	# Qt5 always trumps Qt4 if it is available. There are no configure
-	# options or variables to control this and there is no publicly
-	# available configure.ac either.
-	if use qt5; then
-		PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
-	elif use qt4; then
-		PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
-	fi
-
-	default
-}
+PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
 
 src_configure() {
 	# See bug #439380.
@@ -66,12 +52,17 @@ src_configure() {
 	local econf_args=()
 
 	if use qt5 || use qt4; then
-		econf_args+=( '--enable-gui' )
+		econf_args+=( --enable-gui )
 	else
-		econf_args+=( '--disable-gui' )
+		econf_args+=( --disable-gui )
 	fi
 
-	econf "${econf_args[@]}"
+	econf \
+		--enable-debug \
+		--disable-noec \
+		$(use_enable qt5) \
+		$(use_enable qt4) \
+		"${econf_args[@]}"
 }
 
 src_install() {