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

2024-09-30 Thread James Le Cuirot
commit: 37c284ea4b16c40de55a06270eeb7a04c09cefba
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Sep 30 21:36:12 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Sep 30 21:36:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c284ea

media-video/makemkv: Version bump to 1.17.8

I tried to migrate this to Qt6 even though upstream doesn't support it yet, but
it's not quite trivial.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.17.8.ebuild | 126 ++
 2 files changed, 128 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index a81343186078..fa550f132047 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.17.7.tar.gz 16420879 BLAKE2B 
adc54191fd445832b9c4805400746e42d1b3261d076299b5e34beb1f13d80bf7bcbd113699f3d28fce5e21bb8f810a40927924b3d9c7250467d1979b1bf4f72b
 SHA512 
2c93dd6e63c5e59415ad8a9a1370f7a1eddda2b643fa4dcde6383abb6065b84a77b03b977bf2ade50bc2d3560bb245ad2e1e79bab21629f7fc5816598738a5d9
+DIST makemkv-bin-1.17.8.tar.gz 17859805 BLAKE2B 
0ddbcd50a44a98c118420485c7c8e48a1c03290ac840b22ab8119d5cd6db0743e746ca9cbdd7fd714f49a2a37420645c820477c5c7d7b189763b5a46de342e9d
 SHA512 
033c51a818ccf6537f9709d6d19ce81d89edded7dfa1c24fb080c4c7caf6ae267e18722b39ee27e70752f18d502c819c8c582fc53fbc153013713046ef756c01
 DIST makemkv-oss-1.17.7.tar.gz 6618248 BLAKE2B 
18652db1d72ea7287e7e38706afc589e6fe8fb1fbf9d4e24770b9a2bfe670a464b2c21b7c543b23d3c6234f40048358d944b123897c4f569beb31faac8ef3eb7
 SHA512 
e21bc293133d7f999b3ea4258f01f0b88c5a58610da0185d8f74b724d61578211d35d5d44fae1610887e98f3ff36b2f0df33068d8647ad8983020be49adde037
+DIST makemkv-oss-1.17.8.tar.gz 6627058 BLAKE2B 
76ffcf0a67c2ee6b05820006ff7926accef7939374b328d709dbbf6c746f010e273f89748a2a3386679b83f2af0b4f3e41f31e8acaf29cdbaeffccaf25b57500
 SHA512 
4c8d462933138a614afdf4fe5a896400e92299f9ed1882596dd28168c65a654b51ed89c4b0571d60255c2709c0f1dc8b108d4e7d3bbb84842813a661b28f504b

diff --git a/media-video/makemkv/makemkv-1.17.8.ebuild 
b/media-video/makemkv/makemkv-1.17.8.ebuild
new file mode 100644
index ..c8dd8c6309b2
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.17.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   dev-libs/expat
+   dev-libs/openssl:0=[-bindist(-)]
+   >=media-video/ffmpeg-1.0.0:0=
+   sys-libs/glibc
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+RDEPEND="
+   ${DEPEND}
+   java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-path.patch
+)
+
+src_prepare() {
+   default
+
+   if ! use java; then
+   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+   fi
+}
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   local myarch
+   case "${ARCH}" in
+   arm) myarch=armhf ;;
+   x86) myarch=i386 ;;
+   *) myarch=${ARCH} ;;
+   esac
+
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/"${myarch}"/makemkvcon
+
+   # additional tool is actually part of makemkvcon
+   dosym makemkvcon /usr/bin/sdftool
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+
+   # install unofficial man page
+   doman "${FILESDIR}"/makemkvcon.1
+}
+

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

2024-06-24 Thread Jakov Smolić
commit: 062e28942f5495c281f38236ab0f260dbe123f47
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Jun 24 17:56:30 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jun 24 17:56:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062e2894

media-video/makemkv: Stabilize 1.17.7 amd64, #934763

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/makemkv/makemkv-1.17.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.7.ebuild 
b/media-video/makemkv/makemkv-1.17.7.ebuild
index 76a7456daf63..d70bf6a6572e 100644
--- a/media-video/makemkv/makemkv-1.17.7.ebuild
+++ b/media-video/makemkv/makemkv-1.17.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2024-06-23 Thread Arthur Zamarin
commit: 2d8f84b8fdc55fd2bc9714e84b6a9401bb8350ad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 23 16:10:22 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 23 16:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8f84b8

media-video/makemkv: Stabilize 1.17.7 arm64, #934763

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/makemkv/makemkv-1.17.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.7.ebuild 
b/media-video/makemkv/makemkv-1.17.7.ebuild
index 8b1a9d684d5b..76a7456daf63 100644
--- a/media-video/makemkv/makemkv-1.17.7.ebuild
+++ b/media-video/makemkv/makemkv-1.17.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm arm64 x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2024-06-23 Thread Sam James
commit: db92f9af510dc5bc367dd7f78717240a114a27f9
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 23 16:00:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 23 16:00:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db92f9af

media-video/makemkv: Stabilize 1.17.7 x86, #934763

Signed-off-by: Sam James  gentoo.org>

 media-video/makemkv/makemkv-1.17.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.7.ebuild 
b/media-video/makemkv/makemkv-1.17.7.ebuild
index c8dd8c6309b2..8b1a9d684d5b 100644
--- a/media-video/makemkv/makemkv-1.17.7.ebuild
+++ b/media-video/makemkv/makemkv-1.17.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2024-05-16 Thread James Le Cuirot
commit: c381eb0a4b67af0371a22d9e79e7968f3bd00fb9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu May 16 21:26:40 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May 16 22:53:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381eb0a

media-video/makemkv: Bump to 1.17.7, drop old 1.17.6

Apparently, there are no material changes.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.17.6.ebuild => makemkv-1.17.7.ebuild} | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 01f177748549..a81343186078 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.6.tar.gz 16423034 BLAKE2B 
01c6cc439f618f722ef7f4d44c67d5f5d8c37c786bbdcb6ab7d628c6b87b8e08a50c9d4ea434d541c0a5d922c64e8ee6dcc5b100fb50f4cdfd963326490da2cf
 SHA512 
9c3f90b23e837251f79e1fd3d1dc27b9de35efd678d40411d530657a766e03a611d09003db473a46436e0fea650f3c96fb2e0f84dc71b69f2d031bea7d3a695e
-DIST makemkv-oss-1.17.6.tar.gz 6618067 BLAKE2B 
c29966cfd24b97bf7d42ebab41b28357313364b4191922f06a668b43b67072c7bc09e8df50356349cc2f3267b3d8593abba5dbed2e7b083adb4f38c362efe5a3
 SHA512 
0fb9ee23372f74bad8c3fbbef7c8977d6eeaea73fba85759ecefc60ec9ef6c82fd537c917a9f8000ee8e98f5a225d2e650fac2abb8a6921be96ba590ed5b0dbb
+DIST makemkv-bin-1.17.7.tar.gz 16420879 BLAKE2B 
adc54191fd445832b9c4805400746e42d1b3261d076299b5e34beb1f13d80bf7bcbd113699f3d28fce5e21bb8f810a40927924b3d9c7250467d1979b1bf4f72b
 SHA512 
2c93dd6e63c5e59415ad8a9a1370f7a1eddda2b643fa4dcde6383abb6065b84a77b03b977bf2ade50bc2d3560bb245ad2e1e79bab21629f7fc5816598738a5d9
+DIST makemkv-oss-1.17.7.tar.gz 6618248 BLAKE2B 
18652db1d72ea7287e7e38706afc589e6fe8fb1fbf9d4e24770b9a2bfe670a464b2c21b7c543b23d3c6234f40048358d944b123897c4f569beb31faac8ef3eb7
 SHA512 
e21bc293133d7f999b3ea4258f01f0b88c5a58610da0185d8f74b724d61578211d35d5d44fae1610887e98f3ff36b2f0df33068d8647ad8983020be49adde037

diff --git a/media-video/makemkv/makemkv-1.17.6.ebuild 
b/media-video/makemkv/makemkv-1.17.7.ebuild
similarity index 99%
rename from media-video/makemkv/makemkv-1.17.6.ebuild
rename to media-video/makemkv/makemkv-1.17.7.ebuild
index f5c346192737..c8dd8c6309b2 100644
--- a/media-video/makemkv/makemkv-1.17.6.ebuild
+++ b/media-video/makemkv/makemkv-1.17.7.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD 
and DVD discs"
 HOMEPAGE="http://www.makemkv.com/";
 SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
+S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -44,7 +44,6 @@ BDEPEND="
 "
 
 CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-path.patch



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

2024-01-20 Thread James Le Cuirot
commit: f6297aeced02a9f509b979bd9b7b090a2c828c96
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan 20 22:01:45 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan 20 22:01:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6297aec

media-video/makemkv: Bump to 1.17.6, drop old 1.17.5

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.17.5.ebuild => makemkv-1.17.6.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 345500b6e61e..01f177748549 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.5.tar.gz 16407150 BLAKE2B 
b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400
 SHA512 
fab00ede2c0133b750b03df0b0adf854de72734bc9f760aae1f1ba208e0da378e005000508edef209e6b9359a969e6c7df6ff21d32a17a55e3f42aa19815400b
-DIST makemkv-oss-1.17.5.tar.gz 6618061 BLAKE2B 
128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40
 SHA512 
2bc49e079c06ddff3442c00766e3b5635c03ec928013a331bf5aa386efaf65b1c654db340716d9a31b805b5f96a61be8f96eab3949a1cd24cc3daa9fc90b5a28
+DIST makemkv-bin-1.17.6.tar.gz 16423034 BLAKE2B 
01c6cc439f618f722ef7f4d44c67d5f5d8c37c786bbdcb6ab7d628c6b87b8e08a50c9d4ea434d541c0a5d922c64e8ee6dcc5b100fb50f4cdfd963326490da2cf
 SHA512 
9c3f90b23e837251f79e1fd3d1dc27b9de35efd678d40411d530657a766e03a611d09003db473a46436e0fea650f3c96fb2e0f84dc71b69f2d031bea7d3a695e
+DIST makemkv-oss-1.17.6.tar.gz 6618067 BLAKE2B 
c29966cfd24b97bf7d42ebab41b28357313364b4191922f06a668b43b67072c7bc09e8df50356349cc2f3267b3d8593abba5dbed2e7b083adb4f38c362efe5a3
 SHA512 
0fb9ee23372f74bad8c3fbbef7c8977d6eeaea73fba85759ecefc60ec9ef6c82fd537c917a9f8000ee8e98f5a225d2e650fac2abb8a6921be96ba590ed5b0dbb

diff --git a/media-video/makemkv/makemkv-1.17.5.ebuild 
b/media-video/makemkv/makemkv-1.17.6.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.17.5.ebuild
rename to media-video/makemkv/makemkv-1.17.6.ebuild



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

2024-01-15 Thread Viorel Munteanu
commit: b7a3c1ad5a8c7e8eca5a29c0067eb048a0842661
Author: Matoro Mahri  matoro  tk>
AuthorDate: Mon Jan 15 20:19:08 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Tue Jan 16 05:41:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a3c1ad

media-video/makemkv: Keyword 1.17.5 arm, #914772

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 media-video/makemkv/makemkv-1.17.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.17.5.ebuild 
b/media-video/makemkv/makemkv-1.17.5.ebuild
index 13d076708552..f5c346192737 100644
--- a/media-video/makemkv/makemkv-1.17.5.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2023-09-27 Thread James Le Cuirot
commit: 286b426ee4727133e3a3b3959595216accd16530
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Sep 27 20:21:09 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Sep 27 20:21:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286b426e

media-video/makemkv: Temporarily adjust KEYWORDS to allow a keywordreq

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.17.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.5.ebuild 
b/media-video/makemkv/makemkv-1.17.5.ebuild
index 8b0a0356d161..13d076708552 100644
--- a/media-video/makemkv/makemkv-1.17.5.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2023-09-26 Thread James Le Cuirot
commit: da87738a1f6e809f1f43ee8bef997d23163f331b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep 26 21:45:26 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 26 21:45:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da87738a

media-video/makemkv: Keyword for ~arm64

I tested the GUI using eglfs. :)

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.17.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.5.ebuild 
b/media-video/makemkv/makemkv-1.17.5.ebuild
index 8340ac2483e7..8b0a0356d161 100644
--- a/media-video/makemkv/makemkv-1.17.5.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~arm64 ~x86"
 IUSE="+gui +java"
 RESTRICT="bindist mirror"
 



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

2023-09-26 Thread James Le Cuirot
commit: ab04117131d17f3ff3c0a14bbaf5a1d39e1273d9
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep 26 20:19:40 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 26 20:19:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab041171

media-video/makemkv: Drop old 1.17.4

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.17.4.ebuild | 127 --
 1 file changed, 127 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.17.4.ebuild 
