Merge updates from master

39 files changed, 0 insertions, 1506 deletions

diff --git a/app-misc/utimer/utimer-0.4.ebuild b/app-misc/utimer/utimer-0.4.ebuild
deleted file mode 100644
index 11dcdd5023ac..000000000000
--- a/app-misc/utimer/utimer-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="A command line timer and stopwatch"
-HOMEPAGE="http://utimer.codealpha.net/utimer"
-SRC_URI="http://utimer.codealpha.net/dl.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug nls"
-
-DEPEND=">=dev-libs/glib-2.18.2
-	>=dev-util/intltool-0.40.5"
-RDEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf=
-	if use debug; then
-		myconf="--enable-debug=yes"
-	else
-		myconf="--enable-debug=no"
-	fi
-	econf ${myconf} $(use_enable nls)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "failed to install"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/media-libs/libicns/Manifest b/media-libs/libicns/Manifest
index 7238b21c3c5a..f4c0cdabdd52 100644
--- a/media-libs/libicns/Manifest
+++ b/media-libs/libicns/Manifest
@@ -1,3 +1 @@
-DIST libicns-0.7.1.tar.gz 444500 BLAKE2B d2527e2bde67a05f0a5a19a8fbf52829c7ab0f1642063e4b678ce0bb5ba80092d8258a768ff0a8a51cdb6136a59f0cdcbeb3069e42848b327853d7b9c5711448 SHA512 568ade4462bbe5f65a59306cf92b6fbc8a3e821cc0cc1e488e2cc92dad8deda3081176e5f63e1d3f6d4cad47c2dea45f182a2ccb314f635fdfebd358ab4ed9ea
-DIST libicns-0.8.0.tar.gz 348803 BLAKE2B 844c2f2b46b384e2ab41a932fbad64ff186b2230ce59005232428d4705770396d3d1c5c1c65a28d4a0903f319b3db17676f8790b136d8a0b40d9013762a7f213 SHA512 74abdc12b85fefd47cb1e164b85cd408f56ca5d4846db7f5434c48d8af04c19cc5d178f93bdc37391d5ca7a83ceb4fd0c40ddaee03831c48ebe358c750d8eff2
 DIST libicns-0.8.1.tar.gz 460819 BLAKE2B bc8989d2e58bff343cdf9538ca2d14600e1bee25697e767dfd51dd69b533995c76f83d3076b63c6604c18a2e08bbfd489408f0dd28847ac6b354210b7732b87a SHA512 e9a6da6d639c4e7aa85e21cf0201ec2e8fcad5c8542ef55375dee7628eff6e0136974ebae93f6c7d95447f879d3d001e8f5d480f6590061c8e0ad0e06b52742c
diff --git a/media-libs/libicns/libicns-0.7.1.ebuild b/media-libs/libicns/libicns-0.7.1.ebuild
deleted file mode 100644
index 7d0133cb9033..000000000000
--- a/media-libs/libicns/libicns-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="A library for manipulating MacOS X .icns icon format"
-HOMEPAGE="https://sourceforge.net/projects/icns"
-SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2.43-r2:0
-	media-libs/jasper"
-
-src_prepare() {
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
-		icnsutils/png2icns.c || die
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog DEVNOTES README TODO
-}
diff --git a/media-libs/libicns/libicns-0.8.0.ebuild b/media-libs/libicns/libicns-0.8.0.ebuild
deleted file mode 100644
index 725f6827bd93..000000000000
--- a/media-libs/libicns/libicns-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A library for manipulating MacOS X .icns icon format"
-HOMEPAGE="https://sourceforge.net/projects/icns/"
-SRC_URI="mirror://sourceforge/icns/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	media-libs/jasper"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog DEVNOTES README TODO"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"usr/lib*/lib*.la
-}
diff --git a/media-plugins/rev-plugins/Manifest b/media-plugins/rev-plugins/Manifest
index 0f525678fbeb..fe3465ce156f 100644
--- a/media-plugins/rev-plugins/Manifest
+++ b/media-plugins/rev-plugins/Manifest
@@ -1,2 +1 @@
-DIST REV-plugins-0.3.1.tar.bz2 17574 BLAKE2B db7292a6a3a12e051a68be8abb3e5e1a4f1d7a2a0db8a564798a30fd966c861db35314b249f80e382fb5540f2ceca07737fad416e889026d92584797463403c3 SHA512 ff8a32733fe4c0ba9f5261543bad4d39772638d6d7d9210051b7a4f79cd0bb377d0bb97920e8120d5196acbbbdbbaf8f08ef2c2723f8cafd7e384944b0b4964e
 DIST REV-plugins-0.7.1.tar.bz2 20501 BLAKE2B cd7e93672eac5cd2be1776be5f7ac88e5d3f631b13507ea32a4d387f3f10d91dacf217dcbc772fae5b398949593b2210cecb9978013edd8f30141f15c980a9af SHA512 00f984b47347a4f75d809587c654e3e078cb37a6c324bcec09382d1181bd8665a58044505054de75c9ba58972af7e1d3f964c3a5bd925fed4af5cccd1233bd19
diff --git a/media-plugins/rev-plugins/rev-plugins-0.3.1-r1.ebuild b/media-plugins/rev-plugins/rev-plugins-0.3.1-r1.ebuild
deleted file mode 100644
index 7bd439cee225..000000000000
--- a/media-plugins/rev-plugins/rev-plugins-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib toolchain-funcs
-
-MY_P=${P/rev/REV}
-
-DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	tc-export CXX
-	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die "sed Makefile"
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild b/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild
deleted file mode 100644
index d71c1c0fc401..000000000000
--- a/media-plugins/rev-plugins/rev-plugins-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-MY_P=${P/rev/REV}
-
-DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	tc-export CXX
-	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-plugins/swh-lv2/Manifest b/media-plugins/swh-lv2/Manifest
index 5f7874a35420..a9a917e4789f 100644
--- a/media-plugins/swh-lv2/Manifest
+++ b/media-plugins/swh-lv2/Manifest
@@ -1,2 +1 @@
-DIST swh-lv2-1.0.15.tar.gz 257023 BLAKE2B 8515212af0a15b429508abb7e24abc9fea67426758945bfaa8869d6ccf42404e0e001868c4d679cc3206cc642edb743fffb2a605cb2e7161ae0c8a18a8248559 SHA512 cd5018e6ce8eda3d04f18b0c4546a70ff6cae4d250357bfb82bb52ebd35932620bb857318703dea6ccaeee6a3a15defca7b9f100d00f3ac0b6e4ad736e944251
 DIST swh-lv2-1.0.16.tar.gz 159206 BLAKE2B d8a3e46debebad758e6300203f8cedf71c47799a85b1e95b11c258e464e73fdafd69f5bc80f419bab4f1b6541bd2038d75f5ff9ddc0088829a9a690fa24483e5 SHA512 1ded2c570b7f8385bb702539f5e1573fa23c6ddfb2b763af149b4ef1a32e394590b0b4fffcd006fca362b51318c1ff5cfbaeb40e4341cc07d5241aca1ac2eba0
