commit:     8bede8f34e19c76fbfdc0e56558d9f706cffb36b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 19:43:30 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  5 19:48:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bede8f3

media-video/avidemux, media-libs/avidemux*: remove old versions

 media-libs/avidemux-core/Manifest                  |   5 -
 .../avidemux-core/avidemux-core-2.6.2-r1.ebuild    | 117 --------------
 .../avidemux-core/avidemux-core-2.6.3.ebuild       | 100 ------------
 .../avidemux-core/avidemux-core-2.6.4.ebuild       |  99 ------------
 .../avidemux-core/avidemux-core-2.6.5.ebuild       | 111 -------------
 .../avidemux-core/avidemux-core-2.6.7.ebuild       | 111 -------------
 media-libs/avidemux-plugins/Manifest               |   5 -
 .../avidemux-plugins-2.6.2-r2.ebuild               |  93 -----------
 .../avidemux-plugins/avidemux-plugins-2.6.3.ebuild | 126 ---------------
 .../avidemux-plugins-2.6.4-r1.ebuild               | 141 -----------------
 .../avidemux-plugins/avidemux-plugins-2.6.4.ebuild | 126 ---------------
 .../avidemux-plugins-2.6.5-r1.ebuild               | 143 -----------------
 .../avidemux-plugins/avidemux-plugins-2.6.5.ebuild | 143 -----------------
 .../avidemux-plugins/avidemux-plugins-2.6.7.ebuild | 145 -----------------
 media-video/avidemux/Manifest                      |   6 -
 media-video/avidemux/avidemux-2.5.6-r2.ebuild      | 172 ---------------------
 media-video/avidemux/avidemux-2.6.2-r1.ebuild      | 122 ---------------
 media-video/avidemux/avidemux-2.6.3.ebuild         | 118 --------------
 media-video/avidemux/avidemux-2.6.4.ebuild         | 118 --------------
 media-video/avidemux/avidemux-2.6.5-r1.ebuild      | 134 ----------------
 media-video/avidemux/avidemux-2.6.5.ebuild         | 129 ----------------
 media-video/avidemux/avidemux-2.6.7.ebuild         | 129 ----------------
 .../files/avidemux-2.5.4-build-plugins-fix.patch   |  13 --
 .../avidemux-2.5.6-ffmpeg-symbol-visibility.patch  |  20 ---
 24 files changed, 2426 deletions(-)

diff --git a/media-libs/avidemux-core/Manifest 
b/media-libs/avidemux-core/Manifest
index 2938f20..418a752 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1 @@
-DIST avidemux_2.6.2.tar.gz 17009420 SHA256 
67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 
1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3
 WHIRLPOOL 
0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
-DIST avidemux_2.6.3.tar.gz 17025710 SHA256 
78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 
a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc
 WHIRLPOOL 
899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
-DIST avidemux_2.6.4.tar.gz 17109929 SHA256 
2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 
1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9
 WHIRLPOOL 
a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
-DIST avidemux_2.6.5.tar.gz 17322253 SHA256 
428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 
e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80
 WHIRLPOOL 
192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
-DIST avidemux_2.6.7.tar.gz 17337193 SHA256 
d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 
deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c
 WHIRLPOOL 
a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 
02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 
57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0
 WHIRLPOOL 
29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
deleted file mode 100644
index 789884b..0000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-core/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate 
cpu_flags_x86_mmx oss nls sdl -system-ffmpeg vorbis truetype xvid x264 xv"
-
-RDEPEND="
-       !<media-video/avidemux-2.6.2-r1:${SLOT}
-       >=dev-lang/spidermonkey-1.5-r2:0
-       dev-libs/libxml2
-       media-libs/libpng
-       virtual/libiconv
-       aften? ( media-libs/aften )
-       alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-       amr? ( media-libs/opencore-amr )
-       dts? ( media-libs/libdca )
-       fontconfig? ( media-libs/fontconfig )
-       jack? (
-               media-sound/jack-audio-connection-kit
-               libsamplerate? ( media-libs/libsamplerate )
-       )
-       lame? ( media-sound/lame )
-       sdl? ( media-libs/libsdl )
-       system-ffmpeg? ( 
>=media-video/ffmpeg-1.0:0[aac,cpudetection,mp3,theora] )
-       truetype? ( >=media-libs/freetype-2.1.5 )
-       x264? ( media-libs/x264:= )
-       xv? ( x11-libs/libXv )
-       xvid? ( media-libs/xvid )
-       vorbis? ( media-libs/libvorbis )
-"
-DEPEND="
-       $RDEPEND
-       oss? ( virtual/os-headers )
-       nls? ( sys-devel/gettext )
-       virtual/pkgconfig
-"
-RDEPEND="
-       nls? ( virtual/libintl:0 )
-       $RDEPEND
-"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       # Preparations to support the system ffmpeg.
-       if use system-ffmpeg ; then
-               rm -rf cmake/admFFmpeg* cmake/ffmpeg* 
avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
-
-               sed -i -e 's/include(admFFmpegUtil)//g' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e '/registerFFmpeg/d' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e 's/include(admFFmpegBuild)//g' 
avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
-       fi
-
-       # Avoid existing avidemux installations from making the build process 
fail, bug #461496.
-       sed -i -e 
"s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g"
 cmake/admFFmpegUtil.cmake || die "Failed to avoid existing avidemux 
