Version bump. Exchange R/DEPEND. Use keepdir, not dodir.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 78 insertions, 13 deletions

diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index b87f91b86d21..959ee23254ba 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX shorewall6-lite.initd 1615 RMD160 b39ca8bc782ec14f2d0926bc737991e9ebefd80d SHA1 ff0b1b9d31aef9bc89a61293c462972e12d884a2 SHA256 e95b1f797638fe2623ba14398f4a1ed1b08c97b824bf30dd1232be111b5b5852
 DIST shorewall-docs-html-4.4.15.1.tar.bz2 3403387 RMD160 236bf52dbef3e4cc6409f47b2069176e51198c4f SHA1 9e9af70fab6ef68a722573100830d1427c4f92b7 SHA256 b3a7a118af0ed1e150e44753218ced32ab76e44d758a917ce871ed55adf1f4ab
 DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
+DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall6-lite-4.4.15.1.tar.bz2 68916 RMD160 56441e7cbe5b0f5d3e739e71dc2971e0e1aaf66a SHA1 57c5d5a7229a9c461110e2ed198ba4c646e9528b SHA256 c6abe9b9a7113a4976bf31cdd07d6e54661507c3b3c15d667f07c0a036c61652
 DIST shorewall6-lite-4.4.22.1.tar.bz2 88675 RMD160 167992ea228f6d144f18fb6feb9b4204d28b6a23 SHA1 ba8d8de8f504efc68da25ee7ddca189f46ff3e7e SHA256 750ef9929c8b0bb1d822ba41315b7081e9789e009634d2d38b80dc2709f365b4
+DIST shorewall6-lite-4.4.22.3.tar.bz2 89181 RMD160 8be0e890fec4febd9ab25d781b0fb19977907f4e SHA1 771a1685736c628f529f392577b4ab9c2ce4c6f4 SHA256 4ebbf98cf7db6f18c97bf1e12b7b8a725f66baaf325aaa57bd8384349ad237da
 EBUILD shorewall6-lite-4.4.15.1.ebuild 2040 RMD160 1c9eca2325121f999b6df0b33c58e96516474619 SHA1 1480f977d6d0f1971a120c90f15c2689d85564ff SHA256 0fb27ef71ed734eed5456197ac951c7dc8a85d1eb6d6daeef75bfb8471f81767
 EBUILD shorewall6-lite-4.4.22.1.ebuild 1438 RMD160 2f816f48da36d8868ee0247f80ac8297d2b0112c SHA1 3f4d1b39efd3b7c01889feb3fae5827724bb098d SHA256 e7a44ac553ac82f8cc62f17a7d9e3fb3583ba53a16322f50933faaa5aabc4b43
-MISC ChangeLog 5377 RMD160 ab0e11e2136d32f05e485123efb3b9f92809ded7 SHA1 1ce0cf6ef0c13d58dbf805a08af4404f3bd8c6b2 SHA256 a8874235f31b63ca456435700726785c6e21084667d70a18131e5e9c7f4d3d5c
+EBUILD shorewall6-lite-4.4.22.3.ebuild 1413 RMD160 986d24bf7b7f6141688161ff5eec85d50d5d4c53 SHA1 e92912bf41c6bbfb799a63e198108f3be8793db5 SHA256 1463cad6d60c248deb455ae7cde110bdb6793e05c985cbc9cae5dfd58c12921f
+MISC ChangeLog 5531 RMD160 fd4b2a1b830b1682ef7b0953c9a1e375a1db99b5 SHA1 1e59f72868aa7f8345ca6cb23200b306b1e6c581 SHA256 8f787d7aaed58dec054ef1af2c7dfc1711eea4149610d5e5e03059f85a26edae
 MISC metadata.xml 244 RMD160 ee4ca8f8adef45adbdca39183e5e01d049465be8 SHA1 510c91eccef2a77b282656755d3e507fe43d0cd1 SHA256 0f5986015d7f8061a91aecf6acad539e61f9ca6471fa490301fc560e22530830
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk49YkcACgkQm1t7FhV+4eGfxQP+KAjaKSRRLU3SGVGngDbtypaw
-FxbrFIonW+hB8J7HSiOaeRTyOilSNKUu/UCWxW6ZzrTwaGofxeEdn5mvAD8Gnfj6
-8X+lI9i+1flbzfoosJnO2Yhop/1Nhwam4ntiorikpkuhL+a41V3RK1+F3mtZ7fa7
-Z39aaVRvCStQsVgJ67g=
-=yNdo
+iEYEARECAAYFAk5QQE0ACgkQVWmRsqeSphPJcACfeX4TlTqRA1DsQeW0EKQbqbrh
+NwYAnixiwW8D0jxnRiO6DlWZ+XxF7e/8
+=zRFy
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index d46d1e1fc636..a22dea529c9e 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/shorewall6
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.40 2011/08/06 15:47:29 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.41 2011/08/20 23:16:13 jer Exp $
+
+*shorewall6-4.4.22.3 (20 Aug 2011)
+
+  20 Aug 2011; Jeroen Roovers <jer@gentoo.org> +shorewall6-4.4.22.3.ebuild:
+  Version bump. Exchange R/DEPEND. Use keepdir, not dodir.
 
 *shorewall6-4.4.22.1 (06 Aug 2011)
 
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 887b36038be1..7114d4556976 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX shorewall6.initd 1917 RMD160 405ed8190734de2a561a160cfcce6e45c6a01211 SHA1 860122dc246f7fb541d38eaf607d327a70b9f47f SHA256 e789deef2467f5091c3015de40492324f13d59dbe200f6735468af081d0f0bca
 DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
+DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall6-4.4.15.1.tar.bz2 127226 RMD160 e9b7d0d57142a6c2a3347508d7d5134c4cedba0a SHA1 d66cc2b17760679b98ea0cabea03c5c10aefc268 SHA256 51e395ac819fcef7c5746bfb0b190c54faea49111d9c0e349574965a97aaedaf
 DIST shorewall6-4.4.22.1.tar.bz2 212349 RMD160 9807badb5e4dd8be2a28e31481022785bfcbcbad SHA1 4752dcc806c35458b9fba2b575f75d5e5ff03cf2 SHA256 615fca069047e8c2ff199307107b62ccd8e7301c642d79cb53add42b6b97fbe2
+DIST shorewall6-4.4.22.3.tar.bz2 213781 RMD160 4e08c9203a6977a4e2f617551856dcfa06da9d56 SHA1 ea215e3d06f66385bdba5c20cddfcb91af58d61d SHA256 33f63a16e4223c8ed8189067a4aa8412aefa5abf743c00fd37ce86cb871c5ff3
 EBUILD shorewall6-4.4.15.1.ebuild 2065 RMD160 b7f159bdcb23c6e3d8ef954ccc5a460ac45f3eda SHA1 835b3a822cb37f5ce667beaf387a6f3ab7d5d1bf SHA256 be96b8f0838c44edc8376a22de722bb69a9deca554c53367f5eff05a1c8602d3
 EBUILD shorewall6-4.4.22.1.ebuild 1547 RMD160 b21e500af550cd51b9035326ba40f0edf1465dc4 SHA1 6c57e4eb005143ab9a3de84e8da8094000b81b72 SHA256 e650cbc515ab791e3f4224bfd4d2e1810d05fc5e609933741837f6ca57381454
-MISC ChangeLog 6800 RMD160 9d20c953c0937e11a8a96c247f9d4fb980d01fb5 SHA1 517d20aaff3421659c8fd91a721d2fa5a73eedd3 SHA256 5d238fd78b3db8e87defbb0816ce94a649eb386514c6b41abdddbc46a0cd2bba
+EBUILD shorewall6-4.4.22.3.ebuild 1577 RMD160 2866da156477667da4b20e64706a2ff523645746 SHA1 e708936941746732f0e949b7c09a39cc664e00df SHA256 190a4331bbc1d94d93ddd37c2353a542dd4a96c58a4eddf401e73089b3e1e12d
+MISC ChangeLog 6966 RMD160 5232406abd082b4e8ff97f02a18b5daf3b622f1b SHA1 36da3c202e5b03d8772f6cc27b5ff702b5613c99 SHA256 0c11fc82ed7ca1d34319ca8fff94fab03069aba7ab561a3a42cd7f7906729967
 MISC metadata.xml 244 RMD160 ee4ca8f8adef45adbdca39183e5e01d049465be8 SHA1 510c91eccef2a77b282656755d3e507fe43d0cd1 SHA256 0f5986015d7f8061a91aecf6acad539e61f9ca6471fa490301fc560e22530830
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk49YicACgkQm1t7FhV+4eFx7gP+K4Ga/r7QSv8Pjw6ytWh7LX1V
-yk0TKjOzpNXpCb7ooAufkgAoJdN647uDs+brG/mJEsVkLSNj5UVB4bV9J+aAcbC6
-sfUFQpONU/sqWUnfrP+j1TZ4Ugs/KBhr7FMKbV6VtNoSOpWa+o8+0KYkbWpXB5lq
-UXvYfqfRpjnGYOmI5CU=
-=t6qr
+iEYEARECAAYFAk5QQEMACgkQVWmRsqeSphPkkQCeLA32xwNBsa3oo5B7utPNpApE
+6+EAn2kUsrq+mRaflSHOMfyrmsxovBT5
+=hoPl
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild b/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild
new file mode 100644
index 000000000000..3bca7a023b16
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild,v 1.1 2011/08/20 23:16:14 jer Exp $
+
+EAPI="4"
+
+inherit versionator linux-info
+
+# Select version (stable, RC, Beta, upstream patched):
+MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
+
+MY_PN="${PN/6/}"
+MY_P="${MY_PN}-${MY_PV_BASE}"
+MY_P_DOCS="${MY_PN}-docs-html-${PV}"
+
+DESCRIPTION="Shoreline Firewall with IPv6 support."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc"
+
+RDEPEND=">=net-firewall/iptables-1.4.0
+	sys-apps/iproute2
+	>=net-firewall/shorewall-${MY_PV_BASE}
+	dev-perl/Socket6"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 25 ; then
+		die "${PN} requires at least kernel 2.6.25."
+	fi
+}
+
+src_compile() {
+	# The default make command does not work as expected
+	:
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	cd "${WORKDIR}/${P}"
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r  Samples6
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+	keepdir /var/lock/subsys
+}