b/media-video/makemkv/makemkv-1.17.4.ebuild
deleted file mode 100644
index e99d889b48d6..
--- a/media-video/makemkv/makemkv-1.17.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info xdg
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui +java"
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   dev-libs/expat
-   dev-libs/openssl:0=[-bindist(-)]
-   >=media-video/ffmpeg-1.0.0:0=
-   sys-libs/glibc
-   sys-libs/zlib
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-RDEPEND="
-   ${DEPEND}
-   java? ( >=virtual/jre-1.8 )
-"
-BDEPEND="
-   virtual/pkgconfig
-   gui? ( dev-qt/qtcore:5 )
-"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-path.patch
-)
-
-src_prepare() {
-   default
-
-   if ! use java; then
-   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
-   fi
-}
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   econf \
-   --enable-debug \
-   --disable-noec \
-   $(use_enable gui) \
-   $(use_enable gui qt5)
-}
-
-src_install() {
-   local myarch
-   case "${ARCH}" in
-   arm) myarch=armel ;;
-   x86) myarch=i386 ;;
-   *) myarch=${ARCH} ;;
-   esac
-
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-   cd "${WORKDIR}"/${MY_PB} || die
-
-   # install prebuilt bin
-   dobin bin/"${myarch}"/makemkvcon
-
-   # additional tool is actually part of makemkvcon
-   dosym makemkvcon /usr/bin/sdftool
-
-   # install profiles and locales
-   insinto /usr/share/MakeMKV
-   doins src/share/*
-
-   # install unofficial man page
-   doman "${FILESDIR}"/makemkvcon.1
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   elog "While MakeMKV is in beta mode, upstream has provided a license"
-   elog "to use if you do not want to purchase one."
-   elog ""
-   elog "See this forum thread for more information, including the key:"
-   elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053";
-   elog ""
-   elog "Note that beta license may have an expiration date and you will"
-   elog "need to check for newer licenses/releases. "
-   elog ""
-   elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-   elog "is no longer necessary and you should delete it from there to"
-   elog "avoid warning messages."
-   elog ""
-   elog "MakeMKV can also act as a drop-in replacement for libaacs and"
-   elog "libbdplus, allowing transparent decryption of a wider range of"
-   elog "titles under players like VLC and mplayer. To enable this, set"
-   elog "the following variables when launching the player:"
-   elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}



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

2023-09-26 Thread James Le Cuirot
commit: 4b18d9619165b800b5c271ac47dba01d14f64f1e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Sep 26 20:27:04 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 26 20:27:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b18d961

media-video/makemkv: Bump to 1.17.5, drop old 1.17.4-r1

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest|  4 ++--
 media-video/makemkv/files/makemkv-ffmpeg-6.patch| 13 -
 .../{makemkv-1.17.4-r1.ebuild => makemkv-1.17.5.ebuild} |  3 +--
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 526bb1f52c94..345500b6e61e 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.4.tar.gz 16402081 BLAKE2B 
9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95
 SHA512 
64251bfbbb3a5cad3a99e15a0a215ab8d3dd54fc267b1f22c9ab347fd744add78edd41d2cfd48086999f4e8912da4713974e36db96406fd18a7c930a61b2f6ec
-DIST makemkv-oss-1.17.4.tar.gz 6618658 BLAKE2B 
c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682
 SHA512 
6e69400ec3ce8df63e55d107a8f81ceab3f3182b5e02be2187eb2cac93c5002d3c614b96e1a3672562e32495c447fb1d7a018ac233d3a9e32f1d27957169283d
+DIST makemkv-bin-1.17.5.tar.gz 16407150 BLAKE2B 
b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400
 SHA512 
fab00ede2c0133b750b03df0b0adf854de72734bc9f760aae1f1ba208e0da378e005000508edef209e6b9359a969e6c7df6ff21d32a17a55e3f42aa19815400b
+DIST makemkv-oss-1.17.5.tar.gz 6618061 BLAKE2B 
128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40
 SHA512 
2bc49e079c06ddff3442c00766e3b5635c03ec928013a331bf5aa386efaf65b1c654db340716d9a31b805b5f96a61be8f96eab3949a1cd24cc3daa9fc90b5a28

diff --git a/media-video/makemkv/files/makemkv-ffmpeg-6.patch 
b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
deleted file mode 100644
index 684d8186bab5..
--- a/media-video/makemkv/files/makemkv-ffmpeg-6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 5dda9e1..2b29b87 100644
 a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl 
ffm_audio_encode_init(void* logctx,const char* n
- #else
- ctx->frame = av_frame_alloc();
- if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
--ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
-+ctx->frame_extended_data = av_calloc(ctx->avctx->channels,
- sizeof(*ctx->frame_extended_data));
- if (!ctx->frame_extended_data) {
- ffm_audio_encode_close(ctx);

diff --git a/media-video/makemkv/makemkv-1.17.4-r1.ebuild 
b/media-video/makemkv/makemkv-1.17.5.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.4-r1.ebuild
rename to media-video/makemkv/makemkv-1.17.5.ebuild
index 05a97bd1d4f3..8340ac2483e7 100644
--- a/media-video/makemkv/makemkv-1.17.4-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -48,7 +48,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-path.patch
-   "${FILESDIR}"/${PN}-ffmpeg-6.patch
 )
 
 src_prepare() {
@@ -73,7 +72,7 @@ src_configure() {
 src_install() {
local myarch
case "${ARCH}" in
-   arm) myarch=armel ;;
+   arm) myarch=armhf ;;
x86) myarch=i386 ;;
*) myarch=${ARCH} ;;
esac



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

2023-07-10 Thread Piotr Karbowski
commit: a09ba8ba17ff0c374918d4a7dc6b63ff20a10abe
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Jul 10 18:56:22 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Jul 10 18:57:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09ba8ba

media-video/makemkv: 1.17.4-r1 revbump with ffmpeg-6 support.

Closes: https://bugs.gentoo.org/909307
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-video/makemkv/files/makemkv-ffmpeg-6.patch |  13 +++
 media-video/makemkv/makemkv-1.17.4-r1.ebuild | 128 +++
 2 files changed, 141 insertions(+)

diff --git a/media-video/makemkv/files/makemkv-ffmpeg-6.patch 
b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
new file mode 100644
index ..684d8186bab5
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
@@ -0,0 +1,13 @@
+diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
+index 5dda9e1..2b29b87 100644
+--- a/libffabi/src/ffabi.c
 b/libffabi/src/ffabi.c
+@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl 
ffm_audio_encode_init(void* logctx,const char* n
+ #else
+ ctx->frame = av_frame_alloc();
+ if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
+-ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
++ctx->frame_extended_data = av_calloc(ctx->avctx->channels,
+ sizeof(*ctx->frame_extended_data));
+ if (!ctx->frame_extended_data) {
+ ffm_audio_encode_close(ctx);

diff --git a/media-video/makemkv/makemkv-1.17.4-r1.ebuild 
b/media-video/makemkv/makemkv-1.17.4-r1.ebuild
new file mode 100644
index ..05a97bd1d4f3
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.17.4-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   dev-libs/expat
+   dev-libs/openssl:0=[-bindist(-)]
+   >=media-video/ffmpeg-1.0.0:0=
+   sys-libs/glibc
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+RDEPEND="
+   ${DEPEND}
+   java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-path.patch
+   "${FILESDIR}"/${PN}-ffmpeg-6.patch
+)
+
+src_prepare() {
+   default
+
+   if ! use java; then
+   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+   fi
+}
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   local myarch
+   case "${ARCH}" in
+   arm) myarch=armel ;;
+   x86) myarch=i386 ;;
+   *) myarch=${ARCH} ;;
+   esac
+
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/"${myarch}"/makemkvcon
+
+   # additional tool is actually part of makemkvcon
+   dosym makemkvcon /usr/bin/sdftool
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+
+   # install unofficial man page
+   doman "${FILESDIR}"/makemkvcon.1
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   elog "While MakeMKV is in beta mode, upstream has provided a license"
+   elog "to use if you do not want to purchase one."
+   elog ""
+   elog "See this forum thread for more information, including the key:"
+   elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053";
+   elog ""
+   elog "Note that beta license may have an expiration date and you will"
+   elog "need to check for newer licenses/releases. "
+   elog ""
+   elog "We previously said to copy default.mmcp.

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

2023-06-02 Thread James Le Cuirot
commit: bb06a09b07327113d84fc9f00da6d538038ebd20
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jun  2 21:03:33 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jun  2 21:03:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb06a09b

media-video/makemkv: Bump to 1.17.4, drop old 1.17.3

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.17.3.ebuild => makemkv-1.17.4.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index b572816f8441..526bb1f52c94 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.3.tar.gz 16402650 BLAKE2B 
adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f
 SHA512 
d085afd28d767a1605fb1acfabb65c7bf8998a46c00ac52d1c2833526d7761bb73bf019d826c40d5281e1318aef619d93d2fb358896968c5dbb435b9c6bcdbfd
-DIST makemkv-oss-1.17.3.tar.gz 6618376 BLAKE2B 
640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2
 SHA512 
864a9903443dbaf1decb88981e892b8a5150052b773b24a319b8744a0244ccb770733cb5bae44fa014c748417bd2a4705867081e8a287a803ecddb128e3a543f
+DIST makemkv-bin-1.17.4.tar.gz 16402081 BLAKE2B 
9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95
 SHA512 
64251bfbbb3a5cad3a99e15a0a215ab8d3dd54fc267b1f22c9ab347fd744add78edd41d2cfd48086999f4e8912da4713974e36db96406fd18a7c930a61b2f6ec
+DIST makemkv-oss-1.17.4.tar.gz 6618658 BLAKE2B 
c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682
 SHA512 
6e69400ec3ce8df63e55d107a8f81ceab3f3182b5e02be2187eb2cac93c5002d3c614b96e1a3672562e32495c447fb1d7a018ac233d3a9e32f1d27957169283d

diff --git a/media-video/makemkv/makemkv-1.17.3.ebuild 
b/media-video/makemkv/makemkv-1.17.4.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.17.3.ebuild
rename to media-video/makemkv/makemkv-1.17.4.ebuild



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

2023-02-04 Thread James Le Cuirot
commit: 9d40bcb6bfa85ae77b3e14e9c09787588e67e5ae
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb  4 17:56:28 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb  4 17:56:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d40bcb6

media-video/makemkv: Bump to 1.17.3, drop old 1.17.2

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.17.2.ebuild => makemkv-1.17.3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 65f59d27a9ef..b572816f8441 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.2.tar.gz 16230560 BLAKE2B 
daf9dbe53cd0ae500c41e4a815645390f0309285e1b963d3fbfb15fce08392855217ebe249a7122651d45359657ac18ff5906dfd91f940b8b73d1b7f9028804d
 SHA512 
fb974ddc20e219db1e5f813e9032b42b4fee8d98d798be7e5902dad042ca4615f1ea2c766e7f86425689e2debb2bbb1dbe40a2083c308c2e84701698b32b792f
-DIST makemkv-oss-1.17.2.tar.gz 6631661 BLAKE2B 
97a57318d5d91393e71b3e7b2f9246ad2be27054ba902feeb774ed9107ae177d7fbad25d2374f481068514ad704a49b95bab75ac5c2949cb575e5d635f26aa17
 SHA512 
30b0510fe007508df06754b63ebc28a2f79de0dffbbd61190d1328d17406e3df1780f36e6cb7ee3d5b8f9462cdce38a7bea0ba25c59063b201e08b9e6c1b695a
+DIST makemkv-bin-1.17.3.tar.gz 16402650 BLAKE2B 
adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f
 SHA512 
d085afd28d767a1605fb1acfabb65c7bf8998a46c00ac52d1c2833526d7761bb73bf019d826c40d5281e1318aef619d93d2fb358896968c5dbb435b9c6bcdbfd
+DIST makemkv-oss-1.17.3.tar.gz 6618376 BLAKE2B 
640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2
 SHA512 
864a9903443dbaf1decb88981e892b8a5150052b773b24a319b8744a0244ccb770733cb5bae44fa014c748417bd2a4705867081e8a287a803ecddb128e3a543f

diff --git a/media-video/makemkv/makemkv-1.17.2.ebuild 
b/media-video/makemkv/makemkv-1.17.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.2.ebuild
rename to media-video/makemkv/makemkv-1.17.3.ebuild
index c92f3258e0e3..e99d889b48d6 100644
--- a/media-video/makemkv/makemkv-1.17.2.ebuild
+++ b/media-video/makemkv/makemkv-1.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



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

2022-10-12 Thread James Le Cuirot
commit: 0e57bd10ca6176ce2eda405817925ba54f087f0a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 12 20:23:30 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 12 20:23:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e57bd10

media-video/makemkv: Bump to 1.17.2, drop old 1.17.1

Fixes the crash seen against glibc 2.36.

Closes: https://bugs.gentoo.org/873508
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.17.1.ebuild => makemkv-1.17.2.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0600d44ca045..65f59d27a9ef 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.1.tar.gz 16162724 BLAKE2B 
f6d6f7e7effb6c71dd9c6f6c6d8e8604dfe9b8f29ada1765a52b8e5e3ae0342393455cea6902f3f564904629e9bca4fff20b09bfd8ef9accbdb9c202bf3e136a
 SHA512 
cb875580a69b7a23a84aced235dbfb80e44bbc92f87945d0745cdb00089862bf03818e0d0d2bfee978f310d97778f253028a595d273ff397f76afb442425407d
-DIST makemkv-oss-1.17.1.tar.gz 6631683 BLAKE2B 
f70bc3d663703c0a0915064e5e8df4eea807c573ef1a1666d907b97448894e59f3b4be77752ae31150e2069d766151d330c3dc04d9c5f4a4c8cc5c44cf90f1e7
 SHA512 
83cf5c3abeb19602891b11494ff002f7901467b491841781f4c698abfb2cbcb67a7be2d01214562506fe2642254027cbc74114d1d84601af901f1358e299e696
+DIST makemkv-bin-1.17.2.tar.gz 16230560 BLAKE2B 
daf9dbe53cd0ae500c41e4a815645390f0309285e1b963d3fbfb15fce08392855217ebe249a7122651d45359657ac18ff5906dfd91f940b8b73d1b7f9028804d
 SHA512 
fb974ddc20e219db1e5f813e9032b42b4fee8d98d798be7e5902dad042ca4615f1ea2c766e7f86425689e2debb2bbb1dbe40a2083c308c2e84701698b32b792f
+DIST makemkv-oss-1.17.2.tar.gz 6631661 BLAKE2B 
97a57318d5d91393e71b3e7b2f9246ad2be27054ba902feeb774ed9107ae177d7fbad25d2374f481068514ad704a49b95bab75ac5c2949cb575e5d635f26aa17
 SHA512 
30b0510fe007508df06754b63ebc28a2f79de0dffbbd61190d1328d17406e3df1780f36e6cb7ee3d5b8f9462cdce38a7bea0ba25c59063b201e08b9e6c1b695a

diff --git a/media-video/makemkv/makemkv-1.17.1.ebuild 
b/media-video/makemkv/makemkv-1.17.2.ebuild
similarity index 99%
rename from media-video/makemkv/makemkv-1.17.1.ebuild
rename to media-video/makemkv/makemkv-1.17.2.ebuild
index bfc0eb0c8853..c92f3258e0e3 100644
--- a/media-video/makemkv/makemkv-1.17.1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
dev-libs/expat
dev-libs/openssl:0=[-bindist(-)]
>=media-video/ffmpeg-1.0.0:0=
-   

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

2022-10-02 Thread James Le Cuirot
commit: c1fe0f501af09acaf1acbbbfce1e7bf528b90d57
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct  2 20:28:18 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct  2 20:28:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fe0f50

media-video/makemkv: Broken with glibc 2.36 so prevent upgraded

Obviously users who have already upgraded cannot downgrade, but at least we can
help the ones who haven't upgraded yet.

Bug: https://bugs.gentoo.org/873508
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.17.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.1.ebuild 
b/media-video/makemkv/makemkv-1.17.1.ebuild
index c92f3258e0e3..bfc0eb0c8853 100644
--- a/media-video/makemkv/makemkv-1.17.1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
dev-libs/expat
dev-libs/openssl:0=[-bindist(-)]
>=media-video/ffmpeg-1.0.0:0=
-   sys-libs/glibc
+   

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

2022-09-18 Thread James Le Cuirot
commit: 44a709efaf95221547b76276a7cb698a6115a636
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Sep 18 13:10:25 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Sep 18 13:10:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a709ef

media-video/makemkv: Drop obsolete wget dependency

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.17.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.17.1.ebuild 
b/media-video/makemkv/makemkv-1.17.1.ebuild
index f458e1ceb1d6..c92f3258e0e3 100644
--- a/media-video/makemkv/makemkv-1.17.1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.1.ebuild
@@ -36,7 +36,6 @@ DEPEND="
 "
 RDEPEND="
${DEPEND}
-   net-misc/wget
java? ( >=virtual/jre-1.8 )
 "
 BDEPEND="



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

2022-07-13 Thread James Le Cuirot
commit: 88b0e87ce97a7215a4d8426e5989c64a35ab686c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jul 13 20:18:57 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jul 13 20:19:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b0e87c

media-video/makemkv: Bump to 1.17.1, drop old 1.17.0

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest|  4 ++--
 media-video/makemkv/files/makemkv-flags.patch   | 17 -
 .../{makemkv-1.17.0.ebuild => makemkv-1.17.1.ebuild}|  1 -
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 864814751179..0600d44ca045 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+DIST makemkv-bin-1.17.1.tar.gz 16162724 BLAKE2B 
f6d6f7e7effb6c71dd9c6f6c6d8e8604dfe9b8f29ada1765a52b8e5e3ae0342393455cea6902f3f564904629e9bca4fff20b09bfd8ef9accbdb9c202bf3e136a
 SHA512 
cb875580a69b7a23a84aced235dbfb80e44bbc92f87945d0745cdb00089862bf03818e0d0d2bfee978f310d97778f253028a595d273ff397f76afb442425407d
+DIST makemkv-oss-1.17.1.tar.gz 6631683 BLAKE2B 
f70bc3d663703c0a0915064e5e8df4eea807c573ef1a1666d907b97448894e59f3b4be77752ae31150e2069d766151d330c3dc04d9c5f4a4c8cc5c44cf90f1e7
 SHA512 
83cf5c3abeb19602891b11494ff002f7901467b491841781f4c698abfb2cbcb67a7be2d01214562506fe2642254027cbc74114d1d84601af901f1358e299e696

diff --git a/media-video/makemkv/files/makemkv-flags.patch 
b/media-video/makemkv/files/makemkv-flags.patch
deleted file mode 100644
index 0f05aa7a751b..
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur a/Makefile.in b/Makefile.in
 a/Makefile.in  2022-06-26 20:14:12.0 +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
-
- 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/makemkv-1.17.0.ebuild 
b/media-video/makemkv/makemkv-1.17.1.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.0.ebuild
rename to media-video/makemkv/makemkv-1.17.1.ebuild
index 7bb22f94b4f1..f458e1ceb1d6 100644
--- a/media-video/makemkv/makemkv-1.17.0.ebuild
+++ b/media-video/makemkv/makemkv-1.17.1.ebuild
@@ -49,7 +49,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-path.patch
-   "${FILESDIR}"/${PN}-flags.patch
 )
 
 src_prepare() {



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

2022-07-07 Thread James Le Cuirot
commit: 63385fa5058e0dd87eedf325ab329ba7a939ebaa
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jul  7 12:36:45 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jul  7 12:36:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63385fa5

media-video/makemkv: Respect LDFLAGS when building mmgplsrv

Closes: https://bugs.gentoo.org/856772
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/files/makemkv-flags.patch | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

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.0 +
-+++ 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.0 +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



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

2022-07-06 Thread James Le Cuirot
commit: 7cf73ac1cbe0d710bfdb32c587d0ac943bfaf856
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jul  6 22:14:16 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jul  6 22:14:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf73ac1

media-video/makemkv: Bump to 1.17.0, add unofficial man page

Thanks to Steve Dibb for the man page.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest   |   4 +-
 media-video/makemkv/files/makemkvcon.1 | 242 +
 ...makemkv-1.16.7.ebuild => makemkv-1.17.0.ebuild} |   5 +-
 3 files changed, 248 insertions(+), 3 deletions(-)

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

diff --git a/media-video/makemkv/files/makemkvcon.1 
b/media-video/makemkv/files/makemkvcon.1
new file mode 100644
index ..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 
+.\"  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]  [\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\f

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

2022-03-01 Thread James Le Cuirot
commit: 5d1d7cc72a570c1eb3d7f3f42c1d61fbe2452286
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  1 20:40:13 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar  1 20:40:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1d7cc7

media-video/makemkv: Bump to 1.16.7, drop old 1.16.5

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.16.5.ebuild => makemkv-1.16.7.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index d667005e6dd7..e74db0a7a5a3 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B 
c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af
 SHA512 
4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
-DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B 
e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d
 SHA512 
865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e
+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

diff --git a/media-video/makemkv/makemkv-1.16.5.ebuild 
b/media-video/makemkv/makemkv-1.16.7.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.16.5.ebuild
rename to media-video/makemkv/makemkv-1.16.7.ebuild



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

2022-01-06 Thread James Le Cuirot
commit: b97e82d730dbef0fa36d148b79ded9c9c335f535
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan  6 22:29:39 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan  6 22:29:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97e82d7

media-video/makemkv: Drop old 1.16.4

Closes: https://bugs.gentoo.org/830709
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest  |   2 -
 media-video/makemkv/makemkv-1.16.4.ebuild | 126 --
 2 files changed, 128 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index d0d8cd97cc71..d667005e6dd7 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 
5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b
 SHA512 
d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
 DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B 
c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af
 SHA512 
4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
-DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 
8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094
 SHA512 
e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452
 DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B 
e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d
 SHA512 
865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e

diff --git a/media-video/makemkv/makemkv-1.16.4.ebuild 
b/media-video/makemkv/makemkv-1.16.4.ebuild
deleted file mode 100644
index ea05fb9afbb4..
--- a/media-video/makemkv/makemkv-1.16.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info xdg
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui +java"
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   dev-libs/expat
-   dev-libs/openssl:0=[-bindist(-)]
-   >=media-video/ffmpeg-1.0.0:0=
-   sys-libs/glibc
-   sys-libs/zlib
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-RDEPEND="
-   ${DEPEND}
-   net-misc/wget
-   java? ( >=virtual/jre-1.8 )
-"
-BDEPEND="
-   virtual/pkgconfig
-   gui? ( dev-qt/qtcore:5 )
-"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-path.patch
-   "${FILESDIR}"/${PN}-flags.patch
-)
-
-src_prepare() {
-   default
-
-   if ! use java; then
-   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
-   fi
-}
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   econf \
-   --enable-debug \
-   --disable-noec \
-   $(use_enable gui) \
-   $(use_enable gui qt5)
-}
-
-src_install() {
-   local myarch
-   case "${ARCH}" in
-   arm) myarch=armel ;;
-   x86) myarch=i386 ;;
-   *) myarch=${ARCH} ;;
-   esac
-
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-   cd "${WORKDIR}"/${MY_PB} || die
-
-   # install prebuilt bin
-   dobin bin/"${myarch}"/makemkvcon
-
-   # additional tool is actually part of makemkvcon
-   dosym makemkvcon /usr/bin/sdftool
-
-   # install profiles and locales
-   insinto /usr/share/MakeMKV
-   doins src/share/*
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-
-   elog "While MakeMKV is in beta mode, upstre

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

2021-11-01 Thread James Le Cuirot
commit: 920b09417a7fa5e97686252bcc475f6095f312a2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Nov  1 21:43:01 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov  1 21:43:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920b0941

media-video/makemkv: Version bump to 1.16.5, EAPI 8

Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.16.5.ebuild | 126 ++
 2 files changed, 128 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 6659e450f4a..d0d8cd97cc7 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 
5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b
 SHA512 
d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
+DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B 
c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af
 SHA512 
4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
 DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 
8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094
 SHA512 
e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452
+DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B 
e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d
 SHA512 
865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e

diff --git a/media-video/makemkv/makemkv-1.16.5.ebuild 
b/media-video/makemkv/makemkv-1.16.5.ebuild
new file mode 100644
index 000..23a32955e74
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.16.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   dev-libs/expat
+   dev-libs/openssl:0=[-bindist(-)]
+   >=media-video/ffmpeg-1.0.0:0=
+   sys-libs/glibc
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+RDEPEND="
+   ${DEPEND}
+   net-misc/wget
+   java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-path.patch
+   "${FILESDIR}"/${PN}-flags.patch
+)
+
+src_prepare() {
+   default
+
+   if ! use java; then
+   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+   fi
+}
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   local myarch
+   case "${ARCH}" in
+   arm) myarch=armel ;;
+   x86) myarch=i386 ;;
+   *) myarch=${ARCH} ;;
+   esac
+
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/"${myarch}"/makemkvcon
+
+   # additional tool is actually part of makemkvcon
+   dosym makemkvcon /usr/bin/sdftool
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   elog "While MakeMKV is in beta mode, upstream has provided a license"
+   

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

2021-07-10 Thread James Le Cuirot
commit: 23368b935cdfbc6c29a956745d5e651b6c16ff2a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jul 10 11:14:17 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jul 10 11:23:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23368b93

media-video/makemkv: Bump to 1.16.4, drop old 1.16.3

Adds missing optional Java dependency. The package has included a
precompiled jar for a while. The sources are included but only for
license compliance. Actually building them is probably more hassle
than it's worth.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest|  4 ++--
 .../{makemkv-1.16.3.ebuild => makemkv-1.16.4.ebuild}| 17 +
 media-video/makemkv/metadata.xml|  3 +++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 00e323e19ee..6659e450f4a 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 
34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4
 SHA512 
0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543
-DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 
63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6
 SHA512 
a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0
+DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 
5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b
 SHA512 
d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
+DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 
8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094
 SHA512 
e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452

diff --git a/media-video/makemkv/makemkv-1.16.3.ebuild 
b/media-video/makemkv/makemkv-1.16.4.ebuild
similarity index 94%
rename from media-video/makemkv/makemkv-1.16.3.ebuild
rename to media-video/makemkv/makemkv-1.16.4.ebuild
index 796c9cd0572..ea05fb9afbb 100644
--- a/media-video/makemkv/makemkv-1.16.3.ebuild
+++ b/media-video/makemkv/makemkv-1.16.4.ebuild
@@ -16,14 +16,16 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui "
+IUSE="+gui +java"
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
 DEPEND="
-   sys-libs/glibc
dev-libs/expat
+   dev-libs/openssl:0=[-bindist(-)]
+   >=media-video/ffmpeg-1.0.0:0=
+   sys-libs/glibc
sys-libs/zlib
gui? (
dev-qt/qtcore:5
@@ -31,12 +33,11 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
-   >=media-video/ffmpeg-1.0.0:0=
-   dev-libs/openssl:0=[-bindist(-)]
 "
 RDEPEND="
${DEPEND}
net-misc/wget
+   java? ( >=virtual/jre-1.8 )
 "
 BDEPEND="
virtual/pkgconfig
@@ -51,6 +52,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-flags.patch
 )
 
+src_prepare() {
+   default
+
+   if ! use java; then
+   rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+   fi
+}
+
 src_configure() {
# See bug #439380.
replace-flags -O* -Os

diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 613533077af..3f3bb44be83 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -5,6 +5,9 @@
ch...@gentoo.org
James Le Cuirot

+   
+   Handle additional Blu-ray protection 
mechanisms involving Java
+   

MakeMKV is your one-click solution to convert video that you own
into free and patents-unencumbered format that can be played



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

2021-05-03 Thread Mikle Kolyada
commit: dec3af0c4128c767d03dbdc7b7210976e604d2b6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 09:24:22 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 09:24:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec3af0c

media-video/makemkv: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/makemkv/makemkv-1.16.3.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.16.3.ebuild 
b/media-video/makemkv/makemkv-1.16.3.ebuild
index 06832f14e6a..796c9cd0572 100644
--- a/media-video/makemkv/makemkv-1.16.3.ebuild
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libressl"
+IUSE="+gui "
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
@@ -32,8 +32,7 @@ DEPEND="
dev-qt/qtwidgets:5
)
>=media-video/ffmpeg-1.0.0:0=
-   !libressl? ( dev-libs/openssl:0=[-bindist(-)] )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=[-bindist(-)]
 "
 RDEPEND="
${DEPEND}



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

2021-03-30 Thread James Le Cuirot
commit: 6623af432998f86c34f9ed3f7587c9d0c082651d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar 30 22:25:33 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar 30 22:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6623af43

media-video/makemkv: Bump to 1.16.3, drop old 1.16.1

This version bundles ccextractor as mmccextr. For now, the differences
are almost entirely the disabling of unneeded functionality. This may
change though and I don't want to have to keep checking so I'm keeping
it bundled.

Closes: https://bugs.gentoo.org/777912
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest |  4 ++--
 media-video/makemkv/files/makemkv-flags.patch| 11 +++
 .../{makemkv-1.16.1.ebuild => makemkv-1.16.3.ebuild} | 16 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 8dfd9fb24b0..00e323e19ee 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B 
bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2
 SHA512 
c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404
-DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B 
d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd
 SHA512 
12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199
+DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 
34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4
 SHA512 
0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543
+DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 
63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6
 SHA512 
a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0

diff --git a/media-video/makemkv/files/makemkv-flags.patch 
b/media-video/makemkv/files/makemkv-flags.patch
new file mode 100644
index 000..d7a2f1be16c
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in  2021-03-19 13:06:50.0 +
 b/Makefile.in  2021-03-30 23:28:42.720480399 +0100
+@@ -112,7 +112,7 @@
+ 
+ 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:

diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild 
b/media-video/makemkv/makemkv-1.16.3.ebuild
similarity index 92%
rename from media-video/makemkv/makemkv-1.16.1.ebuild
rename to media-video/makemkv/makemkv-1.16.3.ebuild
index f28d5a01e2d..06832f14e6a 100644
--- a/media-video/makemkv/makemkv-1.16.1.ebuild
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.makemkv.com/";
 SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
http://www.makemkv.com/download/${MY_PB}.tar.gz";
 
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+gui libressl"
@@ -37,7 +37,6 @@ DEPEND="
 "
 RDEPEND="
${DEPEND}
-   media-video/ccextractor
net-misc/wget
 "
 BDEPEND="
@@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-path.patch
+   "${FILESDIR}"/${PN}-flags.patch
 )
 
 src_configure() {
@@ -64,6 +64,13 @@ src_configure() {
 }
 
 src_install() {
+   local myarch
+   case "${ARCH}" in
+   arm) myarch=armel ;;
+   x86) myarch=i386 ;;
+   *) myarch=${ARCH} ;;
+   esac
+
default
 
# add missing symlinks for QA
@@ -77,7 +84,7 @@ src_install() {
cd "${WORKDIR}"/${MY_PB} || die
 
# install prebuilt bin
-   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+   dobin bin/"${myarch}"/makemkvcon
 
# additional tool is actually part of makemkvcon
dosym makemkvcon /usr/bin/sdftool
@@ -85,9 +92,6 @@ src_install() {
# install profiles and locales
insinto /usr/share/MakeMKV
doins src/share/*
-
-   # add symlink rather than relying on MMCCEXTRACTOR env var
-   dosy

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

2021-03-04 Thread James Le Cuirot
commit: 0d5fc804a6cbfffeb5047fb9fda1bacc6a49219f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Mar  4 22:41:02 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Mar  4 22:41:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5fc804

media-video/makemkv: Bump to 1.16.1, drop old 1.16.0

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.16.0.ebuild => makemkv-1.16.1.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index eb470adcbc6..8dfd9fb24b0 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.0.tar.gz 15306173 BLAKE2B 
337f367bb4bad174d7786607c4771fdbf1f382a00dee1e515c6ecd4f81351691482f6a6da55caabc00fd99973a17391480156b7852d7812c189a4491aa35bef3
 SHA512 
8fadeac4966c6b6e76ba3c4b937a7e0a3061a8ee9b48196b15e3ddee9a05b37ba15b4bdfd04c81bf775d780ce7a3703e02523f441b489d69fc20e5098933d05b
-DIST makemkv-oss-1.16.0.tar.gz 6409634 BLAKE2B 
893ec6c33b83e77e7b8c4aba4ce17769c0cdc102e1eb2b04990122047a2310e173a6de4d5ba4beb6894fe51cca59317a3e157a89fb5dc005c035caace4e27166
 SHA512 
b4c3b14decd0d6a49e5a4e2bc3a042042006c248fbb5f9d6dc79695897a524bbc934b9e00cb1a18ea07b4c517093a1f8026e33a705ad14605fd9a5e0d863d945
+DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B 
bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2
 SHA512 
c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404
+DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B 
d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd
 SHA512 
12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199

diff --git a/media-video/makemkv/makemkv-1.16.0.ebuild 
b/media-video/makemkv/makemkv-1.16.1.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.16.0.ebuild
rename to media-video/makemkv/makemkv-1.16.1.ebuild



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

2021-03-02 Thread James Le Cuirot
commit: 9b6ae56507df8d93c73811f50fc348df3dc0be6b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar  2 22:06:33 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar  2 22:06:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6ae565

media-video/makemkv: Bump to 1.16.0, drop old 1.15.4

I know it supports arm and arm64 now but I haven't had a chance to
test that yet.

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.15.4.ebuild => makemkv-1.16.0.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 3c8a15189f8..eb470adcbc6 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 
945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd
 SHA512 
f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
-DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 
84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0
 SHA512 
f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f
+DIST makemkv-bin-1.16.0.tar.gz 15306173 BLAKE2B 
337f367bb4bad174d7786607c4771fdbf1f382a00dee1e515c6ecd4f81351691482f6a6da55caabc00fd99973a17391480156b7852d7812c189a4491aa35bef3
 SHA512 
8fadeac4966c6b6e76ba3c4b937a7e0a3061a8ee9b48196b15e3ddee9a05b37ba15b4bdfd04c81bf775d780ce7a3703e02523f441b489d69fc20e5098933d05b
+DIST makemkv-oss-1.16.0.tar.gz 6409634 BLAKE2B 
893ec6c33b83e77e7b8c4aba4ce17769c0cdc102e1eb2b04990122047a2310e173a6de4d5ba4beb6894fe51cca59317a3e157a89fb5dc005c035caace4e27166
 SHA512 
b4c3b14decd0d6a49e5a4e2bc3a042042006c248fbb5f9d6dc79695897a524bbc934b9e00cb1a18ea07b4c517093a1f8026e33a705ad14605fd9a5e0d863d945

diff --git a/media-video/makemkv/makemkv-1.15.4.ebuild 
b/media-video/makemkv/makemkv-1.16.0.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.15.4.ebuild
rename to media-video/makemkv/makemkv-1.16.0.ebuild
index 643dfc37ef2..f28d5a01e2d 100644
--- a/media-video/makemkv/makemkv-1.15.4.ebuild
+++ b/media-video/makemkv/makemkv-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7



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

2020-12-14 Thread James Le Cuirot
commit: 447ac34f261e49cfe7f3d3ebb3f3002a7f26bfee
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Dec 14 17:12:26 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Dec 14 17:12:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447ac34f

media-video/makemkv: Bump to 1.15.4, drop old 1.15.3

Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest |  4 ++--
 .../makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch| 12 
 .../makemkv/{makemkv-1.15.3.ebuild => makemkv-1.15.4.ebuild} |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 951acfd799b..3c8a15189f8 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 
945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd
 SHA512 
f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
+DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 
84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0
 SHA512 
f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f

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
deleted file mode 100644
index 3dfe508a24a..000
--- a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.0 +
-+++ makemkv-oss-1.15.3/configure   2020-10-03 20:49:45.588257151 +
-@@ -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/makemkv-1.15.3.ebuild 
b/media-video/makemkv/makemkv-1.15.4.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.15.3.ebuild
rename to media-video/makemkv/makemkv-1.15.4.ebuild
index 3c81c3d3988..643dfc37ef2 100644
--- a/media-video/makemkv/makemkv-1.15.3.ebuild
+++ b/media-video/makemkv/makemkv-1.15.4.ebuild
@@ -50,7 +50,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-path.patch
-   "${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
 )
 
 src_configure() {



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

2020-10-12 Thread James Le Cuirot
commit: 43a573c4850f15bd97b15db5b481eebf9c4d9f28
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Oct 12 21:08:24 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Oct 12 21:08:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a573c4

media-video/makemkv: Patch around missing quotes in configure

I have reported this upstream and I believe they will use a proper
autoconf macro to set the -std flag in future.

Closes: https://bugs.gentoo.org/746368
Suggested-By: Matt Whitlock
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 .../makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch| 12 
 media-video/makemkv/makemkv-1.15.3.ebuild|  6 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

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 000..3dfe508a24a
--- /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.0 +
 makemkv-oss-1.15.3/configure   2020-10-03 20:49:45.588257151 +
+@@ -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/makemkv-1.15.3.ebuild 
b/media-video/makemkv/makemkv-1.15.3.ebuild
index 4d94806d84d..3c81c3d3988 100644
--- a/media-video/makemkv/makemkv-1.15.3.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.



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

2020-10-02 Thread James Le Cuirot
commit: 86c47ac90f6b9fc80930ff675b2c5f6975849f87
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Oct  2 20:42:46 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Oct  2 20:43:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c47ac9

media-video/makemkv: Bump to 1.15.3, drop old 1.15.2

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest |  4 ++--
 media-video/makemkv/files/makemkv-path.patch | 12 
 .../makemkv/{makemkv-1.15.2.ebuild => makemkv-1.15.3.ebuild} |  0
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 82330cb0009..951acfd799b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+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

diff --git a/media-video/makemkv/files/makemkv-path.patch 
b/media-video/makemkv/files/makemkv-path.patch
index 7c66849b323..6a3b3cf8dee 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.0 +0100
-+++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp2016-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.0 +0100
 +++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp2016-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
similarity index 100%
rename from media-video/makemkv/makemkv-1.15.2.ebuild
rename to media-video/makemkv/makemkv-1.15.3.ebuild



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

2020-07-23 Thread James Le Cuirot
commit: 58fbbf85697649c9d401d1b71807685eb58b925b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jul 23 21:47:20 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jul 23 21:47:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58fbbf85

media-video/makemkv: Bump to 1.15.2, drop old 1.15.1

Closes: https://bugs.gentoo.org/733610
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.15.1.ebuild => makemkv-1.15.2.ebuild} | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 066a9256f2a..82330cb0009 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.1.tar.gz 8338636 BLAKE2B 
4eafd3dacfc27a5f855d4c8e620f191a0abfa4e6795992533ed75a82e8ca2cd490aafa52207da32774c9059b196b1bf834877f4c3e96b0a661b03c8c9226ad1a
 SHA512 
bc1184a951f20d7320c8f048afb7af7f958b6a8f231e0ea51193c1841bb0878201db17750caf18c60483cd71e1e8a6956a029f114d8f246d590b68a69f268ce8
-DIST makemkv-oss-1.15.1.tar.gz 6403114 BLAKE2B 
e0642c0c740b0817a0d347e4588691282cfae1f81e827431ecad7fcd64b4cfca687829b7646614833f2123216c304e2705b2ecaf9a30904735c6c3c0cc05a845
 SHA512 
f96474c82349277ef6a4e35af8009cf63fbc5a5e8444891950e26466f7167cea9014190053d3750f79a8df9415507e8e8b8c17cfa2b638123f64487a0d74b045
+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

diff --git a/media-video/makemkv/makemkv-1.15.1.ebuild 
b/media-video/makemkv/makemkv-1.15.2.ebuild
similarity index 97%
rename from media-video/makemkv/makemkv-1.15.1.ebuild
rename to media-video/makemkv/makemkv-1.15.2.ebuild
index 67d80b4b86e..4d94806d84d 100644
--- a/media-video/makemkv/makemkv-1.15.1.ebuild
+++ b/media-video/makemkv/makemkv-1.15.2.ebuild
@@ -76,6 +76,9 @@ src_install() {
# install prebuilt bin
dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
 
+   # additional tool is actually part of makemkvcon
+   dosym makemkvcon /usr/bin/sdftool
+
# install profiles and locales
insinto /usr/share/MakeMKV
doins src/share/*



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

2020-04-26 Thread Mikle Kolyada
commit: f135448199ea4b309ca86def96aa313a06933d87
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 10:11:23 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 10:11:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1354481

media-video/makemkv: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/makemkv/makemkv-1.15.1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.15.1.ebuild 
b/media-video/makemkv/makemkv-1.15.1.ebuild
index ff30a137bbc..67d80b4b86e 100644
--- a/media-video/makemkv/makemkv-1.15.1.ebuild
+++ b/media-video/makemkv/makemkv-1.15.1.ebuild
@@ -16,7 +16,7 @@ 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 libressl"
+IUSE="+gui libressl"
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
@@ -31,8 +31,7 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
-   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
-   libav? ( >=media-video/libav-0.8.9:0= )
+   >=media-video/ffmpeg-1.0.0:0=
!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
libressl? ( dev-libs/libressl:0= )
 "



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

2020-04-15 Thread James Le Cuirot
commit: 3820fa8002c079b01e28395e4318d9d6387062c3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr 15 22:50:05 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr 15 22:50:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3820fa80

media-video/makemkv: Bump to 1.15.1, drop old 1.15.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.15.0.ebuild => makemkv-1.15.1.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 5d7bc18bd20..066a9256f2a 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.0.tar.gz 9516617 BLAKE2B 
9df4277a0ef2835bbb946afc32670153181a68924ede88778d613ec91da70a3bd95cf52feb1219e8f6032a8b80f63b6084afb07b10c14a3f9faba0aed8310b64
 SHA512 
c6436870554c29c8e646dccaac3a73e23c0a861f0689e10a1ddafe3c6388dd708860c9944b035b9fbbd4e50ee6e67848c25d65fc0808789bdd24fb54a4668994
-DIST makemkv-oss-1.15.0.tar.gz 6383576 BLAKE2B 
fa1c09545b48d01654c444f2d0a5551035f9af43113bd8dc175c7ba806c7f23fd437cf8e68544632895833feaec915c9440cc4120f90cd9deb6158956d5b1f46
 SHA512 
457c06736ed4ce05eb9a8038fedd28b8741e32b1cd0d77b2fbbec9723419e26e01fb34c9302c0612a3f68c73602f7ba436d93598edd966dda9abec738de1a004
+DIST makemkv-bin-1.15.1.tar.gz 8338636 BLAKE2B 
4eafd3dacfc27a5f855d4c8e620f191a0abfa4e6795992533ed75a82e8ca2cd490aafa52207da32774c9059b196b1bf834877f4c3e96b0a661b03c8c9226ad1a
 SHA512 
bc1184a951f20d7320c8f048afb7af7f958b6a8f231e0ea51193c1841bb0878201db17750caf18c60483cd71e1e8a6956a029f114d8f246d590b68a69f268ce8
+DIST makemkv-oss-1.15.1.tar.gz 6403114 BLAKE2B 
e0642c0c740b0817a0d347e4588691282cfae1f81e827431ecad7fcd64b4cfca687829b7646614833f2123216c304e2705b2ecaf9a30904735c6c3c0cc05a845
 SHA512 
f96474c82349277ef6a4e35af8009cf63fbc5a5e8444891950e26466f7167cea9014190053d3750f79a8df9415507e8e8b8c17cfa2b638123f64487a0d74b045

diff --git a/media-video/makemkv/makemkv-1.15.0.ebuild 
b/media-video/makemkv/makemkv-1.15.1.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.15.0.ebuild
rename to media-video/makemkv/makemkv-1.15.1.ebuild



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

2020-03-07 Thread James Le Cuirot
commit: c51e026f56e3be62909662fe874c0d3b9a6bc751
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar  7 21:10:43 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  7 21:44:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c51e026f

media-video/makemkv: Restrict redistribution

The EULA does say that binary redistribution is allowed but Gentoo
does not accept this for any EULA.

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.15.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/makemkv/makemkv-1.15.0.ebuild 
b/media-video/makemkv/makemkv-1.15.0.ebuild
index 4c6ccaf15ec..ff30a137bbc 100644
--- a/media-video/makemkv/makemkv-1.15.0.ebuild
+++ b/media-video/makemkv/makemkv-1.15.0.ebuild
@@ -17,6 +17,7 @@ LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+gui libav libressl"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 



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

2020-03-07 Thread James Le Cuirot
commit: c58380caa0b5f3d6025b7914e8ba4bf8defff8d0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar  7 20:29:47 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  7 20:29:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58380ca

media-video/makemkv: Bump to 1.15.0, drop old 1.14.7

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest|  4 ++--
 .../{makemkv-1.14.7.ebuild => makemkv-1.15.0.ebuild}| 13 -
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 9ba913534ee..5d7bc18bd20 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.7.tar.gz 9487718 BLAKE2B 
ecba22794035ed022863a2f736572a0da207346d6a3e44e3ca8c319fa672228be23835201ac3b023250d1a6457b8dd37e680573c7a83c53bb8fee1e016d00096
 SHA512 
cdd2eae8a80b2e564b786dfef0273ef36211327e5f4932b0f580a59c1ac288d5a99a2a1fe6fa0059e0f3fec6bcbc07278e7f7580507f36ca6d01f92d47092626
-DIST makemkv-oss-1.14.7.tar.gz 4384451 BLAKE2B 
f2a2cff901a4c6d03286a5a4cdd54ac0f61e3c0f04d3adb4089f03fc767dda099b0d4b4e8f76a3ad0ba57fb1af85cd2ab8fb6d966f4fbed490e25250f0be283c
 SHA512 
2e8ab96ae1c1e855ff840fffaedd7ba998021630b61e66337d1027c53b8315ef8c303016a85ae8fddbfc52ae006fadab44fd63e0f2cca3602bfd17086a52aa06
+DIST makemkv-bin-1.15.0.tar.gz 9516617 BLAKE2B 
9df4277a0ef2835bbb946afc32670153181a68924ede88778d613ec91da70a3bd95cf52feb1219e8f6032a8b80f63b6084afb07b10c14a3f9faba0aed8310b64
 SHA512 
c6436870554c29c8e646dccaac3a73e23c0a861f0689e10a1ddafe3c6388dd708860c9944b035b9fbbd4e50ee6e67848c25d65fc0808789bdd24fb54a4668994
+DIST makemkv-oss-1.15.0.tar.gz 6383576 BLAKE2B 
fa1c09545b48d01654c444f2d0a5551035f9af43113bd8dc175c7ba806c7f23fd437cf8e68544632895833feaec915c9440cc4120f90cd9deb6158956d5b1f46
 SHA512 
457c06736ed4ce05eb9a8038fedd28b8741e32b1cd0d77b2fbbec9723419e26e01fb34c9302c0612a3f68c73602f7ba436d93598edd966dda9abec738de1a004

diff --git a/media-video/makemkv/makemkv-1.14.7.ebuild 
b/media-video/makemkv/makemkv-1.15.0.ebuild
similarity index 92%
rename from media-video/makemkv/makemkv-1.14.7.ebuild
rename to media-video/makemkv/makemkv-1.15.0.ebuild
index 1d97177013e..4c6ccaf15ec 100644
--- a/media-video/makemkv/makemkv-1.14.7.ebuild
+++ b/media-video/makemkv/makemkv-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic linux-info xdg-utils
+inherit flag-o-matic linux-info xdg
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -56,7 +56,6 @@ src_configure() {
econf \
--enable-debug \
--disable-noec \
-   --disable-qt4 \
$(use_enable gui) \
$(use_enable gui qt5)
 }
@@ -86,13 +85,13 @@ src_install() {
 }
 
 pkg_postinst() {
-   xdg_icon_cache_update
+   xdg_pkg_postinst
 
elog "While MakeMKV is in beta mode, upstream has provided a license"
elog "to use if you do not want to purchase one."
elog ""
elog "See this forum thread for more information, including the key:"
-   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
+   elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053";
elog ""
elog "Note that beta license may have an expiration date and you will"
elog "need to check for newer licenses/releases. "
@@ -107,7 +106,3 @@ pkg_postinst() {
elog "the following variables when launching the player:"
elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
 }
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}



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

2020-01-12 Thread David Seifert
commit: 98f017b9af9ba1065b708442365c8a499c3580f4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 12 11:13:26 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 12 11:13:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f017b9

media-video/makemkv: Remove local USE="gui"

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 media-video/makemkv/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 47f90d86823..613533077af 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -22,7 +22,4 @@
may watch Blu-ray and DVD discs with your favorite player on
your favorite OS or on your favorite device.

-   
-   Build the Qt5 GUI
-   
 



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

2019-12-10 Thread James Le Cuirot
commit: 393737f0f1aeee066085d350f5fc536c1ba14fb3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec 10 20:41:12 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec 10 20:41:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393737f0

media-video/makemkv: Bump to 1.14.7, drop old 1.14.6

Package-Manager: Portage-2.3.81, Repoman-2.3.19
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.14.6.ebuild => makemkv-1.14.7.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index ab3a843f54d..9ba913534ee 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.6.tar.gz 9488123 BLAKE2B 
1eda36161abb5fb26a674128aa7e00a1b3b5c3e20b24f57a2c4b63dcbf559750d2882bffa87041b738d1ae744b0d912cb81d96c7193a26d406631a7a8d366484
 SHA512 
b9bf62d6de371733f50e75c9d1d83d5fdbe871fc3308ef489c33105878ccbb67be1d542467e54c164901c330e25be8db9d154b0be18d501c05836e9fe1a03d47
-DIST makemkv-oss-1.14.6.tar.gz 4384514 BLAKE2B 
b65f8667f5946d67c7784b1cbaa4395caf10406637e31b018de952feb3912150c1e5f68b722ef42d10d6406f8eddf0de27950ba84c037001a94a97a7facc0b1a
 SHA512 
88fe5be932a1e5fc368814f081e72881f0934969fc2c77d61dd8fbc23b2449467519577fcd8282ed9b17b7dfc0948e567928da52ecbf63be3d84f8bfb285c8b0
+DIST makemkv-bin-1.14.7.tar.gz 9487718 BLAKE2B 
ecba22794035ed022863a2f736572a0da207346d6a3e44e3ca8c319fa672228be23835201ac3b023250d1a6457b8dd37e680573c7a83c53bb8fee1e016d00096
 SHA512 
cdd2eae8a80b2e564b786dfef0273ef36211327e5f4932b0f580a59c1ac288d5a99a2a1fe6fa0059e0f3fec6bcbc07278e7f7580507f36ca6d01f92d47092626
+DIST makemkv-oss-1.14.7.tar.gz 4384451 BLAKE2B 
f2a2cff901a4c6d03286a5a4cdd54ac0f61e3c0f04d3adb4089f03fc767dda099b0d4b4e8f76a3ad0ba57fb1af85cd2ab8fb6d966f4fbed490e25250f0be283c
 SHA512 
2e8ab96ae1c1e855ff840fffaedd7ba998021630b61e66337d1027c53b8315ef8c303016a85ae8fddbfc52ae006fadab44fd63e0f2cca3602bfd17086a52aa06

diff --git a/media-video/makemkv/makemkv-1.14.6.ebuild 
b/media-video/makemkv/makemkv-1.14.7.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.14.6.ebuild
rename to media-video/makemkv/makemkv-1.14.7.ebuild



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

2019-12-03 Thread James Le Cuirot
commit: e0060b03108e6aa30a9a9bcab6cc0370e52dd9b0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec  3 23:15:10 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec  3 23:16:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0060b03

media-video/makemkv: Bump to 1.14.6, drop old 1.14.5

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest   |  4 ++--
 .../makemkv/{makemkv-1.14.5.ebuild => makemkv-1.14.6.ebuild}   | 10 --
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4c56e7e6703..ab3a843f54d 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.5.tar.gz 9465109 BLAKE2B 
8eccfd5bee60cf1994b96e8f513a1b439193b0e76bda32399afabae922d1ea208e0b41e78c1af37c3fee3c0fde7f46f33dbd6caef3165399e4797c5bed689950
 SHA512 
9086444f30de71a83d93cf9814f4485b5ebe78940acd722a549029af89408fd39a2a25a145ce2444fb97de90bc3c3acdf2df323865e74bada6e5052d23d94d30
-DIST makemkv-oss-1.14.5.tar.gz 4384596 BLAKE2B 
86e684c10c74272be7f4a7f93f41ab9fc1604fcc631bcb42ae78160a74cbd43067a5f1c049beee3c011ebe36b08bf6595d9a74606919ff9d5265d3c69c0225d0
 SHA512 
22097b70c3cee56bd58fc93e65a2acd0556f1a89717ca8ceda7b3b795692086d88d0a01f875fa9cea9b5fe08f19351e6a03997233ff4eb55fe462bc7ff3bcdc7
+DIST makemkv-bin-1.14.6.tar.gz 9488123 BLAKE2B 
1eda36161abb5fb26a674128aa7e00a1b3b5c3e20b24f57a2c4b63dcbf559750d2882bffa87041b738d1ae744b0d912cb81d96c7193a26d406631a7a8d366484
 SHA512 
b9bf62d6de371733f50e75c9d1d83d5fdbe871fc3308ef489c33105878ccbb67be1d542467e54c164901c330e25be8db9d154b0be18d501c05836e9fe1a03d47
+DIST makemkv-oss-1.14.6.tar.gz 4384514 BLAKE2B 
b65f8667f5946d67c7784b1cbaa4395caf10406637e31b018de952feb3912150c1e5f68b722ef42d10d6406f8eddf0de27950ba84c037001a94a97a7facc0b1a
 SHA512 
88fe5be932a1e5fc368814f081e72881f0934969fc2c77d61dd8fbc23b2449467519577fcd8282ed9b17b7dfc0948e567928da52ecbf63be3d84f8bfb285c8b0

diff --git a/media-video/makemkv/makemkv-1.14.5.ebuild 
b/media-video/makemkv/makemkv-1.14.6.ebuild
similarity index 96%
rename from media-video/makemkv/makemkv-1.14.5.ebuild
rename to media-video/makemkv/makemkv-1.14.6.ebuild
index 84c2ac2f4b4..1d97177013e 100644
--- a/media-video/makemkv/makemkv-1.14.5.ebuild
+++ b/media-video/makemkv/makemkv-1.14.6.ebuild
@@ -35,9 +35,15 @@ DEPEND="
!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
libressl? ( dev-libs/libressl:0= )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+   ${DEPEND}
media-video/ccextractor
-   net-misc/wget"
+   net-misc/wget
+"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/qtcore:5 )
+"
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"



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

2019-09-05 Thread James Le Cuirot
commit: 2a32c44a0f07f0643040b6e7583de665e9f22494
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep  5 21:16:01 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  5 21:16:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a32c44a

media-video/makemkv: Bump to 1.14.5, drop old 1.14.4, EAPI 7

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest  | 4 ++--
 .../makemkv/{makemkv-1.14.4.ebuild => makemkv-1.14.5.ebuild}  | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 92ce6eddecb..4c56e7e6703 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.4.tar.gz 9135402 BLAKE2B 
0564ec01067c39fa2c538f4923f010fc4bda555c84e1c054ff04fe8be958fe596adedc272d755958ae192883b28cd914af5e177d87f9274879ce9f49f135fa20
 SHA512 
ef48c09f56b3c46edd25a690b27dd0216b701ff84133e99742c263157f5ea032fd76286b9d8e3979cdd0da8ddceacab4fe0981e056df65228394ac91228c3c09
-DIST makemkv-oss-1.14.4.tar.gz 4385464 BLAKE2B 
1645014ce87fff2f6eedea8059fc3d2db5f9f371272453b6d86162163c7b4fe46362af14310b6f3ce628c22e6b552cf99c780368c4384afa772fe17b44f18dd0
 SHA512 
05fab5d97fe0f0678c2000dd7580532ccafa6c0232bc61a5f17e79f1c02577b6317a78bb12af481d5fdc8eff2e0633aa58a430c256d6d72f04247774e2044b20
+DIST makemkv-bin-1.14.5.tar.gz 9465109 BLAKE2B 
8eccfd5bee60cf1994b96e8f513a1b439193b0e76bda32399afabae922d1ea208e0b41e78c1af37c3fee3c0fde7f46f33dbd6caef3165399e4797c5bed689950
 SHA512 
9086444f30de71a83d93cf9814f4485b5ebe78940acd722a549029af89408fd39a2a25a145ce2444fb97de90bc3c3acdf2df323865e74bada6e5052d23d94d30
+DIST makemkv-oss-1.14.5.tar.gz 4384596 BLAKE2B 
86e684c10c74272be7f4a7f93f41ab9fc1604fcc631bcb42ae78160a74cbd43067a5f1c049beee3c011ebe36b08bf6595d9a74606919ff9d5265d3c69c0225d0
 SHA512 
22097b70c3cee56bd58fc93e65a2acd0556f1a89717ca8ceda7b3b795692086d88d0a01f875fa9cea9b5fe08f19351e6a03997233ff4eb55fe462bc7ff3bcdc7

diff --git a/media-video/makemkv/makemkv-1.14.4.ebuild 
b/media-video/makemkv/makemkv-1.14.5.ebuild
similarity index 96%
rename from media-video/makemkv/makemkv-1.14.4.ebuild
rename to media-video/makemkv/makemkv-1.14.5.ebuild
index 3668bf07c79..84c2ac2f4b4 100644
--- a/media-video/makemkv/makemkv-1.14.4.ebuild
+++ b/media-video/makemkv/makemkv-1.14.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic gnome2-utils linux-info
+inherit flag-o-matic linux-info xdg-utils
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -80,7 +80,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 
elog "While MakeMKV is in beta mode, upstream has provided a license"
elog "to use if you do not want to purchase one."
@@ -103,5 +103,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }



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

2019-06-09 Thread James Le Cuirot
commit: de8df4522326e1117d7e9f80c9cf222f8ee01751
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jun  9 14:13:51 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jun  9 14:13:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8df452

media-video/makemkv: Bump to 1.14.4, drop old 1.14.3

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.14.3.ebuild => makemkv-1.14.4.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 7bd283fd9d3..92ce6eddecb 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.3.tar.gz 9117659 BLAKE2B 
ddc6d080a06adf2b3f8728623a11c9a7fa6392770ca472b62d172bfdf78b433ab7947f4a463ab5a8ea8d9ed7ac4d4f1a1d63572ca694274728751b75c8fb3855
 SHA512 
28c0b252898ba42e0c8b1fcf9440e464c7d1fb183e95faa7bcb906e0e0a299598d0264fcf8c04960c9f6609fe5a4ce0109e8ab7a9438ae205accae4c99433f09
-DIST makemkv-oss-1.14.3.tar.gz 4384183 BLAKE2B 
c5e96ebd06d8d2f0f83bf94344d31a8259cabe8af278307dd856b891f9cd11be8bfe4622c0824ccec5968360a68ada2b088fb71651a5c789fa55297b58d27b20
 SHA512 
bb83f7cafba072012a532cf4ea12e3cf6c640d2a020c65979247a4931abbd75a9c0407dd52a3013ab280bf5ded3a105a5306f9d06dfa108d0102259053e63f9c
+DIST makemkv-bin-1.14.4.tar.gz 9135402 BLAKE2B 
0564ec01067c39fa2c538f4923f010fc4bda555c84e1c054ff04fe8be958fe596adedc272d755958ae192883b28cd914af5e177d87f9274879ce9f49f135fa20
 SHA512 
ef48c09f56b3c46edd25a690b27dd0216b701ff84133e99742c263157f5ea032fd76286b9d8e3979cdd0da8ddceacab4fe0981e056df65228394ac91228c3c09
+DIST makemkv-oss-1.14.4.tar.gz 4385464 BLAKE2B 
1645014ce87fff2f6eedea8059fc3d2db5f9f371272453b6d86162163c7b4fe46362af14310b6f3ce628c22e6b552cf99c780368c4384afa772fe17b44f18dd0
 SHA512 
05fab5d97fe0f0678c2000dd7580532ccafa6c0232bc61a5f17e79f1c02577b6317a78bb12af481d5fdc8eff2e0633aa58a430c256d6d72f04247774e2044b20

diff --git a/media-video/makemkv/makemkv-1.14.3.ebuild 
b/media-video/makemkv/makemkv-1.14.4.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.14.3.ebuild
rename to media-video/makemkv/makemkv-1.14.4.ebuild



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

2019-04-30 Thread James Le Cuirot
commit: e8939a791a819815ffa17716695857298ed1140b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 30 21:58:23 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 30 21:58:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8939a79

media-video/makemkv: Add LibreSSL support

Thanks to ernsteiswuerfel for testing.

Closes: https://bugs.gentoo.org/684482
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/makemkv-1.14.3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.14.3.ebuild 
b/media-video/makemkv/makemkv-1.14.3.ebuild
index f9518dd45e3..3668bf07c79 100644
--- a/media-video/makemkv/makemkv-1.14.3.ebuild
+++ b/media-video/makemkv/makemkv-1.14.3.ebuild
@@ -16,14 +16,13 @@ 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"
+IUSE="+gui libav libressl"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
 DEPEND="
sys-libs/glibc
dev-libs/expat
-   dev-libs/openssl:0=[-bindist(-)]
sys-libs/zlib
gui? (
dev-qt/qtcore:5
@@ -33,6 +32,8 @@ DEPEND="
)
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
+   !libressl? ( dev-libs/openssl:0=[-bindist(-)] )
+   libressl? ( dev-libs/libressl:0= )
 "
 RDEPEND="${DEPEND}
media-video/ccextractor



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

2019-04-14 Thread James Le Cuirot
commit: 0a3a971920a4c40899c0fdf824aa449e7f8614d0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr 14 20:04:55 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr 14 20:05:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3a9719

media-video/makemkv: Bump to 1.14.3, drop old 1.14.2

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.14.2.ebuild => makemkv-1.14.3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 86eb569..7bd283fd9d3 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.2.tar.gz 9332443 BLAKE2B 
ef569688aa2134b0549d2474798ca8f50a99eebb42fd45f68502d06fe1334bd9a94abb5f9ca550948db707dd6e7746a9e8e0fdea1a149ab71fb5ae931ffb9a35
 SHA512 
1c1eb7c5dc7d2db5518823cd2996b427bbe3a38b25e615355d37c75dcda55263b7fbf554abfa7d3e65733707117150cfc408ab678438d868d67afeb9e4021e2d
-DIST makemkv-oss-1.14.2.tar.gz 4384065 BLAKE2B 
dee07ffc86f95ebbae47d7e56c5b9637462e06e7d75ce93019e7ae7d2845c19b7dee24537bfab38d512e047640803d7df07fd4b3d92ebece553dd3a0c35f16a7
 SHA512 
cbbe7afa4fcad7e1d21d41badb01c7b4a5a6bb6239d45994d3c405291a0cf651cbd0bbd63ed30884db228457968d17a83ab25dae932a23d3b3aede7ee90437e5
+DIST makemkv-bin-1.14.3.tar.gz 9117659 BLAKE2B 
ddc6d080a06adf2b3f8728623a11c9a7fa6392770ca472b62d172bfdf78b433ab7947f4a463ab5a8ea8d9ed7ac4d4f1a1d63572ca694274728751b75c8fb3855
 SHA512 
28c0b252898ba42e0c8b1fcf9440e464c7d1fb183e95faa7bcb906e0e0a299598d0264fcf8c04960c9f6609fe5a4ce0109e8ab7a9438ae205accae4c99433f09
+DIST makemkv-oss-1.14.3.tar.gz 4384183 BLAKE2B 
c5e96ebd06d8d2f0f83bf94344d31a8259cabe8af278307dd856b891f9cd11be8bfe4622c0824ccec5968360a68ada2b088fb71651a5c789fa55297b58d27b20
 SHA512 
bb83f7cafba072012a532cf4ea12e3cf6c640d2a020c65979247a4931abbd75a9c0407dd52a3013ab280bf5ded3a105a5306f9d06dfa108d0102259053e63f9c

diff --git a/media-video/makemkv/makemkv-1.14.2.ebuild 
b/media-video/makemkv/makemkv-1.14.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.14.2.ebuild
rename to media-video/makemkv/makemkv-1.14.3.ebuild
index 72c2f91d17c..f9518dd45e3 100644
--- a/media-video/makemkv/makemkv-1.14.2.ebuild
+++ b/media-video/makemkv/makemkv-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6



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

2018-12-02 Thread James Le Cuirot
commit: bec0bcf1c2424469779f09f33e7d1b12642a2896
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec  2 22:28:28 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  2 22:28:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec0bcf1

media-video/makemkv: Version bump to 1.14.2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.14.2.ebuild | 106 ++
 2 files changed, 108 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index fa659e307a3..15a7186ed19 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.14.1.tar.gz 9313691 BLAKE2B 
cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269
 SHA512 
a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f
+DIST makemkv-bin-1.14.2.tar.gz 9332443 BLAKE2B 
ef569688aa2134b0549d2474798ca8f50a99eebb42fd45f68502d06fe1334bd9a94abb5f9ca550948db707dd6e7746a9e8e0fdea1a149ab71fb5ae931ffb9a35
 SHA512 
1c1eb7c5dc7d2db5518823cd2996b427bbe3a38b25e615355d37c75dcda55263b7fbf554abfa7d3e65733707117150cfc408ab678438d868d67afeb9e4021e2d
 DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 
56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589
 SHA512 
4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5
+DIST makemkv-oss-1.14.2.tar.gz 4384065 BLAKE2B 
dee07ffc86f95ebbae47d7e56c5b9637462e06e7d75ce93019e7ae7d2845c19b7dee24537bfab38d512e047640803d7df07fd4b3d92ebece553dd3a0c35f16a7
 SHA512 
cbbe7afa4fcad7e1d21d41badb01c7b4a5a6bb6239d45994d3c405291a0cf651cbd0bbd63ed30884db228457968d17a83ab25dae932a23d3b3aede7ee90437e5

diff --git a/media-video/makemkv/makemkv-1.14.2.ebuild 
b/media-video/makemkv/makemkv-1.14.2.ebuild
new file mode 100644
index 000..72c2f91d17c
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.14.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic gnome2-utils linux-info
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   sys-libs/glibc
+   dev-libs/expat
+   dev-libs/openssl:0=[-bindist(-)]
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
+   libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+   media-video/ccextractor
+   net-misc/wget"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   --disable-qt4 \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+
+   # add symlink rather than relying on MMCCEXTRACTOR env var
+   dosym ccextractor /usr/bin/mmccextr
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+
+   elog "While MakeMKV is in beta mode, upstream has provided a license"
+   elog "to use if you do not want to purchase one."
+   elog ""
+   elog "See this forum thread for more information, including the key:"
+   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
+   elog ""
+   elog "Note that beta license may have an expiration date and you will"
+ 

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

2018-12-02 Thread James Le Cuirot
commit: 434e34430b4d7c819e9435ea0edd839ac7800551
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec  2 22:29:06 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  2 22:29:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434e3443

media-video/makemkv: Drop old 1.14.1-r1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/makemkv/Manifest |   2 -
 media-video/makemkv/makemkv-1.14.1-r1.ebuild | 106 ---
 2 files changed, 108 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 15a7186ed19..86eb569 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.14.1.tar.gz 9313691 BLAKE2B 
cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269
 SHA512 
a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f
 DIST makemkv-bin-1.14.2.tar.gz 9332443 BLAKE2B 
ef569688aa2134b0549d2474798ca8f50a99eebb42fd45f68502d06fe1334bd9a94abb5f9ca550948db707dd6e7746a9e8e0fdea1a149ab71fb5ae931ffb9a35
 SHA512 
1c1eb7c5dc7d2db5518823cd2996b427bbe3a38b25e615355d37c75dcda55263b7fbf554abfa7d3e65733707117150cfc408ab678438d868d67afeb9e4021e2d
-DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 
56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589
 SHA512 
4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5
 DIST makemkv-oss-1.14.2.tar.gz 4384065 BLAKE2B 
dee07ffc86f95ebbae47d7e56c5b9637462e06e7d75ce93019e7ae7d2845c19b7dee24537bfab38d512e047640803d7df07fd4b3d92ebece553dd3a0c35f16a7
 SHA512 
cbbe7afa4fcad7e1d21d41badb01c7b4a5a6bb6239d45994d3c405291a0cf651cbd0bbd63ed30884db228457968d17a83ab25dae932a23d3b3aede7ee90437e5

diff --git a/media-video/makemkv/makemkv-1.14.1-r1.ebuild 
b/media-video/makemkv/makemkv-1.14.1-r1.ebuild
deleted file mode 100644
index 72c2f91d17c..000
--- a/media-video/makemkv/makemkv-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gnome2-utils linux-info
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   sys-libs/glibc
-   dev-libs/expat
-   dev-libs/openssl:0=[-bindist(-)]
-   sys-libs/zlib
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
-   libav? ( >=media-video/libav-0.8.9:0= )
-"
-RDEPEND="${DEPEND}
-   media-video/ccextractor
-   net-misc/wget"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   econf \
-   --enable-debug \
-   --disable-noec \
-   --disable-qt4 \
-   $(use_enable gui) \
-   $(use_enable gui qt5)
-}
-
-src_install() {
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-   cd "${WORKDIR}"/${MY_PB} || die
-
-   # install prebuilt bin
-   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
-
-   # install profiles and locales
-   insinto /usr/share/MakeMKV
-   doins src/share/*
-
-   # add symlink rather than relying on MMCCEXTRACTOR env var
-   dosym ccextractor /usr/bin/mmccextr
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-
-   elog "While MakeMKV is in beta mode, upstream has provided a license"
-   elog "to use if you do not want to purchase one."
-   elog ""
-   elog "See this forum thread for more information, including the key:"
-   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
-   elog ""
-   elog "Note that beta license may have an expiration date and you w

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

2018-11-16 Thread James Le Cuirot
commit: 2d0fa0fef69f27a90083c0801d2b5cecb86a7e5d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Nov 16 21:00:07 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Nov 16 21:00:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0fa0fe

media-video/makemkv: Add missing ccextractor dependency with symlink

Closes: https://bugs.gentoo.org/670840
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 .../makemkv/{makemkv-1.14.1.ebuild => makemkv-1.14.1-r1.ebuild}   | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-video/makemkv/makemkv-1.14.1.ebuild 
b/media-video/makemkv/makemkv-1.14.1-r1.ebuild
similarity index 95%
rename from media-video/makemkv/makemkv-1.14.1.ebuild
rename to media-video/makemkv/makemkv-1.14.1-r1.ebuild
index e5d644a114a..72c2f91d17c 100644
--- a/media-video/makemkv/makemkv-1.14.1.ebuild
+++ b/media-video/makemkv/makemkv-1.14.1-r1.ebuild
@@ -35,6 +35,7 @@ DEPEND="
libav? ( >=media-video/libav-0.8.9:0= )
 "
 RDEPEND="${DEPEND}
+   media-video/ccextractor
net-misc/wget"
 
 CONFIG_CHECK="~CHR_DEV_SG"
@@ -72,6 +73,9 @@ src_install() {
# install profiles and locales
insinto /usr/share/MakeMKV
doins src/share/*
+
+   # add symlink rather than relying on MMCCEXTRACTOR env var
+   dosym ccextractor /usr/bin/mmccextr
 }
 
 pkg_postinst() {



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

2018-11-15 Thread Lars Wendler
commit: 8e816380a0802b291ef026d2877bf0e8f9ce9a59
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Nov 15 15:55:26 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Nov 15 15:55:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e816380

media-video/makemkv: Added sub-slot operator for dev-libs/openssl.

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-video/makemkv/makemkv-1.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.14.1.ebuild 
b/media-video/makemkv/makemkv-1.14.1.ebuild
index e1f60862f3d..e5d644a114a 100644
--- a/media-video/makemkv/makemkv-1.14.1.ebuild
+++ b/media-video/makemkv/makemkv-1.14.1.ebuild
@@ -23,7 +23,7 @@ QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 DEPEND="
sys-libs/glibc
dev-libs/expat
-   dev-libs/openssl:0[-bindist(-)]
+   dev-libs/openssl:0=[-bindist(-)]
sys-libs/zlib
gui? (
dev-qt/qtcore:5



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

2018-11-09 Thread James Le Cuirot
commit: 9213f20c5b6691ab869ce7f78f4f27b2b03e4fac
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Nov  9 21:12:18 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Nov  9 21:12:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9213f20c

media-video/makemkv: Version bump to 1.14.1

1.14.0 was a lemon.

Signed-off-by: James Le Cuirot  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.14.1.ebuild | 102 ++
 2 files changed, 104 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index b0004886f20..35c8ecdbd20 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.14.0.tar.gz 9307621 BLAKE2B 
7ed476d9e1400ce71fd9ec05aa7c63ceae8b94f2c72548b07aa43a243ab7c2badea4b25d3d89da0046924a33f8de20e1a0650a0c9f4e6db81f47aecedbef
 SHA512 
5ebf10f43622680dad377b3219149e27789edd61e662d69f4a80f14109090fcd933a5c1b63593a3a9ad98a8abfe077225679d679da0dcf74e4365100d67ef2ea
+DIST makemkv-bin-1.14.1.tar.gz 9313691 BLAKE2B 
cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269
 SHA512 
a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f
 DIST makemkv-oss-1.14.0.tar.gz 4384023 BLAKE2B 
006e488c2669fee273df6ccb86b012023d7c91aef2b2490c0a505caa6b31d9e7320e8243db530b087da8066b95b933ec880c5bc80d2e120065b69abe4d51e650
 SHA512 
88ba4bc48c45ab1ed00a9f6cd641699d8256a06953316a51192d644bc8b552e3c32fe71123921503f79d108249b30ac622d3d83cc0eb00ddf1ea991b0ed9b3d6
+DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 
56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589
 SHA512 
4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5

diff --git a/media-video/makemkv/makemkv-1.14.1.ebuild 
b/media-video/makemkv/makemkv-1.14.1.ebuild
new file mode 100644
index 000..e1f60862f3d
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.14.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic gnome2-utils linux-info
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   sys-libs/glibc
+   dev-libs/expat
+   dev-libs/openssl:0[-bindist(-)]
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
+   libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+   net-misc/wget"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   --disable-qt4 \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+
+   elog "While MakeMKV is in beta mode, upstream has provided a license"
+   elog "to use if you do not want to purchase one."
+   elog ""
+   elog "See this forum thread for more information, including the key:"
+   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
+   elog ""
+   elog "Note that beta license may have an expiration date and you will"
+   elog "need to check for newer licenses/releases. "
+   elog ""
+   elog "We previously said to copy default.mmcp.xm

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

2018-11-09 Thread James Le Cuirot
commit: 0d410a507b778e77d94eb1af2a8b4e7c3c7f44ac
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Nov  9 21:25:01 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Nov  9 21:25:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d410a50

media-video/makemkv: Drop old 1.14.0

Signed-off-by: James Le Cuirot  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/makemkv/Manifest  |   2 -
 media-video/makemkv/makemkv-1.14.0.ebuild | 102 --
 2 files changed, 104 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 35c8ecdbd20..fa659e307a3 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.14.0.tar.gz 9307621 BLAKE2B 
7ed476d9e1400ce71fd9ec05aa7c63ceae8b94f2c72548b07aa43a243ab7c2badea4b25d3d89da0046924a33f8de20e1a0650a0c9f4e6db81f47aecedbef
 SHA512 
5ebf10f43622680dad377b3219149e27789edd61e662d69f4a80f14109090fcd933a5c1b63593a3a9ad98a8abfe077225679d679da0dcf74e4365100d67ef2ea
 DIST makemkv-bin-1.14.1.tar.gz 9313691 BLAKE2B 
cbbb830c20a35d943e8b99bfb05c05942b817b29c986afa441458dfeac5b544caf8256c5ccf361168a3079852cb914e8c2cd4435c37536b9bace1c707bbaa269
 SHA512 
a3e2f1a41cc430d37d7252e15e5cf04a5c754e1ecb9b4d9e7fd3a3bb6b721d2b4d1d86d55e068d44df0e40912e6bf7a0ebf527b11d2cba07604fc29f5b69943f
-DIST makemkv-oss-1.14.0.tar.gz 4384023 BLAKE2B 
006e488c2669fee273df6ccb86b012023d7c91aef2b2490c0a505caa6b31d9e7320e8243db530b087da8066b95b933ec880c5bc80d2e120065b69abe4d51e650
 SHA512 
88ba4bc48c45ab1ed00a9f6cd641699d8256a06953316a51192d644bc8b552e3c32fe71123921503f79d108249b30ac622d3d83cc0eb00ddf1ea991b0ed9b3d6
 DIST makemkv-oss-1.14.1.tar.gz 4384005 BLAKE2B 
56ec40d46b0d807b552b87e44b129ea982ac5c0cfe4baf4e49a32ebefedd5be9bad8edc69cc5f81a06960e8d6a24ce37fc4f0c914dda32320af3242c3b6fe589
 SHA512 
4d0bf778d2efd417d058b6db339dc47363b3e179734ec51fc5ebd1fe35d4040aac06ca6387a77362dca8598e8eb5d4db6be16aeea00dc7a3655bf36be26998e5

diff --git a/media-video/makemkv/makemkv-1.14.0.ebuild 
b/media-video/makemkv/makemkv-1.14.0.ebuild
deleted file mode 100644
index e1f60862f3d..000
--- a/media-video/makemkv/makemkv-1.14.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gnome2-utils linux-info
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   sys-libs/glibc
-   dev-libs/expat
-   dev-libs/openssl:0[-bindist(-)]
-   sys-libs/zlib
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
-   libav? ( >=media-video/libav-0.8.9:0= )
-"
-RDEPEND="${DEPEND}
-   net-misc/wget"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   econf \
-   --enable-debug \
-   --disable-noec \
-   --disable-qt4 \
-   $(use_enable gui) \
-   $(use_enable gui qt5)
-}
-
-src_install() {
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-   cd "${WORKDIR}"/${MY_PB} || die
-
-   # install prebuilt bin
-   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
-
-   # install profiles and locales
-   insinto /usr/share/MakeMKV
-   doins src/share/*
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-
-   elog "While MakeMKV is in beta mode, upstream has provided a license"
-   elog "to use if you do not want to purchase one."
-   elog ""
-   elog "See this forum thread for more information, including the key:"
-   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
-   elog ""
-   elog "Note that beta license may have an expiration date and you will"
-   elog "need to check for newer licenses/releases. "
-   elog ""
-   elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-

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

2018-11-06 Thread James Le Cuirot
commit: 6b47230430f788e405f195f95379d89602140a85
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Nov  6 23:25:46 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Nov  6 23:25:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b472304

media-video/makemkv: Drop old 1.12.3

Signed-off-by: James Le Cuirot  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/makemkv/Manifest  |   2 -
 media-video/makemkv/makemkv-1.12.3.ebuild | 108 --
 2 files changed, 110 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 5362f707075..b0004886f20 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B 
b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac
 SHA512 
79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
 DIST makemkv-bin-1.14.0.tar.gz 9307621 BLAKE2B 
7ed476d9e1400ce71fd9ec05aa7c63ceae8b94f2c72548b07aa43a243ab7c2badea4b25d3d89da0046924a33f8de20e1a0650a0c9f4e6db81f47aecedbef
 SHA512 
5ebf10f43622680dad377b3219149e27789edd61e662d69f4a80f14109090fcd933a5c1b63593a3a9ad98a8abfe077225679d679da0dcf74e4365100d67ef2ea
-DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 
3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195
 SHA512 
cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892
 DIST makemkv-oss-1.14.0.tar.gz 4384023 BLAKE2B 
006e488c2669fee273df6ccb86b012023d7c91aef2b2490c0a505caa6b31d9e7320e8243db530b087da8066b95b933ec880c5bc80d2e120065b69abe4d51e650
 SHA512 
88ba4bc48c45ab1ed00a9f6cd641699d8256a06953316a51192d644bc8b552e3c32fe71123921503f79d108249b30ac622d3d83cc0eb00ddf1ea991b0ed9b3d6

diff --git a/media-video/makemkv/makemkv-1.12.3.ebuild 
b/media-video/makemkv/makemkv-1.12.3.ebuild
deleted file mode 100644
index bcc7cf5092e..000
--- a/media-video/makemkv/makemkv-1.12.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gnome2-utils linux-info xdg-utils
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   sys-libs/glibc
-   dev-libs/expat
-   dev-libs/openssl:0[-bindist(-)]
-   sys-libs/zlib
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
-   libav? ( >=media-video/libav-0.8.9:0= )
-"
-RDEPEND="${DEPEND}
-   net-misc/wget"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   econf \
-   --enable-debug \
-   --disable-noec \
-   --disable-qt4 \
-   $(use_enable gui) \
-   $(use_enable gui qt5)
-}
-
-src_install() {
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-   cd "${WORKDIR}"/${MY_PB} || die
-
-   # install prebuilt bin
-   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
-
-   # install profiles and locales
-   insinto /usr/share/MakeMKV
-   doins src/share/*
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_desktop_database_update
-
-   elog "While MakeMKV is in beta mode, upstream has provided a license"
-   elog "to use if you do not want to purchase one."
-   elog ""
-   elog "See this forum thread for more information, including the key:"
-   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
-   elog ""
-   elog "Note that beta license may have an expiration date and you will"
-   elog "need to check for newer licenses/releases.

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

2018-11-06 Thread James Le Cuirot
commit: 576f94baf218fd67fd6a74e9115d907f9bf220fc
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Nov  6 23:25:19 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Nov  6 23:25:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576f94ba

media-video/makemkv: Version bump to 1.14.0

Signed-off-by: James Le Cuirot  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.14.0.ebuild | 102 ++
 2 files changed, 104 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index c71ed4d6bf8..5362f707075 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B 
b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac
 SHA512 
79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
+DIST makemkv-bin-1.14.0.tar.gz 9307621 BLAKE2B 
7ed476d9e1400ce71fd9ec05aa7c63ceae8b94f2c72548b07aa43a243ab7c2badea4b25d3d89da0046924a33f8de20e1a0650a0c9f4e6db81f47aecedbef
 SHA512 
5ebf10f43622680dad377b3219149e27789edd61e662d69f4a80f14109090fcd933a5c1b63593a3a9ad98a8abfe077225679d679da0dcf74e4365100d67ef2ea
 DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 
3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195
 SHA512 
cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892
+DIST makemkv-oss-1.14.0.tar.gz 4384023 BLAKE2B 
006e488c2669fee273df6ccb86b012023d7c91aef2b2490c0a505caa6b31d9e7320e8243db530b087da8066b95b933ec880c5bc80d2e120065b69abe4d51e650
 SHA512 
88ba4bc48c45ab1ed00a9f6cd641699d8256a06953316a51192d644bc8b552e3c32fe71123921503f79d108249b30ac622d3d83cc0eb00ddf1ea991b0ed9b3d6

diff --git a/media-video/makemkv/makemkv-1.14.0.ebuild 
b/media-video/makemkv/makemkv-1.14.0.ebuild
new file mode 100644
index 000..e1f60862f3d
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.14.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic gnome2-utils linux-info
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   sys-libs/glibc
+   dev-libs/expat
+   dev-libs/openssl:0[-bindist(-)]
+   sys-libs/zlib
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
+   libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+   net-misc/wget"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   econf \
+   --enable-debug \
+   --disable-noec \
+   --disable-qt4 \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
+}
+
+src_install() {
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
+   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bin
+   dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+
+   # install profiles and locales
+   insinto /usr/share/MakeMKV
+   doins src/share/*
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+
+   elog "While MakeMKV is in beta mode, upstream has provided a license"
+   elog "to use if you do not want to purchase one."
+   elog ""
+   elog "See this forum thread for more information, including the key:"
+   elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053";
+   elog ""
+   elog "Note that beta license may have an expiration date and you will"
+   elog "need to check for newer licenses/releases. "
+   elog ""
+   elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. Thi

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

2018-07-25 Thread James Le Cuirot
commit: 5966e5e410ac11b1483f7d781a061ddf21f66cc1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jul 25 21:25:10 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jul 25 21:25:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5966e5e4

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

The ffmpeg patch is no longer needed.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-video/makemkv/Manifest   |  4 ++--
 media-video/makemkv/files/makemkv-ffmpeg.patch | 25 --
 ...makemkv-1.12.2.ebuild => makemkv-1.12.3.ebuild} |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 234d2b5ca36..c71ed4d6bf8 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B 
b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac
 SHA512 
79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
+DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 
3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195
 SHA512 
cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892

diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch 
b/media-video/makemkv/files/makemkv-ffmpeg.patch
deleted file mode 100644
index 930c144d263..000
--- a/media-video/makemkv/files/makemkv-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Taken from 
https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm
-See 
https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615
-and 
https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 20db4e9..f08d53c 100644
 a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl 
ffm_audio_encode_init(void* logctx,const char* n
- info->profile : FF_PROFILE_UNKNOWN;
- 
- if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
--ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- if (argp) {
- for (i=0;argp[i];i+=2) {
-@@ -718,7 +718,7 @@ int __cdecl 
ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod
- info->delay = (int32_t)ctx->avctx->delay;
- info->flags = 0;
- 
--if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
-+if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)
- info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
- 
- return 0;

diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild 
b/media-video/makemkv/makemkv-1.12.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.12.2.ebuild
rename to media-video/makemkv/makemkv-1.12.3.ebuild
index e5003042929..bcc7cf5092e 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
 
 src_configure() {
# See bug #439380.



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

2018-05-14 Thread James Le Cuirot
commit: 3b2c32569270c1fb2062436efae206e4be737349
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon May 14 21:48:25 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May 14 21:48:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2c3256

media-video/makemkv: Patch for compatibility with ffmpeg 4

Closes: https://bugs.gentoo.org/655488
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-video/makemkv/files/makemkv-ffmpeg.patch | 25 +
 media-video/makemkv/makemkv-1.12.2.ebuild  |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch 
b/media-video/makemkv/files/makemkv-ffmpeg.patch
new file mode 100644
index 000..930c144d263
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-ffmpeg.patch
@@ -0,0 +1,25 @@
+Taken from 
https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm
+See 
https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615
+and 
https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca
+diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
+index 20db4e9..f08d53c 100644
+--- a/libffabi/src/ffabi.c
 b/libffabi/src/ffabi.c
+@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl 
ffm_audio_encode_init(void* logctx,const char* n
+ info->profile : FF_PROFILE_UNKNOWN;
+ 
+ if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
+-ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ if (argp) {
+ for (i=0;argp[i];i+=2) {
+@@ -718,7 +718,7 @@ int __cdecl 
ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod
+ info->delay = (int32_t)ctx->avctx->delay;
+ info->flags = 0;
+ 
+-if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
++if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)
+ info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ return 0;

diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild 
b/media-video/makemkv/makemkv-1.12.2.ebuild
index bcc7cf5092e..e5003042929 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
 
 src_configure() {
# See bug #439380.



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

2018-04-30 Thread James Le Cuirot
commit: 97fd48ee1056584a50eecf2cd9e495f6e3c46e8b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Apr 30 22:29:29 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Apr 30 22:29:29 2018 +
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..000
--- 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.0 +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];
--charargv0[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



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

2018-02-26 Thread James Le Cuirot
commit: 5f87d0a2fc4c3702dcbbf7365b3afc600642fe89
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Feb 26 23:28:56 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Feb 26 23:28:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f87d0a2

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

Also update .desktop cache with xdg-utils.eclass.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/makemkv/Manifest |  4 ++--
 .../{makemkv-1.10.10.ebuild => makemkv-1.12.0.ebuild}| 16 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0d527dbd4c2..b6bf42aa119 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.10.tar.gz 9119354 BLAKE2B 
ed0d2031701aad5d1cc6f9ef8704a8a985ff3fdc343a9dc02310751856c336c08ba83675e3305b3e856a810176ff02d7da148a4dc1d4b9298fe62bce3c8a236f
 SHA512 
d070ccabbcfeaab1a72f5f52cb0efa98cbd6c4c1b7d8445971d76a76c89b487b6debf0f1183af13d877e41a2d7e7deaae355fe30194a783b80704395a2a03b8e
-DIST makemkv-oss-1.10.10.tar.gz 4572400 BLAKE2B 
1ac6c9605cb31f3abdc75430476c398ff01d9a9b500149b2c26a7e2c10d14be11a03b9a0ffe52f805e03b8fdbfdf22f72fa5f3ff7b23c3c24c924e95f8286d5b
 SHA512 
5c73044c7f6a522bd8410cf6454bf38e9829cbcf83a755916242aa242477befb248be8da962b070ec99950dfba7180486fb90c34c86fc62e87485baf9fa99b13
+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

diff --git a/media-video/makemkv/makemkv-1.10.10.ebuild 
b/media-video/makemkv/makemkv-1.12.0.ebuild
similarity index 92%
rename from media-video/makemkv/makemkv-1.10.10.ebuild
rename to media-video/makemkv/makemkv-1.12.0.ebuild
index 05739fbcc6b..530e22a417b 100644
--- a/media-video/makemkv/makemkv-1.10.10.ebuild
+++ b/media-video/makemkv/makemkv-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils flag-o-matic linux-info
+inherit flag-o-matic gnome2-utils linux-info xdg-utils
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}
net-misc/wget"
 
 CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/makemkv-oss-${PV}"
+S="${WORKDIR}/${MY_P}"
 PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
 
 src_configure() {
@@ -76,13 +76,16 @@ src_install() {
 
# install profiles and locales
insinto /usr/share/MakeMKV
-   doins src/share/*.{mo.gz,xml}
+   doins src/share/*
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
+pkg_preinst() {
+   gnome2_icon_savelist
+}
 
 pkg_postinst() {
gnome2_icon_cache_update
+   xdg_desktop_database_update
 
elog "While MakeMKV is in beta mode, upstream has provided a license"
elog "to use if you do not want to purchase one."
@@ -104,4 +107,7 @@ pkg_postinst() {
elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
 }
 
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}



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

2018-01-24 Thread James Le Cuirot
commit: edd37643f6eb6a6106d77b1d191a30965c95c669
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 24 21:03:08 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 24 21:03:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd37643

media-video/makemkv: Warn if CONFIG_CHR_DEV_SG is disabled

Closes: https://bugs.gentoo.org/645456
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-video/makemkv/makemkv-1.10.10.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/makemkv/makemkv-1.10.10.ebuild 
b/media-video/makemkv/makemkv-1.10.10.ebuild
index 9b3bdc586d5..05739fbcc6b 100644
--- a/media-video/makemkv/makemkv-1.10.10.ebuild
+++ b/media-video/makemkv/makemkv-1.10.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils flag-o-matic
+inherit gnome2-utils flag-o-matic linux-info
 
 MY_P=makemkv-oss-${PV}
 MY_PB=makemkv-bin-${PV}
@@ -37,6 +37,7 @@ DEPEND="
 RDEPEND="${DEPEND}
net-misc/wget"
 
+CONFIG_CHECK="~CHR_DEV_SG"
 S="${WORKDIR}/makemkv-oss-${PV}"
 PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
 



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

2018-01-24 Thread James Le Cuirot
commit: 77046375e46f5e8204100566239b1d851ba3e094
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 24 20:57:34 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 24 21:03:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77046375

media-video/makemkv:  Bump to 1.10.10, remove old 1.10.9

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-video/makemkv/Manifest  | 4 ++--
 media-video/makemkv/{makemkv-1.10.9.ebuild => makemkv-1.10.10.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 2265607769f..0d527dbd4c2 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.9.tar.gz 9115532 BLAKE2B 
2e8d290d3dbdfcd560f73aeb8f286d02e34006d29fb29de817407f0e8ce9880a8af99331646b7e28b1d9e3b3101a6285848e5e28bd955c55af3cebf6e5c6e910
 SHA512 
36d2a7f8bace847a89dec5a821d6c6235d9e3aaffac4dbd59233a611070d30758d039a5f27fce5a857a80410d586e15d948a9b980392ba31759ccb7ca9ee6155
-DIST makemkv-oss-1.10.9.tar.gz 4572328 BLAKE2B 
47667c04c05faa8438b93c97178646fd6e1db0affdf38d72982a978e9bd80a8ece2c123a55d60147c602203218f30d9e951bd2c9b41b049dd2e68ac4334d07be
 SHA512 
cdcdd0479ff3c6600a1aba823eea3214e57bfe0d3023f8efc44ca55c8f7653931c13f3f0ad7a7c31cc97c6e2dc50974315e7dceffe9383a511cfe298938d875e
+DIST makemkv-bin-1.10.10.tar.gz 9119354 BLAKE2B 
ed0d2031701aad5d1cc6f9ef8704a8a985ff3fdc343a9dc02310751856c336c08ba83675e3305b3e856a810176ff02d7da148a4dc1d4b9298fe62bce3c8a236f
 SHA512 
d070ccabbcfeaab1a72f5f52cb0efa98cbd6c4c1b7d8445971d76a76c89b487b6debf0f1183af13d877e41a2d7e7deaae355fe30194a783b80704395a2a03b8e
+DIST makemkv-oss-1.10.10.tar.gz 4572400 BLAKE2B 
1ac6c9605cb31f3abdc75430476c398ff01d9a9b500149b2c26a7e2c10d14be11a03b9a0ffe52f805e03b8fdbfdf22f72fa5f3ff7b23c3c24c924e95f8286d5b
 SHA512 
5c73044c7f6a522bd8410cf6454bf38e9829cbcf83a755916242aa242477befb248be8da962b070ec99950dfba7180486fb90c34c86fc62e87485baf9fa99b13

diff --git a/media-video/makemkv/makemkv-1.10.9.ebuild 
b/media-video/makemkv/makemkv-1.10.10.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.9.ebuild
rename to media-video/makemkv/makemkv-1.10.10.ebuild



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

2018-01-18 Thread James Le Cuirot
commit: b1c3385eaafe28fe6e98055779a521681494409c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 18 15:02:28 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 18 15:02:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c3385e

media-video/makemkv: Bump to 1.10.9, remove old 1.10.8

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.8.ebuild => makemkv-1.10.9.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index af2ed5e501b..2265607769f 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.8.tar.gz 9062487 BLAKE2B 
12402d2f7562194840f895453fd0f887673eae7525d1076722485046021ae557f4c427af8539e5cd0daf66b7763ac8e89e7c5b89e6412567a12f07528e37a92f
 SHA512 
8a71c60598ca73369e68ff4a9377e6a74e29e13d82de58b8e18baf6446ebad31169d86e6377de3a14bb13c46bd5fde60fa965a6524917d916be5c9eb0308f78e
-DIST makemkv-oss-1.10.8.tar.gz 4572214 BLAKE2B 
f2557004e59888788d035abd853a3480e1b429e1a3ef879d3adbf29b6a600823fc4a58aa48841c5777aa6790a2fa7921f4120504fa1a837b9c256a528e40b072
 SHA512 
c76438adca70af8049774c8f9e2d8109d04e121b7eafeb08f0aa7b2f149dfc9fa691e73aced7b08f1a296e1907e411ffd673199e6f59841d2921ab3f01f6f468
+DIST makemkv-bin-1.10.9.tar.gz 9115532 BLAKE2B 
2e8d290d3dbdfcd560f73aeb8f286d02e34006d29fb29de817407f0e8ce9880a8af99331646b7e28b1d9e3b3101a6285848e5e28bd955c55af3cebf6e5c6e910
 SHA512 
36d2a7f8bace847a89dec5a821d6c6235d9e3aaffac4dbd59233a611070d30758d039a5f27fce5a857a80410d586e15d948a9b980392ba31759ccb7ca9ee6155
+DIST makemkv-oss-1.10.9.tar.gz 4572328 BLAKE2B 
47667c04c05faa8438b93c97178646fd6e1db0affdf38d72982a978e9bd80a8ece2c123a55d60147c602203218f30d9e951bd2c9b41b049dd2e68ac4334d07be
 SHA512 
cdcdd0479ff3c6600a1aba823eea3214e57bfe0d3023f8efc44ca55c8f7653931c13f3f0ad7a7c31cc97c6e2dc50974315e7dceffe9383a511cfe298938d875e

diff --git a/media-video/makemkv/makemkv-1.10.8.ebuild 
b/media-video/makemkv/makemkv-1.10.9.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.10.8.ebuild
rename to media-video/makemkv/makemkv-1.10.9.ebuild
index 8ae13a9e98f..9b3bdc586d5 100644
--- a/media-video/makemkv/makemkv-1.10.8.ebuild
+++ b/media-video/makemkv/makemkv-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6



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

2017-12-05 Thread James Le Cuirot
commit: 7c14618597b16827b6b05eaa64b75fb0c2056986
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec  5 22:28:13 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec  5 22:36:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c146185

media-video/makemkv: Bump to 1.10.8, remove old 1.10.7-r1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-video/makemkv/Manifest  | 4 ++--
 .../makemkv/{makemkv-1.10.7-r1.ebuild => makemkv-1.10.8.ebuild}   | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 696d78acc13..af2ed5e501b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 
2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 
7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab
 WHIRLPOOL 
7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
-DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 
be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 
f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8
 WHIRLPOOL 
2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137
+DIST makemkv-bin-1.10.8.tar.gz 9062487 BLAKE2B 
12402d2f7562194840f895453fd0f887673eae7525d1076722485046021ae557f4c427af8539e5cd0daf66b7763ac8e89e7c5b89e6412567a12f07528e37a92f
 SHA512 
8a71c60598ca73369e68ff4a9377e6a74e29e13d82de58b8e18baf6446ebad31169d86e6377de3a14bb13c46bd5fde60fa965a6524917d916be5c9eb0308f78e
+DIST makemkv-oss-1.10.8.tar.gz 4572214 BLAKE2B 
f2557004e59888788d035abd853a3480e1b429e1a3ef879d3adbf29b6a600823fc4a58aa48841c5777aa6790a2fa7921f4120504fa1a837b9c256a528e40b072
 SHA512 
c76438adca70af8049774c8f9e2d8109d04e121b7eafeb08f0aa7b2f149dfc9fa691e73aced7b08f1a296e1907e411ffd673199e6f59841d2921ab3f01f6f468

diff --git a/media-video/makemkv/makemkv-1.10.7-r1.ebuild 
b/media-video/makemkv/makemkv-1.10.8.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.7-r1.ebuild
rename to media-video/makemkv/makemkv-1.10.8.ebuild



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

2017-11-26 Thread David Seifert
commit: a5487e4145c736b9604863909d45ef6588d17881
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 12:23:37 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:09:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5487e41

media-video/makemkv: [QA] Consistent whitespace in metadata.xml

 media-video/makemkv/metadata.xml | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 9de3ac702c5..47f90d86823 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -6,21 +6,21 @@
James Le Cuirot


-  MakeMKV is your one-click solution to convert video that you own
-  into free and patents-unencumbered format that can be played
-  everywhere. MakeMKV is a format converter, otherwise called
-  transcoder. It converts the video clips from proprietary (and
-  usually encrypted) disc into a set of MKV files, preserving most
-  information but not changing it in any way. The MKV format can
-  store multiple video/audio tracks with all meta-information and
-  preserve chapters. There are many players that can play MKV
-  files nearly on all platforms, and there are tools to convert
-  MKV files to many formats, including DVD and Blu-ray discs.
+   MakeMKV is your one-click solution to convert video that you own
+   into free and patents-unencumbered format that can be played
+   everywhere. MakeMKV is a format converter, otherwise called
+   transcoder. It converts the video clips from proprietary (and
+   usually encrypted) disc into a set of MKV files, preserving most
+   information but not changing it in any way. The MKV format can
+   store multiple video/audio tracks with all meta-information and
+   preserve chapters. There are many players that can play MKV
+   files nearly on all platforms, and there are tools to convert
+   MKV files to many formats, including DVD and Blu-ray discs.
 
-  Additionally MakeMKV can instantly stream decrypted video
-  without intermediate conversion to wide range of players, so you
-  may watch Blu-ray and DVD discs with your favorite player on
-  your favorite OS or on your favorite device.
+   Additionally MakeMKV can instantly stream decrypted video
+   without intermediate conversion to wide range of players, so you
+   may watch Blu-ray and DVD discs with your favorite player on
+   your favorite OS or on your favorite device.


Build the Qt5 GUI



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

2017-10-22 Thread James Le Cuirot
commit: 4fc9a2ac4be43af35159bfcbcc5a671dae7ee008
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 22 16:33:41 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 22 16:35:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc9a2ac

media-video/makemkv: Drop Qt4 support and introduce gui USE flag

Qt4 will be dropped from the tree soon.

Package-Manager: Portage-2.3.12, Repoman-2.3.2

 ...emkv-1.10.7.ebuild => makemkv-1.10.7-r1.ebuild} | 23 +-
 media-video/makemkv/metadata.xml   |  5 -
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild 
b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
similarity index 90%
rename from media-video/makemkv/makemkv-1.10.7.ebuild
rename to media-video/makemkv/makemkv-1.10.7-r1.ebuild
index f01bbdb662f..8ae13a9e98f 100644
--- a/media-video/makemkv/makemkv-1.10.7.ebuild
+++ b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
@@ -16,7 +16,7 @@ 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="libav multilib qt4 qt5"
+IUSE="+gui libav multilib"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -25,17 +25,12 @@ DEPEND="
dev-libs/expat
dev-libs/openssl:0[-bindist(-)]
sys-libs/zlib
-   qt5? (
+   gui? (
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
-   !qt5? ( qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4
-   ) )
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
 "
@@ -49,20 +44,12 @@ src_configure() {
# See bug #439380.
replace-flags -O* -Os
 
-   local econf_args=()
-
-   if use qt5 || use qt4; then
-   econf_args+=( --enable-gui )
-   else
-   econf_args+=( --disable-gui )
-   fi
-
econf \
--enable-debug \
--disable-noec \
-   $(use_enable qt5) \
-   $(use_enable qt4) \
-   "${econf_args[@]}"
+   --disable-qt4 \
+   $(use_enable gui) \
+   $(use_enable gui qt5)
 }
 
 src_install() {

diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index b650d107cd5..9de3ac702c5 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -21,5 +21,8 @@
   without intermediate conversion to wide range of players, so you
   may watch Blu-ray and DVD discs with your favorite player on
   your favorite OS or on your favorite device.
-
+   
+   
+   Build the Qt5 GUI
+   
 



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

2017-09-06 Thread James Le Cuirot
commit: 52136e8dde2edbbce757577593db0d28ce0b96ca
Author: Nick Sarnie  gmail  com>
AuthorDate: Tue Sep  5 22:25:04 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Sep  6 18:57:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52136e8d

media-video/makemkv: Bump to 1.10.7

Signed-off-by: Nick Sarnie  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/5628

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.6.ebuild => makemkv-1.10.7.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 7792748b8de..696d78acc13 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.6.tar.gz 8414683 SHA256 
99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3 SHA512 
a598d1b21fdccc6a6999e0f42fffb8388fbec8cbcf428e19a333b7d1793977a1e6728cd253f28ece38de4b55767612d0c521734aa8a746082921e605b6185ec8
 WHIRLPOOL 
314e58e4bdc049dc9a538868d729330ffc45c64a853ea53bf9d5baec8311c6f4299de39cf9ee6c402ebd2c63000453f5f0cc402ee7cf28127f0e0a4c290e5d8e
-DIST makemkv-oss-1.10.6.tar.gz 4569611 SHA256 
ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235 SHA512 
41519de6a3bc3b0ca531ae7f0527db867a2ca4b9720e9a886b9b06ec91f1c11478243d0c7247f4bf36b65ce33c07dd6c35fc805dd87132e872024f1405896644
 WHIRLPOOL 
d7d94db83f0dc935b0333951f694a55df04d751a63beecdf323f4f7b9b1080878efd1c9c6347ada185f6d5e71ee2a87a8e4be366425a4e5b29952bbde4fe1821
+DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 
2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 
7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab
 WHIRLPOOL 
7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
+DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 
be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 
f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8
 WHIRLPOOL 
2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137

diff --git a/media-video/makemkv/makemkv-1.10.6.ebuild 
b/media-video/makemkv/makemkv-1.10.7.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.6.ebuild
rename to media-video/makemkv/makemkv-1.10.7.ebuild



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

2017-05-28 Thread James Le Cuirot
commit: 0da2379c666eea769236c0445fe5edbc222ad143
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 28 19:03:40 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 28 19:03:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da2379c

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

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.5.ebuild => makemkv-1.10.6.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 2f966c0ca5c..7792748b8de 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+DIST makemkv-bin-1.10.6.tar.gz 8414683 SHA256 
99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3 SHA512 
a598d1b21fdccc6a6999e0f42fffb8388fbec8cbcf428e19a333b7d1793977a1e6728cd253f28ece38de4b55767612d0c521734aa8a746082921e605b6185ec8
 WHIRLPOOL 
314e58e4bdc049dc9a538868d729330ffc45c64a853ea53bf9d5baec8311c6f4299de39cf9ee6c402ebd2c63000453f5f0cc402ee7cf28127f0e0a4c290e5d8e
+DIST makemkv-oss-1.10.6.tar.gz 4569611 SHA256 
ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235 SHA512 
41519de6a3bc3b0ca531ae7f0527db867a2ca4b9720e9a886b9b06ec91f1c11478243d0c7247f4bf36b65ce33c07dd6c35fc805dd87132e872024f1405896644
 WHIRLPOOL 
d7d94db83f0dc935b0333951f694a55df04d751a63beecdf323f4f7b9b1080878efd1c9c6347ada185f6d5e71ee2a87a8e4be366425a4e5b29952bbde4fe1821

diff --git a/media-video/makemkv/makemkv-1.10.5.ebuild 
b/media-video/makemkv/makemkv-1.10.6.ebuild
similarity index 99%
rename from media-video/makemkv/makemkv-1.10.5.ebuild
rename to media-video/makemkv/makemkv-1.10.6.ebuild
index e7eeb0b8c6b..f01bbdb662f 100644
--- a/media-video/makemkv/makemkv-1.10.5.ebuild
+++ b/media-video/makemkv/makemkv-1.10.6.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"



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

2017-03-26 Thread James Le Cuirot
commit: a790458c38e633d1b90926c4c6dc5a3764fc4ccf
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Mar 26 20:28:03 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Mar 26 20:28:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a790458c

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

 media-video/makemkv/Manifest   |  4 +-
 media-video/makemkv/files/makemkv-flags.patch  | 51 --
 media-video/makemkv/files/makemkv-makefile.patch   | 35 ---
 media-video/makemkv/files/makemkv-qt4.patch| 34 ---
 media-video/makemkv/files/makemkv-qt5.patch| 28 
 media-video/makemkv/files/makemkv-sysmacros.patch  | 10 -
 media-video/makemkv/files/makemkv-wget.patch   | 29 
 ...makemkv-1.10.4.ebuild => makemkv-1.10.5.ebuild} | 33 +-
 8 files changed, 43 insertions(+), 181 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4a90670cfaf..2f966c0ca5c 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 f88bde00e65..000
--- 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.0 +
-+++ b/Makefile.in  2016-12-17 23:13:03.227251463 +
-@@ -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) $(SSTR

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

2016-12-25 Thread James Le Cuirot
commit: 336590669d55c72c5e2b1c4dd49495ff76c56b23
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec 25 23:34:04 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 25 23:34:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33659066

media-video/makemkv: Remove old 1.10.3

Package-Manager: portage-2.3.3

 media-video/makemkv/Manifest  |   2 -
 media-video/makemkv/makemkv-1.10.3.ebuild | 129 --
 2 files changed, 131 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4614dbb..4a90670 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.10.3.tar.gz 8296526 SHA256 
5c860fabd58e5d923c1e0f4c336751a9ba61a7874de320169a3988cda33d6cfb SHA512 
93cca2516b51794af87dc997aee98e1fa99f75933e49b9ca4eb1bc3896464f3a2de251ddaa430a751f0233493ecc5948e39daaffe4b5b0d884ce47a38c27647f
 WHIRLPOOL 
978cc0cd2eacdc495a39d5b070c7dfe48f2e88ac8644c39e5025c76b702af211c2420cf4204c3fcb5d0d656e704f3d1341c59f66a337c0701fa15adfaaf6e9dc
 DIST makemkv-bin-1.10.4.tar.gz 8315649 SHA256 
bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa SHA512 
00482428a6374e37912e0537c1e876b478a5eb9e0a26476b01f74f93c0605ed7aa3547599287211f17dd2d511e5bebf60605e05d0064f501816fdfccd964b98c
 WHIRLPOOL 
29dfa3dcc1f36511bd153ae1c43ca54b6fb2d8cfa8d62960e7605ca460a182d4d1feec05baa9d01dfba5f80734cae4c085b8b9f0ac5d0b0910c58fa766e351f8
-DIST makemkv-oss-1.10.3.tar.gz 4419732 SHA256 
b89069294c27b298d35be86353baf9c3da8d7e18b6bce53d4ad2ee3a46785760 SHA512 
f380aaccd930659f80d937699f82bf39a51631fe67161f81adc7a3380d28ecc107c2921d82c42a7995a9eabdbbf78d289384dca09e84855044eef4cea9c2f0c9
 WHIRLPOOL 
272b25f17ad221dd408f921221390566ec97e6a7e7a1729731ba5d75ff2c097919d46235f1b271db1b2be037053b3c05629690a696fe8e9723f4abe8fe203cd9
 DIST makemkv-oss-1.10.4.tar.gz 4421220 SHA256 
bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4 SHA512 
6a792703ae4ab978ebe7a71e9d9f2c298e230168c2701fd2f7fab724f31a1c83388bae408c253a75504c73b9e25f9fb0ba48d5697cfa1f7ae39df133444983c4
 WHIRLPOOL 
099f0d5d76ec97e3bf3bfa0a0e1ffceb5c539584ca05f9d204b241960d579f9eaabb8dfc8df2a35feec253fa597d9c97ed28c7cef95928f699a6a74bed146bee

diff --git a/media-video/makemkv/makemkv-1.10.3.ebuild 
b/media-video/makemkv/makemkv-1.10.3.ebuild
deleted file mode 100644
index fd12203..
--- a/media-video/makemkv/makemkv-1.10.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils gnome2-utils multilib flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/";
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-   http://www.makemkv.com/download/${MY_PB}.tar.gz";
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav multilib qt4 qt5"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-   sys-libs/glibc[multilib?]
-   dev-libs/expat
-   dev-libs/openssl:0
-   sys-libs/zlib
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   !qt5? ( qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4
-   ) )
-   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
-   libav? ( >=media-video/libav-0.8.9:0= )
-"
-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
-}
-
-src_configure() {
-   # See bug #439380.
-   replace-flags -O* -Os
-
-   local econf_args=()
-
-   if use qt5 || use qt4; then
-   econf_args+=( '--enable-gui' )
-   else
-   econf_args+=( '--disable-gui' )
-   fi
-
-   econf "${econf_args[@]}"
-}
-
-src_install() {
-   default
-
-   # add missing symlinks for QA
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
-   dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-

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

2016-12-25 Thread James Le Cuirot
commit: d9d3d8f5daa2a86e68d710399e16d4b3612d743b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec 25 23:33:31 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 25 23:33:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d3d8f5

media-video/makemkv: Version bump to 1.10.4

My new patches were not included this time but upstream has said they
should go in for next time.

Package-Manager: portage-2.3.3

 media-video/makemkv/Manifest  |   2 +
 media-video/makemkv/makemkv-1.10.4.ebuild | 129 ++
 2 files changed, 131 insertions(+)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index e337340..4614dbb 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,4 @@
 DIST makemkv-bin-1.10.3.tar.gz 8296526 SHA256 
5c860fabd58e5d923c1e0f4c336751a9ba61a7874de320169a3988cda33d6cfb SHA512 
93cca2516b51794af87dc997aee98e1fa99f75933e49b9ca4eb1bc3896464f3a2de251ddaa430a751f0233493ecc5948e39daaffe4b5b0d884ce47a38c27647f
 WHIRLPOOL 
978cc0cd2eacdc495a39d5b070c7dfe48f2e88ac8644c39e5025c76b702af211c2420cf4204c3fcb5d0d656e704f3d1341c59f66a337c0701fa15adfaaf6e9dc
+DIST makemkv-bin-1.10.4.tar.gz 8315649 SHA256 
bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa SHA512 
00482428a6374e37912e0537c1e876b478a5eb9e0a26476b01f74f93c0605ed7aa3547599287211f17dd2d511e5bebf60605e05d0064f501816fdfccd964b98c
 WHIRLPOOL 
29dfa3dcc1f36511bd153ae1c43ca54b6fb2d8cfa8d62960e7605ca460a182d4d1feec05baa9d01dfba5f80734cae4c085b8b9f0ac5d0b0910c58fa766e351f8
 DIST makemkv-oss-1.10.3.tar.gz 4419732 SHA256 
b89069294c27b298d35be86353baf9c3da8d7e18b6bce53d4ad2ee3a46785760 SHA512 
f380aaccd930659f80d937699f82bf39a51631fe67161f81adc7a3380d28ecc107c2921d82c42a7995a9eabdbbf78d289384dca09e84855044eef4cea9c2f0c9
 WHIRLPOOL 
272b25f17ad221dd408f921221390566ec97e6a7e7a1729731ba5d75ff2c097919d46235f1b271db1b2be037053b3c05629690a696fe8e9723f4abe8fe203cd9
+DIST makemkv-oss-1.10.4.tar.gz 4421220 SHA256 
bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4 SHA512 
6a792703ae4ab978ebe7a71e9d9f2c298e230168c2701fd2f7fab724f31a1c83388bae408c253a75504c73b9e25f9fb0ba48d5697cfa1f7ae39df133444983c4
 WHIRLPOOL 
099f0d5d76ec97e3bf3bfa0a0e1ffceb5c539584ca05f9d204b241960d579f9eaabb8dfc8df2a35feec253fa597d9c97ed28c7cef95928f699a6a74bed146bee

diff --git a/media-video/makemkv/makemkv-1.10.4.ebuild 
b/media-video/makemkv/makemkv-1.10.4.ebuild
new file mode 100644
index ..fd12203
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.10.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnome2-utils multilib flag-o-matic
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/";
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+   http://www.makemkv.com/download/${MY_PB}.tar.gz";
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav multilib qt4 qt5"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+   sys-libs/glibc[multilib?]
+   dev-libs/expat
+   dev-libs/openssl:0
+   sys-libs/zlib
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   !qt5? ( qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtdbus:4
+   dev-qt/qtgui:4
+   ) )
+   !libav? ( >=media-video/ffmpeg-1.0.0:0= )
+   libav? ( >=media-video/libav-0.8.9:0= )
+"
+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
+}
+
+src_configure() {
+   # See bug #439380.
+   replace-flags -O* -Os
+
+   local econf_args=()
+
+   if use qt5 || use qt4; then
+   econf_args+=( '--enable-gui' )
+   else
+   econf_args+=( '--disable-gui' )
+   fi
+
+   econf "${econf_args[@]}"
+}
+
+src_install() {
+   default
+
+   # add missing symlinks for QA
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+   dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+   dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+   dosym libmmbd.so.0   

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

2016-12-22 Thread James Le Cuirot
commit: 3ce567c4fec904f50c03d3ef7020d4e13106c206
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Dec 22 23:26:17 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Dec 22 23:26:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce567c4

media-video/makemkv: multilib-strict fix, closes #603428

Package-Manager: portage-2.3.3

 media-video/makemkv/files/makemkv-makefile.patch | 25 
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/media-video/makemkv/files/makemkv-makefile.patch 
b/media-video/makemkv/files/makemkv-makefile.patch
index 224273a..bc057ca 100644
--- a/media-video/makemkv/files/makemkv-makefile.patch
+++ b/media-video/makemkv/files/makemkv-makefile.patch
@@ -1,6 +1,23 @@
 makemkv-oss-1.9.3/Makefile.in.orig 2015-06-02 13:34:00.0 +0200
-+++ makemkv-oss-1.9.3/Makefile.in  2015-06-04 12:32:29.752291023 +0200
-@@ -47,7 +47,7 @@
+--- makemkv-oss-1.10.3/Makefile.in.orig2016-12-11 16:14:27.0 
+
 makemkv-oss-1.10.3/Makefile.in 2016-12-22 23:11:24.248995344 +
+@@ -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
@@ -9,7 +26,7 @@
  
  out/libdriveio.so.0.full:
mkdir -p out
-@@ -91,5 +91,5 @@
+@@ -91,5 +90,5 @@
  
  tmp/image_data.o : makemkvgui/bin/image_data.bin
mkdir -p tmp



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

2016-12-17 Thread James Le Cuirot
commit: 2d2e27068addf11b3a4f60265a031686383fd741
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 17 23:42:32 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 17 23:43:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2e2706

media-video/makemkv: Fix building against Qt 5.7, closes bug #599228

The -std=c++11 flag is needed for building against Qt 5.7. Trouble is
that upstream builds with CC rather than CXX. This only exhibits a
warning but if you try to force CXX, it fails to build the C parts,
which probably explains why upstream did this in the first place. I
thought -x none might work but it breaks unless you put it before
every C file. Possibly a GCC bug? Ideally upstream would just use
automake and avoid this whole mess. The easiest way out is to only
apply CXX and -std=c++11 to the makemkv binary, which doesn't have any
C sources.

The new patch also respects LDFLAGS. CFLAGS (not CXXFLAGS) is already
respected by upstream now so src_compile is no longer needed.

Some of the src_install stuff has also been dropped in favour of
default as we now want upstream behaviour.

Package-Manager: portage-2.3.3

 media-video/makemkv/files/makemkv-flags.patch | 51 +++
 media-video/makemkv/makemkv-1.10.3.ebuild | 24 +++--
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/media-video/makemkv/files/makemkv-flags.patch 
b/media-video/makemkv/files/makemkv-flags.patch
new file mode 100644
index ..f88bde0
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -0,0 +1,51 @@
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in  2016-12-11 16:14:27.0 +
 b/Makefile.in  2016-12-17 23:13:03.227251463 +
+@@ -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/makemkv-1.10.3.ebuild 
b/media-video/makemkv/makemkv-1.10.3.ebuild
index d2a5e6e..fd12203 100644
--- a/media-video/makemkv/makemkv-1.10.3.ebuild
+++ b/media-video/makemkv/makemkv-1.10.3.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
-   PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros}.patch )
+   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
@@ -75,15 +75,10 @@ src_configure() {
econf "${econf_args[@]}"
 }
 
-src_compile() {
-   emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
-}
-

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

2016-12-13 Thread James Le Cuirot
commit: 2e94db8a887a2ef04d3a7a332c07278c2c38bfc7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Dec 13 23:02:26 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Dec 13 23:02:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e94db8a

media-video/makemkv: Version bump to 1.10.3

Package-Manager: portage-2.3.3

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.2.ebuild => makemkv-1.10.3.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 6c7b18b..e337340 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.2.tar.gz 8006523 SHA256 
b75faf68f613a79a39db7295c9080c051eacfd7fc721682e1d6cd1648bbb1437 SHA512 
70abe0769d5c49813adc1e5fb40a723c0b55e60754370fb58bb6bbfee4c36d15a290ac480492fe0c7cf71cf4784d87640ac64dadc9241ce70dcb77d434e01c2e
 WHIRLPOOL 
fdf4cb9cc34704ef76fa910bf64b6f885789dee096c0942d0d3ea411bcaedbb50cb296f0ecbc72d232eab5065cb6810bf1210d28762a96461dc6a708e0352f53
-DIST makemkv-oss-1.10.2.tar.gz 4419723 SHA256 
ebce597603f934d5a288067ebee8f35b07f4e6dfc48a00b1b2a9063ad83c65ad SHA512 
0a4e7018f83ee076cca1e343feefc53567cdf6e7e2791fe74b78bf01f4caf8613ff428543e3c7baa381cbd18af66899c71bb9c0be9c7d69110e10e968374b60a
 WHIRLPOOL 
2851587838d42d44350c6557220aa5f0a938243c01e6dd81220788c7630e4a7d02c18b18555efab8e71af8961c85d7fde8902ea29007b540adb522a01978b349
+DIST makemkv-bin-1.10.3.tar.gz 8296526 SHA256 
5c860fabd58e5d923c1e0f4c336751a9ba61a7874de320169a3988cda33d6cfb SHA512 
93cca2516b51794af87dc997aee98e1fa99f75933e49b9ca4eb1bc3896464f3a2de251ddaa430a751f0233493ecc5948e39daaffe4b5b0d884ce47a38c27647f
 WHIRLPOOL 
978cc0cd2eacdc495a39d5b070c7dfe48f2e88ac8644c39e5025c76b702af211c2420cf4204c3fcb5d0d656e704f3d1341c59f66a337c0701fa15adfaaf6e9dc
+DIST makemkv-oss-1.10.3.tar.gz 4419732 SHA256 
b89069294c27b298d35be86353baf9c3da8d7e18b6bce53d4ad2ee3a46785760 SHA512 
f380aaccd930659f80d937699f82bf39a51631fe67161f81adc7a3380d28ecc107c2921d82c42a7995a9eabdbbf78d289384dca09e84855044eef4cea9c2f0c9
 WHIRLPOOL 
272b25f17ad221dd408f921221390566ec97e6a7e7a1729731ba5d75ff2c097919d46235f1b271db1b2be037053b3c05629690a696fe8e9723f4abe8fe203cd9

diff --git a/media-video/makemkv/makemkv-1.10.2.ebuild 
b/media-video/makemkv/makemkv-1.10.3.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.2.ebuild
rename to media-video/makemkv/makemkv-1.10.3.ebuild



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

2016-09-26 Thread James Le Cuirot
commit: 9fc4b9ce86e3fbb4b611c6b6d77af3cc1b28b27e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Sep 26 22:24:14 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Sep 26 22:24:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc4b9ce

media-video/makemkv: Version bump to 1.10.2, closes bug #595174

Package-Manager: portage-2.3.1

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.1.ebuild => makemkv-1.10.2.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 71ed4c2..6c7b18b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.1.tar.gz 7977684 SHA256 
c0ff103a02275bb7f7b608e1982313f922abeaaeed45ce3f8676d815da9d SHA512 
c2a3dbc85ba77d1363cc5e7c66de2864bb0e8b3a74bf95fc91e7cbbcb3b2e67a1437112e5e403c01b72ab576ceab432283ff967a080470c372d6b0158e3682e2
 WHIRLPOOL 
77173e55c94fce216d8d31fe0aaf28a8bc2f0431f713453bc4d248e554d1270bad62ba64ca3ffc55dfa0bab882e9382c206d77c74e59fd1293d5f694711ca048
-DIST makemkv-oss-1.10.1.tar.gz 4419738 SHA256 
0b4f85f43d5ea58086f6a998dbd060b4ef189c56964c8e19ac397d2485ab965f SHA512 
027681ac20ecd5193f788f9429a895eaa2135c44ba5e65b806087ea4c101179c42793cb743f6fd4f1d567bf0e6edf0e9b2b211cedb31a83ba6df6d79bc4ea585
 WHIRLPOOL 
4e2d6757abc18d1db43c6c303af6900e5765b06ad43f9b1a4294b70620823284ce3fcf09f64898dd57f5c716235f6254efee347f65e5370cd6453455ce831d88
+DIST makemkv-bin-1.10.2.tar.gz 8006523 SHA256 
b75faf68f613a79a39db7295c9080c051eacfd7fc721682e1d6cd1648bbb1437 SHA512 
70abe0769d5c49813adc1e5fb40a723c0b55e60754370fb58bb6bbfee4c36d15a290ac480492fe0c7cf71cf4784d87640ac64dadc9241ce70dcb77d434e01c2e
 WHIRLPOOL 
fdf4cb9cc34704ef76fa910bf64b6f885789dee096c0942d0d3ea411bcaedbb50cb296f0ecbc72d232eab5065cb6810bf1210d28762a96461dc6a708e0352f53
+DIST makemkv-oss-1.10.2.tar.gz 4419723 SHA256 
ebce597603f934d5a288067ebee8f35b07f4e6dfc48a00b1b2a9063ad83c65ad SHA512 
0a4e7018f83ee076cca1e343feefc53567cdf6e7e2791fe74b78bf01f4caf8613ff428543e3c7baa381cbd18af66899c71bb9c0be9c7d69110e10e968374b60a
 WHIRLPOOL 
2851587838d42d44350c6557220aa5f0a938243c01e6dd81220788c7630e4a7d02c18b18555efab8e71af8961c85d7fde8902ea29007b540adb522a01978b349

diff --git a/media-video/makemkv/makemkv-1.10.1.ebuild 
b/media-video/makemkv/makemkv-1.10.2.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.1.ebuild
rename to media-video/makemkv/makemkv-1.10.2.ebuild



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

2016-08-15 Thread James Le Cuirot
commit: b14f6d29b8c691dcfe045c99b6e376a9048e215c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Aug 15 21:02:13 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Aug 15 21:02:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14f6d29

media-video/makemkv: Version bump to 1.10.1

Package-Manager: portage-2.3.0

 media-video/makemkv/Manifest | 4 ++--
 media-video/makemkv/{makemkv-1.10.0.ebuild => makemkv-1.10.1.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 610c9f5..71ed4c2 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.0.tar.gz 7789479 SHA256 
910d717444676b60b57b5a2be9211a683f80734c4cac3cc8a90cd568b4756b9a SHA512 
77394409c4180ba8f46e5e86fec1ba295ae1a846bb368f05ee01821000a2d5008fc5f18b4d227a1c4d176d591ae8fa0c22a1ca125a873fa64d993762ee997ba0
 WHIRLPOOL 
e8522155c643b04e2b8fad8007083dda1497a69a50ff193ae4b01aeb995cfcf27a4d90890def24ec093293bb657dd278bd0cf30bdd99233dbaae4fa6cb58fe72
-DIST makemkv-oss-1.10.0.tar.gz 4419794 SHA256 
3be02125ee753b3620f95ce1dff5e13c3d19f664cb6eff7a524b29938ef8f9ff SHA512 
6c819aee37a0298680f70c1726a2f4f6a5d22ee91384bf8dfeb9dc594ef811c1749b26583fed450099526e8fb62a67560034c742f110e7c689badc3566622942
 WHIRLPOOL 
0d8fec11c5bc6494e69b4a07811a8571ff397ecd13853ce6ab241fd16836c33511c0dd1989dca29b397d4cd35ae687da7185719c24b6a606287d1c9ce74a6899
+DIST makemkv-bin-1.10.1.tar.gz 7977684 SHA256 
c0ff103a02275bb7f7b608e1982313f922abeaaeed45ce3f8676d815da9d SHA512 
c2a3dbc85ba77d1363cc5e7c66de2864bb0e8b3a74bf95fc91e7cbbcb3b2e67a1437112e5e403c01b72ab576ceab432283ff967a080470c372d6b0158e3682e2
 WHIRLPOOL 
77173e55c94fce216d8d31fe0aaf28a8bc2f0431f713453bc4d248e554d1270bad62ba64ca3ffc55dfa0bab882e9382c206d77c74e59fd1293d5f694711ca048
+DIST makemkv-oss-1.10.1.tar.gz 4419738 SHA256 
0b4f85f43d5ea58086f6a998dbd060b4ef189c56964c8e19ac397d2485ab965f SHA512 
027681ac20ecd5193f788f9429a895eaa2135c44ba5e65b806087ea4c101179c42793cb743f6fd4f1d567bf0e6edf0e9b2b211cedb31a83ba6df6d79bc4ea585
 WHIRLPOOL 
4e2d6757abc18d1db43c6c303af6900e5765b06ad43f9b1a4294b70620823284ce3fcf09f64898dd57f5c716235f6254efee347f65e5370cd6453455ce831d88

diff --git a/media-video/makemkv/makemkv-1.10.0.ebuild 
b/media-video/makemkv/makemkv-1.10.1.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.0.ebuild
rename to media-video/makemkv/makemkv-1.10.1.ebuild



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

2016-07-24 Thread James Le Cuirot
commit: 36bfd363c334cbd763eb65ff26d8837d65d104a0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 24 21:21:49 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 24 21:23:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36bfd363

media-video/makemkv: Version bump to 1.10.0, undo locales, amend Qt

The locale flags were a nice idea but Gentoo is moving away from
LINGUAS-based USE flags. These will be replaced by L10N-based flags
but not for this particular use case. The new INSTALL_MASK mechanism
won't support the non-standard locations used by this package. We may
as well just install them all as they only take up 150KB.

Also prefer qt5 over qt4 without REQUIRED_USE in accordance with
Gentoo's Qt policy.

Package-Manager: portage-2.3.0

 media-video/makemkv/Manifest   |  4 +-
 ...makemkv-1.9.10.ebuild => makemkv-1.10.0.ebuild} | 57 +-
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 289b40b..610c9f5 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.10.tar.gz 5619754 SHA256 
d94468b1cb1ec815b5ab899baab7ab9a03fcdb35c93bc0f6cbc646ffcac4b6c4 SHA512 
fb42fad4404aab5196eb506ce82cfb0b094193e38cd5f42992c7007b4fb1870658cfca518e7258b8c29baf50c2b2c9be75857b7464d7a555aaadfedcf710c1f0
 WHIRLPOOL 
668ed528b8ca3695e039fe35028690c38e785d91c159ff4646a647b1e37fbfde1ea807e0c4d74eddc6168c8b69f1c26d92a5c8cfbbaa708afcbcbec185122c38
-DIST makemkv-oss-1.9.10.tar.gz 4419555 SHA256 
b395bebd64d4c95b1558573d316e88221b4ce03798dace65bd339cae2314ecfa SHA512 
b9ac8679dbb62f7174cf085726301fefbd6384dcf9beeb2a2e73c157120bd03b3313700711fda69543764b0dd27c7b4b262515315eb3cd055d42c162a26bff82
 WHIRLPOOL 
ce31538bc888c15266d5bed10fade07a42a976cb6c0dc32d710f88270085daedb1aac45acca449e00805f3abe8912335fe6e2eb0ebd4b5af8da5195b3dd1663b
+DIST makemkv-bin-1.10.0.tar.gz 7789479 SHA256 
910d717444676b60b57b5a2be9211a683f80734c4cac3cc8a90cd568b4756b9a SHA512 
77394409c4180ba8f46e5e86fec1ba295ae1a846bb368f05ee01821000a2d5008fc5f18b4d227a1c4d176d591ae8fa0c22a1ca125a873fa64d993762ee997ba0
 WHIRLPOOL 
e8522155c643b04e2b8fad8007083dda1497a69a50ff193ae4b01aeb995cfcf27a4d90890def24ec093293bb657dd278bd0cf30bdd99233dbaae4fa6cb58fe72
+DIST makemkv-oss-1.10.0.tar.gz 4419794 SHA256 
3be02125ee753b3620f95ce1dff5e13c3d19f664cb6eff7a524b29938ef8f9ff SHA512 
6c819aee37a0298680f70c1726a2f4f6a5d22ee91384bf8dfeb9dc594ef811c1749b26583fed450099526e8fb62a67560034c742f110e7c689badc3566622942
 WHIRLPOOL 
0d8fec11c5bc6494e69b4a07811a8571ff397ecd13853ce6ab241fd16836c33511c0dd1989dca29b397d4cd35ae687da7185719c24b6a606287d1c9ce74a6899

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.10.0.ebuild
similarity index 81%
rename from media-video/makemkv/makemkv-1.9.10.ebuild
rename to media-video/makemkv/makemkv-1.10.0.ebuild
index cb90134..d2a5e6e 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.10.0.ebuild
@@ -18,7 +18,6 @@ LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
-REQUIRED_USE="?? ( qt4 qt5 )"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -27,45 +26,23 @@ DEPEND="
dev-libs/expat
dev-libs/openssl:0
sys-libs/zlib
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4
-   )
qt5? (
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
+   !qt5? ( qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtdbus:4
+   dev-qt/qtgui:4
+   ) )
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
 "
 RDEPEND="${DEPEND}
net-misc/wget"
 
-# Upstream uses non-standard locale names so map them with this
-# associative array and perform some tricks below.
-declare -A MY_LOCALES
-MY_LOCALES=(
-   [zh]=chi
-   [da]=dan
-   [de]=deu
-   [nl]=dut
-   [fr]=fra
-   [it]=ita
-   [ja]=jpn
-   [no]=nor
-   [fa]=per
-   [pl]=pol
-   [pt_BR]=ptb
-   [es]=spa
-   [sv]=swe
-)
-
-PLOCALES="${!MY_LOCALES[@]}"
-inherit l10n
-
 S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
@@ -74,15 +51,12 @@ src_prepare() {
# 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 qt4; then
-   PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
-   elif use qt5; then
+   if use qt5; then
PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
+   elif use qt4; then
+   PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
fi
 
-   # Chec

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

2016-05-08 Thread James Le Cuirot
commit: c1c9e268fe5997000ea124eeacc5b9d8fd5006d5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat May  7 22:35:31 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May  8 16:26:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c9e268

media-video/makemkv: Use the l10n eclass to select locales

Upstream uses non-standard locale names so map them with an
associative array and perform some tricks.

Thanks to Jan Chren for the initial work on this.

Package-Manager: portage-2.2.28

 media-video/makemkv/makemkv-1.9.10.ebuild | 52 ---
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
index 58a4765..d1daf39 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -43,6 +43,28 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+# Upstream uses non-standard locale names so map them with this
+# associative array and perform some tricks below.
+declare -A MY_LOCALES
+MY_LOCALES=(
+   [zh]=chi
+   [da]=dan
+   [de]=deu
+   [nl]=dut
+   [fr]=fra
+   [it]=ita
+   [ja]=jpn
+   [no]=nor
+   [fa]=per
+   [pl]=pol
+   [pt_BR]=ptb
+   [es]=spa
+   [sv]=swe
+)
+
+PLOCALES="${!MY_LOCALES[@]}"
+inherit l10n
+
 S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
@@ -57,6 +79,9 @@ src_prepare() {
PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
fi
 
+   # Check for locale changes against the non-standard names.
+   PLOCALES="${MY_LOCALES[@]}" l10n_find_plocales_changes 
"${WORKDIR}"/${MY_PB}/src/share makemkv_ .mo.gz
+
default
 }
 
@@ -103,24 +128,29 @@ src_install() {
make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
fi
 
-   # install bin package
-   pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
+   cd "${WORKDIR}"/${MY_PB} || die
+
+   # install prebuilt bins
if use x86; then
-   dobin i386/{makemkvcon,mmdtsdec}
+   dobin bin/i386/{makemkvcon,mmdtsdec}
elif use amd64; then
-   dobin amd64/makemkvcon
-   use multilib && dobin i386/mmdtsdec
+   dobin bin/amd64/makemkvcon
+   use multilib && dobin bin/i386/mmdtsdec
fi
-   popd >/dev/null
 
-   # install license and default profile
-   pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null
insinto /usr/share/MakeMKV
-   doins *.{gz,xml}
-   popd >/dev/null
+
+   # install profiles
+   doins src/share/*.xml
+
+   # install locales
+   local locale
+   for locale in $(l10n_get_locales); do
+   doins src/share/makemkv_${MY_LOCALES[${locale}]}.mo.gz
+   done
 }
 
-pkg_preinst() {gnome2_icon_savelist; }
+pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
gnome2_icon_cache_update



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

2016-05-08 Thread James Le Cuirot
commit: 6848ba2fb2727dd91e9ff0003e052068afc110de
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May  8 13:15:29 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May  8 16:26:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6848ba2f

media-video/makemkv: Launch executables from the PATH

Upstream launches wget as /usr/bin/wget and uses a hardcoded set of
paths to search for other executables. All the required executables
should be in the PATH anyway and this will fix prefixed systems.

Also add missing dependency on wget. It's in @system but it's one of
the less obvious entries.

Package-Manager: portage-2.2.28

 media-video/makemkv/files/makemkv-path.patch | 72 +++-
 media-video/makemkv/makemkv-1.9.10.ebuild|  5 +-
 2 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/media-video/makemkv/files/makemkv-path.patch 
b/media-video/makemkv/files/makemkv-path.patch
index 88f44a9..7c66849 100644
--- a/media-video/makemkv/files/makemkv-path.patch
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -1,13 +1,59 @@
 makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp.orig   2014-04-13 
14:01:36.0 +0100
-+++ makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp2014-05-08 
00:09:52.863784998 +0100
-@@ -36,9 +36,7 @@
- }
- 
- static const char* const app_locations[]={
--"/bin",
--"/usr/bin",
--"/usr/local/bin",
-+"/opt/bin",
- NULL };
- 
- const char* const* ApGetAppLocations()
+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.0 +0100
 makemkv-oss-1.9.10/libabi/src/httplinux.cpp2016-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.0 +0100
 makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp2016-05-08 
13:51:48.761885862 +0100
+@@ -54,8 +54,6 @@
+ 
+ if (AppName[0]==':')
+ {
+-bool app_found = false;
+-const char* const* app_locations = ApGetAppLocations();
+ const char* p_env = getenv("MAKEMKVCON");
+ 
+ AppName++;
+@@ -63,6 +61,13 @@
+ if (p_env!=NULL)
+ {
+ strcpy(app_path,p_env);
++} else {
++strcpy(app_path,AppName);
++}
++} else {
++strcpy(app_path,AppName);
++}
++/*
+ app_found = true;
+ } else {
+ for (size_t i=0;app_locations[i]!=NULL;i++)
+@@ -105,7 +110,7 @@
+ }
+ strcpy(p,AppName);
+ }
+-
++*/
+ strcpy(str_guiserver,"guiserver");
+ strcpy(str_apver,verstr);
+ 
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp 
makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp 2016-04-15 
21:35:36.0 +0100
 makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp  2016-05-08 