installation from making the build fail."
-}
-
-src_configure() {
-       local x mycmakeargs
-
-       mycmakeargs="
-               $(for x in ${IUSE}; do cmake-utils_use ${x/#-/}; done)
-               $(cmake-utils_use amr OPENCORE_AMRWB)
-               $(cmake-utils_use amr OPENCORE_AMRNB)
-               $(cmake-utils_use dts LIBDCA)
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       mkdir "${S}"/buildCore || die "Can't creante build folder."
-       cd "${S}"/buildCore || die "Can't enter build folder."
-
-       cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-               -DCMAKE_INSTALL_PREFIX="/usr" \
-               ${mycmakeargs} -G "Unix Makefiles" 
../"avidemux_core${POSTFIX}/" || die "cmake failed."
-}
-
-src_compile() {
-       # 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
-
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake DESTDIR="${ED}" -j1 install
-
-       dodoc "${S}"/{AUTHORS,README}
-}

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
deleted file mode 100644
index a630a9f..0000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-core/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls sdl system-ffmpeg vdpau xv"
-
-DEPEND="
-       !<media-video/avidemux-${PV}:${SLOT}
-       dev-db/sqlite
-       sdl? ( media-libs/libsdl )
-       system-ffmpeg? ( 
>=media-video/ffmpeg-1.0:0[aac,cpudetection,mp3,theora] )
-       xv? ( x11-libs/libXv )
-       vdpau? ( x11-libs/libvdpau )
-"
-RDEPEND="
-       nls? ( virtual/libintl:0 )
-       $DEPEND
-"
-DEPEND="
-       $DEPEND
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       if use system-ffmpeg ; then
-               # Preparations to support the system ffmpeg. Currently fails 
because it depends on files the system ffmpeg doesn't install.
-               rm -rf cmake/admFFmpeg* cmake/ffmpeg* 
avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
-
-               sed -i -e 's/include(admFFmpegUtil)//g' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e '/registerFFmpeg/d' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e 's/include(admFFmpegBuild)//g' 
avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
-       else
-               # Avoid existing avidemux installations from making the build 
process fail, bug #461496.
-               sed -i -e 
"s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g"
 cmake/admFFmpegUtil.cmake || die "Failed to avoid existing avidemux 
installation from making the build fail."
-       fi
-
-}
-
-src_configure() {
-       local x mycmakeargs
-
-       mycmakeargs="
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vdpau VDPAU)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       mkdir "${S}"/buildCore || die "Can't create build folder."
-       cd "${S}"/buildCore || die "Can't enter build folder."
-
-       cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-               -DCMAKE_INSTALL_PREFIX="/usr" \
-               ${mycmakeargs} -G "Unix Makefiles" 
../"avidemux_core${POSTFIX}/" || die "cmake failed."
-}
-
-src_compile() {
-       # 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
-
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake DESTDIR="${ED}" -j1 install
-
-       dodoc "${S}"/{AUTHORS,README}
-}

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
deleted file mode 100644
index 5afad85..0000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-core/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls sdl system-ffmpeg vdpau xv"
-
-DEPEND="
-       !<media-video/avidemux-${PV}:${SLOT}
-       dev-db/sqlite
-       sdl? ( media-libs/libsdl )
-       system-ffmpeg? ( 
>=media-video/ffmpeg-1.0:0[aac,cpudetection,mp3,theora] )
-       xv? ( x11-libs/libXv )
-       vdpau? ( x11-libs/libvdpau )
-"
-RDEPEND="
-       nls? ( virtual/libintl:0 )
-       $DEPEND
-"
-DEPEND="
-       $DEPEND
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       default
-
-       if use system-ffmpeg ; then
-               # Preparations to support the system ffmpeg. Currently fails 
because it depends on files the system ffmpeg doesn't install.
-               rm -rf cmake/admFFmpeg* cmake/ffmpeg* 
avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
-
-               sed -i -e 's/include(admFFmpegUtil)//g' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e '/registerFFmpeg/d' 
avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-               sed -i -e 's/include(admFFmpegBuild)//g' 
avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
-       else
-               # Avoid existing avidemux installations from making the build 
process fail, bug #461496.
-               sed -i -e 
"s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g"
 cmake/admFFmpegUtil.cmake || die "Failed to avoid existing avidemux 
