[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6aa27f33d47ecb9cdbcbe78b1122143ea505d3b8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 22:56:03 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 09:34:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa27f33

media-libs/avidemux-plugins: Drop 2.6.8

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-libs/avidemux-plugins/Manifest               |   1 -
 .../avidemux-plugins/avidemux-plugins-2.6.8.ebuild | 145 ---------------------
 .../avidemux-plugins-2.6.4-optional-pulse.patch    |  21 ---
 3 files changed, 167 deletions(-)

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 6f017f59f92..4bf6be8c5b5 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,2 +1 @@
 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

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 215b8e16ef2..00000000000
--- 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 78650aaa7c0..00000000000
--- 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)