10:52:37.137598384 +0100
+@@ -70,7 +70,7 @@
+ }
+ }
+ 
+-err = posix_spawn(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
++err = posix_spawnp(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
+ 
+ posix_spawn_file_actions_destroy(&spawn_actions);
+ posix_spawnattr_destroy(&spawn_attr);

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
index bafbae6..57fd31d 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="?? ( qt4 qt5 )"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 
-RDEPEND="
+DEPEND="
sys-libs/glibc[multilib?]
dev-libs/expat
dev-libs/openssl:0
@@ -41,7 +41,8 @@ RDEPEND="
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+   net-misc/wget"
 
 # Upstream uses non-standard locale names so map them with this
 # associative array and perform some tricks below.



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

2016-05-08 Thread James Le Cuirot
commit: 235cb0563c3bb04cab45b7182292594364c4b9c5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May  8 13:21:19 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May  8 16:26:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235cb056

media-video/makemkv: Install everything to /usr, not some to /opt

makemkvcon looks for files in ../share/MakeMKV. Installing them to
/opt/share/MakeMKV is a bit weird and using /opt requires patching so
it's not exactly supported by upstream.

This means installing prebuilt binaries to /usr but we were previously
having to install a freshly-built binary to /opt so we're screwing FHS
either way. ;)

Package-Manager: portage-2.2.28

 media-video/makemkv/makemkv-1.9.10.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
index 57fd31d..cb90134 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libav multilib qt4 qt5"
 REQUIRED_USE="?? ( qt4 qt5 )"
 
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
 DEPEND="
sys-libs/glibc[multilib?]
@@ -116,7 +116,6 @@ src_install() {
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so
dosym libmmbd.so.0/usr/$(get_libdir)/libmmbd.so.0.${PV}
-   into /opt
 
if use qt4 || use qt5; then
dobin out/makemkv
@@ -165,9 +164,9 @@ pkg_postinst() {
elog "Note that beta license may have an expiration date and you will"
elog "need to check for newer licenses/releases. "
elog ""
-   elog "If this is a new install, remember to copy the default profile"
-   elog "to the config directory:"
-   elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
+   elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+   elog "is no longer necessary and you should delete it from there to"
+   elog "avoid warning messages."
elog ""
elog "MakeMKV can also act as a drop-in replacement for libaacs and"
elog "libbdplus, allowing transparent decryption of a wider range of"



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

2016-05-08 Thread James Le Cuirot
commit: be1b18ebfa5b0355faa799cc8ce7eeb7a90d2da3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May  8 12:59:37 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May  8 16:26:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1b18eb

media-video/makemkv: Patch implicit inclusion of sysmacros.h, #580342

Package-Manager: portage-2.2.28

 media-video/makemkv/files/makemkv-sysmacros.patch | 10 ++
 media-video/makemkv/makemkv-1.9.10.ebuild |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/media-video/makemkv/files/makemkv-sysmacros.patch 
b/media-video/makemkv/files/makemkv-sysmacros.patch
new file mode 100644
index 000..9f4edeb
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-sysmacros.patch
@@ -0,0 +1,10 @@
+--- makemkv-oss-1.9.10/libabi/src/sys_linux.c.orig 2016-04-15 
21:35:36.0 +0100
 makemkv-oss-1.9.10/libabi/src/sys_linux.c  2016-05-08 10:34:07.988650837 
+0100
+@@ -20,6 +20,7 @@
+ */
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
index d1daf39..bafbae6 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -68,7 +68,7 @@ inherit l10n
 S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
-   PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path}.patch )
+   PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros}.patch )
 
