Version bump; Add new files/ structure

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB80F419010E3EC3

15 files changed, 573 insertions, 12 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 9e077e334ad5..adad2693883f 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.135 2013/08/28 15:17:25 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.136 2013/08/28 16:51:21 constanze Exp $
+
+*shorewall-lite-4.5.19 (28 Aug 2013)
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.19/shorewall-lite.confd, +files/4.5.19/shorewall-lite.initd,
+  +files/4.5.19/shorewallrc, +shorewall-lite-4.5.19.ebuild,
+  +files/4.5.19/shorewall-lite.systemd:
+  Version bump; Add new files/ structure
 
   28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
   -shorewall-lite-4.5.15.ebuild, -shorewall-lite-4.5.17.ebuild:
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index 2fb38ca165b5..f915a8bf86b7 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.5.19/shorewall-lite.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.19/shorewall-lite.initd 2267 SHA256 6f4a60e75ed61290918e776e8556b1009b687aca9d86542d8e780b5b33472b5f SHA512 c1424571594e585e48652ce9ac1b602f4763f7494e58d6d981fbd8a14f0193c6f52510e38225a70d0e8f74b6171f1a319ad89ae6682674384d74509fbc22fb62 WHIRLPOOL 8be4243da4f6f81f1f50807593861c3fc34e4857df50cb1ebb12deed74262050d0bb63a47b7b9c83597063a881eaf9b01b923478ca3b50fe3aa69ca9e28022fb
+AUX 4.5.19/shorewall-lite.systemd 481 SHA256 6f627628ed86e5a70f80454117bca3b197af105c1186e2a183157a995e6ecf16 SHA512 2c3efb6be4bc6d2f09a0eedab7a121987c84e9fdc19f001d8dde2fe37a6e603304c4adfe755d2911aa31b4fd3d2a5a60c6097c042abf17e66e589368ccd71cac WHIRLPOOL f367a6769094df0b69ccdc2cae414527b777a75c238d6f3ef84e383cf235682b823e8922a68a82a8f9f06456affb07863016a1424760d734966bb2f7ff3183cf
+AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
 AUX shorewall-lite 1788 SHA256 98d1fe31a2a190ed671e9b1aa21b17d659bd66f7befccaf06c6e7e1e24f9a67a SHA512 e7ba286ea90b5d2f9f7fb3d95536ddf411aaa111138c009c813d4b8837f5cb8bea2b8c7da8433f047f699dbedb264eefb6fda8a56e6a078344f354256e5495ed WHIRLPOOL 2e78e1bc70ba400cd34ed884da31d42ce1c1b15da31e4f6614563f17847d90e7e536ae348a1a9b92a817d9add01a47c4866aeaaf4ac39e15d93eb378127204c0
 AUX shorewall-lite.systemd 472 SHA256 9958fae5cb6b172f764e7cbb91991cb37e608453e161ce9f10ee3e5013932e2f SHA512 219a60a720224ef305eec288032983f68c43aa98528b6d84684fc1907bc97f0b0ded9b3edc16cbab48338b640206fabdac5fa1520d3a0f588d717559dfe6c11f WHIRLPOOL b6a91090d44d05e2b999b0c82b624253a4a67321e96800201733b8aa7a731d5de2a7e63fc378100687560f0ff5526ef91bc5f485049ad006491b074855638f1a
 AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
+DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
 DIST shorewall-lite-4.5.18.tar.bz2 73702 SHA256 b66680361c527ac710d33d643f4c233ab8e754e7916de0891a863ca7a973d03c SHA512 de181f2878402bb86b550bcfd4aaa86d874ef8be2674d145052322c80499bcc4691086a2b09612a0228de7d1c9e75c335ac99dbc63dcc0d5c8c2fc305f377be6 WHIRLPOOL cd29da8106f7fb2faa84e07fe2a2fa7e080a36db15c04b09926855a7735310c20e4c29f26695bc3c1dbc91b2c262223b8f83341018da2fa91fad1f8edc99a026
