gentoo resync : 29.10.2017

3 files changed, 0 insertions, 169 deletions

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 48703f4a80c2..2836008ce38c 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,9 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 SHA256 2ce7cd2717ef971ad5d16d442a41ebd3380a9289d160be01995ca095ce03da79 SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710 WHIRLPOOL 9a39bfcc38d500fc30dbcfc2110e14ac1f781a78f6e75662d66f0262a0e5e1021709350da3c83cfc1faaaba5f9035d4163169935492558885a2eddc961a156f3
-AUX avidemux-plugins-2.6.4-optional-pulse.patch 787 SHA256 c95b6e56c51aa41894aa963c8568289968d07b8d685a3d7ed0d5ed74ade9a453 SHA512 783963cfb21e0e6510b80a56ffd2eb93dd94c79ab9f81ec91d82753734c7fc545c14d61f19abcc6ee935b05791182e83b5ad2db84d5286d220f7bfa013413dd6 WHIRLPOOL 0f91cd59f61d9695d1fedcb3efb6cd69520ecedc982cb2b74167c452db36174c8b24290191f35cd319caa5e2b4a360252ad1b11ec794266a572e6eafd9d72501
 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-plugins-2.6.20.ebuild 4706 SHA256 70eeed1eabbff20311e11ffe1407d6da05cf4a8637464def34006d5565b8a57d SHA512 475ecaf3baff8af51786330f641d3d05a6f293e7c026a5dd003e0ace5c3eca6395b9136179f837f3bba7b36f532e530d83c26c0fae1df60e31d8f81a2cbcf097 WHIRLPOOL c7ab0a17b15c082826a21c9322b0baa3fa9f9d42d8d5b80e0a7777b1627abdad3c45474ae1b04669b0beaebf647f3775db0de56a8bd2f898756c8dfda2a20b11
-EBUILD avidemux-plugins-2.6.8.ebuild 4071 SHA256 8a3178bfc25aabb41e389ff9c0d52e09b7767a1bd521db0303f325e67dbe208a SHA512 7ee9144a8109c0e35a77d868891a46d18be67cfd56077a964947929a6b81a1cf04d166fc164ced26b9e56cfa9bbfe73283b7a1db2f8636f39f40b3a665a3b6da WHIRLPOOL 6f6ba24829ac13ff0e2f530967b948f620edf8608b34aed1419b461de74f3866ecc1f4d7a202a22ab9a39f8845a25a97d54e47a6ef18f449dd165a6bd94dbc0e
 EBUILD avidemux-plugins-9999.ebuild 4706 SHA256 70eeed1eabbff20311e11ffe1407d6da05cf4a8637464def34006d5565b8a57d SHA512 475ecaf3baff8af51786330f641d3d05a6f293e7c026a5dd003e0ace5c3eca6395b9136179f837f3bba7b36f532e530d83c26c0fae1df60e31d8f81a2cbcf097 WHIRLPOOL c7ab0a17b15c082826a21c9322b0baa3fa9f9d42d8d5b80e0a7777b1627abdad3c45474ae1b04669b0beaebf647f3775db0de56a8bd2f898756c8dfda2a20b11
 MISC ChangeLog 3761 SHA256 68ccdf9757ff5e0f74c592bca09d851073735b24d09f60752b30c1bf58c41d4f SHA512 8f94b86d56d47099f7c7d0249c4adf9d007623a88ef085f82b02aa30a99ab27d37c069658724e31b46f8d226ee678b28c69bd1a782be2059423fa1bfb0c3d2af WHIRLPOOL 2e6fd95c315af987d08b4930aab1524fc67ed59743fb8ce802ff869aa78b455d5ea2c8ae3a337d4c7244dbaa3def2ebdec1adff8c572fd5834c48411f91b862f
 MISC ChangeLog-2015 6171 SHA256 c84b0e215cc8bbe441059a4dd3d6b8dfbdafaff5eb413147c6bae05c55ecee65 SHA512 233280790085ff124bd1558ce7ee8a92dd8d17a4e7dded89ad6cec3ea19d037fd12ad45e6bed2f0e6a2d30c1151e6122457e4086ff1bc37f3fd14b8c09b40097 WHIRLPOOL a059eaff3177d67d3bf51ec156f9d579af208d4b88a95b2a5236188a2b4a2424dd734b383a3aa196161b855472aaa33b381d0ad28aa959af8b65173fbbe68c8a
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
deleted file mode 100644
index 215b8e16ef21..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-plugins/}"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
-
-	inherit git-2
-else
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-RDEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
-	>=dev-lang/spidermonkey-1.5-r2:0=
-	dev-libs/libxml2:2
-	media-libs/libpng:0=
-	virtual/libiconv:0
-	aac? (
-		media-libs/faac:0
-		media-libs/faad2:0
-	)
-	aften? ( media-libs/aften:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
-	amr? ( media-libs/opencore-amr:0 )
-	dts? ( media-libs/libdca:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi:0 )
-	jack? (
-		media-sound/jack-audio-connection-kit:0
-		libsamplerate? ( media-libs/libsamplerate:0 )
-	)
-	lame? ( media-sound/lame:0 )
-	pulseaudio? ( media-sound/pulseaudio:0 )
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame:0 )
-	x264? ( media-libs/x264:0= )
-	xv? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXv:0
-	)
-	xvid? ( media-libs/xvid:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0 )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers:0 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
-
-src_configure() {
-	# 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
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		local build="${process%%:*}"
-
-		local mycmakeargs="
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			$(cmake-utils_use aac FAAC)
-			$(cmake-utils_use aac FAAD)
-			$(cmake-utils_use alsa)
-			$(cmake-utils_use aften)
-			$(cmake-utils_use amr OPENCORE_AMRWB)
-			$(cmake-utils_use amr OPENCORE_AMRNB)
-			$(cmake-utils_use dts LIBDCA)
-			$(cmake-utils_use fontconfig)
-			$(cmake-utils_use jack)
-			$(cmake-utils_use lame)
-			$(cmake-utils_use oss)
-			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-			$(cmake-utils_use qt4)
-			$(cmake-utils_use truetype FREETYPE2)
-			$(cmake-utils_use twolame)
-			$(cmake-utils_use x264)
-			$(cmake-utils_use xv XVIDEO)
-			$(cmake-utils_use xvid)
-			$(cmake-utils_use vdpau)
-			$(cmake-utils_use vorbis)
-			$(cmake-utils_use vorbis LIBVORBIS)
-			$(cmake-utils_use vpx VPXDEC)
-		"
-
-		if use debug ; then
-			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
-		fi
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		# cmake-utils_src_install doesn't respect BUILD_DIR
-		# and there sometimes is a preinstall phase present.
-		pushd "${S}/${process%%:*}" > /dev/null || die
-			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
-			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
-		popd > /dev/null || die
-	done
-
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
deleted file mode 100644
index 78650aaa7c02..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake


-+++ b/cmake/admCheckAudioDeviceLibs.cmake


-@@ -158,6 +158,8 @@


- 


- 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")


- 	MESSAGE(STATUS "*****************************")


-+


-+	IF (PULSEAUDIOSIMPLE)


-         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)


-         # in cache already


-          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)


-@@ -198,6 +200,9 @@


-         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)


- 


- 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")


-+	ELSE (PULSEAUDIOSIMPLE)


-+		MESSAGE("${MSG_DISABLE_OPTION}")


-+	ENDIF (PULSEAUDIOSIMPLE)


- ELSE (UNIX AND NOT APPLE)


- 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)


- ENDIF (UNIX AND NOT APPLE)