# Qt5 always trumps Qt4 if it is available. There are no configure
# options or variables to control this and there is no publicly



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

2016-05-08 Thread James Le Cuirot
commit: ae9c0f2920a2239f7eeddd78b80a4972ec1bdb69
Author: Jan Chren  gmail  com>
AuthorDate: Fri Apr 22 09:45:51 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May  8 16:26:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9c0f29

media-video/makemkv: Bump to 1.9.10, EAPI 6, minor fixes

 media-video/makemkv/Manifest   |  4 ++--
 ...{makemkv-1.9.9.ebuild => makemkv-1.9.10.ebuild} | 23 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4aa0b66..289b40b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.9.tar.gz 5516983 SHA256 
66c9e8db89d461ddafb2682af75102611a492ae4c7bf91645b2840d9bdd355e7 SHA512 
1ef8d5d588b52c9ca255c8588fd7c50cedba8b76304d55b6bf112f7903832c46650633525106c066234d2214a8348b9c5d951977bacb89fb230265a31f0b
 WHIRLPOOL 
e8f3b3387b1ef4a84add3977da3090405bf388a81ba383ddbc33ba280b934bb4c24425b13b8cc5c4e73f62c6f68351f9bee2524d81187dcceeb5b5f8a4c83838
-DIST makemkv-oss-1.9.9.tar.gz 4419556 SHA256 
608d89170b66d2bb89fe80497d4d4f00d604346412f997da52e06c8b10451d1c SHA512 
4901d19c331d2256e024a2c739fbb7d89d6d2fafdc5530ec5fea3931587da058ec438bf2a7d9aefc362e5211996e940ab3f1a404264a276d737f6d9ccdf613c1
 WHIRLPOOL 