+DIST shorewall-lite-4.5.19.tar.bz2 74489 SHA256 f5d1e8f2ae4b42461e5b414b52b4ac6614a144e4f6ad211b025f94716f898aec SHA512 c7d1edf2bad8c5ef4cb51fd5ef1d2dddd6bfc4d5d984b85b6fe8b6686a762bdd888c3a7dc2f7ce21cc6e7e217f51e7f5c00d534d7ee2b7bddcdfd534f936768e WHIRLPOOL 0d61e9648e4b34ad58d942cbb4e7e38d2551f877cc82cba7ea64f72362010067b2d663b984c052acdb9c1c544f184abf42e51b9e6797adcacaa8fa9064e5aaed
 EBUILD shorewall-lite-4.5.18.ebuild 1499 SHA256 132580bd50bb8c41b4cf78a7918a4fe2efe4c9d51560c00de4806aedb828af75 SHA512 9e5b470129fdce4a6b060456b711e8d60f54a2cf2531deb7b0df9c566194075db6e4a4254c6484cb799a2dc4115d6f3d5374e6f01763bb3bc8936e2ddcfe608d WHIRLPOOL 3be3ab13d1d30c414559a9e83ed99efcce89f9d839eb6a95e66266186a270b1adf0e4ee7c7571c1da8719d0b442ab7947890be69f982e9f908d96d11bf45f1e3
-MISC ChangeLog 21137 SHA256 c709fb1c19e4df599cef849692b48c517c7f23e302b968433ad277462ea00096 SHA512 6c83dc8cf6901652f6f3d9f6b33908b6b3694e14810d0c0a979af692698c139764e3eb4270d6c737de1f420d646f137db7bf7a6ee82913c0c99f0d5532bd6731 WHIRLPOOL 02368f76fd578ee0d1a2223a65c141c8143e2aa54b897a5bc0a4334b0f4e4a3486bd687f1cefc4320c0f914731558e2e1f204895e84137594c18b1d3e684bd67
+EBUILD shorewall-lite-4.5.19.ebuild 2693 SHA256 dd25aa829df0951166104c7215f453054d249b8f3b2fdc9505783ab76039ce1a SHA512 a79983efdaca8e1285e03541fb63e1bf375494340d38132a5106a89e65e15d7cc34526a7d0ee6805a78d5d08b3b0a7989a49177b5a32f75b4015a495ce372bac WHIRLPOOL cde182feea22895f512ade2fa0deda207e7156dadfc5adf3343e1036fba70143852a13dfb2faa666df69e2c2d66e99b353d8ec5aab12601de35f858729ba7bbb
+MISC ChangeLog 21447 SHA256 566b2449e43051f0b3d578b287b0eb8f8d91be1fda67332c64d67f04c9be4a78 SHA512 ec97ec70793d46e2cd5fcdcd27b360172c5472dc96df8eecf329ab876bae0ed366d842936149c34c7e01f1f6455a1543ffcb10d553c9cbd2c2480791b7c7c306 WHIRLPOOL 58c68ad54684a20968a92b9788045bc3d4b3f3999c673ceebdcdb0277ba08b29981cc5df507880a548b425e6bc6c2b84f03e2131fe23c97945aa1719916b94f2
 MISC metadata.xml 249 SHA256 cdf32b905fad83550eb790e99cc420f9d31e5f084687dafef696caa74270f544 SHA512 0f1cd0c406c41d29198618f897793943d21cf001fb9751bceaab6e839b9bf632435498a7552f10420ac01ffb6e3c1c37bdb709d416458c5b2ce80078f88f142a WHIRLPOOL 7c41b0e1fc6e004743781d062b73653c41add99d31604fece37d10f00b91549ad28c1c49689723c3f6668607f8b85847f9b6c671f64961ec9938d8d359ec575b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iL4EAREIAGYFAlIeFIZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlIeKolfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
-ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsOqdQD/eRqALkRksHBrkzJ4EOkYWfKU
-NTvNTRfyUppty03vP58A/1zllOn1z+4EzJ+iGoz9OobVkaAucNTkLgbXmz5lqRe5
-=3q/T
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsNLIgD/QR8KnX/tggFWumu4vmF/fzOA
+dHNnVgqanzbmwikFVL8BAIT88JLqQtO4jCoYh8lAwFF63BA10bhNyR9iPd2eX5in
+=nmAi
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+# 
+OPTIONS=""
+
+# Start options
+# 
+STARTOPTIONS=""
+
+# Stop options
+# 
+STOPOPTIONS=""
+
+# Restart options
+# 
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd
new file mode 100644
index 000000000000..2f985630ac50
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd
@@ -0,0 +1,82 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd,v 1.1 2013/08/28 16:51:20 constanze Exp $
+
+description='The Shoreline Firewall Lite, more commonly known as "Shorewall Lite", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall Lite. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	/sbin/shorewall-lite status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall-lite"
+	/sbin/shorewall-lite ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall-lite"
+	/sbin/shorewall-lite ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall-lite"
+	/sbin/shorewall-lite status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall-lite ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall-lite rules and setting policy to ACCEPT"
+	/sbin/shorewall-lite ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall-lite"
+	/sbin/shorewall-lite ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.systemd b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.systemd
new file mode 100644
index 000000000000..a7c932418a9c
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall Lite (Shorewall-Lite) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv4 firewall lite
+Documentation=man:shorewall-lite(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall-lite
+ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall-lite $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall-lite/files/4.5.19/shorewallrc b/net-firewall/shorewall-lite/files/4.5.19/shorewallrc
new file mode 100644
index 000000000000..c2fce7246c1b
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/4.5.19/shorewallrc
@@ -0,0 +1,22 @@
+#
+# Gentoo Shorewall 4.5 rc file
+#
+BUILD=                                  #Default is to detect the build system
+HOST=linux                              #Generic Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild
new file mode 100644
index 000000000000..65a8304452ac
--- /dev/null
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild,v 1.1 2013/08/28 16:51:21 constanze Exp $
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+MY_URL_PREFIX=
+case ${P} in
+	*_beta* | \
+	*_rc*)
+		MY_URL_PREFIX='development/'
+		;;
+esac
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+MY_P_DOCS=shorewall-docs-html-${MY_PV}
+
+MY_MAJORMINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="=net-firewall/shorewall-core-${PV}"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20
+	sys-apps/iproute2[-minimal]
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
+
+	local ERROR_CONNTRACK="${PN} requires NF_CONNTRACK support."
+
+	local ERROR_CONNTRACK_IPV4="${PN} requires NF_CONNTRACK_IPV4 support."
+
+	check_extra_config
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
+	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
+
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PV}/shorewall-lite.systemd ${PN}.service
+
+	# Currently, install.sh from upstream is broken and will always
+	# default.debian so have to do it on our own:
+	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Before you can use ${PN}, you need to provide a configuration, which you can"
+		elog "create using ${CATEGORY}/shorewall (the full version, including the compiler)."
+		elog ""
+		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
+		elog ""
+		elog "  # rc-update add ${PN} default"
+	fi
+}
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 8e45c5fc241b..6df4431096bb 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.243 2013/08/28 15:20:19 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.244 2013/08/28 16:45:58 constanze Exp $
+
+*shorewall-4.5.19 (28 Aug 2013)
+
+  28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
+  +files/4.5.19/shorewall.conf-SUBSYSLOCK.patch, +files/4.5.19/shorewall.confd,
+  +files/4.5.19/shorewall.initd, +files/4.5.19/shorewall.systemd,
+  +files/4.5.19/shorewallrc, +shorewall-4.5.19.ebuild:
+  Version bump; Add new files/ structure
 
   28 Aug 2013; Constanze Hausner <constanze@gentoo.org>
   -shorewall-4.5.15.ebuild, -shorewall-4.5.17.ebuild:
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 28fcc672763d..2bcab09fa8c9 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 4.5.19/shorewall.conf-SUBSYSLOCK.patch 700 SHA256 81ea118b54d7801eab04e70d21df0545be4c9680c2981de7ade727d8401363ca SHA512 2099951583f1fff3d90b7693c99ce61a77262ee2935a1b0ea3c81357c1c74874f49cd104d652e63b2ba9530db77b584c6ae0c33e7556bfd0c190d3765b15a993 WHIRLPOOL d26a2e9bdf8b04286dbfe7204a8e736b2c2464cd22efe10f5819bff84c5ee08621e35e934581fc5a112d9370f8307c1835b265b951ae573106d5ba730a1fd5fe
+AUX 4.5.19/shorewall.confd 160 SHA256 99aa9a4d3ae9f3bb590f5426c1266b6f7ee50a9e52f5a65b4cc56744a953982b SHA512 00e58351aade2ea9ade38373f3cacca3f10dcf4230b29e4a4e2b5d5d449ea9b78f40e2da7d94ed7c23980de2428198e3472399c6268662598b0fdbe008aff4b8 WHIRLPOOL 18532d1659a794d531548a91b0f096942fe5e82637ed05a9c5d49ed580d99a3e0c2807fd5ca5ea5c38139dc4c6f798b952433e59ee893f80240e5f4254435eda
+AUX 4.5.19/shorewall.initd 2943 SHA256 5c0006795938b81df9a097b7b1495fd477383b933d91de358254f80a86e8e806 SHA512 597cb7e269eda3165c24c5ac5f57e97a716e0d373abdd88cd55ac877bed5551553b89236105b5d657c10571d9f70d5ff7c83e71667c7446405a06be46ba679e3 WHIRLPOOL 045bc29eba691c1a760a566d1b58c211527d2f24f4b3750b07f0b6731a9ab9f750cda118eaacea42abc231358548c73247fd3de971544ca5ea94510d3d4c9b76
+AUX 4.5.19/shorewall.systemd 446 SHA256 f593a0514902bf369ae3f4e9aa6b782fd0e3abfbba6d63ce9d0521303b504c17 SHA512 63cb819570a249ce97bd0bf3b29e27bc84116c201348c49cb52688eb86bb45e30fb78f6b73055ea54db2392d75c77638ec64d636b9c801345e446402d43b27a2 WHIRLPOOL 98ff8938b7998a20fbf0acd0f1186ac13e543b4e2df99f55feea0e8f038e6a6724083ef221efba33f5c1af0844a8e53d1dcd266686ea2a2dcbd65d67a75b251d
+AUX 4.5.19/shorewallrc 1893 SHA256 13e755e42553215dc2f6a5f9abc4cca92e8f0f48d70f94072e780c5a8a432e1a SHA512 3c1f347095bd0c38d5d51bdd96e9cc7d73b3648ee669cdfb2195bed2badc2f7336e84ef9ead3c783d60a062e6ee39bf904a7749f7c43b798a8be70558eb611a0 WHIRLPOOL 48423249fc93de10ccd32d88f13595f54deeff38dbcaaf04ea87c42ae97f6324338c7c30f1fc68530e02714fb761d82093c40015e8577d11153ba63e2cf0583b
 AUX shorewall.initd 2064 SHA256 ee8cff251a24cc5f9b31e835682f6fc7d9f01625e93c2f9d8c82c859dad09e8e SHA512 365819451ee3a412c321eea4d3011c548295f00f9dd2cbb996c84a61be77eae859d568077677f1acad64af2a642028e2ef577a3757239703153b3293232afade WHIRLPOOL eeb0b2f9e0a48dd3194c1f977309c132e84b018944ed19e68a6d575e9a834acb0c51ae894031a3c4bf01b9b0bcd94094a776c3839a3b74a10d5e46a16f631e91
 AUX shorewall.systemd 450 SHA256 7af76981195a12e4cf0181f710d606e53d1964fd5cd033a4db489f8eb98a8495 SHA512 181c701b8aa6a18f21b578a536841616424bff96e220fb06de991d6c7ebd0209ce672d9a1f0b44976c2fe98b5638d0fcc5f6823c6f0bfef81afb2817609a7cc0 WHIRLPOOL af6666199890f43f81a2b67c89e3b06cf081ae4351e24925e92c8f24164be81f5d2fcedaafc262eda672733e809a1a2a4f3042375893eafa0bd58de28c1cb966
 AUX shorewallrc_new 1773 SHA256 24a169e763eea3926b8d1c44d62c52d3e2cad94eccea303376ba3e873e0a8224 SHA512 e080f4bce47fa5482dee46486e358ed17f35edeaf9050126b8c6f009cb29d1ca2ead2821153233e15fc18757f6cb72ff60f72b3f2d65aca32f9a63bc33a31f0e WHIRLPOOL 54311d12f85c1b9791a0e8db32878e7031c846471594400011236c58ef0183d75be960f65ce207d909758107a9bd13aee6fff2fc001b42651397ae877162e654
 DIST shorewall-4.5.18.tar.bz2 470187 SHA256 81bbcb2cc24d0b54769fb153cb472d78e6eed9cdc9f005f1dd70ef2ae9efe131 SHA512 69857ba9181989a0d0b8ce691e637b313b59d4f5643784e62a801f8d74add0605452011e19e5344aaca97a329fe66980627181e69d9c0fc0625ff23afb192f78 WHIRLPOOL 2aaa1d5fce8170507e4989cb5c11cedeca938a161795894edad0ced658c9af42eac299ff4385b15d5fde003ece87f856ac57b985e4d26ea0adc870f109596082