installation from making the build fail."
-       fi
-}
-
-src_configure() {
-       local mycmakeargs="
-               -DAVIDEMUX_SOURCE_DIR='${S}'
-               -DCMAKE_INSTALL_PREFIX='/usr'
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vdpau VDPAU)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       if use debug ; then
-               mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-       fi
-
-       local build="${S}"/buildCore
-       mkdir ${build} || die "Can't create build folder."
-       cd ${build} || die "Can't enter build folder."
-       CMAKE_USE_DIR="${S}"/avidemux_core BUILD_DIR=${build} 
cmake-utils_src_configure
-}
-
-src_compile() {
-       # 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
-
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-       # TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
-       cd "${S}"/buildCore || die "Can't enter build folder."
-       emake DESTDIR="${ED}" -j1 install
-
-       dodoc "${S}"/{AUTHORS,README}
-}

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
deleted file mode 100644
index 43228d5..0000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, 
filtering and encoding tasks"
-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="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-core/}"
-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}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, 
are they needed?
-DEPEND="
-       !<media-video/avidemux-${PV}:${SLOT}
-       dev-db/sqlite:3
-       sdl? ( media-libs/libsdl:0 )
-       system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-       xv? ( x11-libs/libXv:0 )
-       vaapi? ( x11-libs/libva:0 )
-       vdpau? ( x11-libs/libvdpau:0 )
-       video_cards_fglrx? (
-               || ( >=x11-drivers/ati-drivers-14.12-r3
-                       x11-libs/xvba-video:0 )
-               )"
-RDEPEND="
-       nls? ( virtual/libintl:0 )
-       $DEPEND
-"
-DEPEND="
-       $DEPEND
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-       mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
-       cmake-utils_src_prepare
-
-       if use system-ffmpeg ; then
-               # Preparations to support the system ffmpeg. Currently fails 
because it depends on files the system ffmpeg doesn't install.
-               local error="Failed to remove ffmpeg."
-
-               rm -rf cmake/admFFmpeg* cmake/ffmpeg* 
avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-               sed -i -e 's/include(admFFmpegUtil)//g' 
avidemux/commonCmakeApplication.cmake || die "${error}"
-               sed -i -e '/registerFFmpeg/d' 
avidemux/commonCmakeApplication.cmake || die "${error}"
-               sed -i -e 's/include(admFFmpegBuild)//g' 
avidemux_core/CMakeLists.txt || die "${error}"
-       else
-               # Avoid existing avidemux installations from making the build 
process fail, bug #461496.
-               sed -i -e 
"s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g"
 cmake/admFFmpegUtil.cmake \
-                       || die "Failed to avoid existing avidemux installation 
from making the build fail."
-       fi
-
-       # 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_configure() {
-       local mycmakeargs="
-               -DAVIDEMUX_SOURCE_DIR='${S}'
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vaapi LIBVA)
-               $(cmake-utils_use vdpau 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
-
-       CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
-}
-
-src_compile() {
-       cmake-utils_src_compile -j1
-}
-
-src_install() {
-       cmake-utils_src_install -j1
-}

diff --git a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
deleted file mode 100644
index 29a9ee6..0000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, 
filtering and encoding tasks"
-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="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-core/}"
-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
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, 
are they needed?
-DEPEND="
-       !<media-video/avidemux-${PV}:${SLOT}
-       dev-db/sqlite:3
-       sdl? ( media-libs/libsdl:0 )
-       system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-       xv? ( x11-libs/libXv:0 )
-       vaapi? ( x11-libs/libva:0 )
-       vdpau? ( x11-libs/libvdpau:0 )
-       video_cards_fglrx? (
-               || ( >=x11-drivers/ati-drivers-14.12-r3
-                       x11-libs/xvba-video:0 )
-               )"
-RDEPEND="
-       nls? ( virtual/libintl:0 )
-       $DEPEND
-"
-DEPEND="
-       $DEPEND
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-       !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-       mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
-       cmake-utils_src_prepare
-
-       if use system-ffmpeg ; then
-               # Preparations to support the system ffmpeg. Currently fails 
because it depends on files the system ffmpeg doesn't install.
-               local error="Failed to remove ffmpeg."
-
-               rm -rf cmake/admFFmpeg* cmake/ffmpeg* 
avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-               sed -i -e 's/include(admFFmpegUtil)//g' 
avidemux/commonCmakeApplication.cmake || die "${error}"
-               sed -i -e '/registerFFmpeg/d' 
avidemux/commonCmakeApplication.cmake || die "${error}"
-               sed -i -e 's/include(admFFmpegBuild)//g' 
avidemux_core/CMakeLists.txt || die "${error}"
-       else
-               # Avoid existing avidemux installations from making the build 
process fail, bug #461496.
-               sed -i -e 
"s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g"
 cmake/admFFmpegUtil.cmake \
-                       || die "Failed to avoid existing avidemux installation 
from making the build fail."
-       fi
-
-       # 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_configure() {
-       local mycmakeargs="
-               -DAVIDEMUX_SOURCE_DIR='${S}'
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vaapi LIBVA)
-               $(cmake-utils_use vdpau 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
-
-       CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
-}
-
-src_compile() {
-       cmake-utils_src_compile -j1
-}
-
-src_install() {
-       cmake-utils_src_install -j1
-}

diff --git a/media-libs/avidemux-plugins/Manifest 
b/media-libs/avidemux-plugins/Manifest
index 2938f20..418a752 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1 @@
-DIST avidemux_2.6.2.tar.gz 17009420 SHA256 
67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 
1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3
 WHIRLPOOL 
0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
-DIST avidemux_2.6.3.tar.gz 17025710 SHA256 
78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 
a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc
 WHIRLPOOL 
