gentoo resync : 31.03.2018

4 files changed, 30 insertions, 2 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 98d63a70f5ef..848cc0b55400 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 3f51cd41f5f6..6fb56b94bd7f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -12,6 +12,7 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r1 2075 BLAKE2B 7aeaa263ea5c318d3c2b29262e655929f87e36de17e347e613bb9ac4141deea5ba983695b4279effb3ba8b4a5da706a2213209571866e8bdb844c9619f1df85d SHA512 9cf87d5b5807b224a325c9d038f159e55d277ad3eca62a1fd82d06d9ec1d0f71e58b239c57532b9b081271c7ab6f90b281cea1dca0bb9ea26e1e1c8ddaf3a691
+AUX shorewallrc-r2 2035 BLAKE2B e130d1d45427f5d5fba36e75e88ce9cafd3d3a207e63e006ed869c4b9cabc37e0ee1573f89ba8a1c4879a701baccba1a8c6c45c051b4ddd1043a0afac534aa03 SHA512 0a446beabc540bead854c141cc0e19ded5da548f7cbb83f99cbcce58227311579c7f03f3b94f51851ed689b8c904085a2fd32478f18729f34c1aabfc1ea9b577
 DIST shorewall-5.1.12.3.tar.bz2 554963 BLAKE2B dcf3334546b0c67e61b8d9a5a0710f92aad6169fd2386431abc254188837d939034d01c5f9a5cd80e1cbb10904c526d1ecc00f51b4c2e934c195b644f4715e77 SHA512 5c4c27b59fc0d0de7a5b47a84ffaf8effd664568b4f5e8e5b0f8170238873742c1507e3a20369643b5d0d83d696c2c4c476cd341f45fd71dec7a434a09e4f434
 DIST shorewall-core-5.1.12.3.tar.bz2 86394 BLAKE2B 05ac5047bb498c787e627dcceeb2e543f4541d86b8fa956445307ef2ef41b933b5124b039a307c441c65fca595030de9caa4344d99fb503c6b001d6436f98a98 SHA512 8f88ebc94d475ca234c8a238e793fac9c7009d61f9a8936e84a0ceda5b6b48a70ef6aef5222eaa6c7d5235aecd2821b348c9cffb74e70d9f30b89bc109df3530
 DIST shorewall-docs-html-5.1.12.3.tar.bz2 4281525 BLAKE2B b3e13ebfe0447d13a36e462e47cc9448f25008032da66e652bf59ce7ee9c5aaf2df88acd059fc2f8c4ecbc2b793326d0ef911689c1d3c4295b3ccc8bc6d3dd44 SHA512 0e713d56894394614fd18ddcb83486b570083ea174e9142ed5f19a8051baeeb45c72905da8a9fd8c8e4dbba5a2dfbd548c99b85d873170c3c597f629bde3fe49
@@ -19,5 +20,5 @@ DIST shorewall-init-5.1.12.3.tar.bz2 41487 BLAKE2B 114fa4e647d1016f315a94f94dfe2
 DIST shorewall-lite-5.1.12.3.tar.bz2 47161 BLAKE2B f9471cd473bad27ddad1f4e17b64f767edf53341bc0fbbcd1f6365a593bddde0a50e569790daa46cdd0818d9a87de59377f01a4924b24488f4fe98c594292834 SHA512 d665563613000d7d9c3d787347d730a61879e9f31da48414dbd7997e1921a5675ae4e91f7fb6a30714ee385964923007bc4828dbb7f5b59a2723ff9dffb8ec25
 DIST shorewall6-5.1.12.3.tar.bz2 197348 BLAKE2B f4e76d19c39f1068948a2a340e1b442ca87dfbbc76f68c4b63de0a6ecfab9ac0eb3e1eed7ddff05d9273f0dfc7ae19ed73c068949b8d6f358e08be9f67b2b1da SHA512 04877c4578b5eaca5a577fd2fa51f4aa90a29dda77316537d6ea8a07aa59667aaf5b76cd338f481291358360f66d33291ada8ff8d7ca908f24686dff19521e1f
 DIST shorewall6-lite-5.1.12.3.tar.bz2 46837 BLAKE2B 37158fb740673680edba992957bcbf836b57e01b66248dcd2630542c1f54347fdb92f4d31f1e20f969c58da8ceeb6af6a1b1414e0d97d666ae30c8b269298f83 SHA512 9bfc4dea894f51f35e366d9aed1380096865ecfd0fce913f2bb5e1c2154206359d41a4e9abd5f2e287c9c7fd9aaba9c74693296429727b30cc73a33b237b3874
-EBUILD shorewall-5.1.12.3.ebuild 16131 BLAKE2B 77655ddcb11961ef4ade55ebf540067eb8c54774ecc998387ae8333b04e612db40aedb1b318cc5f9a57bb690493927d2be3c24dc151a57fa13913de39f632935 SHA512 9a4662bbcb4d0534b639228623715128930fc02a7b8c3dea7345e72441a08f6a8df14389cee22fac750fb304f6f6ad608b63f9c167af45d1466d9e3dd6425414
+EBUILD shorewall-5.1.12.3-r1.ebuild 16274 BLAKE2B ec3a48d6ca7da8e553c0771bff4ffad54ff2ddaf61dda8a5d781d59f53075f637303eead6ffdcdba940a7db38e6099a3a070dcfcfd3bec0167af369e082b6cf7 SHA512 7ac1aa7e32c815499a49c0a97427359db8fed3fc135026593ff724d53e42a566a5ec023bdd760ad9959768a84ad453df1a88973c018b7f45b543efa6bfa0e969
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewallrc-r2 b/net-firewall/shorewall/files/shorewallrc-r2
new file mode 100644
index 000000000000..ecc21a23875a
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewallrc-r2
@@ -0,0 +1,24 @@
+#
+# Gentoo Shorewall 5.1 rc file
+#
+BUILD=gentoo                            #Default is to detect the build system
+HOST=gentoo                             #Gentoo GNU 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=${PREFIX}/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
+SERVICEDIR=tbs          #Directory where .service files are installed (systems running systemd only)
+SERVICEFILE=gentoo.service              #Name of the distributed file to be installed as systemd service file
+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.
+DEFAULT_PAGER=${PAGER}                  #Pager to use if none specified in shorewall[6].conf
diff --git a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
index 0f6140661fb1..d7c5285f28b0 100644
--- a/net-firewall/shorewall/shorewall-5.1.12.3.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.3-r1.ebuild
@@ -156,8 +156,11 @@ src_prepare() {
 	# This allows us to use patches from upstream and keeps epatch_user working
 
 	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	cp "${FILESDIR}"/shorewallrc-r2 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
 	eprefixify "${S}"/shorewallrc.gentoo
+	sed -i \
+		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
+		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
 
 	# shorewall-core
 	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"