Version bump for bug 78468. Removed 2.0.10.

(Portage version: 2.0.51-r15)

5 files changed, 42 insertions, 34 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index a0a7878351b1..f85bca2c87e2 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.62 2005/01/22 15:18:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.63 2005/01/25 14:07:07 ka0ttic Exp $
+
+*shorewall-2.2.0_rc5 (25 Jan 2005)
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -shorewall-2.0.10.ebuild,
+  +shorewall-2.2.0_rc5.ebuild:
+  Version bump for bug 78468. Removed 2.0.10.
 
   22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.0.7.ebuild:
   Stable on alpha.
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 789f101251c7..739da4f61cd9 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41dba864b6e5d074ac211f9608eb7ccc ChangeLog 8479
-MD5 5fdc88cd3f8a29464251a6164ecb3425 shorewall-2.0.10.ebuild 1877
 MD5 3ba0fb02dda1d52c7e5ebbb989bac85a shorewall-1.4.10f.ebuild 1118
-MD5 ee371d23c52fcb459b83f11cb35d2053 shorewall-2.0.4.ebuild 1872
-MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 ede681c7cdfe4cc71ce6a9a2f6ffb2a1 shorewall-2.2.0_rc5.ebuild 2384
 MD5 d1f8846cc788a3eeea16169776924ded shorewall-2.0.7.ebuild 1873
+MD5 ee371d23c52fcb459b83f11cb35d2053 shorewall-2.0.4.ebuild 1872
 MD5 fd7a8869be5c3b7315f5334409377c6e shorewall-2.0.13.ebuild 1877
+MD5 58bc97a03d76a052e3bb5c78fb52826c ChangeLog 8668
+MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 f7624af859e62ac0d00abc12ea839d23 files/digest-shorewall-2.0.4 138
+MD5 42daac4688988d74bb62f390b6aa486a files/digest-shorewall-2.0.7 139
+MD5 e5bea352c75a6b0c56f36a29dec327a8 files/digest-shorewall-2.2.0_rc5 147
+MD5 3b1f1510d6cf9a2d9a050cfd5e70c7d5 files/digest-shorewall-1.4.10f 142
 MD5 89555a3093e081abbc3365b6e050cb74 files/digest-shorewall-2.0.13 141
-MD5 f53428eeb724b643f540a16577d8b154 files/digest-shorewall-2.0.10 141
 MD5 886a46dd1ca55990686be5bf42b776de files/shorewall 1041
-MD5 3b1f1510d6cf9a2d9a050cfd5e70c7d5 files/digest-shorewall-1.4.10f 142
-MD5 42daac4688988d74bb62f390b6aa486a files/digest-shorewall-2.0.7 139
-MD5 f7624af859e62ac0d00abc12ea839d23 files/digest-shorewall-2.0.4 138
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8m7HugEuf3OQ0akRAoLxAJwO8xwOL0sDRBQzm+ter6AqxsmhCgCfaxOx
-jJL2OwkUnsw6hblBkLElabA=
-=ynFC
------END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.10 b/net-firewall/shorewall/files/digest-shorewall-2.0.10
deleted file mode 100644
index 48e0aebef88c..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.0.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 985ce9215ea9cc0299f0b5450fdbe05e shorewall-2.0.10.tgz 103091
-MD5 73b8d81a235e293085ce517c9ecf9ba4 shorewall-docs-html-2.0.10.tgz 2443866
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5 b/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5
new file mode 100644
index 000000000000..9705a3e6fc54
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5
@@ -0,0 +1,2 @@
+MD5 ce97657e732fb729f240ab06936b5517 shorewall-2.2.0-RC5.tgz 124727
+MD5 657b08cbe33ca741752ffca43d6eae16 shorewall-docs-html-2.2.0-RC5.tgz 2531021
diff --git a/net-firewall/shorewall/shorewall-2.0.10.ebuild b/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
index 202c3e8d1a33..d9df3eda50b7 100644
--- a/net-firewall/shorewall/shorewall-2.0.10.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.10.ebuild,v 1.2 2005/01/22 15:18:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild,v 1.1 2005/01/25 14:07:07 ka0ttic Exp $
 
-IUSE="doc"
+inherit versionator
 
-MY_P_DOCS=${P/${PN}/${PN}-docs-html}
+MY_P="${PN}-$(replace_version_separator 3 '-' ${PV/rc/RC})"
+MY_P_DOCS="${MY_P/${PN}/${PN}-docs-html}"
 
 DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.0/${P}/${MY_P_DOCS}.tgz )"
+SRC_URI="http://shorewall.net/pub/${PN}/2.2-Beta/${MY_P}/${MY_P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/2.2-Beta/${MY_P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="doc"
 
 DEPEND="virtual/libc
 	>=net-firewall/iptables-1.2.4
 	sys-apps/iproute2"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	keepdir /var/lib/shorewall
 
-	cd ${WORKDIR}/${P}
-	PREFIX=${D} ./install.sh || die
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd ${FILESDIR}/shorewall shorewall || die "newinitd failed"
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
 	dodoc COPYING INSTALL changelog.txt releasenotes.txt
 	if use doc; then
 		cd ${WORKDIR}/${MY_P_DOCS}
@@ -38,10 +38,19 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
+	echo
+
+	if use doc ; then
+		einfo "Documentation is available at /usr/share/doc/${PF}/html"
+	else
+		einfo "Documentation is available at http://www.shorewall.net"
+	fi
+
 	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
+	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
+	einfo
+	einfo "Information on upgrading is available at:"
+	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
 	einfo
 	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
 	einfo
@@ -56,4 +65,7 @@ pkg_postinst() {
 	einfo
 	einfo "See the shorewall documentation for more details."
 	einfo
+	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
+	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
+	echo
 }