899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
-DIST avidemux_2.6.4.tar.gz 17109929 SHA256 
2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 
1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9
 WHIRLPOOL 
a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
-DIST avidemux_2.6.5.tar.gz 17322253 SHA256 
428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 
e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80
 WHIRLPOOL 
192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
-DIST avidemux_2.6.7.tar.gz 17337193 SHA256 
d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 
deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c
 WHIRLPOOL 
a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 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.2-r2.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild
deleted file mode 100644
index 826b435..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-plugins/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate 
cpu_flags_x86_mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
-
-# TODO: Figure out which dependencies can be moved out of avidemux-core and 
avidemux into here.
-RDEPEND="=media-video/avidemux-${PV}-r1"
-DEPEND="$RDEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-PROCESSES="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-
-use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
-
-src_configure() {
-       local x mycmakeargs plugin_ui
-
-       mycmakeargs="
-               $(for x in ${IUSE}; do cmake-utils_use ${x/#-/}; done)
-               $(cmake-utils_use amr OPENCORE_AMRWB)
-               $(cmake-utils_use amr OPENCORE_AMRNB)
-               $(cmake-utils_use dts LIBDCA)
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-               DEST="${PROCESS#*:}"
-
-               mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-               cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-               if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=COMMON"
-               elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=CLI"
-               elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=QT4"
-               fi
-
-               cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-                       -DCMAKE_INSTALL_PREFIX="/usr" \
-                       ${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" 
../"${DEST}${POSTFIX}/" || die "cmake failed."
-       done
-}
-
-src_compile() {
-       # 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
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-}

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
deleted file mode 100644
index 11ad390..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-plugins/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame 
libsamplerate cpu_flags_x86_mmx opengl oss qt4 vorbis truetype twolame xvid 
x264 vpx"
-
-DEPEND="
-       =media-video/avidemux-${PV}[opengl?,qt4?]
-       >=dev-lang/spidermonkey-1.5-r2:0
-       dev-libs/libxml2
-       media-libs/libpng
-       virtual/libiconv
-       aften? ( media-libs/aften )
-       alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-       amr? ( media-libs/opencore-amr )
-       dts? ( media-libs/libdca )
-       faac? ( media-libs/faac )
-       faad? ( media-libs/faad2 )
-       fontconfig? ( media-libs/fontconfig )
-       fribidi? ( dev-libs/fribidi )
-       jack? (
-               media-sound/jack-audio-connection-kit
-               libsamplerate? ( media-libs/libsamplerate )
-       )
-       lame? ( media-sound/lame )
-       oss? ( virtual/os-headers )
-       truetype? ( >=media-libs/freetype-2.1.5 )
-       twolame? ( media-sound/twolame )
-       x264? ( media-libs/x264:= )
-       xvid? ( media-libs/xvid )
-       vorbis? ( media-libs/libvorbis )
-       vpx? ( media-libs/libvpx )
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-PROCESSES="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-
-use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
-
-src_configure() {
-       local x mycmakeargs plugin_ui extra_mycmakeargs
-
-       mycmakeargs="
-               $(cmake-utils_use fontconfig FONTCONFIG)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use x264 X264)
-       "
-
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-               DEST="${PROCESS#*:}"
-
-               mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-               cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-               if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=COMMON"
-
-                       extra_mycmakeargs="
-                               $(cmake-utils_use amr OPENCORE_AMRWB)
-                               $(cmake-utils_use amr OPENCORE_AMRNB)
-                               $(cmake-utils_use dts LIBDCA)
-                               $(cmake-utils_use faad FAAD)
-                               $(cmake-utils_use jack JACK)
-                               $(cmake-utils_use vorbis VORBIS)
-                       "
-               elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=CLI"
-                       extra_mycmakeargs=""
-               elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=QT4"
-                       extra_mycmakeargs=""
-               fi
-
-               cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-                       -DCMAKE_INSTALL_PREFIX="/usr" \
-                       ${mycmakeargs} ${extra_mycmakeargs} ${plugin_ui} -G 
"Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
-       done
-}
-
-src_compile() {
-       # 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
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-}

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
deleted file mode 100644
index faebc53..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-plugins/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-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 vpx"
-
-DEPEND="
-       ~media-video/avidemux-${PV}[opengl?,qt4?]
-       >=dev-lang/spidermonkey-1.5-r2:0
-       dev-libs/libxml2
-       media-libs/libpng
-       virtual/libiconv
-       aac? (
-               media-libs/faac
-               media-libs/faad2
-       )
-       aften? ( media-libs/aften )
-       alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-       amr? ( media-libs/opencore-amr )
-       dts? ( media-libs/libdca )
-       fontconfig? ( media-libs/fontconfig )
-       fribidi? ( dev-libs/fribidi )
-       jack? (
-               media-sound/jack-audio-connection-kit
-               libsamplerate? ( media-libs/libsamplerate )
-       )
-       lame? ( media-sound/lame )
-       oss? ( virtual/os-headers )
-       pulseaudio? ( media-sound/pulseaudio )
-       truetype? ( media-libs/freetype:2 )
-       twolame? ( media-sound/twolame )
-       x264? ( media-libs/x264:= )
-       xv? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXv
-       )
-       xvid? ( media-libs/xvid )
-       vorbis? ( media-libs/libvorbis )
-       vpx? ( media-libs/libvpx )
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-processes="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-
-use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-optional-pulse.patch
-}
-
-src_configure() {
-       for process in ${processes} ; do
-               local mycmakeargs="
-                       -DAVIDEMUX_SOURCE_DIR='${S}'
-                       -DCMAKE_INSTALL_PREFIX='/usr'
-                       $(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 vorbis)
-                       $(cmake-utils_use vorbis LIBVORBIS)
-                       $(cmake-utils_use vpx VPXDEC)
-               "
-
-               if use debug ; then
-                       mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-               fi
-
-               local build="${process%%:*}"
-
-               if [[ "${build}" == "buildPluginsCommon" ]] ; then
-                       mycmakeargs+=" -DPLUGIN_UI=COMMON"
-               elif [[ "${build}" == "buildPluginsCLI" ]] ; then
-                       mycmakeargs+=" -DPLUGIN_UI=CLI"
-               elif [[ "${build}" == "buildPluginsQt4" ]] ; then
-                       mycmakeargs+=" -DPLUGIN_UI=QT4"
-               fi
-
-               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
-}
-
-src_compile() {
-       # 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
-
-       for process in ${processes} ; do
-               cd "${S}"/${process%%:*} || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for process in ${processes} ; do
-               cd "${S}"/${process%%:*} || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-}

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild
deleted file mode 100644
index 11ad390..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_PN="${PN/-plugins/}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts faac faad fontconfig fribidi jack lame 
libsamplerate cpu_flags_x86_mmx opengl oss qt4 vorbis truetype twolame xvid 
x264 vpx"
-
-DEPEND="
-       =media-video/avidemux-${PV}[opengl?,qt4?]
-       >=dev-lang/spidermonkey-1.5-r2:0
-       dev-libs/libxml2
-       media-libs/libpng
-       virtual/libiconv
-       aften? ( media-libs/aften )
-       alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-       amr? ( media-libs/opencore-amr )
-       dts? ( media-libs/libdca )
-       faac? ( media-libs/faac )
-       faad? ( media-libs/faad2 )
-       fontconfig? ( media-libs/fontconfig )
-       fribidi? ( dev-libs/fribidi )
-       jack? (
-               media-sound/jack-audio-connection-kit
-               libsamplerate? ( media-libs/libsamplerate )
-       )
-       lame? ( media-sound/lame )
-       oss? ( virtual/os-headers )
-       truetype? ( >=media-libs/freetype-2.1.5 )
-       twolame? ( media-sound/twolame )
-       x264? ( media-libs/x264:= )
-       xvid? ( media-libs/xvid )
-       vorbis? ( media-libs/libvorbis )
-       vpx? ( media-libs/libvpx )
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-PROCESSES="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-
-use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
-
-src_configure() {
-       local x mycmakeargs plugin_ui extra_mycmakeargs
-
-       mycmakeargs="
-               $(cmake-utils_use fontconfig FONTCONFIG)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use x264 X264)
-       "
-
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-               DEST="${PROCESS#*:}"
-
-               mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-               cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-               if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=COMMON"
-
-                       extra_mycmakeargs="
-                               $(cmake-utils_use amr OPENCORE_AMRWB)
-                               $(cmake-utils_use amr OPENCORE_AMRNB)
-                               $(cmake-utils_use dts LIBDCA)
-                               $(cmake-utils_use faad FAAD)
-                               $(cmake-utils_use jack JACK)
-                               $(cmake-utils_use vorbis VORBIS)
-                       "
-               elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=CLI"
-                       extra_mycmakeargs=""
-               elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
-                       plugin_ui="-DPLUGIN_UI=QT4"
-                       extra_mycmakeargs=""
-               fi
-
-               cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-                       -DCMAKE_INSTALL_PREFIX="/usr" \
-                       ${mycmakeargs} ${extra_mycmakeargs} ${plugin_ui} -G 
"Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
-       done
-}
-
-src_compile() {
-       # 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
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-}

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild
deleted file mode 100644
index 34ed5cf..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-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 vpx"
-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}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-       ~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 )
-       oss? ( virtual/os-headers: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}
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-processes="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-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
-
-       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 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/avidemux-plugins-2.6.5.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild
deleted file mode 100644
index 34ed5cf..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-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 vpx"
-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}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-       ~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 )
-       oss? ( virtual/os-headers: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}
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-processes="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-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
-
-       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 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/avidemux-plugins-2.6.7.ebuild 
b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
deleted file mode 100644
index 39ecfb5..0000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, 
filtering and encoding tasks"
-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"
-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
-
-DEPEND="
-       ~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 )
-       oss? ( virtual/os-headers: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}
-"
-RDEPEND="$DEPEND"
-
-S="${WORKDIR}/${MY_P}"
-
-processes="buildPluginsCommon:avidemux_plugins
-       buildPluginsCLI:avidemux_plugins"
-use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-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
-
-       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-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8c4b4ff..418a752 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1 @@
-DIST avidemux_2.5.6.tar.gz 14914123 SHA256 
d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 
8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c
 WHIRLPOOL 
fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
-DIST avidemux_2.6.2.tar.gz 17009420 SHA256 
67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 
1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3
 WHIRLPOOL 
0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
-DIST avidemux_2.6.3.tar.gz 17025710 SHA256 
78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 
a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc
 WHIRLPOOL 
899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
-DIST avidemux_2.6.4.tar.gz 17109929 SHA256 
2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 
1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9
 WHIRLPOOL 
a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
-DIST avidemux_2.6.5.tar.gz 17322253 SHA256 
428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 
e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80
 WHIRLPOOL 
192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
-DIST avidemux_2.6.7.tar.gz 17337193 SHA256 
d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 
deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c
 WHIRLPOOL 
a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 
02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 
57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0
 WHIRLPOOL 
29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6

diff --git a/media-video/avidemux/avidemux-2.5.6-r2.ebuild 
b/media-video/avidemux/avidemux-2.5.6-r2.ebuild
deleted file mode 100644
index 8f92b5e..0000000
--- a/media-video/avidemux/avidemux-2.5.6-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils eutils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding 
tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="aac aften alsa amr gtk jack +mp3 nls opengl oss pulseaudio
-       qt4 sdl +truetype vorbis vpx +x264 +xv +xvid"
-
-RDEPEND="
-       dev-libs/libxml2
-       sys-libs/zlib
-       aac? (
-               media-libs/faac
-               media-libs/faad2
-       )
-       aften? ( media-libs/aften[cxx] )
-       alsa? ( media-libs/alsa-lib )
-       amr? ( media-libs/opencore-amr )
-       gtk? ( x11-libs/gtk+:2 )
-       jack? (
-               media-libs/libsamplerate
-               media-sound/jack-audio-connection-kit
-       )
-       mp3? ( media-sound/lame )
-       pulseaudio? ( media-sound/pulseaudio )
-       qt4? (
-               >=dev-qt/qtgui-4.6:4
-               opengl? (
-                       virtual/opengl
-                       >=dev-qt/qtopengl-4.6:4
-               )
-       )
-       sdl? ( media-libs/libsdl )
-       truetype? (
-               media-libs/freetype:2
-               media-libs/fontconfig
-       )
-       vorbis? ( media-libs/libvorbis )
-       vpx? ( media-libs/libvpx )
-       x264? ( media-libs/x264:= )
-       xv? (
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXv
-       )
-       xvid? ( media-libs/xvid )
-"
-DEPEND="${RDEPEND}
-       dev-lang/yasm
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )
-"
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for lang in ${AVIDEMUX_LANGS}; do
-       IUSE+=" linguas_${lang}"
-done
-unset lang
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-DOCS=( AUTHORS )
-PATCHES=(
-       "${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch"
-       "${FILESDIR}/${P}-ffmpeg-symbol-visibility.patch"
-)
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       local lingua= po_files= qt_ts_files= avidemux_ts_files=
-       for lingua in ${LINGUAS}; do
-               if has ${lingua} ${AVIDEMUX_LANGS}; then
-                       if [[ -e ${S}/po/${lingua}.po ]]; then
-                               po_files+=" \${po_subdir}/${lingua}.po"
-                       fi
-                       if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-                               qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
-                       fi
-                       if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-                               avidemux_ts_files+=" 
\${ts_subdir}/${PN}_${lingua}.ts"
-                       fi
-               fi
-       done
-
-       sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-               "${S}/cmake/Po.cmake" || die "sed failed"
-       sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-           -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-               "${S}/cmake/Ts.cmake" || die "sed failed"
-
-       # fix major issues in desktop files wrt bugs #291453, #316599, #430500
-       sed -i -re '/^(Exec|Path)/ s:\[\$e\]::' avidemux2-gtk.desktop || die
-       sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' avidemux2.desktop || die
-
-       # don't install Windows-only files
-       sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die
-}
-
-src_configure() {
-       # add lax vector typing for PowerPC
-       if use ppc || use ppc64; then
-               append-cflags -flax-vector-conversions
-       fi
-       # bug 432322
-       use x86 && replace-flags -O0 -O1
-
-       local mycmakeargs=(
-               -DAVIDEMUX_SOURCE_DIR="${S}"
-               -DAVIDEMUX_INSTALL_PREFIX="${BUILD_S}"
-               -DAVIDEMUX_CORECONFIG_DIR="${BUILD_S}/config"
-               -DARTS=OFF
-               -DESD=OFF
-               $(cmake-utils_use aac FAAC)
-               $(cmake-utils_use aac FAAD)
-               $(cmake-utils_use aften)
-               $(cmake-utils_use alsa)
-               $(cmake-utils_use amr OPENCORE_AMRNB)
-               $(cmake-utils_use amr OPENCORE_AMRWB)
-               $(cmake-utils_use gtk)
-               $(cmake-utils_use jack)
-               $(cmake-utils_use mp3 LAME)
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use_use opengl)
-               $(cmake-utils_use oss)
-               $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-               $(cmake-utils_use qt4)
-               $(cmake-utils_use sdl)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use truetype FONTCONFIG)
-               $(cmake-utils_use vorbis)
-               $(cmake-utils_use vorbis LIBVORBIS)
-               $(cmake-utils_use vpx VPXDEC)
-               $(cmake-utils_use x264)
-               $(cmake-utils_use xv XVIDEO)
-               $(cmake-utils_use xvid)
-       )
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       # first build the application
-       cmake-utils_src_compile -j1
-
-       # and then go on with plugins
-       emake -C "${CMAKE_BUILD_DIR}/plugins"
-}
-
-src_install() {
-       # install the application
-       cmake-utils_src_install
-
-       # install plugins
-       emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
-
-       newicon ${PN}_icon.png ${PN}.png
-       use gtk && domenu avidemux2-gtk.desktop
-       use qt4 && domenu avidemux2.desktop
-}