diff --git a/media-plugins/swh-lv2/swh-lv2-1.0.15.ebuild b/media-plugins/swh-lv2/swh-lv2-1.0.15.ebuild
deleted file mode 100644
index 0a00da8534c3..000000000000
--- a/media-plugins/swh-lv2/swh-lv2-1.0.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Large collection of LV2 audio plugins/effects"
-HOMEPAGE="http://plugin.org.uk/"
-SRC_URI="http://plugin.org.uk/lv2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=sci-libs/fftw-3*"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e 's:-O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die
-}
-
-src_install() {
-	emake INSTALL_DIR="${D}/usr/$(get_libdir)/lv2" install-system || die
-	dodoc README
-}
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index a8606ec602bb..3f13ca04b177 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,3 +1,2 @@
-DIST gramofile_1.6-8.diff.gz 26697 BLAKE2B 67b620351d87b297d9a7f62e85f5159993e7850c47841fc36eb4d9dd9df545b91a9c09b86f960a0a54b7bd062f39410691d96c194cf6ae641b5161721b4cea5b SHA512 f03ab82de0aa8fca44bd5be4e64c0606c08a083ed09039728e163a2e535348c8984acd958bc6589139907101faf867e3030ff2ad09abdc8e3b292864f69e64ae
 DIST gramofile_1.6-9.diff.gz 25244 BLAKE2B 60170f960693932d894022d0c576b2d58764e546e6f2a13461ab78abfb92235007047bb9f35964859908c580c815d21e8c80d73ddd4e33b0c1d25deda78d395a SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249
 DIST gramofile_1.6.orig.tar.gz 108596 BLAKE2B fc076c60d3f2f46ab33f63194db165b6d0df6bd76996bade730968dfd821d234b0a88f486e98f84e76804efb8b08fb2538cb553de5f9eb09eb3dde60b441fbf4 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5
diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
deleted file mode 100644
index 4c35dd3eb2ff..000000000000
--- a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/bplaysrc/Makefile
-+++ b/bplaysrc/Makefile
-@@ -6,13 +6,12 @@
-         ../clrscr.o ../secshms.o
- #SRCS = bplay.c sndfunc.o shmbuf.c
- 
--CC = gcc
--LDFLAGS = 
-+CC ?= gcc
- 
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
-+CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER
- LIBS = -lncurses
- 
- # For FreeBSD (and maybe others), use these:
---- a/gramofile.c
-+++ b/gramofile.c
-@@ -11,6 +11,7 @@
- #include "splashscr.h"
- #include <signal.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
---- a/Makefile
-+++ b/Makefile
-@@ -14,13 +14,12 @@
- OBJS = $(SRCS:.c=.o)
- SHELL = /bin/sh
- 
--CC = gcc
--LDFLAGS = 
-+CC ?= gcc
- 
- ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
- 
- # For Linux (and maybe others), use these:
--CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
-+CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
- DEPS = $(OBJS) makebplay
- LIBS = -lncurses -lrfftw -lfftw -lm
- COPY_A = -a
---- a/signpr_cmf3.c
-+++ b/signpr_cmf3.c
-@@ -34,6 +34,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #ifndef OLD_CURSES
- #include <ncurses.h>
- #else
diff --git a/media-sound/gramofile/gramofile-1.6-r1.ebuild b/media-sound/gramofile/gramofile-1.6-r1.ebuild
deleted file mode 100644
index bd252d4a6936..000000000000
--- a/media-sound/gramofile/gramofile-1.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-PATCH_LEVEL=8
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Transfer sound from gramophone records to CD"
-HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
-SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	sci-libs/fftw:2.1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" epatch ${P}/debian
-	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed"
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bplay_gramo brec_gramo || die "doexe failed"
-	dodoc ChangeLog README TODO *.txt
-	newdoc ${P}/debian/changelog ChangeLog.debian
-}
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index afbf95dbe23f..accfba9c0490 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,3 +1 @@
-DIST jaaa-0.4.2.tar.bz2 25307 BLAKE2B 81896c0a5030404c2f451ccf6f6fb3aa5ed9e69be9a4038a5771b85be517dba83d321e8b9fa00c225bc2cdcc41fca4ff8757b04401b7d124f20b07eaf765bdd7 SHA512 c587a616f5ed882c238bf8fc9673d9072fc63d7e345434348427f6c0f64e134685ad3dfbb4bd6abdbc992ba33c69fb96e44be7ef36c7dfcbe7561a53ed481292
-DIST jaaa-0.6.0.tar.bz2 25375 BLAKE2B 773183f25846a6a56a55c0fc2e9d72bd6bc4bea2e5416b0d2c3b768f133887c6d7b6a2afd829ae04a0d5623e0afb9e5ec8212eb5cd0856cc518ceed9bea6935e SHA512 a93ea4c8a5fe9b1589a5c47052eb56b74164a6baaee835f11c261dd8cfa1141354d52ec71519bff93ecce9d7787138b5d12ead10f44fa3f4d0d83ecc390f3538
 DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
