The 2.4 and 2.5 series no longer compile with modern autoconf. If you have a really old server that you need to talk to, you can get them from the CVS Attic.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

20 files changed, 17 insertions, 4770 deletions

diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index f583a6d52b83..5060de2dd5b2 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-backup/amanda
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.61 2009/11/22 09:54:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.62 2009/11/22 10:05:40 robbat2 Exp $
+
+  22 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> -amanda-2.4.5.ebuild,
+  -amanda-2.4.5_p1.ebuild, -files/amanda-2.4.5-4tb-holding-disk.patch,
+  -files/amanda-2.4.5-amverify-loop-detect.patch,
+  -files/amanda-2.4.5-samba-printf.patch, -amanda-2.5.1_p3-r1.ebuild,
+  -amanda-2.5.1_p3-r2.ebuild, -amanda-2.5.1_p3-r4.ebuild,
+  -files/amanda-2.5.1_p2-tar-1.16.patch,
+  -files/amanda-2.5.1_p3-displayunit.patch, -amanda-2.5.2_p1.ebuild,
+  -amanda-2.5.2_p1-r1.ebuild, -amanda-2.5.2_p1-r2.ebuild,
+  -amanda-2.5.2_p1-r3.ebuild, -amanda-2.5.2_p1-r4.ebuild,
+  -amanda-2.5.2_p1-r5.ebuild, -files/amanda-2.5.2_p1-chg-multi.patch,
+  -files/amanda-2.5.2_p1-fix-asneeded.patch,
+  -files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch:
+  The 2.4 and 2.5 series no longer compile with modern autoconf. If you have
+  a really old server that you need to talk to, you can get them from the
+  CVS Attic.
 
   22 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Add Dustin from upstream to metadata.