diff --git a/media-video/avidemux/avidemux-2.6.2-r1.ebuild 
b/media-video/avidemux/avidemux-2.6.2-r1.ebuild
deleted file mode 100644
index bc2cbd5..0000000
--- a/media-video/avidemux/avidemux-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding 
tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}";
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate 
cpu_flags_x86_mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
-
-# TODO: Figure out which dependencies can be moved out of avidemux-core into 
here.
-RDEPEND="=media-libs/avidemux-core-${PV}-r1[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,cpu_flags_x86_mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]
-       qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
-DEPEND="$RDEPEND"
-PDEPEND="=media-libs/avidemux-plugins-${PV}-r2[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,cpu_flags_x86_mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]"
-
-S="${WORKDIR}/${MY_P}"
-
-PROCESSES="buildCli:avidemux/cli"
-
-use qt4 && PROCESSES+=" buildQt4:avidemux/qt4"
-
-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."
-
-       # Now rename the desktop file to not collide with 2.5.
-       mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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 -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.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.6.desktop
-}
-
-src_configure() {
-       local x mycmakeargs
-
-       mycmakeargs="
-               $(for x in ${IUSE}; do cmake-utils_use ${x/#-/}; done)
-               $(cmake-utils_use amr OPENCORE_AMRWB)
-               $(cmake-utils_use amr OPENCORE_AMRNB)
-               $(cmake-utils_use dts LIBDCA)
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use truetype FREETYPE2)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-               DEST="${PROCESS#*:}"
-
-               mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-               cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-               cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-                       -DCMAKE_INSTALL_PREFIX="/usr" \
-                       ${mycmakeargs} -G "Unix Makefiles" 
../"${DEST}${POSTFIX}/" || die "cmake failed."
-       done
-}
-
-src_compile() {
-       # 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
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-
-       cd "${S}" || die "Can't enter source folder."
-
-       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
-       use qt4 && fperms +x /usr/bin/avidemux3_qt4
-
-       newicon ${PN}_icon.png ${PN}-2.6.png
-       use qt4 && domenu ${PN}-2.6.desktop
-
-       dodoc AUTHORS README
-}

diff --git a/media-video/avidemux/avidemux-2.6.3.ebuild 
b/media-video/avidemux/avidemux-2.6.3.ebuild
deleted file mode 100644
index e3e59e0..0000000
--- a/media-video/avidemux/avidemux-2.6.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding 
tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}";
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opengl nls qt4 sdl vdpau xv"
-
-DEPEND="=media-libs/avidemux-core-${PV}[nls?,sdl?,vdpau?,xv?]
-       opengl? ( virtual/opengl )
-       qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
-RDEPEND="$DEPEND"
-PDEPEND="=media-libs/avidemux-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-PROCESSES="buildCli:avidemux/cli"
-
-use qt4 && PROCESSES+=" buildQt4:avidemux/qt4"
-
-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."
-
-       # Now rename the desktop file to not collide with 2.5.
-       mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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 -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.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.6.desktop
-}
-
-src_configure() {
-       local x mycmakeargs
-
-       mycmakeargs="
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vdpau VDPAU)
-               $(cmake-utils_use xv XVIDEO)
-       "
-       use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 
-DCMAKE_BUILD_TYPE=Debug"
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-               DEST="${PROCESS#*:}"
-
-               mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-               cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-               cmake -DCMAKE_INSTALL_PREFIX="/usr" \
-                       ${mycmakeargs} -G "Unix Makefiles" 
../"${DEST}${POSTFIX}/" || die "cmake failed."
-       done
-}
-
-src_compile() {
-       # 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
-
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for PROCESS in ${PROCESSES} ; do
-               SOURCE="${PROCESS%%:*}"
-
-               cd "${S}/${SOURCE}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-
-       cd "${S}" || die "Can't enter source folder."
-
-       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
-       use qt4 && fperms +x /usr/bin/avidemux3_qt4
-
-       newicon ${PN}_icon.png ${PN}-2.6.png
-       use qt4 && domenu ${PN}-2.6.desktop
-
-       dodoc AUTHORS README
-}

