old, quoting

Package-Manager: portage-2.1.5.5

3 files changed, 10 insertions, 208 deletions

diff --git a/app-admin/bastille/bastille-2.1.1-r1.ebuild b/app-admin/bastille/bastille-2.1.1-r1.ebuild
deleted file mode 100644
index 61f035b4d1d2..000000000000
--- a/app-admin/bastille/bastille-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r1.ebuild,v 1.13 2007/10/28 12:46:02 phreak Exp $
-
-inherit perl-app eutils
-
-PATCHVER=0.1
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.org/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-IUSE="X"
-
-RDEPEND="net-firewall/iptables
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/psad
-	X? ( dev-perl/perl-tk )
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
-	epatch ${FILESDIR}/bastille-firewall-imap.patch
-	epatch ${FILESDIR}/${P}-hlist-fix.patch
-}
-
-src_compile() {
-	cd ${S}
-	cp ${FILESDIR}/bastille-${PV}-firewall.init ./bastille-firewall
-}
-
-src_install() {
-
-	keepdir /var/lock/subsys/${PN}
-	dodir /etc/Bastille
-
-	cd ${S}
-	into /usr
-	dosbin bastille AutomatedBastille InteractiveBastille \
-		BastilleBackEnd RevertBastille *.pl
-
-	dosym RevertBastille /usr/sbin/UndoBastille
-
-	insinto /usr/share/Bastille
-	doins Questions* Credits bastille-* *.xbm *.config
-
-	insinto /usr/share/Bastille
-	doins Questions.txt Credits complete.xbm incomplete.xbm \
-		ifup-local hosts.allow
-
-	exeinto /usr/share/Bastille
-	doexe bastille-firewall* bastille-tmpdir* \
-		bastille-ipchains bastille-netfilter \
-		firewall/*.sh
-
-	perlinfo
-	insinto ${SITE_LIB}
-	doins Bastille_Curses.pm
-	use X && doins Bastille_Tk.pm
-	insinto ${SITE_LIB}/Curses
-	doins Curses/Widgets.pm
-
-	doman docs/bastille.1m
-	dodoc docs/* firewall/*.txt
-
-	cd ${S}/Bastille
-
-	insinto /usr/lib/Bastille
-	doins AccountSecurity.pm Apache.pm API.pm OSX_API.pm BootSecurity.pm \
-		ConfigureMiscPAM.pm DisableUserTools.pm DNS.pm \
-		FilePermissions.pm FTP.pm Firewall.pm HP_API.pm HP_UX.pm \
-		IOLoader.pm Patches.pm Logging.pm \
-		MiscellaneousDaemons.pm PatchDownload.pm Printing.pm \
-		RemoteAccess.pm SecureInetd.pm Sendmail.pm TMPDIR.pm  \
-		test_AccountSecurity.pm test_Apache.pm test_DNS.pm \
-		test_FTP.pm test_HP_UX.pm test_MiscellaneousDaemons.pm \
-		test_SecureInetd.pm test_Sendmail.pm TestAPI.pm IPFilter.pm
-
-	# Documentation
-	cd ${S}
-	dodoc *.txt BUGS Change* README*
-}
-
-pkg_postinst() {
-	use X || elog "When not using the Tk interface you will need to start use the -c flag when calling ${PN} from command line. example ${PN} -c --os GE1.4"
-}
diff --git a/app-admin/bastille/bastille-2.1.1-r2.ebuild b/app-admin/bastille/bastille-2.1.1-r2.ebuild
deleted file mode 100644
index 32a5122db053..000000000000
--- a/app-admin/bastille/bastille-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r2.ebuild,v 1.12 2007/10/28 12:46:02 phreak Exp $
-
-inherit perl-app eutils
-
-PATCHVER=0.1
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.org/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha ~amd64"
-IUSE="X"
-
-RDEPEND="net-firewall/iptables
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/psad
-	X? ( dev-perl/perl-tk )
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
-	epatch ${FILESDIR}/bastille-firewall-imap.patch
-	epatch ${FILESDIR}/${P}-hlist-fix.patch
-}
-
-src_compile() {
-	cd ${S}
-	cp ${FILESDIR}/bastille-${PV}-firewall.init ./bastille-firewall
-
-	cd ${S}/psad/Psad.pm
-	perl-module_src_compile
-}
-
-src_install() {
-
-	keepdir /var/lock/subsys/${PN}
-	dodir /etc/Bastille
-
-	cd ${S}
-	into /usr
-	dosbin bastille AutomatedBastille InteractiveBastille \
-		BastilleBackEnd RevertBastille *.pl
-
-	dosym RevertBastille /usr/sbin/UndoBastille
-
-	insinto /usr/share/Bastille
-	doins Questions* Credits bastille-* *.xbm *.config
-
-	insinto /usr/share/Bastille
-	doins Questions.txt Credits complete.xbm incomplete.xbm \
-		ifup-local hosts.allow
-
-	exeinto /usr/share/Bastille
-	doexe bastille-firewall* bastille-tmpdir* \
-		bastille-ipchains bastille-netfilter \
-		firewall/*.sh
-
-	perlinfo
-	insinto ${SITE_LIB}
-	doins Bastille_Curses.pm
-	use X && doins Bastille_Tk.pm
-	insinto ${SITE_LIB}/Curses
-	doins Curses/Widgets.pm
-
-	doman docs/bastille.1m
-	dodoc docs/* firewall/*.txt
-
-	cd ${S}/Bastille
-
-	insinto /usr/lib/Bastille
-	doins AccountSecurity.pm Apache.pm API.pm OSX_API.pm BootSecurity.pm \
-		ConfigureMiscPAM.pm DisableUserTools.pm DNS.pm \
-		FilePermissions.pm FTP.pm Firewall.pm HP_API.pm HP_UX.pm \
-		IOLoader.pm Patches.pm Logging.pm \
-		MiscellaneousDaemons.pm PatchDownload.pm Printing.pm \
-		RemoteAccess.pm SecureInetd.pm Sendmail.pm TMPDIR.pm  \
-		test_AccountSecurity.pm test_Apache.pm test_DNS.pm \
-		test_FTP.pm test_HP_UX.pm test_MiscellaneousDaemons.pm \
-		test_SecureInetd.pm test_Sendmail.pm TestAPI.pm IPFilter.pm
-
-	# psad interface module
-	cd ${S}/psad/Psad.pm
-	newins Psad.pm PSAD.pm
-
-	# Documentation
-	cd ${S}
-	dodoc *.txt BUGS Change* README*
-}
-
-pkg_postinst() {
-	use X || elog "When not using the Tk interface you will need to start use the -c flag when calling ${PN} from command line. example ${PN} -c --os GE1.4"
-}
diff --git a/app-admin/bastille/bastille-2.1.1-r3.ebuild b/app-admin/bastille/bastille-2.1.1-r3.ebuild
index 103f7f1d3f07..d2585de5c225 100644
--- a/app-admin/bastille/bastille-2.1.1-r3.ebuild
+++ b/app-admin/bastille/bastille-2.1.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r3.ebuild,v 1.5 2007/10/28 12:46:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r3.ebuild,v 1.6 2008/06/16 15:40:49 drac Exp $
 
 inherit perl-app eutils
 
@@ -27,25 +27,22 @@ RDEPEND="net-firewall/iptables
 
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
-	epatch ${FILESDIR}/bastille-firewall-imap.patch
-	epatch ${FILESDIR}/${P}-hlist-fix.patch
+	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+	epatch "${FILESDIR}"/bastille-firewall-imap.patch
+	epatch "${FILESDIR}"/${P}-hlist-fix.patch
 }
 
 src_compile() {
-	cd ${S}
-	cp ${FILESDIR}/bastille-${PV}-firewall.init ./bastille-firewall
+	cp "${FILESDIR}"/bastille-${PV}-firewall.init ./bastille-firewall
 
-	cd ${S}/psad/Psad.pm
+	cd "${S}"/psad/Psad.pm
 	perl-module_src_compile
 }
 
 src_install() {
-
 	keepdir /var/lock/subsys/${PN}
 	dodir /etc/Bastille
 
-	cd ${S}
 	into /usr
 	dosbin bastille AutomatedBastille InteractiveBastille \
 		BastilleBackEnd RevertBastille *.pl
@@ -74,7 +71,7 @@ src_install() {
 	doman docs/bastille.1m
 	dodoc docs/* firewall/*.txt
 
-	cd ${S}/Bastille
+	cd "${S}"/Bastille
 
 	insinto /usr/lib/Bastille
 	doins AccountSecurity.pm Apache.pm API.pm OSX_API.pm BootSecurity.pm \
@@ -88,11 +85,11 @@ src_install() {
 		test_SecureInetd.pm test_Sendmail.pm TestAPI.pm IPFilter.pm
 
 	# psad interface module
-	cd ${S}/psad/Psad.pm
+	cd "${S}"/psad/Psad.pm
 	newins Psad.pm PSAD.pm
 
 	# Documentation
-	cd ${S}
+	cd "${S}"
 	dodoc *.txt BUGS Change* README*
 }