23d88f8bcd1458812df65b8d0e6c9d03985b10a51aff477209bfaab21cf5ff1d70cc6e9d0d3fa9fdbbc6453c55b8f6f9f9cf3eac0b73aeb3518375ddea351083
+DIST makemkv-bin-1.9.10.tar.gz 5619754 SHA256 
d94468b1cb1ec815b5ab899baab7ab9a03fcdb35c93bc0f6cbc646ffcac4b6c4 SHA512 
fb42fad4404aab5196eb506ce82cfb0b094193e38cd5f42992c7007b4fb1870658cfca518e7258b8c29baf50c2b2c9be75857b7464d7a555aaadfedcf710c1f0
 WHIRLPOOL 
668ed528b8ca3695e039fe35028690c38e785d91c159ff4646a647b1e37fbfde1ea807e0c4d74eddc6168c8b69f1c26d92a5c8cfbbaa708afcbcbec185122c38
+DIST makemkv-oss-1.9.10.tar.gz 4419555 SHA256 
b395bebd64d4c95b1558573d316e88221b4ce03798dace65bd339cae2314ecfa SHA512 
b9ac8679dbb62f7174cf085726301fefbd6384dcf9beeb2a2e73c157120bd03b3313700711fda69543764b0dd27c7b4b262515315eb3cd055d42c162a26bff82
 WHIRLPOOL 