+DIST shorewall-4.5.19.tar.bz2 475805 SHA256 91368877973411c5a6228a22a5d5bcac03aca42cc56c3cd95a3775ca964d0756 SHA512 0c3346a0f15b25051102a9a9d3e0d08a8bea3138c541fc32987278e569bb2f58c8d147b61cb095b694935c799207c5c6409c66ffd7667f07ad88bc60db68845e WHIRLPOOL 950d972b0570cc4586fb7b39a3017b37a2261ed08228a9032f6868258595a28236d3f36f8461a3404f91fb7a3972f57054af0b7c33f2427d7e1778219d0e45da
 DIST shorewall-docs-html-4.5.18.tar.bz2 4022828 SHA256 a98263059952ed50b826eb1787e18eccff09f41fa8f5d70f705ce39660b0c835 SHA512 790b89c3ee885a70daf62d145fcc3e1fb15871abcc9e8a868154c982e264a46acd8dfba81986604de60eb1c375b080d52992b6435b15b3cca91ab3afb895708f WHIRLPOOL 72c73ed925f3289978bfdfd8490bd617c0d39190ce874583773f04ec16d5710d007fd2edaef80b20e7b504e58df0d7bcf09595ee228a0948500295b848c333b3
+DIST shorewall-docs-html-4.5.19.tar.bz2 4033970 SHA256 7be6ebfa73a52151137201e098588ff6e67aa6fc21cf530a0fba564eeb8e77d1 SHA512 8ce06db614a6114cfe2c5c78acfaf111cba0ae5aa488df3879af6b5ecb20205ee453e308a7299e5df243a71067f93dcd8f4cf5faefbd8729ba11acee35cf34e0 WHIRLPOOL b55f90c6f9ca28cccddfb7bd899ce5815573db3ff4b4deabe454c6f30a9b01196ec4609d5251413d9761a28944a6acb19b6748c4dd41ea58fe2fa8da9845ed49
 EBUILD shorewall-4.5.18.ebuild 1506 SHA256 ea8ec1f2f64ba52b3e356bd55442de01b0e45045bc653ae48151cc4c6a645ba2 SHA512 03920b6d37d6a243d6d39bfe5a5108aeae4c7a691138ce6b73d67de35dd444da6a221c268daa65a9f761dbc2cefb1189784a901a44e54aa77b9cd7260c4f40d7 WHIRLPOOL b1a30462e723dcbbeb2d4232066d5dd0739ea8499a3a8bc672cf8171804f025475ecbde8ed793ee6338602aa50711dbf34f3f26f609fc25a269be1f1009416e5
