app-shells/schily-tools media-video/avidemux: Version bump

Signed-off-by: Martin Väth <mvath@google.com>

9 files changed, 14 insertions, 49 deletions

diff --git a/app-shells/schily-tools/Manifest b/app-shells/schily-tools/Manifest
index 745c4d7e..e86b733d 100644
--- a/app-shells/schily-tools/Manifest
+++ b/app-shells/schily-tools/Manifest
@@ -1 +1 @@
-DIST schily-2019-01-22.tar.bz2 4273776 SHA512 27352f73ec72c4b298f9d3f00a3d525631ea3e39be9f0c539895dbb53af764cc0feee20d3f3625d4400afa0f09ec5e0721d6e0560292278d3e1f9b654c449130
+DIST schily-2019-02-18.tar.bz2 4275260 SHA512 c5b86c52e5c7fcef90123b39e5d75233e194d13523b278038dcd5733b68ef01e785e93c662a1ce3ceedd0f9f357aaba49f355c45d4947686190fffb6b8535bc1
diff --git a/app-shells/schily-tools/schily-tools-2019.01.22.ebuild b/app-shells/schily-tools/schily-tools-2019.02.18.ebuild
index abbd2695..abbd2695 100644
--- a/app-shells/schily-tools/schily-tools-2019.01.22.ebuild
+++ b/app-shells/schily-tools/schily-tools-2019.02.18.ebuild
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 39dec42b..60929277 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1 @@
-DIST avidemux_2.7.1.tar.gz 22263775 SHA512 85a690a36cad827f176818d6f566d897b4e46b2a272c8fb18bd64672d92f106d2706ac214b3e3ac3a836c5c98f81f7d5feca1229c3f3f2152ab715a3565008be
+DIST avidemux_2.7.2.tar.gz 23903618 SHA512 40d023a1dadfadd9dc8ecfd3368f0e1ad27edd45fe33f7cf8245ab2c7b6038e12c2c05b975b515fc4686e7b8043e75016a5b617a827f8d23a5e40b870c718d1b
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.2.ebuild
index a10e3d6e..d7d581de 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
+# EAPI=7 causes cmake-utils to apply broken patches
 EAPI=6
+RESTRICT="mirror"
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 39dec42b..60929277 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1 @@
-DIST avidemux_2.7.1.tar.gz 22263775 SHA512 85a690a36cad827f176818d6f566d897b4e46b2a272c8fb18bd64672d92f106d2706ac214b3e3ac3a836c5c98f81f7d5feca1229c3f3f2152ab715a3565008be
+DIST avidemux_2.7.2.tar.gz 23903618 SHA512 40d023a1dadfadd9dc8ecfd3368f0e1ad27edd45fe33f7cf8245ab2c7b6038e12c2c05b975b515fc4686e7b8043e75016a5b617a827f8d23a5e40b870c718d1b
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.1-r2.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.2.ebuild
index bbbb4c38..41063cf4 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.1-r2.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
+# EAPI=7 causes cmake-utils to apply broken patches
 EAPI=6
+RESTRICT="mirror"
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 39dec42b..60929277 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1 +1 @@
-DIST avidemux_2.7.1.tar.gz 22263775 SHA512 85a690a36cad827f176818d6f566d897b4e46b2a272c8fb18bd64672d92f106d2706ac214b3e3ac3a836c5c98f81f7d5feca1229c3f3f2152ab715a3565008be
+DIST avidemux_2.7.2.tar.gz 23903618 SHA512 40d023a1dadfadd9dc8ecfd3368f0e1ad27edd45fe33f7cf8245ab2c7b6038e12c2c05b975b515fc4686e7b8043e75016a5b617a827f8d23a5e40b870c718d1b
diff --git a/media-video/avidemux/avidemux-2.7.1-r1.ebuild b/media-video/avidemux/avidemux-2.7.2.ebuild
index 6b39448e..5dc1faa3 100644
--- a/media-video/avidemux/avidemux-2.7.1-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+RESTRICT="mirror"
 
 if [[ ${PV} == *9999* ]] ; then
 	MY_P="${P}"
