gentoo resync : 29.10.2017

2 files changed, 0 insertions, 130 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index bc21321d7a90..6cf0cd4bf55b 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1,5 @@
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-2.6.20.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
-EBUILD avidemux-2.6.8.ebuild 3756 SHA256 172e966eb9bbd8c601fd9e9955bb1734661c50ce4b691983bf6650a0f8b75e9b SHA512 81fe43ed4d4e4263587310b5a14eaf355dddee13d145e6417b9cbd528e2bff230dc16e63b39004977be61ca8ee3507cfb4b438f88e9778f0087da08b74b0bf0a WHIRLPOOL 53e6427ad1939f300c90c1268e528ee6faa14208cb8e0250ccb929b40c398c2bd6da8588b793a5a3c9b92d69cb877847b9ef7e3d5e8d86da2403d22cf389bccc
 EBUILD avidemux-9999.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
 MISC ChangeLog 3639 SHA256 3a79a443e426c7880449f1b2cb9a46029fad0e5f38d292e0eb95a9fba14cfbf7 SHA512 10d5194ff3371f4d98eaf444c00958f3b597732b8d8f7f08156ff4fd629a7223637e96feb76af5f5f447be6a354e056a25c91cae10c3d17efd23be7a7c948c6a WHIRLPOOL 97abe8eaf9b159d491e2a07a52f0b0024e064eddfadf25eaec3d19e1379f8c535a61479c06ef07feb8cceba884b92e3a9302c7efb67460255bb5398ff2d2d0b9
 MISC ChangeLog-2015 43501 SHA256 bf5c8b539d6e30ac299b9383b3c3dda2ce8a5bb087860335f6b970b174da3957 SHA512 e85c2de4babc72668e180da6e580876ae2c6cef1cc0826b96546e9838e071949c167507ab02ee943d97d7e4ab77b90116e615fdcecfc10dc1326d4f7ceed6652 WHIRLPOOL b070add4eed7e98da1dfea88a5f534b50944c7ebdef40bdc4e8e38eeb860509d57f95a04f58429a163375f0c3d9084e73b28e13cf5267b7d40159c5d5a0b9754
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
deleted file mode 100644
index d31c66fd8977..000000000000
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
-
-	inherit git-2
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${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.5 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Fix QA warnings that complain a trailing ; is missing 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.5.
-	mv ${PN}2.desktop ${PN}-2.6.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."
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use vaapi LIBVA)
-		$(cmake-utils_use vdpau)
-		$(cmake-utils_use video_cards_fglrx XVBA)
-		$(cmake-utils_use xv XVIDEO)
-	"
-
-	if use debug ; then
-		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
-	fi
-
-	processes="buildCli:avidemux/cli"
-	use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-	for process in ${processes} ; do
-		local build="${process%%:*}"
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-		cd "${S}"/${build} || die "Can't enter build folder."
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
-	done
-
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
-	done
-}
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
-	done
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-2.6.png
-
-	if use qt4 ; then
-		fperms +x /usr/bin/avidemux3_qt4
-		domenu ${PN}-2.6.desktop
-	fi
-}