diff --git a/media-video/avidemux/avidemux-2.6.4.ebuild 
b/media-video/avidemux/avidemux-2.6.4.ebuild
deleted file mode 100644
index 9390c32..0000000
--- a/media-video/avidemux/avidemux-2.6.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 toolchain-funcs
-
-SLOT="2.6"
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding 
tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}";
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opengl nls qt4 sdl vdpau xv"
-
-DEPEND="~media-libs/avidemux-core-${PV}[nls?,sdl?,vdpau?,xv?]
-       opengl? ( virtual/opengl )
-       qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-processes="buildCli:avidemux/cli"
-
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-src_prepare() {
-       default
-
-       # 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."
-
-       # Now rename the desktop file to not collide with 2.5.
-       mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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 -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.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.6.desktop
-}
-
-src_configure() {
-       local mycmakeargs="
-               -DAVIDEMUX_SOURCE_DIR='${S}'
-               -DCMAKE_INSTALL_PREFIX='/usr'
-               $(cmake-utils_use nls GETTEXT)
-               $(cmake-utils_use sdl SDL)
-               $(cmake-utils_use vdpau VDPAU)
-               $(cmake-utils_use xv XVIDEO)
-       "
-
-       if use debug ; then
-               mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-       fi
-
-       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
-}
-
-src_compile() {
-       # 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
-
-       for process in ${processes} ; do
-               local source="${process%%:*}"
-
-               cd "${S}/${source}" || die "Can't enter build folder."
-               emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-       done
-}
-
-src_install() {
-       for process in ${processes} ; do
-               local source="${process%%:*}"
-
-               cd "${S}/${source}" || die "Can't enter build folder."
-               emake DESTDIR="${ED}" install
-       done
-
-       cd "${S}" || die "Can't enter source folder."
-
-       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
-       use qt4 && fperms +x /usr/bin/avidemux3_qt4
-
-       newicon ${PN}_icon.png ${PN}-2.6.png
-       use qt4 && domenu ${PN}-2.6.desktop
-
-       dodoc AUTHORS README
-}