@@ -56,35 +57,6 @@ src_prepare() {
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
 	done
-
-	# Fix icon name -> avidemux-2.7.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${PN}2.desktop || \
-		die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.7 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \
-		die "Desktop file fix failed."
-	if use qt5; then
-		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
-			die "Desktop file fix failed."
-	fi
-
-	# QA warnings: missing trailing ';' and 'Application' is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \
-		die "Desktop file fix failed."
-
-	# Now rename the desktop file to not collide with 2.6.
-	mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
-
-	# Remove "Build Option" dialog because it doesn't reflect
-	# what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
-		die "Couldn't remove \"Build Option\" dialog."
-
-	# Fix underlinking with gold
-	sed -i -e 's/{QT_QTGUI_LIBRARY}/{QT_QTGUI_LIBRARY} -lXext/' \
-		avidemux/common/ADM_render/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -96,10 +68,6 @@ src_configure() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
-	# The build relies on an avidemux-core header that uses 'nullptr'
-	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
-	append-cxxflags -std=c++14
-
 	local mycmakeargs=(
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
@@ -153,9 +121,6 @@ src_install() {
 		fperms +x /usr/bin/avidemux3_jobs
 	fi
 
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-${SLOT}.png
-
 	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_qt5
 	fi
@@ -163,10 +128,6 @@ src_install() {
 	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
 		fperms +x /usr/bin/avidemux3_jobs_qt5
 	fi
-
-	if use qt5 ; then
-		domenu ${PN}-${SLOT}.desktop
-	fi
 }
 
 pkg_postinst() {
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index db113b7e..aec2988f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -39,7 +39,7 @@ app-shells/oh-my-zsh 99999999: A ready-to-use zsh configuration with plugins
 app-shells/push 3.1-r2: A POSIX shell function to treat a variable like an array, quoting args
 app-shells/quoter 4.1-r1: Quote arguments or standard input for usage in POSIX shell by eval
 app-shells/runtitle 2.10: Scripts to run commands and set the hard status line (windows title)
-app-shells/schily-tools 2019.01.22: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
+app-shells/schily-tools 2019.02.18: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
 app-shells/set_prompt 3.1: An intelligent prompt for zsh or bash with status line (window title) support
 app-shells/termcolors-mv 4.7-r1: 256colors sample script and dircolors configuration for standard or 256 colors
 app-shells/zsh-autosuggestions 0.5.0 0.5.1_alpha20181123 99999999: Fish-like autosuggestions for zsh
@@ -75,12 +75,12 @@ games-rpg/m5figur-mv 4.1.4: LaTeX2e character sheet layout for the Midgard Role
 mail-client/alpine 2.00-r7 2.21.1-r1: alpine is an easy to use text-based based mail and news client
 media-gfx/ipe 7.2.7: Drawing editor for creating figures in PDF or PS formats
 media-gfx/pqiv 2.11: powerful GTK based command-line image viewer with a minimal UI
-media-libs/avidemux-core 2.7.1: Core libraries for simple video cutting, filtering and encoding tasks
-media-libs/avidemux-plugins 2.7.1-r2: Plugins for the video editor media-video/avidemux
+media-libs/avidemux-core 2.7.2: Core libraries for simple video cutting, filtering and encoding tasks
+media-libs/avidemux-plugins 2.7.2: Plugins for the video editor media-video/avidemux
 media-tv/nvtv 0.4.7-r3: TV-Out for NVidia cards
 media-tv/sundtek-tv 181220.135032: Sundtek MediaTV Pro III Drivers
 media-tv/w_scan 20170107-r1: Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies
-media-video/avidemux 2.7.1-r1: Video editor designed for simple cutting, filtering and encoding tasks
+media-video/avidemux 2.7.2: Video editor designed for simple cutting, filtering and encoding tasks
 media-video/avinfo 1.0_alpha15_p1: Utility for displaying AVI information
 media-video/video-mv 16.2: Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder
 net-dialup/accounting 1.60.45.3.1-r1: Give statistics about dialup connections. Originally part of SuSE's smpppd