gentoo resync : 09.07.2022

4 files changed, 263 insertions, 11 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 2b25fa2373cb..efa980a63bca 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,7 @@
-AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990dab88ee61f3656495ea125d97e929e0626b6626f2fa12e1219e3dcfb80067e9f682311bb75d8750dc7eddb SHA512 c43c28774e9750f79624ff682bbcd8566aadf18bf4c44692d214e80f654eecf63f26bcaa8c7292d4d8e3969350f50f0b720982099e0114866630a8c0828088a7
+AUX makemkv-flags.patch 1014 BLAKE2B 335c3d9bb8f48e2af9b6ee82d9fcebe980ece2b02e5429aa716ebcbdbf42e8ebfb40ebe850957207996a9def153235afd336d620dbe54eb3b8cd240524d97673 SHA512 181a2d551a90dec314e9359b3dad520ddc281e99fccafc2c1c8dd24cb82443402b94398e4fa87116ffc714ceec67bf55fde91ba316e62165a3f01a4acade2111
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
-DIST makemkv-bin-1.16.7.tar.gz 16130689 BLAKE2B 6535cbeb65d0166c5093920f2064065f4d7a3ea0232878dfeda76f5ea53dad68e2da10894dcbeaab706c93b733f32e9c316a07a9365f43943a1f0710a48af83f SHA512 8233affac002a4ec9b0d37746371d2f582f5ebbb18621bb4801442bab2f8b79616b7f641893b896c350a8a7e8f09368b8b4acae58a6ab32a591926d98b808be1
-DIST makemkv-oss-1.16.7.tar.gz 6541953 BLAKE2B 28273db7300532b1ce2ab63629aa5ceb90059e4e02ea22e6f2764e727946fe6e6dbc45e16c743bf239e3bdfe015e447e662d0c5e838ada8564d0e251721a6bcc SHA512 6e8159b344caa70103369585f5a2f12dcfb6e5d6f65fb19466dab97dbf690cecaa1f08f6501342007966c23a08aa13f625eca078e270c8bb651d9b896a5977ff
-EBUILD makemkv-1.16.7.ebuild 3062 BLAKE2B da5bfc8f074694402ad05878fcec5590a64e520a2793a509d28ce91cc5e63be150ab551bf0f9adb9d7bb0a2afd75cd3f72da9a2c68c6bd55ff80ccf080312ede SHA512 f64291ca19f83a2a32401376c93be2129a52146234d4d8185af9b6cae6081a5fb79e23c4be70abd250bd0b1c0a17fb0d4450c20f0aca7530e3f34b7306461405
+AUX makemkvcon.1 6118 BLAKE2B bf8f7665d7b367e4dc5cfb12136cb91271087991d86bb0c2bfe6fe41def407539276114f95548cd867c49bc10bed25cec51ac00dbd6defe5df7fd82f2fe29b25 SHA512 a9334a96fcc90932a109c2d74b1769ab60e652a1e860399d8a486bd36ba02fbdabf55816059e0c51e3e4826824b7798f86b85cb5e22a4d13c2e18a2944522ac4
+DIST makemkv-bin-1.17.0.tar.gz 16332197 BLAKE2B 9a51f7802c54ad7cfba5678ea1caf45d5099f9479fe1c6bdb4be05fe29d738b69d780c747e69147ef0eed85d9bc1174e0a959642039276ede9fe0a693d377b85 SHA512 f60ad2279e738e91dbe9d716a64102212b00bc32819907ebf4da8ea2127d74bb577dee25f3efb16da6393b1e29d3a2a09498dec93fc70940175471f0a4744939
+DIST makemkv-oss-1.17.0.tar.gz 6631571 BLAKE2B fd4c383deb26a948079005671e59d3bc3230612b7b405ee8587684922175a94beee4f4ba2ab7e4d0052ca09f6fdabaca4ef008a5a711d77c7e861dc879df3120 SHA512 895c0edd429e934d72f851a6cbbfe6df183e246e65a2899945e77917c612e7ee04251c4a22f94f2d7df547ce58ddded4fd451497791c56fe473b1d201aaa52e6
+EBUILD makemkv-1.17.0.ebuild 3128 BLAKE2B 6acd4e23e9d48ec8323d50cf7d9fa5a23030a4cff1f9c0f5a4324b94a3270f783d27bca334d5961242d29f4fb0878f9236e02dba6d7099c9fe4683068ca466f4 SHA512 bf532c4351a440cf31445da19288229e8c7c1b29efa6b111d135d5b3834075a69033fa3b28a9ed33269275b062c16a6f46bf8c58a078e342193f2efa40d2e715
 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