diff --git a/app-backup/amanda/amanda-2.4.5.ebuild b/app-backup/amanda/amanda-2.4.5.ebuild
deleted file mode 100644
index 54d2e2e2809d..000000000000
--- a/app-backup/amanda/amanda-2.4.5.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.4.5.ebuild,v 1.14 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		app-arch/mt-st
-		sci-visualization/gnuplot
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		sys-block/mtx
-		app-arch/dump
-		virtual/mailx
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm samba xfs"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=${AMANDA_USER_HOMEDIR}/tmp
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix glitch with recognizing tar-1.14.90
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/patch-tar-1.14.90 || die "Failed to add tar support patch"
-	epatch "${FILESDIR}"/${P}-4tb-holding-disk.patch || die "Failed to patch for 4TB holding disks"
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-samba-printf.patch || die "Failed to patch samba printf bug"
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-amverify-loop-detect.patch || die "Failed to patch amverify loop bug"
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# Debug
-	myconf="${myconf} `use_with debug debugging`"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	use samba && myconf="${myconf} --with-smbclient=/usr/bin/smbclient" || myconf="${myconf} --without-smbclient"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Depreacted, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc "${D}"/usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	dodoc "${MYFILESDIR}"/amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-amandahosts amandahosts
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto ${AMANDA_USER_HOMEDIR}
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not excetuable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} ${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd amanda
-
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw acces to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-}
diff --git a/app-backup/amanda/amanda-2.4.5_p1.ebuild b/app-backup/amanda/amanda-2.4.5_p1.ebuild
deleted file mode 100644
index 904324973125..000000000000
--- a/app-backup/amanda/amanda-2.4.5_p1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.4.5_p1.ebuild,v 1.10 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		app-arch/mt-st
-		sci-visualization/gnuplot
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		sys-block/mtx
-		app-arch/dump
-		virtual/mailx
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		>=sys-apps/portage-2.0.51-r3"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm samba xfs"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=${AMANDA_USER_HOMEDIR}/tmp
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix glitch with recognizing tar-1.14.90
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.4.5-4tb-holding-disk.patch || die "Failed to patch for 4TB holding disks"
-	# merged by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.4.5-samba-printf.patch || die "Failed to patch samba printf bug"
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.4.5-amverify-loop-detect.patch || die "Failed to patch amverify loop bug"
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# Debug
-	myconf="${myconf} `use_with debug debugging`"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	use samba && myconf="${myconf} --with-smbclient=/usr/bin/smbclient" || myconf="${myconf} --without-smbclient"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Depreacted, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc "${D}"/usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp ${TMPENVFILE} "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	dodoc "${MYFILESDIR}"/amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-amandahosts amandahosts
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto ${AMANDA_USER_HOMEDIR}
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not excetuable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} ${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw acces to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-}
diff --git a/app-backup/amanda/amanda-2.5.1_p3-r1.ebuild b/app-backup/amanda/amanda-2.5.1_p3-r1.ebuild
deleted file mode 100644
index 876f869de233..000000000000
--- a/app-backup/amanda/amanda-2.5.1_p3-r1.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.1_p3-r1.ebuild,v 1.6 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix glitch with recognizing tar-1.14.90
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
-	# Fix tar 1.16 changes
-	# ( http://cvs.savannah.gnu.org/viewcvs/tar/NEWS?rev=1.125&root=tar )
-	# commented by sgw, but not yet removed:
-	# the patch is in the upstream source already
-	#EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-tar-1.16.patch || die "Failed to add tar 1.16 patch"
-
-	# Fix broken display of chunks with parameter displayunit.
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-displayunit.patch || die "Failed to add amstatus-patch"
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# Debug
-	myconf="${myconf} `use_with debug debugging`"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	use samba && myconf="${myconf} --with-smbclient=/usr/bin/smbclient" || myconf="${myconf} --without-smbclient"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${FILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 >>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${FILESDIR}"/amanda-amandahosts-server2.5.1_p3-r1 >>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto ${AMANDA_USER_HOMEDIR}
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not excetuable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} ${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
diff --git a/app-backup/amanda/amanda-2.5.1_p3-r2.ebuild b/app-backup/amanda/amanda-2.5.1_p3-r2.ebuild
deleted file mode 100644
index 9f9f67d58cf9..000000000000
--- a/app-backup/amanda/amanda-2.5.1_p3-r2.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.1_p3-r2.ebuild,v 1.7 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix glitch with recognizing tar-1.14.90
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
-	# Fix tar 1.16 changes
-	# ( http://cvs.savannah.gnu.org/viewcvs/tar/NEWS?rev=1.125&root=tar )
-	# commented by sgw, but not yet removed:
-	# the patch is in the upstream source already
-	#EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-tar-1.16.patch || die "Failed to add tar 1.16 patch"
-
-	# Fix broken display of chunks with parameter displayunit.
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-displayunit.patch || die "Failed to add amstatus-patch"
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	use samba && myconf="${myconf} --with-smbclient=/usr/bin/smbclient" || myconf="${myconf} --without-smbclient"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${FILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${FILESDIR}"/amanda-amandahosts-server2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not excetuable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} ${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
diff --git a/app-backup/amanda/amanda-2.5.1_p3-r4.ebuild b/app-backup/amanda/amanda-2.5.1_p3-r4.ebuild
deleted file mode 100644
index bcabeac4a93a..000000000000
--- a/app-backup/amanda/amanda-2.5.1_p3-r4.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.1_p3-r4.ebuild,v 1.5 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		kerberos? ( app-crypt/mit-krb5 )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	# Fix glitch with recognizing tar-1.14.90
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
-	# Fix tar 1.16 changes
-	# ( http://cvs.savannah.gnu.org/viewcvs/tar/NEWS?rev=1.125&root=tar )
-	# commented by sgw, but not yet removed:
-	# the patch is in the upstream source already
-	#EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-tar-1.16.patch || die "Failed to add tar 1.16 patch"
-
-	# Fix broken display of chunks with parameter displayunit.
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-displayunit.patch || die "Failed to add amstatus-patch"
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME \
-		AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR \
-		AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE \
-		AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME \
-		AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP \
-		AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${FILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${FILESDIR}"/amanda-amandahosts-server2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto ${AMANDA_USER_HOMEDIR}
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1-r1.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r1.ebuild
deleted file mode 100644
index e9b554600fb9..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1-r1.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r1.ebuild,v 1.3 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		kerberos? ( app-crypt/mit-krb5 )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME \
-		AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR \
-		AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE \
-		AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME \
-		AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP \
-		AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}"/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1-r2.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r2.ebuild
deleted file mode 100644
index d4cf9ceb9b71..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1-r2.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r2.ebuild,v 1.4 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		kerberos? ( app-crypt/mit-krb5 )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed.
-AMANDA_ENV_SETTINGS="
-AMANDA_GROUP_GID AMANDA_GROUP_NAME
-AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
-AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
-AMANDA_TAR_LISTDIR AMANDA_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_DBMODE"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# What tar to use
-	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in ${AMANDA_ENV_SETTINGS} ; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}"/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1-r3.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r3.ebuild
deleted file mode 100644
index d74ef3034ef5..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1-r3.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r3.ebuild,v 1.3 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		kerberos? ( app-crypt/mit-krb5 )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed. This variable name must not start with AMANDA_, as we do not want
-# it captured into the env file.
-ENV_SETTINGS_AMANDA="
-AMANDA_GROUP_GID AMANDA_GROUP_NAME
-AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
-AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
-AMANDA_TAR_LISTDIR AMANDA_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_DBMODE"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# What tar to use
-	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE} | grep -v '^AMANDA_ENV_SETTINGS')
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in ${ENV_SETTINGS_AMANDA} ; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}"/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1-r4.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r4.ebuild
deleted file mode 100644
index 80e5b8f074de..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1-r4.ebuild
+++ /dev/null
@@ -1,450 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r4.ebuild,v 1.3 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		dev-libs/glib
-		samba? ( net-fs/samba )
-		kerberos? ( app-crypt/mit-krb5 )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed. This variable name must not start with AMANDA_, as we do not want
-# it captured into the env file.
-ENV_SETTINGS_AMANDA="
-AMANDA_GROUP_GID AMANDA_GROUP_NAME
-AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
-AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
-AMANDA_TAR_LISTDIR AMANDA_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_MAX_TAPE_BLOCK_KB"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# What tar to use
-	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
-	# Text mode is the only one left.
-	AMANDA_DBMODE='text'
-
-	# Raise maximum configurable blocksize
-	[ -z "${AMANDA_MAX_TAPE_BLOCK_KB}" ] && AMANDA_MAX_TAPE_BLOCK_KB=512
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE} | grep -v '^AMANDA_ENV_SETTINGS')
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	[ -n "${AMANDA_DBMODE}" -a "${AMANDA_DBMODE}" != "text" ] && \
-		ewarn "Using db or gdbm modes for the database is no longer supported."
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Gentoo bug #192296, chg-multi fails
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.5.2_p1-chg-multi.patch || die "Failed to apply patch to correct typo in chg-multi!"
-
-	# Gentoo bug #212970, --as-needed linking
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.5.2_p1-fix-asneeded.patch || die "Failed to apply patch to correct bug #212970!"
-
-	eautomake
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	# Raise maximum configurable blocksize
-	myconf="${myconf} --with-maxtapeblocksize=${AMANDA_MAX_TAPE_BLOCK_KB}"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in ${ENV_SETTINGS_AMANDA} ; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}"/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild
deleted file mode 100644
index aff7a27a64fc..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild,v 1.2 2009/04/01 21:34:56 robbat2 Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		dev-libs/glib
-		samba? ( net-fs/samba )
-		kerberos? ( app-crypt/mit-krb5 )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed. This variable name must not start with AMANDA_, as we do not want
-# it captured into the env file.
-ENV_SETTINGS_AMANDA="
-AMANDA_GROUP_GID AMANDA_GROUP_NAME
-AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
-AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
-AMANDA_TAR_LISTDIR AMANDA_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_MAX_TAPE_BLOCK_KB"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# What tar to use
-	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
-	# Text mode is the only one left.
-	AMANDA_DBMODE='text'
-
-	# Raise maximum configurable blocksize
-	[ -z "${AMANDA_MAX_TAPE_BLOCK_KB}" ] && AMANDA_MAX_TAPE_BLOCK_KB=512
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE} | grep -v '^AMANDA_ENV_SETTINGS')
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	[ -n "${AMANDA_DBMODE}" -a "${AMANDA_DBMODE}" != "text" ] && \
-		ewarn "Using db or gdbm modes for the database is no longer supported."
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Gentoo bug #192296, chg-multi fails
-	EPATCH_OPTS="-d ${S}" epatch \
-		"${FILESDIR}"/${PN}-2.5.2_p1-chg-multi.patch \
-		|| die "Failed to apply patch to correct typo in chg-multi!"
-
-	# Gentoo bug #212970, --as-needed linking
-	EPATCH_OPTS="-d ${S}" epatch \
-		"${FILESDIR}"/${PN}-2.5.2_p1-fix-asneeded.patch \
-		|| die "Failed to apply patch to correct bug #212970!"
-
-	# Fix a fun race condition if you use encryption.
-	# This is one of the reasons you should test your recovery procedures often.
-	EPATCH_OPTS="-d ${S}" epatch \
-		"${FILESDIR}"/${PN}-2.5.2p1-amcrypt-ossl-asym-race-fix.patch \
-		|| die "Failed to apply race fix for encryption"
-
-	pushd "${S}" >/dev/null
-	WANT_AUTOMAKE=1.9 eautomake
-	popd >/dev/null
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	# Raise maximum configurable blocksize
-	myconf="${myconf} --with-maxtapeblocksize=${AMANDA_MAX_TAPE_BLOCK_KB}"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in ${ENV_SETTINGS_AMANDA} ; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}"/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/amanda-2.5.2_p1.ebuild b/app-backup/amanda/amanda-2.5.2_p1.ebuild
deleted file mode 100644
index 80a483c9ee13..000000000000
--- a/app-backup/amanda/amanda-2.5.2_p1.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1.ebuild,v 1.3 2008/08/13 21:13:32 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-		virtual/inetd
-		sys-apps/gawk
-		app-arch/tar
-		dev-lang/perl
-		app-arch/dump
-		net-misc/openssh
-		samba? ( net-fs/samba )
-		berkdb? ( sys-libs/db )
-		kerberos? ( app-crypt/mit-krb5 )
-		gdbm? ( sys-libs/gdbm )
-		!sparc? ( xfs? ( sys-fs/xfsdump ) )
-		!minimal? ( virtual/mailx
-			app-arch/mt-st
-			sys-block/mtx
-			sci-visualization/gnuplot
-			app-crypt/aespipe
-			app-crypt/gnupg )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-IUSE="berkdb debug gdbm minimal samba xfs kerberos"
-
-S="${WORKDIR}/${P/_/}"
-MYFILESDIR="${WORKDIR}/files"
-MYTMPDIR="${WORKDIR}/tmp"
-MYINSTTMPDIR="/usr/share/amanda"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
-TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${ENVDFILE}"
-
-amanda_variable_setup() {
-
-	# Setting vars
-	local currentamanda
-
-	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
-	use debug && einfo "Current settings: ${currentamanda}"
-	#for i in ${currentamanda}; do
-	#	eval `eval echo ${i}`
-	#	echo "Setting: ${i}"
-	#done;
-
-	# First we set the defaults
-	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
-	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
-	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
-	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
-	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=-1
-	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
-	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
-
-	# This installs Amanda, with the server. However, it could be a client,
-	# just specify an alternate server name in AMANDA_SERVER.
-	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
-	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
-	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
-	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
-	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
-	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
-	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
-	# These are left empty by default
-	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
-	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
-	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
-	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
-
-	# This one is a little more complicated
-	# The priority list is this:
-	# 1. 'Berkely DB style' (only if USE="berkdb")
-	# 2. 'GDBM style' (only if USE="gdbm")
-	# 3. 'Text style'
-	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
-	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
-	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
-
-	# Now pull in the old stuff
-	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
-		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
-	fi
-
-	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
-
-}
-
-pkg_setup() {
-	# Now add users if needed
-	amanda_variable_setup
-	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
-	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# now the real fun
-	amanda_variable_setup
-	# places for us to work in
-	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
-	# Now we store the settings we just created
-	set | egrep "^AMANDA_" > "${TMPENVFILE}"
-}
-
-src_compile() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source "${TMPENVFILE}"
-	local myconf
-	cd "${S}"
-
-	einfo "Using '${AMANDA_DBMODE}' style database"
-	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
-	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
-	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
-	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
-	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
-	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
-	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
-	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
-
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
-		eerror "If you want _both_ UDP and TCP ports, please use only the"
-		eerror "AMANDA_PORTS environment variable for identical ports, or set"
-		eerror "AMANDA_PORTS_BOTH."
-		die "Bad port setup!"
-	fi
-	if [ -n "${AMANDA_PORTS_UDP}" ]; then
-		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
-	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
-		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
-	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
-		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
-	fi
-
-	# Extras
-	# Speed option
-	myconf="${myconf} --with-buffered-dump"
-	# "debugging" in the configuration is NOT debug in the conventional sense.
-	# It is actually just useful output in the application, and should remain
-	# enabled. There are some cases of breakage with MTX tape changers as of
-	# 2.5.1p2 that it exposes when turned off as well.
-	myconf="${myconf} --with-debugging"
-	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
-	# Samba support
-	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
-
-	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
-	# default
-	myconf="${myconf} --with-bsd-security"
-	myconf="${myconf} --with-ssh-security"
-	myconf="${myconf} --with-bsdudp-security"
-	myconf="${myconf} --with-bsdtcp-security"
-
-	# kerberos-security mechanism version 4
-	# always disable, per bug #173354
-	myconf="${myconf} --without-krb4-security"
-
-	# kerberos-security mechanism version 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Force the correct TAR
-	myconf="${myconf} --with-gnutar=/bin/tar"
-
-	# Client only, as requested in bug #127725
-	use minimal && myconf="${myconf} --without-server"
-
-	econf ${myconf} || die "econf failed!"
-	emake -j1 || die "emake failed!"
-
-	# Compile the tapetype program too
-	# This is deprecated, use amtapetype instead!
-	# cd tape-src
-	# emake tapetype || die "emake tapetype failed!"
-
-	# Only needed if you we do versioning
-	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
-	#perl ${S}/contrib/set_prod_link.pl
-
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Prepare our custom files
-	einfo "Building custom configuration files"
-	cp "${FILESDIR}"/amanda-* "${MYFILESDIR}"
-	local i # our iterator
-	local sedexpr # var for sed expr
-	sedexpr=''
-	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME \
-		AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR \
-		AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE \
-		AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME \
-		AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP \
-		AMANDA_PORTS_BOTH AMANDA_PORTS; do
-		local val
-		eval "val=\"\${${i}}\""
-		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
-	done
-	#einfo "Compiled SED expression: '${sedexpr}'"
-
-	# now apply the sed expr
-	for i in "${FILESDIR}"/amanda-* ; do
-		local filename
-		filename="`basename ${i}`"
-		#einfo "Applying compiled SED expression to ${filename}"
-		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}"/${filename}
-	done
-
-	# Build the envdir file
-	# Don't forget this..
-	einfo "Building environment file"
-	local t
-	t="${MYFILESDIR}"/${ENVDFILE}
-	echo "# These settings are what was present in the environment when this" >>"${t}"
-	echo "# Amanda was compiled.  Changing anything below this comment will" >>"${t}"
-	echo "# have no effect on your application, but it merely exists to" >>"${t}"
-	echo "# preserve them for your next emerge of Amanda" >>"${t}"
-	cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}"
-
-	into /usr
-
-	# Deprecated, use amtapetype instead
-	#einfo "Installing tapetype utility"
-	#newsbin tape-src/tapetype tapetype
-
-	# docs
-	einfo "Installing documentation"
-	dodoc AUTHORS C* INSTALL NEWS README
-	# Clean up some bits
-	dodoc /usr/share/amanda/*
-	rm -rf "${D}"/usr/share/amanda
-	mkdir -p "${D}"/${MYINSTTMPDIR} || die
-	cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die
-	# our inetd sample
-	einfo "Installing standard inetd sample"
-	newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 amanda-inetd.amanda.sample
-	# Stock extra docs
-	docinto docs
-	dodoc "${S}"/docs/*
-	# Labels
-	einfo "Installing labels"
-	docinto labels
-	dodoc "${S}"/example/3hole.ps
-	dodoc "${S}"/example/8.5x11.ps
-	dodoc "${S}"/example/DIN-A4.ps
-	dodoc "${S}"/example/DLT.ps
-	dodoc "${S}"/example/EXB-8500.ps
-	dodoc "${S}"/example/HP-DAT.ps
-	# Amanda example configs
-	einfo "Installing example configurations"
-	docinto example
-	dodoc "${S}"/example/*
-	docinto example1
-	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
-	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
-	newdoc "${FILESDIR}"/example_global.conf global.conf
-	docinto example2
-	newdoc "${S}"/example/amanda.conf amanda.conf
-	newdoc "${S}"/example/disklist disklist
-	# Compress it all
-	prepalldocs
-
-	# Just make sure it exists for XFS to work...
-	use !sparc && use xfs && keepdir /var/xfsdump/inventory
-
-	insinto /etc/amanda
-	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
-
-	cat "${FILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-	use minimal \
-	|| cat "${FILESDIR}"/amanda-amandahosts-server2.5.1_p3-r1 \
-		>>"${D}"/etc/amanda/amandahosts
-
-	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
-	insinto "${AMANDA_USER_HOMEDIR}"
-	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
-	newins "${MYFILESDIR}"/amanda-profile .profile
-
-	einfo "Installing Sample Daily Cron Job for Amanda"
-	CRONDIR=/etc/cron.daily/
-	exeinto ${CRONDIR}
-	newexe "${MYFILESDIR}"/amanda-cron amanda
-	# Not executable by default
-	fperms 644 ${CRONDIR}/amanda
-
-	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
-	keepdir /etc/amanda
-	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
-
-	local i
-	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} \
-		${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps \
-		${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} \
-		/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
-		einfo "Securing directory (${i})"
-		dodir ${i}
-		keepdir ${i}
-		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
-		fperms 700 ${i}
-	done
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# DevFS
-	einfo "Installing DevFS config file"
-	insinto /etc/devfs.d
-	newins "${MYFILESDIR}"/amanda-devfs amanda
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}"/${ENVDFILE}
-
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda
-
-}
-
-pkg_postinst() {
-	local aux="${ROOT}"/${TMPINSTENVFILE}
-	[ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!"
-	source "${aux}"
-	rm "${aux}"
-	rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error
-
-	local i
-	for i in amandates dumpdates; do
-		einfo "Creating inital Amanda file (${i})"
-		touch "${ROOT}"/etc/${i}
-		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/etc/${i}
-		chmod 600 "${ROOT}"/etc/${i}
-	done
-
-	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
-	# another host than HOSTNAME.
-	if use minimal; then
-		if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then
-			echo
-			ewarn "You are installing a client-only version of Amanda."
-			ewarn "You should set the variable $AMANDA_SERVER to point at your"
-			ewarn "Amanda-tape-server, otherwise you will have to specify its name"
-			ewarn "when using amrecover on the client."
-			ewarn "For example: Use something like"
-			ewarn "AMANDA_SERVER=\"myserver\" emerge amanda"
-			echo
-		fi
-	fi
-
-	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
-
-	elog "You should configure Amanda in /etc/amanda now."
-	elog
-	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
-	elog "and restart xinetd afterwards!"
-	elog
-	elog "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "NOTICE: If you need raw access to partitions you need to add the"
-	elog "amanda user to the 'disk' group and uncomment following lines in"
-	elog "your /etc/devfs.d/amanda:"
-	elog "SCSI:"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
-	elog "IDE:"
-	elog "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
-	elog
-	elog "NOTICE: If you have a tape changer, also uncomment the following"
-	elog "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
-	elog
-	elog "If you use localhost in your disklist your restores may break."
-	elog "You should replace it with the actual hostname!"
-	elog "Please also see the syntax changes to amandahosts."
-}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
-	local root="$1"
-	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
-	for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \
-		/usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \
-		/usr/libexec/planner ; do
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
-		chmod u=srwx,g=rx,o= "${root}"/${i}
-	done
-}
diff --git a/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch b/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
deleted file mode 100644
index f056e98cf808..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NuarwbB amanda-2.4.5.orig/common-src/statfs.c amanda-2.4.5/common-src/statfs.c
---- amanda-2.4.5.orig/common-src/statfs.c	1999-05-23 10:11:18.000000000 -0700
-+++ amanda-2.4.5/common-src/statfs.c	2005-06-08 13:12:58.000000000 -0700
-@@ -127,7 +127,7 @@
- # endif
- #endif
- 
--#define scale(r,s)	( (r) == -1? -1 : (int)((r)*(double)(s)/1024.0) )
-+#define scale(r,s)	( (r) == -1? -1 : (long)((r)*(double)(s)/1024.0) )
- 
- int get_fs_stats(dir, sp)
- char *dir;
diff --git a/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch b/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
deleted file mode 100644
index bbf358af6d13..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From upstream. http://groups.yahoo.com/group/amanda-hackers/message/4510
---- amanda-2.4.5/server-src/amverify.sh.in.orig	2005-06-08 13:30:11.000000000 -0700
-+++ amanda-2.4.5/server-src/amverify.sh.in	2005-06-08 13:32:27.000000000 -0700
-@@ -425,14 +425,16 @@
- 		fi
- 		RESULT=`$AMRESTORE -h -p $DEVICE 2> $TEMP/amrestore.out \
- 			| doonefile 2> $TEMP/onefile.errors`
-+		# save previous filename to detect looping
-+		FILE_prev="$FILE"
- 		FILE=`grep restoring $TEMP/amrestore.out \
- 			| sed 's/^.*restoring //'`
- 		EOF=`grep "reached end of tape" $TEMP/amrestore.out`
- 		EOI=`grep "reached end of information" $TEMP/amrestore.out`
- 		# amrestore:   0: restoring sundae._mnt_sol1_usr.19961127.1
--		if [ X"$FILE" != X"" -a X"$RESULT" = X"0" ]; then
-+		if [ X"$FILE" != X"" -a X"$FILE" != X"$FILE_prev" -a X"$RESULT" = X"0" ]; then
- 			report "Checked $FILE"
--		elif [ X"$FILE" != X"" -a X"$RESULT" = X"999" ]; then
-+		elif [ X"$FILE" != X"" -a X"$FILE" != X"$FILE_prev" -a X"$RESULT" = X"999" ]; then
- 			report "Skipped $FILE (`cat $TEMP/errors`)"
- 		elif [ -n "$EOF" ]; then
- 			report "End-of-Tape detected."
diff --git a/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch b/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch
deleted file mode 100644
index 01dca14ca092..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-From upstream. See http://groups.yahoo.com/group/amanda-hackers/message/4511
---- amanda-2.4.5/client-src/sendsize.c.orig	2005-06-08 13:28:10.000000000 -0700
-+++ amanda-2.4.5/client-src/sendsize.c	2005-06-08 13:28:34.000000000 -0700
-@@ -557,6 +557,7 @@
- #ifdef SAMBA_CLIENT
- 	  if (est->amdevice[0] == '/' && est->amdevice[1] == '/')
- 	    dbprintf(("%s: Can't use CALCSIZE for samba estimate: %s %s\n",
-+	      	      debug_prefix_time(NULL),
- 		      est->amname, est->dirname));
- 	  else
- #endif
diff --git a/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch b/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch
deleted file mode 100644
index 5d77aad9ffdf..000000000000
--- a/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- client-src/sendbackup.c.	2006-07-25 20:27:56.000000000 +0200
-+++ client-src/sendbackup.c	2006-12-13 03:31:03.000000000 +0100
-@@ -597,6 +597,12 @@
-     }
- #endif
- 
-+    if(pid == tarpid) { 
-+	if(ret == 1) { 
-+	    rc = 0; 
-+	} 
-+    }
-+
- #ifdef IGNORE_TAR_ERRORS
-     if(pid == tarpid) {
- 	/*
diff --git a/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch b/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch
deleted file mode 100644
index 92c8fb5e6e2c..000000000000
--- a/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -u -r --show-c-function --new-file --exclude-from=/home/martinea/src.orig/amanda.diff --ignore-matching-lines='$Id:' amanda-2.5.1p3.new/server-src/amstatus.pl.in amanda-2.5.1p3.new.amstatus/server-src/amstatus.pl.in
---- amanda-2.5.1p3.new/server-src/amstatus.pl.in	2007-02-01 14:17:01.000000000 -0500
-+++ amanda-2.5.1p3.new.amstatus/server-src/amstatus.pl.in	2007-02-12 18:35:11.000000000 -0500
-@@ -763,9 +763,9 @@ while(<AMDUMP>) {
- 	}
- 	elsif(/splitting chunk that started at \d*kb after (\d*)kb/) {
- 		$ntchunk{$nb_tape}++;
--		$ntsize{$nb_tape} += $1;
--		$ntesize{$nb_tape} += $1;
--		$ntchunk_size += $1;
-+		$ntsize{$nb_tape} += $1 / $unitdivisor;
-+		$ntesize{$nb_tape} += $1 / $unitdivisor;
-+		$ntchunk_size += $1 / $unitdivisor;
- 	}
- 	elsif(/driver: FINISHED/) {
- 		$driver_finished = 1;
-Binary files amanda-2.5.1p3.new/server-src/.amstatus.pl.in.swp and amanda-2.5.1p3.new.amstatus/server-src/.amstatus.pl.in.swp differ
diff --git a/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch b/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch
deleted file mode 100644
index 02ccc879c887..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar amanda-2.5.2p1.orig/changer-src/chg-multi.sh.in amanda-2.5.2p1/changer-src/chg-multi.sh.in
---- amanda-2.5.2p1.orig/changer-src/chg-multi.sh.in	2007-05-17 10:38:34.000000000 -0700
-+++ amanda-2.5.2p1/changer-src/chg-multi.sh.in	2008-06-25 14:57:04.000000000 -0700
-@@ -325,7 +325,7 @@
- 		echo $answer
- 		exit 2
- 	    fi
--	    echo `_ '     -> offline'` "$device"` >> $logfile
-+	    echo `_ '     -> offline'` "$device" >> $logfile
- 	    $MT $MTF $device offline >> $logfile 2>&1
- 	    if [ $? -ne 0 ]; then
- 		answer=`_ '%s %s: %s: unable to change to slot %s' "$newslot" "$pname" "$device" "$curslot"`
diff --git a/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch b/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch
deleted file mode 100644
index 012e0272556b..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- amanda-2.5.2_p1.orig/tape-src/Makefile.am	2007-05-04 11:39:08.000000000 +0000
-+++ amanda-2.5.2_p1/tape-src/Makefile.am	2008-03-10 19:06:28.000000000 +0000
-@@ -20,6 +20,8 @@ libamtape_la_SOURCES = 	output-file.c \
- 
- libamtape_la_LDFLAGS =  -release $(VERSION)
- 
-+libamtape_la_LIBADD = ../common-src/libamanda.la
-+
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
- # libraries, and because of the way libtool sets up the command line, we
---- amanda-2.5.2_p1.orig/server-src/Makefile.am	2007-05-04 11:39:04.000000000 +0000
-+++ amanda-2.5.2_p1/server-src/Makefile.am	2008-03-10 19:07:58.000000000 +0000
-@@ -36,6 +36,8 @@ libamserver_la_SOURCES=	amindex.c	change
- 
- libamserver_la_LDFLAGS= -release $(VERSION)
- 
-+libamserver_la_LIBADD = ../tape-src/libamtape.la
-+
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
- # libraries, and because of the way libtool sets up the command line, we
diff --git a/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch b/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch
deleted file mode 100644
index 512b962b3290..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-There is a race condition inside the client-side sendbackup. The short version
-is that any output from the compression or encryption pipes that gets send
-before the "sendbackup:" headers gets discarded by the server on receipt.
-
-For any pipe command that outputs headers, a sufficiently fast machine will
-allow this to happen.
-
-As a solution, we buffer the header from amcrypt-ossl-asym, and only output it
-after we have started receiving real data. At the time of writing this patch,
-amaespipe looks to suffer from the same problem.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar amanda-2.5.2p1.orig/server-src/amcrypt-ossl-asym.sh.in amanda-2.5.2p1/server-src/amcrypt-ossl-asym.sh.in
---- amanda-2.5.2p1.orig/server-src/amcrypt-ossl-asym.sh.in	2008-09-21 22:09:10.973248726 -0700
-+++ amanda-2.5.2p1/server-src/amcrypt-ossl-asym.sh.in	2008-09-21 22:09:46.575745504 -0700
-@@ -88,7 +88,7 @@
- 	perl -pe 'BEGIN { $bs = 96; $/ = \8192 } $nbytes = ($nbytes + length) % $bs; END { print "\0" x ($bs - $nbytes) }'
- }
- 
--encrypt() {
-+encrypt_setup() {
- 	# generate a random printable cipher key (on one line)
- 	echo `"${OPENSSL}" rand -base64 80` >"${WORKDIR}/pass"
- 
-@@ -98,11 +98,20 @@
- 
- 	# print magic
- 	printf %s "${MAGIC}"
-+	[ $? -eq 0 ] || return 1
- 
- 	# print the encrypted cipher key, preceded by size
- 	ls -l "${WORKDIR}/pass.ciphertext" | awk '{ printf("%-10d", $5) }'
-+	[ $? -eq 0 ] || return 1
- 	cat "${WORKDIR}/pass.ciphertext"
-+	[ $? -eq 0 ] || return 1
- 
-+	# Do a test encryption to see that it will work and we will not lose data
-+	echo foo | encrypt >/dev/null
-+	[ $? -eq 0 ] || return 1
-+}
-+
-+encrypt() {
- 	# encrypt data using the cipher key and print
- 	pad | "${OPENSSL}" enc "-${CIPHER}" -nopad -e -pass "file:${WORKDIR}/pass" -nosalt
- 	[ $? -eq 0 ] || return 1
-@@ -173,7 +182,26 @@
- 		exit 1
- 	fi
- 
--	encrypt
-+	# we must perform the encryption setup, but not produce any output until we start getting input
-+	encrypt_setup >"${WORKDIR}/encryption-header"
-+	if [ $? -ne 0 ]; then
-+		echo "${ME}: encryption setup failed" >&2
-+		exit 1
-+	fi
-+	# block until the first of the input
-+	dd of="${WORKDIR}/data.buffer" bs=4 count=1 2>/dev/null
-+	if [ $? -ne 0 ]; then
-+		echo "${ME}: encryption failed to get input data" >&2
-+		exit 1
-+	fi
-+	# now spit out the encryption header
-+	cat "${WORKDIR}/encryption-header" 
-+	if [ $? -ne 0 ]; then
-+		echo "${ME}: encryption failed to output encryption header" >&2
-+		exit 1
-+	fi
-+	# followed by our first bit of input, then the rest
-+	cat "${WORKDIR}/data.buffer" - | encrypt
- 	if [ $? -ne 0 ]; then
- 		echo "${ME}: encryption failed" >&2
- 		exit 1