diff --git a/media-video/avidemux/avidemux-2.6.5-r1.ebuild 
b/media-video/avidemux/avidemux-2.6.5-r1.ebuild
deleted file mode 100644
index 1e8da39..0000000
--- a/media-video/avidemux/avidemux-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}/${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}"
-
-processes="buildCli:avidemux/cli"
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-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
-
-       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
-               # 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
-
-       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
-}

diff --git a/media-video/avidemux/avidemux-2.6.5.ebuild 
b/media-video/avidemux/avidemux-2.6.5.ebuild
deleted file mode 100644
index fa60e22..0000000
--- a/media-video/avidemux/avidemux-2.6.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}/${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}"
-
-processes="buildCli:avidemux/cli"
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-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
-
-       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
-}

diff --git a/media-video/avidemux/avidemux-2.6.7.ebuild 
b/media-video/avidemux/avidemux-2.6.7.ebuild
deleted file mode 100644
index c978ae6..0000000
--- a/media-video/avidemux/avidemux-2.6.7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}"
-
-processes="buildCli:avidemux/cli"
-use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-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
-
-       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
-}

diff --git a/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch 
b/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch
deleted file mode 100644
index 66b44ad..0000000
--- a/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: avidemux_2.5.4/CMakeLists.txt
-===================================================================
---- avidemux_2.5.4.orig/CMakeLists.txt
-+++ avidemux_2.5.4/CMakeLists.txt
-@@ -205,7 +205,7 @@ ADD_SUBDIRECTORY(avidemux)
- ADD_SUBDIRECTORY(po)
- ADD_SUBDIRECTORY(scripts)
- # MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)
--
-+ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)
- ########################################
- # Config Summary
- ########################################

diff --git 
a/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch 
b/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch
deleted file mode 100644
index 3251209..0000000
--- a/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 
branches/avidemux_2.5_branch_gruntster/cmake/patches/libavcodec_libavcodec.v.patch
 2011/12/15 11:09:11     7699
-+++ 
branches/avidemux_2.5_branch_gruntster/cmake/patches/libavcodec_libavcodec.v.patch
 2012/03/15 07:19:34     7750
-@@ -1,11 +1,12 @@
----- ../ffmpeg-0.9/libavcodec/libavcodec.v     2011-12-14 15:00:29 +0000
--+++ libavcodec/libavcodec.v   2011-12-14 15:00:28 +0000
--@@ -25,5 +25,8 @@
-+--- libavcodec/libavcodec.v.old       2012-03-04 08:36:22.038330656 +0100
-++++ libavcodec/libavcodec.v   2012-03-04 08:36:44.128330633 +0100
-+@@ -25,5 +25,9 @@
-                  ff_mmxext_idct;
-                  ff_idct_xvid*;
-                  ff_jpeg_fdct*;
- +                ff_h264_info;
--+                             ff_golomb_vlc_len;
--+                             ff_ue_golomb_vlc_code;
-++                ff_golomb_vlc_len;
-++                ff_ue_golomb_vlc_code;
-++                ff_se_golomb_vlc_code;
-          local:  *;
-  };

Reply via email to