ce31538bc888c15266d5bed10fade07a42a976cb6c0dc32d710f88270085daedb1aac45acca449e00805f3abe8912335fe6e2eb0ebd4b5af8da5195b3dd1663b

diff --git a/media-video/makemkv/makemkv-1.9.9.ebuild 
b/media-video/makemkv/makemkv-1.9.10.ebuild
similarity index 90%
rename from media-video/makemkv/makemkv-1.9.9.ebuild
rename to media-video/makemkv/makemkv-1.9.10.ebuild
index 252dc73..58a4765 100644
--- a/media-video/makemkv/makemkv-1.9.9.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
+
 inherit eutils gnome2-utils multilib flag-o-matic
 
 MY_P=makemkv-oss-${PV}
@@ -42,30 +43,36 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/makemkv-oss-${PV}
+S="${WORKDIR}/makemkv-oss-${PV}"
 
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-{makefile,path}.patch
+   PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path}.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 qt4; then
-   epatch "${FILESDIR}"/${PN}-qt4.patch
+   PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
elif use qt5; then
-   epatch "${FILESDIR}"/${PN}-qt5.patch
+   PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
fi
+
+   default
 }
 
 src_configure() {
# See bug #439380.
replace-flags -O* -Os
 
+   local econf_args=()
+
if use qt4 || use qt5; then
-   econf --enable-gui
+   econf_args+=( '--enable-gui' )
else
-   econf --disable-gui
+   econf_args+=( '--disable-gui' )
fi
+
+   econf "${econf_args[@]}"
 }
 
 src_compile() {



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

2016-01-19 Thread James Le Cuirot
commit: 09efdf662c12bcc55a50628f2251a787b8c43dd7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jan 19 14:54:28 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jan 19 14:55:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09efdf66

media-video/makemkv: Version bump

Not fully tested as I'm at work!

Package-Manager: portage-2.2.26

 media-video/makemkv/Manifest  | 4 ++--
 media-video/makemkv/{makemkv-1.9.8-r1.ebuild => makemkv-1.9.9.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index fd994cf..4aa0b66 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.8.tar.gz 5485398 SHA256 
3c08a9881f5d45bc1117cad87948e25d718da497e656ae2360864a3cb526d201 SHA512 
cc1621f950bd565ba9281aabe5b6294a9581c3d2644d8c19162f19594bb24c3a250fd42f29e5ebae5fd344b30431b34d47c1119ac5816954515536a3cfa9e7c3
 WHIRLPOOL 
d32a72ceaaf685c9139067c5bf20ae61b55c14706c9585c1a89c8d92eba9bcf3d5c6ac701cf2c45f72cef2613a9e3f09720f6d47f9ebc2a669b4c89aca62701d
-DIST makemkv-oss-1.9.8.tar.gz 4419358 SHA256 
15c6dde52430086ff9749750952ca0d2e0002017be2f8c30f9961ca4997ab065 SHA512 
a797bba9774ab0fd2e36a2628e832acfa20cd1f00c82962662a01e8fcf97de80346a00d14aa977223ca1b53be1dc3c388ed5ec72178eceae255a6e852d69c5a8
 WHIRLPOOL 
a7945d0067496fc976262029085f1304e182f37d0c315e911a54fad8ff1f39beaffe8fcbd05dd885e0149f72f766899d8171f602c24a6791244047cac57c3e3b
+DIST makemkv-bin-1.9.9.tar.gz 5516983 SHA256 
66c9e8db89d461ddafb2682af75102611a492ae4c7bf91645b2840d9bdd355e7 SHA512 
1ef8d5d588b52c9ca255c8588fd7c50cedba8b76304d55b6bf112f7903832c46650633525106c066234d2214a8348b9c5d951977bacb89fb230265a31f0b
 WHIRLPOOL 
e8f3b3387b1ef4a84add3977da3090405bf388a81ba383ddbc33ba280b934bb4c24425b13b8cc5c4e73f62c6f68351f9bee2524d81187dcceeb5b5f8a4c83838
+DIST makemkv-oss-1.9.9.tar.gz 4419556 SHA256 
608d89170b66d2bb89fe80497d4d4f00d604346412f997da52e06c8b10451d1c SHA512 
4901d19c331d2256e024a2c739fbb7d89d6d2fafdc5530ec5fea3931587da058ec438bf2a7d9aefc362e5211996e940ab3f1a404264a276d737f6d9ccdf613c1
 WHIRLPOOL 
23d88f8bcd1458812df65b8d0e6c9d03985b10a51aff477209bfaab21cf5ff1d70cc6e9d0d3fa9fdbbc6453c55b8f6f9f9cf3eac0b73aeb3518375ddea351083

diff --git a/media-video/makemkv/makemkv-1.9.8-r1.ebuild 
b/media-video/makemkv/makemkv-1.9.9.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.9.8-r1.ebuild
rename to media-video/makemkv/makemkv-1.9.9.ebuild



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

2015-12-27 Thread James Le Cuirot
commit: a7865d18b3ecb8fd9fd7da9dc2ad0aba73795d60
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Dec 27 12:05:23 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 27 12:09:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7865d18

media-video/makemkv: Add Qt5 support, closes bug #569768

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 so we have to selectively patch the raw
configure script directly.

Also make a couple of simplifications. src_configure checked for a
configure script even though there is always one there now. I also
couldn't see any reason for having virtual/opengl as a dependency.

Package-Manager: portage-2.2.26

 media-video/makemkv/files/makemkv-qt4.patch| 34 ++
 media-video/makemkv/files/makemkv-qt5.patch| 28 ++
 ...akemkv-1.9.8.ebuild => makemkv-1.9.8-r1.ebuild} | 31 +++-
 3 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/media-video/makemkv/files/makemkv-qt4.patch 
b/media-video/makemkv/files/makemkv-qt4.patch
new file mode 100644
index 000..cbc2fa0
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt4.patch
@@ -0,0 +1,34 @@
+--- makemkv-oss-1.9.8/configure.orig   2015-12-20 16:22:19.0 +
 makemkv-oss-1.9.8/configure2015-12-26 23:59:44.601387071 +
+@@ -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
new file mode 100644
index 000..58b5e41
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt5.patch
@@ -0,0 +1,28 @@
+--- makemkv-oss-1.9.8/configure.orig   2015-12-20 16:22:19.0 +
 makemkv-oss-1.9.8/configure2015-12-27 00:05:18.659860655 +
+@@ -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/makemkv-1.9.8.ebuild 
b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
similarity index 85%
rename from media-video/makemkv/makemkv-1.9.8.ebuild
rename to media-video/makemkv/makemkv-1.9.8-r1.ebuild
index 74150ad..252dc73 100644
--- a/media-video/makemkv/makemkv-1.9.8.ebuild
+++ b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
@@ -16,7 +16,8 @@ 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="libav multilib qt4"
+IUSE="libav multilib qt4 qt5"
+REQUIRED_USE="?? ( qt4 qt5 )"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 
@@ -26,11 +27,16 @@ RDEPEND="
dev-libs/openssl:0
sys-libs/zlib
qt4? (
-   virtual/opengl
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
)
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
 "
@@ -40,14 +46,25 @@ S=${WORKDIR}/makemkv-oss-${PV}
 
 src_prepare() {
epatch "${FILESDIR}"/${PN}-{makefile,path}.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 qt4; then
+   epatch "${FILESDIR}"/${PN}-qt4.patch
+   elif use qt5; then
+   epatch "${FILESDIR}"/${PN}-qt5.patch
+   fi
 }
 
 src_configure() {
+   # See bug #439380.
replace-flags -O* -Os
-   local args=""
-   use qt4 || args="--disable-gui"
-   if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-   econf $args
+
+   if use qt4 || use qt5; then
+   econf --enable-gui
+   else
+   econf --disable-gui
fi

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

2015-12-25 Thread James Le Cuirot
commit: 4a3ce7edc21f70ec34596d1d1e001c0f3769f76b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Dec 25 15:02:28 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Dec 25 15:03:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3ce7ed

media-video/makemkv: Version bump

Package-Manager: portage-2.2.26

 media-video/makemkv/Manifest   | 4 ++--
 media-video/makemkv/{makemkv-1.9.7.ebuild => makemkv-1.9.8.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 79cf750..fd994cf 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.7.tar.gz 5305589 SHA256 
de6d0fd802c13fbaac4a3d0720e3de15f81b006fde0042a2df42d784b46b33ac SHA512 
8d50673c5291381f5800c0e93341e6a01a4e40d9ac0b47ac1f48bbdfb883ed8e82e9fb9c50e48a667b45aa9903a88e4f680b7b7afe7d6913c5db0cc86030c133
 WHIRLPOOL 
346f4a64e4ec594deec592f9cf7b24d83357a1ec523ed49e9370c68a82728f8431cbf5b54c0a3b9789b14ce18327ddd9194dd745a27c653db4938b70b1d6
-DIST makemkv-oss-1.9.7.tar.gz 4405814 SHA256 
69fd254a2eb63e90f616051fde6cd7188c3ee454033bdf288c63843876a02e99 SHA512 
842aecac301889116f24afa99f35bfe8acacc15a4544c6801742461c65f7f24e7bb2b75725cc22a64c2b6b3d6458eb991a6fa6b68ec61d2b559fd96a55472333
 WHIRLPOOL 
9856be4771628cee0ac2ceca8067926397f48d96ce5f3c250edaa7be4c3a149e8f00a1b9c51c9b1e905966ffbdae1c8544a07b38662767a6f1556f2c18fe1b74
+DIST makemkv-bin-1.9.8.tar.gz 5485398 SHA256 
3c08a9881f5d45bc1117cad87948e25d718da497e656ae2360864a3cb526d201 SHA512 
cc1621f950bd565ba9281aabe5b6294a9581c3d2644d8c19162f19594bb24c3a250fd42f29e5ebae5fd344b30431b34d47c1119ac5816954515536a3cfa9e7c3
 WHIRLPOOL 
d32a72ceaaf685c9139067c5bf20ae61b55c14706c9585c1a89c8d92eba9bcf3d5c6ac701cf2c45f72cef2613a9e3f09720f6d47f9ebc2a669b4c89aca62701d
+DIST makemkv-oss-1.9.8.tar.gz 4419358 SHA256 
15c6dde52430086ff9749750952ca0d2e0002017be2f8c30f9961ca4997ab065 SHA512 
a797bba9774ab0fd2e36a2628e832acfa20cd1f00c82962662a01e8fcf97de80346a00d14aa977223ca1b53be1dc3c388ed5ec72178eceae255a6e852d69c5a8
 WHIRLPOOL 
a7945d0067496fc976262029085f1304e182f37d0c315e911a54fad8ff1f39beaffe8fcbd05dd885e0149f72f766899d8171f602c24a6791244047cac57c3e3b

diff --git a/media-video/makemkv/makemkv-1.9.7.ebuild 
b/media-video/makemkv/makemkv-1.9.8.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.9.7.ebuild
rename to media-video/makemkv/makemkv-1.9.8.ebuild



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

2015-10-04 Thread James Le Cuirot
commit: 766b3d3b666805071af008c4fffec761de484a9c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct  4 18:49:50 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct  4 18:51:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766b3d3b

media-video/makemkv: Another version bump!

Package-Manager: portage-2.2.20.1

 media-video/makemkv/Manifest   | 4 ++--
 media-video/makemkv/{makemkv-1.9.6.ebuild => makemkv-1.9.7.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 05be3d8..79cf750 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.6.tar.gz 5290948 SHA256 
da0eb23d19cc6248ef61535f3e4784ee57c113d68bfbb6e9c29dc713c2c60c0d SHA512 
045205770410cdceb21035030a89502645e5e25b50ca2162250608d4a4d042477f968bf257b6313d0bd67234c48970027cae432943866cb78d53e11b39522ea3
 WHIRLPOOL 
b048b3f4dcd4a729d7306a4d7f2d8448edb86f17226aab1217289d1581836fb0877eb100ce01c8645f07306d6f78a8a48d788960af0bdb9f2b08f3fb6cf60c97
-DIST makemkv-oss-1.9.6.tar.gz 4405665 SHA256 
eddcd73db7b26f8fef0fcfa0cae588a8cfc9fd404fd15caeb33acc79cad6ae2a SHA512 
141d7ba7608d17e0fa2d60be96dc6674641ec223c8d0ad0cdc438a4d979e8f84cb5ffc5abaf1d5b93accde30428b5080fcf9c2db046a8114854e347760f15164
 WHIRLPOOL 
171ea471eb90bb67846ca3356e97172f76b8fbd53969d719968740fbb3a83d0a70eb0fa5bf6973650bd6b4db3d8416ff08d8879ed2d56275030378265ab91139
+DIST makemkv-bin-1.9.7.tar.gz 5305589 SHA256 
de6d0fd802c13fbaac4a3d0720e3de15f81b006fde0042a2df42d784b46b33ac SHA512 
8d50673c5291381f5800c0e93341e6a01a4e40d9ac0b47ac1f48bbdfb883ed8e82e9fb9c50e48a667b45aa9903a88e4f680b7b7afe7d6913c5db0cc86030c133
 WHIRLPOOL 
346f4a64e4ec594deec592f9cf7b24d83357a1ec523ed49e9370c68a82728f8431cbf5b54c0a3b9789b14ce18327ddd9194dd745a27c653db4938b70b1d6
+DIST makemkv-oss-1.9.7.tar.gz 4405814 SHA256 
69fd254a2eb63e90f616051fde6cd7188c3ee454033bdf288c63843876a02e99 SHA512 
842aecac301889116f24afa99f35bfe8acacc15a4544c6801742461c65f7f24e7bb2b75725cc22a64c2b6b3d6458eb991a6fa6b68ec61d2b559fd96a55472333
 WHIRLPOOL 
9856be4771628cee0ac2ceca8067926397f48d96ce5f3c250edaa7be4c3a149e8f00a1b9c51c9b1e905966ffbdae1c8544a07b38662767a6f1556f2c18fe1b74

diff --git a/media-video/makemkv/makemkv-1.9.6.ebuild 
b/media-video/makemkv/makemkv-1.9.7.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.9.6.ebuild
rename to media-video/makemkv/makemkv-1.9.7.ebuild



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

2015-09-26 Thread James Le Cuirot
commit: e65d755e3a2d4f2d054d742f0dece8da07b4325f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 26 18:05:02 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 26 18:05:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65d755e

media-video/makemkv: Version bump

Package-Manager: portage-2.2.20.1

 media-video/makemkv/Manifest   | 4 ++--
 media-video/makemkv/{makemkv-1.9.5.ebuild => makemkv-1.9.6.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 996262e..05be3d8 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.5.tar.gz 5257139 SHA256 
57468cc5d34fc442f2d4a7888e1baa2ec7f006027dc5ba3322472724636ef3e3 SHA512 
6d193fedcb1c28a2a5b091db16f190b7615c41ba3c03b3824141910581f82387af95ebd76afb7b0b81dde9d6f345a28305a4c69bce78972e881aee1c16f8
 WHIRLPOOL 
517c458ec158481462c16326b0655ff8095a31b03cce8235aa26a0ea57cdd5af2c8e5c8780ada7d6242ea692367c6e8c0fdd385e8d99c74c1d2e10a16901e34b
-DIST makemkv-oss-1.9.5.tar.gz 4405616 SHA256 
cfd1729a40063dde2a52d3100091d2a0002aa616f87597108fa8d11c3ab5b5c6 SHA512 
f7865fb8cba9fb0a6e595f427bf3c19054d5e2d45495a9b9c8cedbfa807211968f797f02661d143549877f7543f0991ca080a05f6ade36d9b6212fffa2675b5e
 WHIRLPOOL 
9df57929bb350db7a97ce36f7cb86476d4c5ec7b534fd1e59d9a23f48ebce993d8c00df68cdc8259f5b951af6a2241173fbbf2a504073c3e3d009bf73c028a09
+DIST makemkv-bin-1.9.6.tar.gz 5290948 SHA256 
da0eb23d19cc6248ef61535f3e4784ee57c113d68bfbb6e9c29dc713c2c60c0d SHA512 
045205770410cdceb21035030a89502645e5e25b50ca2162250608d4a4d042477f968bf257b6313d0bd67234c48970027cae432943866cb78d53e11b39522ea3
 WHIRLPOOL 
b048b3f4dcd4a729d7306a4d7f2d8448edb86f17226aab1217289d1581836fb0877eb100ce01c8645f07306d6f78a8a48d788960af0bdb9f2b08f3fb6cf60c97
+DIST makemkv-oss-1.9.6.tar.gz 4405665 SHA256 
eddcd73db7b26f8fef0fcfa0cae588a8cfc9fd404fd15caeb33acc79cad6ae2a SHA512 
141d7ba7608d17e0fa2d60be96dc6674641ec223c8d0ad0cdc438a4d979e8f84cb5ffc5abaf1d5b93accde30428b5080fcf9c2db046a8114854e347760f15164
 WHIRLPOOL 
171ea471eb90bb67846ca3356e97172f76b8fbd53969d719968740fbb3a83d0a70eb0fa5bf6973650bd6b4db3d8416ff08d8879ed2d56275030378265ab91139

diff --git a/media-video/makemkv/makemkv-1.9.5.ebuild 
b/media-video/makemkv/makemkv-1.9.6.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.9.5.ebuild
rename to media-video/makemkv/makemkv-1.9.6.ebuild