Version bumped. Closes 55675

5 files changed, 15 insertions, 66 deletions

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 20ef57e0df7f..44232e70e101 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,12 +1,12 @@
 MD5 b029c450d7ff77cfb0617c1be9da4152 shorewall-1.4.10c.ebuild 1143
-MD5 26d6e8d61840a17b58d12123385c0e27 shorewall-2.0.1.ebuild 1160
 MD5 7376e94ddbe4efd920e006f73fecedec shorewall-1.4.5-r1.ebuild 847
-MD5 4dd773f6573f2859fa5c2559d5d1e8f4 shorewall-2.0.3a.ebuild 1160
+MD5 c80de10055fafaa01afdc9d116ddf67f shorewall-1.4.10f.ebuild 1143
+MD5 0d1758120f1557231f976940a81c5099 shorewall-2.0.3a.ebuild 1140
 MD5 0e68cda66c44a17c770b4fd84d552e62 ChangeLog 5864
-MD5 9609009ebec716ef1c1f2336ac96bfd5 shorewall-2.0.0.ebuild 1160
 MD5 6886119bbf73f0eefc615224276b8026 shorewall-1.4.10b.ebuild 1135
 MD5 15be5815097cdddb4eb018aef62ea4b5 files/shorewall 563
 MD5 1362896295d3e48686b4845303c49bb9 files/digest-shorewall-1.4.10c 143
+MD5 3b1f1510d6cf9a2d9a050cfd5e70c7d5 files/digest-shorewall-1.4.10f 142
 MD5 7c8660b2d2395b8c9b6cc7f5902170f4 files/digest-shorewall-1.4.5-r1 65
 MD5 a7d8f0cc57793c05a50f3f8ff363556b files/digest-shorewall-2.0.3a 141
 MD5 5b05d5de1dd9592dc38da2599bd0845f files/digest-shorewall-1.4.10b 143
diff --git a/net-firewall/shorewall/files/digest-shorewall-1.4.10f b/net-firewall/shorewall/files/digest-shorewall-1.4.10f
new file mode 100644
index 000000000000..6f150a301d3f
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-1.4.10f
@@ -0,0 +1,2 @@
+MD5 217011c68ea56503913cd7dbac84ae57 shorewall-1.4.10f.tgz 87883
+MD5 4526fd09bc6d79853d7bf975c04328db shorewall-docs-html-1.4.10f.tgz 2257263
diff --git a/net-firewall/shorewall/shorewall-2.0.0.ebuild b/net-firewall/shorewall/shorewall-1.4.10f.ebuild
index 9600e59cba3c..e355ffd3613e 100644
--- a/net-firewall/shorewall/shorewall-2.0.0.ebuild
+++ b/net-firewall/shorewall/shorewall-1.4.10f.ebuild
@@ -1,46 +1,40 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.0.ebuild,v 1.4 2004/06/24 22:41:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-1.4.10f.ebuild,v 1.1 2004/07/01 12:14:23 mholzer Exp $
 
 IUSE="doc"
 
-MY_P_DOCS=${P/${PN}/${PN}-docs-html}
-
 DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	doc? ( mirror://sourceforge/${PN}/${MY_P_DOCS}.tgz )"
-RESTRICT="nomirror"
+SRC_URI="ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${P}.tgz
+	doc? ( ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${PN}-docs-html-${PV}.tgz )"
+#RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND="virtual/glibc
-	>=net-firewall/iptables-1.2.4
+	net-firewall/iptables
 	sys-apps/iproute2"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P}
 
 src_install() {
 	keepdir /var/lib/shorewall
-
-	cd ${WORKDIR}/${P}
-	PREFIX=${D} ./install.sh || die
+	PREFIX=${D} ./install.sh /etc/init.d || die
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/shorewall shorewall
 	dodoc COPYING INSTALL changelog.txt releasenotes.txt
 	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
+		cd ${WORKDIR}/${PN}-docs-html-${PV}
 		dohtml -r *
 	fi
 }
 
 pkg_postinst() {
-	einfo
 	einfo "Read the documentation from http://www.shorewall.net"
 	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo
+	einfo "and edit the files in /etc/shorewall before starting the firewall"
 }
diff --git a/net-firewall/shorewall/shorewall-2.0.1.ebuild b/net-firewall/shorewall/shorewall-2.0.1.ebuild
deleted file mode 100644
index e30e6ad91f4f..000000000000
--- a/net-firewall/shorewall/shorewall-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.1.ebuild,v 1.4 2004/06/24 22:41:53 agriffis Exp $
-
-IUSE="doc"
-
-MY_P_DOCS=${P/${PN}/${PN}-docs-html}
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	doc? ( mirror://sourceforge/${PN}/${MY_P_DOCS}.tgz )"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-DEPEND="virtual/glibc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd ${WORKDIR}/${P}
-	PREFIX=${D} ./install.sh || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo
-}
diff --git a/net-firewall/shorewall/shorewall-2.0.3a.ebuild b/net-firewall/shorewall/shorewall-2.0.3a.ebuild
index d8adbca29538..712fea7476d5 100644
--- a/net-firewall/shorewall/shorewall-2.0.3a.ebuild
+++ b/net-firewall/shorewall/shorewall-2.0.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.3a.ebuild,v 1.1 2004/07/01 12:04:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.3a.ebuild,v 1.2 2004/07/01 12:14:23 mholzer Exp $
 
 IUSE="doc"
 
@@ -10,7 +10,6 @@ DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
 	doc? ( mirror://sourceforge/${PN}/${MY_P_DOCS}.tgz )"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"