old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 6 insertions, 257 deletions

diff --git a/net-ftp/ftpbase/ChangeLog b/net-ftp/ftpbase/ChangeLog
index 335fc476e034..de6c39183041 100644
--- a/net-ftp/ftpbase/ChangeLog
+++ b/net-ftp/ftpbase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/ftpbase
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.31 2013/11/30 13:35:59 naota Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ChangeLog,v 1.32 2015/04/18 06:13:32 mr_bones_ Exp $
+
+  18 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> -ftpbase-0.00.ebuild,
+  -ftpbase-0.01-r1.ebuild, -ftpbase-0.01.ebuild:
+  old
 
   30 Nov 2013; Naohiro Aota <naota@gentoo.org> ftpbase-0.01-r2.ebuild:
   Use pam_ftpusers on FreeBSD. #462204
diff --git a/net-ftp/ftpbase/ftpbase-0.00.ebuild b/net-ftp/ftpbase/ftpbase-0.00.ebuild
deleted file mode 100644
index 51e7e9b91db7..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.00.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.00.ebuild,v 1.18 2013/03/03 09:00:33 vapier Exp $
-
-inherit eutils pam user
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="pam"
-
-DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-
-S=${WORKDIR}
-
-check_collision() {
-	[[ ! -e $1 ]] && return 0
-
-	[[ $(head -n 1 "$1") == $(head -n 1 "$2") ]] && return 0
-
-	eerror "   $1 exists and was not provided by ${P}"
-	return 1
-}
-
-pkg_setup() {
-	ebegin "Checking for possible file collisions..."
-
-	local collide=false
-	check_collision "${ROOT}etc/ftpusers" "${FILESDIR}/ftpusers" || collide=true
-
-	if use pam ; then
-		check_collision "${ROOT}etc/pam.d/ftp" "${FILESDIR}/ftp-pamd" || collide=true
-	fi
-
-	if ${collide} ; then
-		eerror
-		eerror "Those files listed above have to be removed in order to"
-		eerror "install this version of ftpbase."
-		eerror
-		eerror "If you edited them, remember to backup and when restoring make"
-		eerror " sure the first line in each file is:"
-		eerror "$(head -n 1 "${FILESDIR}/ftpusers")"
-		eend 1
-		die "Can't be installed, files will collide"
-	fi
-
-	eend 0
-
-	# Check if home exists
-	local exists=false
-	[[ -d "${ROOT}home/ftp" ]] && exists=true
-
-	# Add our default ftp user
-	enewgroup ftp 21
-	enewuser ftp 21 -1 /home/ftp ftp
-
-	# If home did not exist and does now then we created it in the enewuser
-	# command. Now we have to change it's permissions to something sane.
-	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
-		chown root:ftp "${ROOT}"home/ftp
-	fi
-}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers" || die
-
-	# Ideally we would create the home directory here with a dodir.
-	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
-
-	if use pam ; then
-		if has_version "<sys-libs/pam-0.78" ; then
-			newpamd "${FILESDIR}/ftp-pamd" ftp
-		else
-			newpamd "${FILESDIR}/ftp-pamd-include" ftp
-		fi
-	fi
-}
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild
deleted file mode 100644
index fead6ff724e0..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.01-r1.ebuild,v 1.8 2013/03/03 09:00:33 vapier Exp $
-
-inherit eutils pam user
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="pam"
-
-DEPEND="pam? ( virtual/pam )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-
-S=${WORKDIR}
-
-check_collision() {
-	[[ ! -e $1 ]] && return 0
-
-	[[ $(head -n 1 "$1") == $(head -n 1 "$2") ]] && return 0
-
-	eerror "   $1 exists and was not provided by ${P}"
-	return 1
-}
-
-pkg_setup() {
-	ebegin "Checking for possible file collisions..."
-
-	local collide=false
-	check_collision "${ROOT}etc/ftpusers" "${FILESDIR}/ftpusers" || collide=true
-
-	if use pam ; then
-		check_collision "${ROOT}etc/pam.d/ftp" "${FILESDIR}/ftp-pamd" || collide=true
-	fi
-
-	if ${collide} ; then
-		eerror
-		eerror "Those files listed above have to be removed in order to"
-		eerror "install this version of ftpbase."
-		eerror
-		eerror "If you edited them, remember to backup and when restoring make"
-		eerror " sure the first line in each file is:"
-		eerror "$(head -n 1 "${FILESDIR}/ftpusers")"
-		eend 1
-		die "Can't be installed, files will collide"
-	fi
-
-	eend 0
-
-	# Check if home exists
-	local exists=false
-	[[ -d "${ROOT}home/ftp" ]] && exists=true
-
-	# Add our default ftp user
-	enewgroup ftp 21
-	enewuser ftp 21 -1 /home/ftp ftp
-
-	# If home did not exist and does now then we created it in the enewuser
-	# command. Now we have to change it's permissions to something sane.
-	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
-		chown root:ftp "${ROOT}"home/ftp
-	fi
-}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers" || die
-
-	# Ideally we would create the home directory here with a dodir.
-	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
-
-	newpamd "${FILESDIR}/ftp-pamd-include" ftp
-}
diff --git a/net-ftp/ftpbase/ftpbase-0.01.ebuild b/net-ftp/ftpbase/ftpbase-0.01.ebuild
deleted file mode 100644
index 144e003254ca..000000000000
--- a/net-ftp/ftpbase/ftpbase-0.01.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/ftpbase-0.01.ebuild,v 1.2 2013/03/03 09:00:33 vapier Exp $
-
-inherit eutils pam user
-
-DESCRIPTION="FTP layout package"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="pam"
-
-DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
-	!<net-ftp/proftpd-1.2.10-r6
-	!<net-ftp/pure-ftpd-1.0.20-r2
-	!<net-ftp/vsftpd-2.0.3-r1"
-
-S=${WORKDIR}
-
-check_collision() {
-	[[ ! -e $1 ]] && return 0
-
-	[[ $(head -n 1 "$1") == $(head -n 1 "$2") ]] && return 0
-
-	eerror "   $1 exists and was not provided by ${P}"
-	return 1
-}
-
-pkg_setup() {
-	ebegin "Checking for possible file collisions..."
-
-	local collide=false
-	check_collision "${ROOT}etc/ftpusers" "${FILESDIR}/ftpusers" || collide=true
-
-	if use pam ; then
-		check_collision "${ROOT}etc/pam.d/ftp" "${FILESDIR}/ftp-pamd" || collide=true
-	fi
-
-	if ${collide} ; then
-		eerror
-		eerror "Those files listed above have to be removed in order to"
-		eerror "install this version of ftpbase."
-		eerror
-		eerror "If you edited them, remember to backup and when restoring make"
-		eerror " sure the first line in each file is:"
-		eerror "$(head -n 1 "${FILESDIR}/ftpusers")"
-		eend 1
-		die "Can't be installed, files will collide"
-	fi
-
-	eend 0
-
-	# Check if home exists
-	local exists=false
-	[[ -d "${ROOT}home/ftp" ]] && exists=true
-
-	# Add our default ftp user
-	enewgroup ftp 21
-	enewuser ftp 21 -1 /home/ftp ftp
-
-	# If home did not exist and does now then we created it in the enewuser
-	# command. Now we have to change it's permissions to something sane.
-	if [[ ${exists} == "false" && -d "${ROOT}home/ftp" ]] ; then
-		chown root:ftp "${ROOT}"home/ftp
-	fi
-}
-
-src_install() {
-	# The ftpusers file is a list of people who are NOT allowed
-	# to use the ftp service.
-	insinto /etc
-	doins "${FILESDIR}/ftpusers" || die
-
-	# Ideally we would create the home directory here with a dodir.
-	# But we cannot until bug #9849 is solved - so we kludge in pkg_postinst()
-
-	if use pam ; then
-		if has_version "<sys-libs/pam-0.78" ; then
-			newpamd "${FILESDIR}/ftp-pamd" ftp
-		else
-			newpamd "${FILESDIR}/ftp-pamd-include" ftp
-		fi
-	fi
-}