-MISC ChangeLog 34364 SHA256 8335b3407abeecc61d7af756fd6af8bd97de6b48a792ff330cbbabea2891b122 SHA512 6423dbe1dbeb72473f24002e56d71dc99d566c5a40f1387a52a3e39bc16345bbe907c78501044e677979026fe713719462ea801b1ae2337d3d55ac9f16ee4914 WHIRLPOOL 2ec231786028875f191fa29114020bd6c3627dc6d2bdfd494fd4ce634e6369d34af07de7574d4c67c009615d901c7a93a02ab6f645e5702bfc76f40ff12a3125
+EBUILD shorewall-4.5.19.ebuild 2972 SHA256 b75dd04f4fc1df875f1bb1f9177795438844f0c930f966e85de7b65c3d5de7e5 SHA512 48d5f0db9fcb527dca04c4d5c6c1afd5baafe8d92357718437d26b538da0d5d86deca1beb10c6db6321651c2564d524d7da1554c5c9c397d24e21407a057c596 WHIRLPOOL c1ee402589f46e3e40dedee1bd562c1195b8226206ac5e01bc7cfb7254af1a48d3c3f5e0df8045f1065120adbf3407a8da174ada71e50fe8a6f40ae50769a28b
+MISC ChangeLog 34696 SHA256 5d34f6e705a45b32cdb06c3682c9e6185acf5ac6e9ec82a34a3777f25a650494 SHA512 828dce3007747b8ca73d7aa45b60ed5047723c623f8d3819978cb07bd8bf9ce70cb029bde7c0641e9ce8357108b97852f98dc0b31fc857539396ea4943738af3 WHIRLPOOL d342a3170b6a09ae3079deeb418d50934d77e0525c6a60193a224b392ed61f260235752b4664553252f79836489843a8f23414e5cc55c323beb08ba43f36484d
 MISC metadata.xml 275 SHA256 79fdedf162d8e4a13d3bd5b771e926ede25495b51424b45478f9c87a3519b10b SHA512 248a3902e8a5cc9a1a579ffa90e3a6f151b770f46eef21ea09c5b871d76bcf059d3c86cc7da57a5e979db92be0bd64b0f8174bed90a4ef0e98e65d58543ef938 WHIRLPOOL d1179529011fdd06a563d646ffe220b65fd220dd87783c056070de2241e98f1ce9f9fec0846f6ec11043dfe41595a3399966dfdd08d0f0f7118255aee05e67da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iL4EAREIAGYFAlIeFTRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlIeKVpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIwNjQwRkMzRTI1OTEyQUUwM0MwQjVBQUJC
-ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsNuVgD/SfOBYx0rV2Ku/7Yc8C0NLMEn
-8in2WHoz8LfAuCNE8/8BAKdq3wzB6xrD+X4yXKpsUXu8tmAl2fv9t76cvGMixrx3
-=0Avq
+ODBGNDE5MDEwRTNFQzMACgkQu4D0GQEOPsOX2wD+OqXPP+7hGrHLfT60gGtCQ3Zp
+ER1D3OX1fPbrdztUwnAA/Rqjj6IiEw0tEjg4vEffrnUqQQkWY7ae87CHxS4CtLH/
+=KDSI
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch b/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch
new file mode 100644
index 000000000000..37a080adf999
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch
@@ -0,0 +1,22 @@
+--- configfiles/shorewall.conf	2013-06-24 22:07:38.000000000 +0200
++++ configfiles/shorewall.conf.new	2013-07-01 15:50:54.747711444 +0200
+@@ -85,7 +85,7 @@
+ 
+ SHOREWALL_SHELL=/bin/sh
+ 
+-SUBSYSLOCK=/var/lock/subsys/shorewall
++SUBSYSLOCK=/run/lock/shorewall
+ 
+ TC=
+ 
+--- configfiles/shorewall.conf.annotated	2013-06-27 20:32:22.000000000 +0200
++++ configfiles/shorewall.conf.annotated.new	2013-07-01 15:51:38.448332964 +0200
+@@ -444,7 +444,7 @@
+ #     or specified as a null value, /bin/sh is assumed. Using a light-weight
+ #     shell such as ash or dash can significantly improve performance.
+ # 
+-SUBSYSLOCK=/var/lock/subsys/shorewall
++SUBSYSLOCK=/run/lock/shorewall
+ #
+ # SUBSYSLOCK=[pathname]
+ # 
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.confd b/net-firewall/shorewall/files/4.5.19/shorewall.confd
new file mode 100644
index 000000000000..e5957167b5b9
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.19/shorewall.confd
@@ -0,0 +1,15 @@
+# Global start/restart/stop options
+# 
+OPTIONS=""
+
+# Start options
+# 
+STARTOPTIONS=""
+
+# Stop options
+# 
+STOPOPTIONS=""
+
+# Restart options
+# 
+RESTARTOPTIONS=""
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.initd b/net-firewall/shorewall/files/4.5.19/shorewall.initd
new file mode 100644
index 000000000000..a4e9b99be4f7
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.19/shorewall.initd
@@ -0,0 +1,107 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/4.5.19/shorewall.initd,v 1.1 2013/08/28 16:45:57 constanze Exp $
+
+description='The Shoreline Firewall, more commonly known as "Shorewall", is'
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} Shorewall. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+status() {
+	local _retval
+	/sbin/shorewall status 1>/dev/null
+	_retval=$?
+	if [ ${_retval} = '0' ]; then
+		einfo 'status: started'
+		mark_service_started "${SVCNAME}"
+		return 0
+	else
+		einfo 'status: stopped'	
+		mark_service_stopped "${SVCNAME}"
+		return 3
+	fi
+}
+
+start() {
+	ebegin "Starting shorewall"
+	/sbin/shorewall ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping shorewall"
+	/sbin/shorewall ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+
+	ebegin "Restarting shorewall"
+	/sbin/shorewall status 1>/dev/null
+	if [ $? != 0 ] ; then
+		svc_start
+	else
+		/sbin/shorewall ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all shorewall rules and setting policy to ACCEPT"
+	/sbin/shorewall ${OPTIONS} clear 1>/dev/null
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in shorewall"
+	/sbin/shorewall ${OPTIONS} reset 1>/dev/null
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing shorewall rules"
+	/sbin/shorewall ${OPTIONS} refresh 1>/dev/null
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking shorewall configuration"
+	/sbin/shorewall ${OPTIONS} check 1>/dev/null
+	eend $?
+}
diff --git a/net-firewall/shorewall/files/4.5.19/shorewall.systemd b/net-firewall/shorewall/files/4.5.19/shorewall.systemd
new file mode 100644
index 000000000000..db278fd54585
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.19/shorewall.systemd
@@ -0,0 +1,17 @@
+#
+#	The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5
+#
+[Unit]
+Description=Shorewall IPv4 firewall
+Documentation=man:shorewall(8) http://www.shorewall.net/Documentation_Index.html
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/conf.d/shorewall
+ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS
+ExecStop=/sbin/shorewall $OPTIONS stop $STOPOPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-firewall/shorewall/files/4.5.19/shorewallrc b/net-firewall/shorewall/files/4.5.19/shorewallrc
new file mode 100644
index 000000000000..c2fce7246c1b
--- /dev/null
+++ b/net-firewall/shorewall/files/4.5.19/shorewallrc
@@ -0,0 +1,22 @@
+#
+# Gentoo Shorewall 4.5 rc file
+#
+BUILD=                                  #Default is to detect the build system
+HOST=linux                              #Generic Linux
+PREFIX=@GENTOO_PORTAGE_EPREFIX@/usr                             #Top-level directory for shared files, libraries, etc.
+SHAREDIR=${PREFIX}/share                #Directory for arch-neutral files.
+LIBEXECDIR=${PREFIX}/share              #Directory for executable scripts.
+PERLLIBDIR=${PREFIX}/share/shorewall    #Directory to install Shorewall Perl module directory
+CONFDIR=@GENTOO_PORTAGE_EPREFIX@/etc                            #Directory where subsystem configurations are installed
+SBINDIR=@GENTOO_PORTAGE_EPREFIX@/sbin                           #Directory where system administration programs are installed
+MANDIR=${PREFIX}/share/man              #Directory where manpages are installed.
+INITDIR=${CONFDIR}/init.d               #Directory where SysV init scripts are installed.
+INITFILE=${PRODUCT}                     #Name of the product's installed SysV init script
+INITSOURCE=init.gentoo.sh               #Name of the distributed file to be installed as the SysV init script
+ANNOTATED=                              #If non-zero, annotated configuration files are installed
+SYSTEMD=@GENTOO_PORTAGE_EPREFIX@/usr/lib/systemd/system         #Directory where .service files are installed (systems running systemd only)
+SYSCONFFILE=default.gentoo              #Name of the distributed file to be installed in $SYSCONFDIR
+SYSCONFDIR=${CONFDIR}/conf.d            #Directory where SysV init parameter files are installed
+SPARSE=                                 #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR
+VARLIB=@GENTOO_PORTAGE_EPREFIX@/var/lib                         #Directory where product variable data is stored.
+VARDIR=${VARLIB}/${PRODUCT}             #Directory where product variable data is stored.
diff --git a/net-firewall/shorewall/shorewall-4.5.19.ebuild b/net-firewall/shorewall/shorewall-4.5.19.ebuild
new file mode 100644
index 000000000000..321986ba84bf
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.19.ebuild,v 1.1 2013/08/28 16:45:58 constanze Exp $
+
+EAPI="5"
+
+inherit eutils linux-info prefix systemd versionator
+
+MY_URL_PREFIX=
+case ${P} in
+	*_beta* | \
+	*_rc*)
+		MY_URL_PREFIX='development/'
+		;;
+esac
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+MY_P_DOCS=shorewall-docs-html-${MY_PV}
+
+MY_MAJORMINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
+DESCRIPTION+=' a high-level tool for configuring Netfilter.'
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P}.tar.bz2
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJORMINOR}/shorewall-${MY_PV}/${MY_P_DOCS}.tar.bz2 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-lang/perl-5.10
+	virtual/perl-Digest-SHA
+	=net-firewall/shorewall-core-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4.20
+	sys-apps/iproute2[-minimal]
+	sys-devel/bc
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run ${PN} on the local system."
+
+	local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+	local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local system."
+
+	check_extra_config
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${PV}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc_new failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	cp "${FILESDIR}"/${PV}/${PN}.confd "${S}"/default.gentoo || die "Copying shorewall.confd failed"
+	cp "${FILESDIR}"/${PV}/${PN}.initd "${S}"/init.gentoo.sh || die "Copying shorewall.initd failed"
+
+	epatch "${FILESDIR}"/${PV}/shorewall.conf-SUBSYSLOCK.patch
+	epatch_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh failed"
+	systemd_newunit "${FILESDIR}"/${PV}/${PN}.systemd ${PN}.service
+
+	# Currently, install.sh from upstream is broken and will always
+	# default.debian so have to do it on our own:
+	newconfd "${FILESDIR}"/${PV}/${PN}.confd ${PN}
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r Samples
+		cd "${WORKDIR}"/${MY_P_DOCS}
+		dohtml -r *
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Before you can use ${PN}, you need to edit its configuration in:"
+		elog ""
+		elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
+		elog ""
+		elog "To activate ${PN} on system start, please add ${PN} to your default runlevel:"
+		elog ""
+		elog "  # rc-update add ${PN} default"
+	fi
+}