gentoo resync : 04.05.2019

3 files changed, 2 insertions, 119 deletions

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 8b09d7b962b2..b2251de5bdae 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,6 +2,5 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe
 AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
-EBUILD mjpegtools-2.1.0-r3.ebuild 2873 BLAKE2B a40d80911829ee07b60582fb4c964469d522d123d41f16644fc43f3da5e231c60bcf767291663b66a36c6dd600e07e4fd61f17d842673749d9d0c2d4b9471398 SHA512 bc1c60e424c841aaad9538a3bdb038341e560cf98ae2b4f93443c4e2e9cdc8b9325efda3980b34495279f3a0cbb9af1db863422ffdd0d496d9ffafce42d2dd36
-EBUILD mjpegtools-2.1.0-r4.ebuild 2888 BLAKE2B d6af8d9d61375ce5b5b7b726002c7cc8abb2ceca5dade17073808628df7549b39ffb808b3b26019794564558820ed72b22a6de41d121e47ac60ddb5c0ccf9766 SHA512 237eba0f0e42632199a95a46d9dac0c9aad6295b653a96ce1c81ed002074af38776faef3c6d5b68981bd8eb102921db6ab6dabb31788676850debdc6d7f50eba
+EBUILD mjpegtools-2.1.0-r4.ebuild 2887 BLAKE2B 5766a4400f6142bcf2d35ac7e641ed465bdefaf4aaeae47e6f82948083601fd95aad889657fd44b7934e24208981810466189f552a1b7b3ad3bf58957d1e5447 SHA512 5e58b44d51e5148f18686786646bb71f4bbf43c41ca103691152f63914666fca434471b9942de9e785543d4b3280385b3554a9ad7c6067073a7b1aec7b5caca9
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
deleted file mode 100644
index 9b92deb1bff7..000000000000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-RDEPEND="
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0= )
-	quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		sdlgfx? ( media-libs/sdl-gfx )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	virtual/awk
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pic.patch
-	# https://sourceforge.net/p/mjpeg/bugs/139/
-	"${FILESDIR}"/${P}-sdl-cflags.patch
-	"${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-	local myconf=(
-		--enable-compile-warnings
-		$(use_enable cpu_flags_x86_mmx simd-accel)
-		$(use_enable static-libs static)
-		--enable-largefile
-
-		$(use_with quicktime libquicktime)
-		$(use_with dv libdv)
-		$(use_with sdl libsdl)
-		--without-v4l
-		$(use_with sdl x)
-
-		# used by tools only
-		$(multilib_native_use_with gtk)
-		$(multilib_native_use_with png libpng)
-		$(multilib_native_use_with sdlgfx)
-
-		# used only in V4LCONF_LIBS that is not used anywhere...
-		--without-dga
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# avoid building programs
-		emake bin_PROGRAMS=
-	fi
-}
-
-multilib_src_test() {
-	# there are no tests at the moment, so it would just build
-	# all programs in non-native ABIs...
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install \
-			bin_PROGRAMS=
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "mjpegtools installs user contributed scripts which require additional"
-		elog "dependencies not pulled in by the installation."
-		elog "These have to be installed manually."
-		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
-		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
-	fi
-}
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 0b1c14cf658e..9d93eeb9c645 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"