diff --git a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch b/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
deleted file mode 100644
index 1b483c0de2d3..000000000000
--- a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: jaaa/Makefile
-===================================================================
---- jaaa.orig/Makefile
-+++ jaaa/Makefile
-@@ -20,7 +20,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.4.2
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O3 -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
-+CPPFLAGS += -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- #CPPFLAGS += -march=pentium4
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
-@@ -31,7 +31,7 @@ JAAA_O = jaaa.o styles.o spectwin.o audi
- 
- 
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
- 
- 
- install:	jaaa
diff --git a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch b/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
deleted file mode 100644
index cfbe5be6b175..000000000000
--- a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: jaaa-0.6.0/Makefile
-===================================================================
---- jaaa-0.6.0.orig/Makefile
-+++ jaaa-0.6.0/Makefile
-@@ -24,8 +24,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.6.0
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CPPFLAGS += -march=native
-+CPPFLAGS += -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
-@@ -33,7 +32,7 @@ LDLIBS += -lclalsadrv -lclthreads -lclxc
- 
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
- 
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/jaaa-0.4.2.ebuild b/media-sound/jaaa/jaaa-0.4.2.ebuild
deleted file mode 100644
index b1a2f3947a31..000000000000
--- a/media-sound/jaaa/jaaa-0.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-1.2.1
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	>=sci-libs/fftw-3.0.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die
-}
-
-src_install() {
-	dobin jaaa || die
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jaaa/jaaa-0.6.0.ebuild b/media-sound/jaaa/jaaa-0.6.0.ebuild
deleted file mode 100644
index 6a3b2345d6b7..000000000000
--- a/media-sound/jaaa/jaaa-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-2.0.0
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	>=sci-libs/fftw-3.0.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jamin/jamin-0.95.0-r2.ebuild b/media-sound/jamin/jamin-0.95.0-r2.ebuild
deleted file mode 100644
index 5b1cdbc5ebea..000000000000
--- a/media-sound/jamin/jamin-0.95.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
-HOMEPAGE="http://jamin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="osc"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
-	>=media-plugins/swh-plugins-0.4.6
-	media-libs/ladspa-sdk
-	>=sci-libs/fftw-3.0.1
-	media-libs/libsndfile
-	media-libs/alsa-lib
-	>=dev-libs/libxml2-2.5
-	>=x11-libs/gtk+-2:2
-	osc? ( >=media-libs/liblo-0.5 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multilib-strict.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable osc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest
index 89fd12586ec1..05eb56e5bf4f 100644
--- a/media-video/jubler/Manifest
+++ b/media-video/jubler/Manifest
@@ -1,2 +1 @@
-DIST Jubler-source-4.6.1.tar.bz2 1971701 BLAKE2B 055b15eae2ae2bc1f5529823592ca2a61936d256a7635d51ea925711c8a456400c47d528cb9d4145dea64faf3b860869d63a7c712c281d81ea8a388f9f625860 SHA512 629aef58f98d2d8569a58a4c68c9bf440cd4693ca8847a0b8ad9e84458cd88de44542b5fc84e25033c1e22b26a4d675e070c5a58203a6bbe671072e5cdc2680a
 DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
deleted file mode 100644
index 18df9069d198..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-1.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeaudio.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-@@ -67,19 +67,19 @@ jboolean decodeAudio(JNIEnv * env, jobje
-     AVStream *audio_st=NULL;
-     int got_audio, len, err=0, audio_index=-1, i=0, pack_duration=0, packsize=0, codec_is_open=-1, video_index=-1, codec_enc_is_open=-1;
-     jlong pack_pts=0;
--    char *outbuf=NULL;
-+    AVFrame *outbuf=NULL;
-     unsigned char *packptr;
-     jboolean ret = JNI_TRUE, nobrk = JNI_TRUE;
-     
-     av_register_all();
-     
-     /* Open the input/output files */
--    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
-     if(err<0){
-         DEBUG(env, this, "decodeAudio", "Could not open file '%s'.", input_filename);
-         ret = JNI_FALSE;
-     }
--    outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+    outbuf = avcodec_alloc_frame();
-     if(outbuf==NULL) {
-         DEBUG(env, this, "decodeAudio", "Could not allocate memory for outbuf.");
-         ret = JNI_FALSE;
-@@ -129,7 +129,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
-     }
-     else {
-         /* open it */
--        if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
-+        if ((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0) {
-             DEBUG(env, this, "decodeAudio", "Could not open codec.");
-             ret = JNI_FALSE;
-         }
-@@ -158,10 +158,10 @@ jboolean decodeAudio(JNIEnv * env, jobje
-                     }
-                     
-                     /* use wav as the output format of the file */
--                    fmt = guess_format(NULL, output_filename, NULL);
-+                    fmt = av_guess_format(NULL, output_filename, NULL);
-                     if (!fmt) {
- 								DEBUG(env, this, "decodeAudio", "Could not deduce output format from file extension: using WAV.");
--                        fmt = guess_format("wav", NULL, NULL);
-+                        fmt = av_guess_format("wav", NULL, NULL);
-                     }
-                     if (!fmt) {
-                         DEBUG(env, this, "decodeAudio", "Could not find suitable output format.");
-@@ -182,35 +182,28 @@ jboolean decodeAudio(JNIEnv * env, jobje
-                             audio_st = add_audio_stream(env, this, ofcx, fmt->audio_codec, ccx->sample_rate, ccx->channels);
-                         }
-                         
--                        /* set the output parameters (must be done even if no parameters) */
--                        if (av_set_parameters(ofcx, NULL) < 0) {
--                            DEBUG(env, this, "decodeAudio", "Invalid output format parameters.");
--                            ret = JNI_FALSE;
--                        }
--                        else {
-                             codec_enc = avcodec_find_encoder(audio_st->codec->codec_id);
-                             if (!codec_enc) {
-                                 DEBUG(env, this, "decodeAudio", "Encoder codec not found.");
-                                 ret = JNI_FALSE;
-                             }
-                             else {
--                                if ((codec_enc_is_open = avcodec_open(audio_st->codec, codec_enc)) < 0) {
-+                                if ((codec_enc_is_open = avcodec_open2(audio_st->codec, codec_enc, NULL)) < 0) {
-                                     DEBUG(env, this, "decodeAudio", "Could not open encoder codec.");
-                                     ret = JNI_FALSE;
-                                 }
-                                 else {
-                                      if (!(fmt->flags & AVFMT_NOFILE)) {
--                                         if (url_fopen(&ofcx->pb, output_filename, URL_WRONLY) < 0) {
-+                                         if (avio_open(&ofcx->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-                                              DEBUG(env, this, "decodeAudio", "Could not open file '%s'", output_filename);
-                                              ret = JNI_FALSE;
-                                          }
-                                          else {
--                                             av_write_header(ofcx);
-+                                             avformat_write_header(ofcx,NULL);
-                                          }
-                                      }
-                                 }
-                             }
--                        }
-                     }
-                 }
-                 else {
-@@ -243,7 +236,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
-                     ccx->request_channels = 2;
-                 }
-                 got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--                len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, packptr, packsize);
-+                len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
-                 
-                 if (len < 0) {
-                     DEBUG(env, this, "decodeAudio", "Error while decoding.");
-@@ -258,7 +251,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
-                      * this is the frame we want */
-                     if (pack_pts >= seek_time_start) {
-                         /* if a frame has been decoded, output it */
--                        audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
-+                        audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
-                         /* if the next frame gets past our stop time, we want to stop decoding */
-                         if ( pack_pts + pack_duration > seek_time_stop ) {
-                             av_free_packet(&pkt);
-@@ -269,7 +262,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
-                     /* If the next frame will be past our start seek time, this is the frame we want */
-                     else if (pack_pts + pack_duration > seek_time_start) {
-                         /* if a frame has been decoded, output it */
--                        audio_enc_out(env, this, ofcx, audio_st, (short *)outbuf, got_audio);
-+                        audio_enc_out(env, this, ofcx, audio_st, (short *)(outbuf->data[0]), av_samples_get_buffer_size(NULL, ccx->channels, outbuf->nb_samples, ccx->sample_fmt, 1));
-                         /* if the next frame gets past our stop time, we want to stop decoding */
-                         if ( pack_pts + pack_duration > seek_time_stop ) {
-                             av_free_packet(&pkt);
-@@ -301,7 +294,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- 
-     	/* close the output file */
-     	if (!(fmt->flags & AVFMT_NOFILE) && ofcx->pb != NULL) {
--        	url_fclose(ofcx->pb);
-+        	avio_close(ofcx->pb);
-     	}
- 		
-     	/* free the stream */
-@@ -309,7 +302,7 @@ jboolean decodeAudio(JNIEnv * env, jobje
- 	}
- 
-     if(codec_is_open >= 0) avcodec_close(ccx);
--    if(outbuf != NULL)     free(outbuf);
-+    if(outbuf != NULL)     av_free(outbuf);
-     if(fcx != NULL)        av_close_input_file(fcx);
-     
-     return ret;
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/decodeframe.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeframe.c
-@@ -122,7 +122,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
-     AVFrame *frame=avcodec_alloc_frame();
-     
-     /* Open the input file */
--    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
-     if(err<0){
-         DEBUG(env, this, "decodeFrame", "Could not open file '%s'.", input_filename);
-         retflag = FALSE;
-@@ -157,7 +157,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
-     }
-     else {
-         // Open codec
--        if((codec_is_open = avcodec_open(ccx, codec)) < 0 ) {
-+        if((codec_is_open = avcodec_open2(ccx, codec, NULL)) < 0 ) {
-             DEBUG(env, this, "decodeFrame", "Could not open codec.");
-             retflag = FALSE;
-         }
-@@ -190,7 +190,7 @@ AVPicture* decodeFrame(JNIEnv * env, job
-             pack_duration = av_rescale_q(pkt.duration, fcx->streams[video_index]->time_base, AV_TIME_BASE_Q);
-             comp_pts += pkt.duration;
-             // Decode this packet
--            len = avcodec_decode_video(ccx, frame, &got_picture, pkt.data, pkt.size);
-+            len = avcodec_decode_video2(ccx, frame, &got_picture, &pkt);
-             if (len < 0) {
-                 DEBUG(env, this, "decodeFrame", "Error while decoding.");
-                 retflag = FALSE;
-@@ -265,7 +265,7 @@ int file_info(JNIEnv * env, jobject this
-     av_register_all();
-     
-     // Open the input file.
--    err = av_open_input_file(&fcx, input_filename, NULL, 0, NULL);
-+    err = avformat_open_input(&fcx, input_filename, NULL, NULL);
-     if(err<0){
-         DEBUG(env, this, "file_info", "Could not open file '%s'.", input_filename);
-         return 1;
-@@ -275,9 +275,9 @@ int file_info(JNIEnv * env, jobject this
-     err = av_find_stream_info(fcx);
-     
-     // Give us information about the file and exit
--    dump_format(fcx, 0, input_filename, FALSE);
-+    av_dump_format(fcx, 0, input_filename, FALSE);
-     
--    av_close_input_file(fcx);
-+    avformat_close_input(&fcx);
-     return 0;
- }
- 
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/grabinfo.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/grabinfo.c
-@@ -82,7 +82,7 @@ void get_information(JNIEnv * env, jobje
-     av_register_all();
-     
-     // Open the input file.
--    err = av_open_input_file(&fcx, video_c, NULL, 0, NULL);
-+    err = avformat_open_input(&fcx, video_c, NULL, NULL);
-     if(err<0) {
-         DEBUG(env, this, "get_information", "Could not open file '%s'.", video_c);
-         ret = JNI_FALSE;
-Index: Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-===================================================================
---- Jubler-4.6.1.orig/resources/ffmpeg/ffdecode/makecache.c
-+++ Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-@@ -59,7 +59,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-     float ratewindow = 0;
-     unsigned int offset=0, maxbyte=0, sampledcounter=1;
-     FILE *cachefile=NULL;
--    uint8_t *outbuf=NULL;
-+    AVFrame *outbuf=NULL;
-     jboolean nobrk = JNI_TRUE;
-     
-     int ENDIANESS = isLittleEndian();
-@@ -81,7 +81,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-         ret = JNI_TRUE;
-         
-         // Open the input file.
--        err = av_open_input_file(&fcx, audio_c, NULL, 0, NULL);
-+        err = avformat_open_input(&fcx, audio_c, NULL, NULL);
-         cachefile = fopen(cache_c, "wb");
-         if(err<0){
-             DEBUG(env, this, "makeCache", "Could not open audio file '%s'.", audio_c);
-@@ -91,7 +91,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-             DEBUG(env, this, "makeCache", "Could not open cache file '%s'.", cache_c);
-             ret = JNI_FALSE;
-         }
--        outbuf = malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+        outbuf = avcodec_alloc_frame();
-         if(outbuf==NULL) {
-             DEBUG(env, this, "makeCache", "Could not allocate memory for outbuf.");
-             ret = JNI_FALSE;
-@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-         }
-         else {
-             /* open it */
--            if ((codec_is_open = avcodec_open(ccx, codec)) < 0) {
-+            if ((codec_is_open = avcodec_open2(ccx, codec,NULL)) < 0) {
-                 DEBUG(env, this, "makeCache", "Could not open codec.");
-                 ret = JNI_FALSE;
-             }
-@@ -175,7 +175,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-                     pack_pts = av_rescale_q(pkt.pts, fcx->streams[audio_index]->time_base, AV_TIME_BASE_Q);
-                     // Decode the paket
-                     got_audio = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--                    len = avcodec_decode_audio2(ccx, (short *)outbuf, &got_audio, pkt.data, pkt.size);
-+                    len = avcodec_decode_audio4(ccx, outbuf, &got_audio, &pkt);
-                     
-                     if (len < 0) {
-                         DEBUG(env, this, "makeCache", "Error while decoding.");
-@@ -196,7 +196,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-                             if (bytecounter+offset + step*channels >= maxbyte) {
-                                 for (j = 1; j <= channels ; j++) {
-                                     // actually sample is not the whole sample, but the data for one channel each time
--                                    sample = (char)outbuf[bytecounter+ENDIANESS];
-+                                    sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
-                                     // min max averaging: only keep the highest and the lowest sample value
-                                     if (maxsample[j-1] < sample) maxsample[j-1] = sample;
-                                     if (minsample[j-1] > sample) minsample[j-1] = sample;
-@@ -215,7 +215,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-                             }
-                             else {
-                                 for (j = 1; j <= channels; j++) {
--                                    sample = (char)outbuf[bytecounter+ENDIANESS];
-+                                    sample = (char)outbuf->data[0][bytecounter+ENDIANESS];
-                                     // min max averaging
-                                     if (maxsample[j-1] < sample) maxsample[j-1] = sample;
-                                     if (minsample[j-1] > sample) minsample[j-1] = sample;
-@@ -254,7 +254,7 @@ JNIEXPORT jboolean JNICALL Java_com_pana
-     if(minsample != NULL)  free(minsample);
-     if(cachefile != NULL)  fclose(cachefile);
-     if(codec_is_open >= 0) avcodec_close(ccx);
--    if(outbuf != NULL)     free(outbuf);
-+    if(outbuf != NULL)     av_free(outbuf);
-     if(fcx != NULL)        av_close_input_file(fcx);
-     
-     return ret;
diff --git a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch b/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
deleted file mode 100644
index 28f50b57d6ad..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-ffmpeg-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-index 92bf071..d163010 100644
---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/decodeaudio.c
-@@ -37,6 +37,13 @@ jboolean decodeAudio(JNIEnv* env, jobject this, const char *input_filename, cons
- AVStream *add_audio_stream(JNIEnv* env, jobject this, AVFormatContext *oc, int codec_id, int sample_rate, int channels);
- void audio_enc_out(JNIEnv * env, jobject this, AVFormatContext *ofcx, AVStream *audio_st, const short *samples, int buf_size);
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#ifndef MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#else
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
-+#endif
-+#endif
- 
- JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_createClip(JNIEnv * env, jobject this, jstring audio, jstring wav, jlong start, jlong stop) {
-     const char * audio_c;
-diff --git a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-index d7ea88b..0190b79 100644
---- a/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-+++ b/Jubler-4.6.1/resources/ffmpeg/ffdecode/makecache.c
-@@ -38,6 +38,14 @@
- #include "defaults.h"
- #include "utilities.h"
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#ifndef MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#else
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE MAX_AUDIO_FRAME_SIZE
-+#endif
-+#endif
-+
- JNIEXPORT jboolean JNICALL Java_com_panayotis_jubler_media_preview_decoders_NativeDecoder_makeCache(JNIEnv * env, jobject this, jstring audio, jstring cache, jstring original) {
-     const char *audio_c;
-     const char *cache_c;
diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
deleted file mode 100644
index 25afdba2fcc9..000000000000
--- a/media-video/jubler/files/jubler-4.6.1-gentoo.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Nur Jubler-4.6.1/build.xml Jubler-4.6.1_patched/build.xml
---- Jubler-4.6.1/build.xml	2011-02-05 23:46:03.000000000 +0200
-+++ Jubler-4.6.1_patched/build.xml	2011-02-13 14:46:56.562977001 +0200
-@@ -1,36 +1,9 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<project name="Jubler" default="dist" basedir=".">
-+<project name="Jubler" default="allparts" basedir=".">
- 	<description>Builds, tests, and runs the project Jubler.</description>
- 	<property file="core/src/com/panayotis/jubler/information/version.prop" />
--
--	<taskdef resource="net/sf/antcontrib/antlib.xml">
--		<classpath>
--			<pathelement location="resources/libs/ant-contrib/ant-contrib-1.0b3.jar"/>
--		</classpath>
--	</taskdef>
-+	<taskdef resource="net/sf/antcontrib/antlib.xml"/>
- 	
--	<taskdef name="jarbundler"
--		onerror="report"
--		classpath="/opt/local/share/java/jarbundler.jar"
--		classname="net.sourceforge.jarbundler.JarBundler" />
--
--   <taskdef name="izpack"
--		onerror="report"
--		classpath="../../Tools/IzPack/standalone-compiler.jar"
--		classname="com.izforge.izpack.ant.IzPackTask"/>
--
--	<taskdef name="launch4j"
--		onerror="report"
--		classpath="/opt/local/share/launch4j/launch4j.jar:/opt/local/share/launch4j/lib/xstream.jar" 
--		classname="net.sf.launch4j.ant.Launch4jTask"/>
--
--	<target name="jupidator">
--		<ant antfile="../jupidator/build.xml" inheritall="false" target="jar"/>
--		<copy file="../jupidator/dist/jupidator.jar" todir="dist/lib"/>
--		<ant antfile="../jupidator/build.xml" inheritall="false" target="clean"/>
--	</target>
--		
--
- 	<target name="i18n">
- 		<exec dir="resources/i18n" executable="bash" failonerror="true">
- 			<arg line="compile"/>
-@@ -45,12 +18,14 @@
- 		<move file="resources/help/jubler-faq.html" todir="dist/help"/>
- 		<copy file="resources/help/question.png" todir="dist/help"/>
- 	</target>
--
-+	
-+	<target name="jupidator"/>
-+	
- 	<target name="changelog" depends="jupidator">
- 		<delete file="ChangeLog.html"/>
- 		<echo message="" file="ChangeLog.html"/>
--		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="dist/lib/jupidator.jar">
--			<arg value="http://www.jubler.org/files/updates/update.xml"/>
-+		<java fork="true" classname="com.panayotis.jupidator.helpers.ChangeLogCreator" classpath="resources/libs/jupidator.jar">
-+			<arg value="update-${version}.xml"/>
- 			<arg value="ChangeLog.html"/>
- 		</java>
- 	</target>
-@@ -311,7 +286,7 @@
- 	</target>
- 
- 	<!-- Create an isntallation-like file tree -->
--	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, -linuxdesktopintegration">
-+	<target name="-linuxinstall" depends="-linuxproperties, -cleandestdir, linuxdesktopintegration">
- 		<!-- Basic Jubler files -->
- 		<copy file="dist/Jubler.jar" todir="${libdir}"/>
- 		<copy todir="${libdir}/lib">
-@@ -337,7 +312,7 @@
- 	</target>
- 
- 	<!-- Linux desktop intergration -->
--	<target name="-linuxdesktopintegration" depends="-linuxproperties">
-+	<target name="linuxdesktopintegration" depends="-linuxproperties">
- 		<!-- Icon files -->
- 		<copy file="resources/installers/linux/jubler.menu" tofile="${sharedir}/menu/jubler"/>
- 		<copy file="resources/installers/linux/jubler.xpm" todir="${sharedir}/pixmaps"/>
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-01-31 01:19:02.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/information/HelpBrowser.java	2011-02-12 14:38:50.220780001 +0200
-@@ -47,7 +47,7 @@
- 
-         history = new ArrayList<String>();
- 
--        String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/help/jubler-faq.html";
-+        String initpage = "file:" + SystemFileFinder.getJublerAppPath() + "/../help/jubler-faq.html";
-         setPage(initpage);
-         history.add(initpage);
- 
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-01-31 01:19:02.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemDependent.java	2011-02-12 14:43:25.740780001 +0200
-@@ -182,7 +182,7 @@
-                 Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
-             else { //assume Unix or Linux
-                 String[] browsers = {
--                    "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
-+                    "xdg-open", "firefox", "konqueror", "opera", "epiphany", "mozilla", "netscape"};
-                 String browser = null;
-                 for (int count = 0; count < browsers.length && browser == null; count++)
-                     if (Runtime.getRuntime().exec(
-diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java
---- Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-05 01:59:45.000000000 +0200
-+++ Jubler-4.6.1_patched/core/src/com/panayotis/jubler/os/SystemFileFinder.java	2011-02-12 14:38:18.520780001 +0200
-@@ -56,9 +56,8 @@
- 
-     public static boolean loadLibrary(String name) {
-         File libfile = findFile("lib" + FileCommunicator.FS + System.mapLibraryName(name));
--        if (libfile != null)
-             try {
--                System.load(libfile.getAbsolutePath());
-+                System.loadLibrary(name);
-                 return true;
-             } catch (UnsatisfiedLinkError e) {
-                 DEBUG.debug(e);
-diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile
---- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile	2011-01-31 16:26:26.000000000 +0200
-+++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile	2011-02-15 20:26:34.213149001 +0200
-@@ -12,9 +12,6 @@
- # Name of the produced library
- PROJ=ffdecode
- 
--# Paths of include files
--JAVA_HOME=${shell /bin/sh ../../system/findjava.sh -j}
--
- # Current Path
- CPATH=${shell pwd}
- 
-@@ -42,7 +39,6 @@
- # Various options
- FFCONF=configure
- LIBSUF=_${SYSTEM}.${ARCH}
--MAKEOPTS=-j3
- 
- # Find requested files
- NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' }
-@@ -136,7 +132,6 @@
- CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' }
- DCONFIG=--with-mp4v2 --host=${CCPREF_NOS}
- 
--CC=${CCPREF}gcc
- RANLIB=${CCPREF}ranlib
- 
- ifeq (${NOSTRIP},) 
-@@ -151,7 +146,7 @@
- .SUFFIXES:.o .c
- 
- .c.o:
--	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
-+	${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} ${JINCLUDE} -c -o $@ $?
- 
- 
- develop:javacheck
-@@ -208,7 +203,7 @@
- LIB:${LIBNAME}
- 
- ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
--	${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
-+	${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
- 	${STRIPCMD} ${LIBNAME}
- 
- 
diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild
deleted file mode 100644
index c8541a6b8181..000000000000
--- a/media-video/jubler/jubler-4.6.1-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-WANT_ANT_TASKS="ant-nodeps ant-contrib"
-inherit fdo-mime eutils java-pkg-2 java-ant-2 toolchain-funcs
-
-MY_PN=${PN/#j/J}
-DESCRIPTION="Java subtitle editor"
-HOMEPAGE="http://www.jubler.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}-source-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mplayer nls spell"
-
-RDEPEND=">=virtual/jre-1.5
-	virtual/ffmpeg
-	mplayer? ( media-video/mplayer[libass] )
-	spell? (
-		app-text/aspell
-		>=dev-java/zemberek-2.0[l10n_tr]
-	)"
-
-DEPEND=">=virtual/jdk-1.5
-	virtual/ffmpeg
-	app-text/xmlto
-	>=dev-java/jupidator-0.6.0
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}"/update-${PV}.xml "${S}" || die
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg-1.patch
-	epatch "${FILESDIR}"/${P}-ffmpeg-2.patch
-	chmod +x resources/installers/linux/iconinstall
-	#cd resources/libs || die
-	java-pkg_jarfrom --build-only --into resources/libs jupidator
-	rm -R plugins/{autoupdate,macapp} || die "unneeded plugin cleanup failed"
-	rm -R resources/libs/ant-contrib || die "jar cleanup failed"
-	if ! use mplayer; then
-		rm -R plugins/mplayer || die "mplayer plugin removal failed"
-	fi
-	if ! use spell; then
-		rm -R plugins/{zemberek,aspell} || die "spellcheck plugin removal failed"
-	fi
-	sed -i -e "s/CODEC_TYPE/AVMEDIA_TYPE/g" $(find resources/ffmpeg/ffdecode -name "*.c")
-	sed -i -e "s:PKT_FLAG_KEY:AV_PKT_FLAG_KEY:g" $(find resources/ffmpeg/ffdecode -name "*.c")
-}
-
-src_compile() {
-	java-pkg_filter-compiler ecj-3.2
-	ANT_TASKS="ant-nodeps ant-contrib" eant $(use nls && echo allparts) $(use nls || echo parts) help changelog || die "eant failed"
-	#cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
-	cd resources/ffmpeg/ffdecode || die
-	CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/Jubler.jar
-	use nls && java-pkg_dojar dist/i18n/*.jar
-	insinto /usr/share/jubler/lib/lib
-	doins dist/lib/*.jar  || die "Plugin installation failed"
-	#java-pkg_dojar dist/lib/*.jar
-	use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar
-	use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar
-	java-pkg_doso resources/ffmpeg/ffdecode/libffdecode.so
-	doicon resources/installers/linux/jubler.png
-	domenu resources/installers/linux/jubler.desktop
-
-	DESTDIR="${D}" eant linuxdesktopintegration
-	rm -vr "${D}/usr/share/menu" || die
-
-	java-pkg_dolauncher jubler --main Jubler
-	dohtml ChangeLog.html || die "dohtml failed"
-	dodoc README || die "dodoc failed"
-	doman resources/installers/linux/jubler.1 || die "doman failed"
-	insinto /usr/share/jubler/help
-	doins dist/help/* || die "doins failed"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
deleted file mode 100644
index 0e9d613171e6..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-HOMEPAGE="http://chaosreader.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="GPL-2"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
-}
-
-src_install() {
-	newbin ${P} chaosreader || die
-}
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
deleted file mode 100644
index 52a9411efebd..000000000000
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PN=NessusClient
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A client for the Nessus vulnerability scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/nessus-client.png.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="doc"
-
-RDEPEND="!net-analyzer/nessus-core
-	dev-libs/openssl
-	>=x11-libs/gtk+-2.8.8:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/htmldoc )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	sed -i \
-		-e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
-		nessus.tmpl.in || die
-}
-
-src_configure() {
-	tc-export CC
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CHANGES README_SSL VERSION
-
-	doicon "${WORKDIR}"/${PN}.png
-	make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
-}
-
-pkg_postinst() {
-	if ! use doc; then
-		elog "If you do not have documentation installed, nessus-client"
-		elog "will complain. To install documentation, please emerge with"
-		elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
-		elog "a big package."
-	fi
-}
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 8b706eb54cd7..e57b5a8b883a 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,4 +1 @@
-DIST libinklevel-0.8.0.tar.gz 326397 BLAKE2B 470b8f12f14c453865f9b4cb6a642f65b5fcb8dcfec28b2208c961d5f456061137f92af1073b8c2544fedb81096c0de8ce0085ccce813a16819f802f622a3608 SHA512 bc521a97eafe0b0b73a907e522ef3af6ce404c5b8f44ddb3765ee7c388a67f93392a623c7987053e31411d7d9e247065463c2eeaa77e5fcd70c13b915c36d30e
-DIST libinklevel-0.9.0.tar.gz 367521 BLAKE2B 4e1ac21e5773fa1df5d9524ef322c34133d80f02170f70bd09c91a03ce767a123cb24e69ef0c73b19bb3754bdaf29da9564ef3129ce279b47208d9ad7d49c765 SHA512 23ff9a0f959aff953006a51d1bced235be57dee7bf4046147cdec85525b8d8003d3d3d22bd116b7a3adf3620b10002f736e0156968c78224bccab63505bc5b49
-DIST libinklevel-0.9.1.tar.gz 367651 BLAKE2B 5e82641391535e810a75c8837be5488170b16566d1e9ad09f68689697ef9ef738a94d665e8a4ad72d1c6aeffecf90ae55dc0198969377297e42bb498699fc6ee SHA512 c21ac2ed2949777dcca0f2258de8e0bf565b429b579d6b2c6c7bdb218935b9b7c88e891b240996c4c5274bb7bc8f5796bd9bb1f90b89d9b09580ab8fb9dd067a
 DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
diff --git a/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch b/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
deleted file mode 100644
index 68af9e102f9d..000000000000
--- a/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in	2010-03-28 22:11:26.000000000 +0300
-+++ configure.in.fixed	2010-03-28 22:18:14.000000000 +0300
-@@ -16,9 +16,14 @@
- 
- ## Determine hostname & OS
- ## AC_CANONICAL_HOST
--
--AC_ARG_ENABLE([debug], [  --enable-debug	  enable debugging output], 
--	      AC_DEFINE(DEBUG, 1, [enable debugging output]))
-+AC_ARG_ENABLE(debug,
-+              [  --enable-debug         Enable debugging output if available (default=no)],
-+              [ case "${enableval}" in
-+             yes|"") enabled=yes; AC_DEFINE(DEBUG, 1, [enable debugging output]) ;;
-+             no) ;;
-+             *) ;;
-+    esac],
-+)
- 
- ## Check for programs
- ## we want libtool to build our libs
diff --git a/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild b/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
deleted file mode 100644
index d220441aa0ea..000000000000
--- a/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagicdebug.patch
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-	rm "${D}"/usr/lib/libinklevel.la
-}
diff --git a/net-print/libinklevel/libinklevel-0.9.0.ebuild b/net-print/libinklevel/libinklevel-0.9.0.ebuild
deleted file mode 100644
index 4d84a588e9cf..000000000000
--- a/net-print/libinklevel/libinklevel-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
-}
diff --git a/net-print/libinklevel/libinklevel-0.9.1.ebuild b/net-print/libinklevel/libinklevel-0.9.1.ebuild
deleted file mode 100644
index 4d84a588e9cf..000000000000
--- a/net-print/libinklevel/libinklevel-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
-}
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
deleted file mode 100644
index 04b93b89793d..000000000000
--- a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils autotools
-
-MYP=ParMGridGen-${PV}
-
-DESCRIPTION="Software for parallel (mpi) generating coarse grids"
-HOMEPAGE="http://www-users.cs.umn.edu/~moulitsa/software.html"
-SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="mirror bindist"
-
-DEPEND="virtual/mpi"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MYP}
-
-pkg_setup(){
-	export CC=mpicc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-autotools.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README Doc/*.pdf || die
-}
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index 7d64e5e1609e..551628427ffa 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,3 +1 @@
-DIST ucspi-proxy-0.97.tar.gz 26717 BLAKE2B 5c3b677cb5dbc97f70f4b70a8b9b3ea20fad228f5ee6fa801435202a6d98835dae4ddbf2f2dd815732ce9c906171f90e7eb3d87eda32080d2454faca36cb5c25 SHA512 92adb00ee6af43c12a89cfb22b00f140fd222bc42b3faa8e6d660278344a9dacd9e24280a3e2769bd7e15787e1be028ee33dd670e627e46ed92065f5c37e08e0
-DIST ucspi-proxy-0.98.tar.gz 35278 BLAKE2B c8153c30926d9d4b6f00a41de3000f4c7814af5d1eda8193e208ea81ec4d2aa04af6831d4bd5e1fa5ae73113a3ebd7b112e718a9b206888ac47b81276daa6233 SHA512 db767fd19825753107965a3f8a7e8c588e053fb911b3cbe1060684e6100244f9ce720f73e97bdfb26a3af00f6dda2a011866f7e5008ff7edca71b0fe3319da1b
 DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
deleted file mode 100644
index 5eeb9dcf1f2c..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=">=dev-libs/bglibs-1.025"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man/" > conf-man
-	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/lib/bglibs/" > conf-bglibs
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
deleted file mode 100644
index 7a54182bf1ba..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/bglibs-1.106"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e '/^>bin$/ac:::755::ucspi-proxy' INSTHIER
-}
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man" > conf-man
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/www-servers/pound/Manifest b/www-servers/pound/Manifest
index ecaa8656e18e..73c67241207a 100644
--- a/www-servers/pound/Manifest
+++ b/www-servers/pound/Manifest
@@ -1,3 +1 @@
-DIST Pound-2.6.tgz 180595 BLAKE2B 614507fb1e5373dd5cb340004dd7ffb7be3f08735168381c0bb2f62e463de3c3a14230f354e5eaa0bc359ba7c5ac531acb4a812af5b1d452055e43727c495e55 SHA512 ec397740672ab3784322136e9e0ab7ac059c888453f2bdaf00cf64795a0ff9985d9d60a77a78491f64f2d0a63cce0b18a5df4f9b74a97ab9065a591ac046ad36
-DIST Pound-2.7d.tgz 184801 BLAKE2B 005383acc65401a29f9d43705f6ca03b62a788b048bb4e031f6da41d7e5410be3573faa7b59420e457897b4dd5114a72c46b9f6f6789c6678a36b1940b98c94c SHA512 3a64a910327c3acbc43daaaca28612fe5f98f89937612844fc2a4de9d638499465783b09782daceda0a10f8cfdf396d233fa231fb967b7889213898078015416
 DIST Pound-2.7f.tgz 186719 BLAKE2B 39a31b43c5945db1b5ad008e2f43d3026728ea5bdc3de0fa8c0b68a743d0bea4b86dd61a527ea140e6b0546732f0c66c863e78131432af32ab5b0874a7c1f705 SHA512 292f4f7b4363365829f204b687080eae9e17b9a67ae7eb6021eb5a028321191d97abd9633d5664db5ebca6467795f73a787be4a0bd29360d737865930ff81830
diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index 5abcc6461591..7c2ee308598d 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -12,7 +12,4 @@
 		SSL wrapper for those Web servers that do not offer it natively. Pound is
 		distributed under the GPL - no warranty, it's free to use, copy and give away.
 	</longdescription>
-	<use>
-		<flag name="dynscaler">Enable dynamic rescaling of back-end priorities</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-servers/pound/pound-2.6.ebuild b/www-servers/pound/pound-2.6.ebuild
deleted file mode 100644
index d7d176e63a5e..000000000000
--- a/www-servers/pound/pound-2.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
-IUSE="dynscaler"
-
-DEPEND="dev-libs/libpcre
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable dynscaler)
-}
-
-src_install() {
-	dodir /usr/sbin
-	cp "${S}"/pound "${D}"/usr/sbin/
-	cp "${S}"/poundctl "${D}"/usr/sbin/
-
-	doman pound.8
-	doman poundctl.8
-	dodoc README FAQ
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-	echo
-	ewarn "You will have to upgrade you configuration file, if you are"
-	ewarn "upgrading from a version <= 2.0."
-	echo
-	ewarn "The 'WebDAV' config statement is no longer supported!"
-	ewarn "Please adjust your configuration, if necessary."
-	echo
-}
diff --git a/www-servers/pound/pound-2.7d.ebuild b/www-servers/pound/pound-2.7d.ebuild
deleted file mode 100644
index 79e7d10fc790..000000000000
--- a/www-servers/pound/pound-2.7d.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodir /usr/sbin
-	cp "${S}"/pound "${D}"/usr/sbin/
-	cp "${S}"/poundctl "${D}"/usr/sbin/
-
-	doman pound.8
-	doman poundctl.8
-	dodoc README FAQ
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-	echo
-	ewarn "You will have to upgrade you configuration file, if you are"
-	ewarn "upgrading from a version <= 2.0."
-	echo
-	ewarn "The 'WebDAV' config statement is no longer supported!"
-	ewarn "Please adjust your configuration, if necessary."
-	echo
-}
diff --git a/www-servers/pound/pound-2.7f.ebuild b/www-servers/pound/pound-2.7f.ebuild
deleted file mode 100644
index 79e7d10fc790..000000000000
--- a/www-servers/pound/pound-2.7f.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P=${P/p/P}
-DESCRIPTION="A http/https reverse-proxy and load-balancer"
-HOMEPAGE="http://www.apsis.ch/pound/"
-SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodir /usr/sbin
-	cp "${S}"/pound "${D}"/usr/sbin/
-	cp "${S}"/poundctl "${D}"/usr/sbin/
-
-	doman pound.8
-	doman poundctl.8
-	dodoc README FAQ
-
-	dodir /etc/init.d
-	newinitd "${FILESDIR}"/pound.init-1.9 pound
-
-	insinto /etc
-	newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
-}
-
-pkg_postinst() {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "read the man-page for more info."
-	elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
-	echo
-	ewarn "You will have to upgrade you configuration file, if you are"
-	ewarn "upgrading from a version <= 2.0."
-	echo
-	ewarn "The 'WebDAV' config statement is no longer supported!"
-	ewarn "Please adjust your configuration, if necessary."
-	echo
-}