index d7a2f1be16c5..0f05aa7a751b 100644
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -1,11 +1,17 @@
---- a/Makefile.in	2021-03-19 13:06:50.000000000 +0000
-+++ b/Makefile.in	2021-03-30 23:28:42.720480399 +0100
-@@ -112,7 +112,7 @@
- 
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2022-06-26 20:14:12.000000000 +0100
++++ b/Makefile.in	2022-07-07 13:28:27.481730073 +0100
+@@ -113,12 +113,12 @@
+
  out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h
  	mkdir -p out
 -	$(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
 +	$(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
  	-ffunction-sections -Wl,--gc-sections -Wl,-z,defs
- 
- tmp/gen_buildinfo.h:
+
+ out/mmgplsrv.full: $(MMGPL_SRC)
+ 	mkdir -p out
+-	$(GCC) $(CFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
++	$(GCC) $(CFLAGS) $(LDFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
+ 	$(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MMGPL_DEF) -D_GNU_SOURCE -Dstl=std -o$@ $(MMGPL_SRC) $(MMGPL_SRC_LINUX) -lc -lstdc++ \
+ 	-ffunction-sections -Wl,--gc-sections -Wl,-z,defs
diff --git a/media-video/makemkv/files/makemkvcon.1 b/media-video/makemkv/files/makemkvcon.1
new file mode 100644
index 000000000000..0abeaa5387e0
--- /dev/null
+++ b/media-video/makemkv/files/makemkvcon.1
@@ -0,0 +1,242 @@
+'\" t
+.\"     Title: makemkvcon
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 05/20/2020
+.\"    Manual: \ \&
+.\"    Source: \ \&
+.\"  Language: English
+.\"
+.TH "MAKEMKVCON" "1" "05/20/2020" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+makemkvcon \- MakeMKV console application
+.SH "SYNOPSIS"
+.sp
+\fBmakemkvcon\fR [\fIOPTIONS\fR] <backup|info|mkv> [\fIPARAMETERS\fR]
+.SH "DESCRIPTION"
+.sp
+Command\-line options for MakeMKV\&.
+.sp
+Configuration options and setup keys are located in ~/\&.MakeMKV/
+.SH "OPTIONS"
+.sp
+General options:
+.PP
+\fB\-\-messages=\fR\fIFILE\fR
+.RS 4
+Output all messgaes to a file\&. Special file names: stdout, stderr, null\&. Default is to stdout\&.
+.RE
+.PP
+\fB\-\-progress=\fR\fIFILE\fR
+.RS 4
+Output all progress messages to a file\&. Special file names: stdout, stderr, null\&. Use
+\fB\-same\fR
+to use
+\fB\-\-messages\fR
+argument\&. Default is no output\&.
+.RE
+.PP
+\fB\-\-debug\fR[=\fIFILE\fR]
+.RS 4
+Enables debug messages\&. Optionally saves to output file\&.
+.RE
+.PP
+\fB\-\-directio=[true|false]\fR
+.RS 4
+Enables or disables direct disc access\&.
+.RE
+.PP
+\fB\-\-noscan\fR
+.RS 4
+Don\(cqt access any media during disc scan and do not check for media insertion and removal\&. Helpful when other applications are already accessing discs in other drives\&.
+.RE
+.PP
+\fB\-\-cache=\fR\fISIZE\fR
+.RS 4
+Specifies size of read cache in megabytes\&. By default program uses a huge amount of memory\&. About 128 MB is recommended for streaming and backup, 512MB for DVD conversion and 1024MB for Blu\-ray conversion\&.
+.RE
+.PP
+\fB\-r, \-\-robot\fR
+.RS 4
+Enables automation mode\&. Program will output more information in a format that is easier to parse\&. All output is line\-based and output is flushed on line end\&. All strings are quoted, all control characters and quotes are backlash\-escaped\&. If you automate this program it is highly recommended to use this option\&. Some options make reference to apdefs\&.h file that can be found in MakeMKV open\-source package, included with version for Linux\&. These values will not change in future versions\&.
+.RE
+.sp
+Backup options:
+.PP
+\fB\-\-decrypt\fR
+.RS 4
+Decrypt stream files during backup\&. Default: no decryption\&.
+.RE
+.PP
+\fB\-\-minlength\fR=\fISECONDS\fR
+.RS 4
+Specify minimum title length\&. Default: program preferences\&.
+.RE
+.SH "COMMANDS"
+.sp
+\fBbackup\fR Backup disc\&.
+.sp
+\fBinfo\fR Display information about a disc\&.
+.sp
+\fBmkv\fR Copy titles from disc\&.
+.sp
+\fBf\fR Run universal firmware tool\&.
+.SH "PARAMETERS"
+.PP
+\fBsource iso:\fR\fIFILENAME\fR
+.RS 4
+Open ISO image\&.
+.RE
+.PP
+\fBsource file:\fR\fIDIRECTORY\fR
+.RS 4
+Open files in directory\&.
+.RE
+.PP
+\fBsource disc:\fR\fIDISC ID\fR
+.RS 4
+Open disc with ID\&.
+.RE
+.PP
+\fBsource dev:\fR\fIDEVICE\fR
+.RS 4
+Open disc with device name\&.
+.RE
+.SH "EXAMPLES"
+.sp
+Copy all titles from first disc and save as MKV files into current directory:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon mkv disc:0 all \&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+List all available drives:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon \-r \-\-cache=1 info disc:9999
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Backup first disc decrypting all video files in automation mode with progress output:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon backup \-\-decrypt \-\-cache=16 \-\-noscan \-r \-\-progress=\-same disc:0 \&.
+.fi
+.if n \{\
+.RE
+.\}
+.SH "MESSAGE FORMATS"
+.sp
+\fBMessage output\fR
+.sp
+MSG:code,flags,count,message,format,param0,param1,\&...
+.sp
+code \- unique message code, should be used to identify particular string in language\-neutral way\&.
+.sp
+flags \- message flags, see AP_UIMSG_xxx flags in apdefs\&.h
+.sp
+count \- number of parameters
+.sp
+message \- raw message string suitable for output
+.sp
+format \- format string used for message\&. This string is localized and subject to change, unlike message code\&.
+.sp
+paramX \- parameter for message
+.sp
+\fBCurrent and total progress title\fR
+.sp
+PRGC:code,id,name
+.sp
+PRGT:code,id,name
+.sp
+code \- unique message code
+.sp
+id \- operation sub\-id
+.sp
+name \- name string
+.sp
+\fBProgress bar values for current and total progress\fR
+.sp
+PRGV:current,total,max
+.sp
+current \- current progress value
+.sp
+total \- total progress value
+.sp
+max \- maximum possible value for a progress bar, constant
+.sp
+\fBDrive scan messages\fR
+.sp
+DRV:index,visible,enabled,flags,drive name,disc name
+.sp
+index \- drive index
+.sp
+visible \- set to 1 if drive is present
+.sp
+enabled \- set to 1 if drive is accessible
+.sp
+flags \- media flags, see AP_DskFsFlagXXX in apdefs\&.h
+.sp
+drive name \- drive name string
+.sp
+disc name \- disc name string
+.sp
+\fBDisc information output messages\fR
+.sp
+TCOUT:count
+.sp
+count \- titles count
+.sp
+\fBDisc, title and stream information\fR
+.sp
+CINFO:id,code,value
+.sp
+TINFO:id,code,value
+.sp
+SINFO:id,code,value
+.sp
+id \- attribute id, see AP_ItemAttributeId in apdefs\&.h
+.sp
+code \- message code if attribute value is a constant string
+.sp
+value \- attribute value
+.SH "RESOURCES"
+.sp
+Console usage: https://www\&.makemkv\&.com/developers/usage\&.txt
+.sp
+MakeMKV for Linux forum: https://www\&.makemkv\&.com/forum/viewforum\&.php?f=3
+.sp
+Main web site: https://www\&.makemkv\&.com/
diff --git a/media-video/makemkv/makemkv-1.16.7.ebuild b/media-video/makemkv/makemkv-1.17.0.ebuild
index 23a32955e746..7bb22f94b4f1 100644
--- a/media-video/makemkv/makemkv-1.16.7.ebuild
+++ b/media-video/makemkv/makemkv-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,6 +100,9 @@ src_install() {
 	# install profiles and locales
 	insinto /usr/share/MakeMKV
 	doins src/share/*
+
+	# install unofficial man page
+	doman "${FILESDIR}"/makemkvcon.1
 }
 
 pkg_postinst() {