gentoo resync : 20.05.2018

14 files changed, 68 insertions, 138 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 478417a8b6fd..405708c1fa5c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/chrootuid/Manifest b/app-admin/chrootuid/Manifest
index 7373ea0be587..688080306525 100644
--- a/app-admin/chrootuid/Manifest
+++ b/app-admin/chrootuid/Manifest
@@ -1,4 +1,4 @@
 DIST chrootuid1.3.tar.gz 5439 BLAKE2B 315be66360f8d81b77169cdac28171399492657d7a377bcf688c17cf82ed16b4042ead9dbf8e4c6149895c727f74fb4185bec867a93a14fea2c272cc1c7296ca SHA512 55ccc60e6010910466e700f9d0f2f666bc16ab72af3fbc1115916b4e005684d9ad28bc0b8b1cba3804ca68384c3b0fbe137114623eba70241eb8653325382a1f
 EBUILD chrootuid-1.3-r1.ebuild 623 BLAKE2B 6d059bf8b265c728dd13fdba0f890d06a69224f414f5b1774a1de2bb60d693b42489fdc4eb6af7e8028d3079901a698683ca19cc1772c369cc02c615701457ce SHA512 a31cc38602064d125b9ef6060d9a1d9ea15728501b4a36ed45b2e282d4be159e3632df1d6fa3747e5596321ee753de7864d3732b51e25628ba3040b21e29d76f
-EBUILD chrootuid-1.3.ebuild 612 BLAKE2B d579a0b7756192f48f39a1d554c3f6d358c34e18f429ac3cecf2b8713ddcf1c23ca80773400ba123f66efda492a38bbc8e791588a292821b2c98e47fed6a1fd7 SHA512 f7d9614890643a445c194e704dd72b4ac59ceadba15e4df53cb6a5e7b46eebbf40b785ffb371e6ae07be0a6f09b575646d1bf570592f7101d3a0d8dddeb7f23b
+EBUILD chrootuid-1.3-r2.ebuild 626 BLAKE2B d8c864b342c4ff1b6c4837a6209002821f18277cdc28bb347ea6086ca5a4a94d04e4aa9cf1e2278005da2bb6031a94fa4dffecefe507074c2470017b79a22435 SHA512 9898fea1bdc1f949dd974d27cad94fca8ea8e11948956d2828e0f2bded887f9d5bd8a7c845858aa4803745d183a80dc02b1e1bcc6fea52b76ce4029816a528c7
 MISC metadata.xml 222 BLAKE2B 49e8d7211eae902342acdd0ded674ae77affa878ee3ad2d1928f8988373fed091b4ab792823d739af897d5703bd67e36e19bb3c8295787123930b3b0aaf1fbda SHA512 a92bf1c4f983f2c7c834060538f86818a43cd13c06fda425d628a50b3f890fa3e6c36640a449df57af495ac39c3baf3560a4555cacd32c71f3dde533a992556a
diff --git a/app-admin/chrootuid/chrootuid-1.3.ebuild b/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
index c2c45d72e5c0..cdb02fef8c5a 100644
--- a/app-admin/chrootuid/chrootuid-1.3.ebuild
+++ b/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -13,17 +13,17 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
 }
 
 src_install() {
+	dodoc README chrootuid_license
 	dobin chrootuid
 	doman chrootuid.1
-	dodoc README chrootuid_license
 }
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 75164a87e008..ee5901f90d69 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -6,5 +6,4 @@ AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96f
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
 EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B ed919fd5d042acb254861e7caa29becfa4637bf9077a791d5828e5c873f4479ce398ef8da72316d4059f63ae3c2b75550e78c8f778b8a20fbb1924bd5f033fff SHA512 ffbadfef4f779a87d0e6631be8e9bdad909176076713502d053f4acd538358281a20bdd94ea74d45d4311b3ae5e580114ea13114cff8a6835e488a03b620143b
-EBUILD conserver-8.1.18.ebuild 2232 BLAKE2B 472f1cdcd63136977b4ada77b3b69be7dae71bc6a38757de581b5549b1ddff901df2afec89738fdc0620e58c6ccae5e2a942a7505aa04d1f8c5c460fa051883e SHA512 2948eca7d779cca4e6894d5216790ffc3dd24a8a46f4c39b912e97f66b86fc0eab7ae4cef9f465cf1674457fa621d8c5d85b8c9da4e1a3358b61550dfeda7839
 MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1
diff --git a/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild
deleted file mode 100644
index 008ee1e31768..000000000000
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit ssl-cert eutils pam autotools
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com/"
-SRC_URI="https://www.conserver.com/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="kerberos pam ssl tcpd debug"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_prepare() {
-	# Apply patch to prevent package from stripping binaries
-	epatch "${FILESDIR}"/${PN}-prestrip.patch
-
-	# Apply patch to use custom dmalloc macro
-	epatch "${FILESDIR}"/${P}-dmalloc.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with tcpd libwrap) \
-		$(use_with debug dmalloc) \
-		$(use_with kerberos gssapi) \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd conserver
-	newconfd "${FILESDIR}"/conserver.confd conserver
-
-	dodir /etc/conserver
-	fperms 700 /etc/conserver
-	insinto /etc/conserver
-	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
-	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ PROTOCOL README TODO
-	dodoc conserver/Sun-serial contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-pkg_postinst() {
-	# Add certs if SSL use flag is enabled
-	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
-		install_cert /etc/ssl/conserver/conserver
-	fi
-}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 7994694b61a6..29aae29a6b19 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -12,6 +12,6 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
-EBUILD logrotate-3.14.0.ebuild 2519 BLAKE2B c8b540ebda04859024039ef25e44da854495fe434760f5cda85f0dd7d5b81260992e914d6358cb798dc999bf7b7347f2c8a5c42d8e0edfd9cff08e60da6d3d90 SHA512 2a7985587eebb623cfb4c3ecc86eb72df10bc74555d1ce202ab8b609df525d204de08a2065a8bad93ded5d1284a9eaa16d93ed16c98f376bb3e8ecd7b3aed3a1
+EBUILD logrotate-3.14.0.ebuild 2518 BLAKE2B ae63e0533481c9832069d1952c6e8947d9d7e5659af2e55a76483d95d5e341fa9a8f6b89a0cc22f283a7d780f3ebceaee6609d3a66c1956fae6e2334dfb10482 SHA512 5c88c0d35be0dd77e7d3b118146b023f81d96bf2452590fd52ec7309c9fcecc4323c4907fe6c7836f56d7a11c0e589e963797020bdb5b7d97924dfe64cb31f01
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index 4f19e8b5cdc7..b91a54cba8d8 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
index 414ef5afa59d..4ac5d333c40c 100644
--- a/app-admin/pwcrypt/Manifest
+++ b/app-admin/pwcrypt/Manifest
@@ -1,4 +1,4 @@
 DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
 EBUILD pwcrypt-1.2.2-r1.ebuild 600 BLAKE2B 7ea7ff450ce343bfd8555478448c6cfa17d41b9563c60571d73836bb80fb72b8ad7c5c47696b12b18a0f185bb87a085f1e52b8d41dbf713649b5a2f5f6dafe26 SHA512 c25aec3737c58ce888455c64615cf478b4e4e868534ea0b5f4e060491c48a9789c6b9072295d98c9092301242513b737a7e200ee96c03145dd348ec0b8f98a37
-EBUILD pwcrypt-1.2.2.ebuild 477 BLAKE2B 8941d06b122b11fbd60ee524ecc35cd222ca01499334776ceb2707f57553fc017c3183266e9d39194bbaf9f75f04b4ee87fcc66c05731159faa8ef207e30284c SHA512 1c92437b27116f5e2061bc929899c39cd4ae61d97f686fc597b06dc54e5b0a28da38ae704d718a17a377e8497fb23f730f56bf87c1dee4bae783ae8d5dac3838
+EBUILD pwcrypt-1.2.2-r2.ebuild 610 BLAKE2B 5b28efb087478dbbbb6fe76298e1267c4abb567c9972a4fb47fbf286443f6c12a75135bd686439378a4cdac410fea614456b3668155d760358ba46bbb2d6776d SHA512 2e922e6fd9cfc0dd94243b1f2e7b12f92a0013b0cca86cb02feaa2f7199ee9637805265677816cd12edc24222a6987e6e56eaab952ddd0d7ac1eda444aec2950
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
index 46467862af0a..0e60b33f530b 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,14 +11,18 @@ SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DOCS=( CREDITS README )
+
 src_prepare()  {
-	tc-export CC
-}
+	default
+	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
+	sed -i \
+		-e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
+		-e "/-install/s/ -s//" \
+		src/Makefile.in || die
 
-src_install() {
-	dobin src/pwcrypt
-	dodoc CREDITS README
+	tc-export CC
 }
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a3c4a2125a97..d7e67b4fe9e1 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -5,6 +5,7 @@ AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239b
 AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch 3878 BLAKE2B 9f1a030807a312801ce6c66bb5120029b935bf5ba2029b4d7297713f865f509fd1761595ba05c479a1aa860c8564fe38bdebe51c3c36ab278aa518de0f2285dd SHA512 19765cbd9aa13cce9590ab08c4a626eba06b94fd4345b3fc3b77149ed9401ea91c41f00b105a5b7f15bae611f5b718abdac23fff9ec205c3385686203e6aa701
 AUX 8-stable/rsyslog-8.34.0-fix-issue2612.patch 558 BLAKE2B ad05cd0a3b3570821465faf9f01541164eb18b1355363ad2208d9ee148971e1b86fb47fa2a81da2050a13c750342b3643e24dcb4db78149e6495353805180e10 SHA512 5249be1b70070ae30a41feacce83feea1a97f76eda0b5b60c29e4db6d50f4d27be8ab66de6187343d5b881eaf19414c2b8766fc99523c52e51f6a7c9b62e7d94
 AUX 8-stable/rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
+AUX 8-stable/rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
 AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
@@ -23,5 +24,5 @@ EBUILD rsyslog-8.28.0-r1.ebuild 12496 BLAKE2B 6389d72e3018fc1df8c7fa1f2a511360f1
 EBUILD rsyslog-8.32.0-r4.ebuild 12716 BLAKE2B 9bbfe2d1395a6b298dded2c36d0393e1b11f8b11b0b05c87d2fbe7d1d72d52956b46b2a1a65048daed2a21ba2ed897023dc419f7dca242febbc70b54f4dc0112 SHA512 b8b14edcc03b268699a2e727a942ba34706d95a953426c8a9e2fde33f2aab44a4588d8b8c21627b0b8bd2fa95c295d5e1d84f83ccb3de857c46a768a72093451
 EBUILD rsyslog-8.33.1-r1.ebuild 12634 BLAKE2B efd3e3c908e293ff50a3ff7102c42068627403b912393edfd970271e2974083280839a16bce4175ce4cc946f2d01ff2d516428c18c5f157b541d24c2b316e38e SHA512 ac770033e43c6f5d7d9f93c5586a29389436bc4b479ff1d2a81f7b63121ccd3bff3f9726b7395244a5384d4a3844968b9c8f0bd11ea1f56a381616d231b66fbf
 EBUILD rsyslog-8.34.0.ebuild 12868 BLAKE2B 51096caa37554c13a90b8949a8494e7017eaee33387c2c98c3a28617992079032eb8a846d733b6d04b7033716fcdd519ca2d873fd197f56ef85c526b9841ee9f SHA512 571ad42a40103e5f5df78d27109c8239c20892b0e8c6a25f19b6ece6679855bade12c789f1af9f3ce624e45cc14c19a051a7c4f90efa49a7702f98387e0730be
-EBUILD rsyslog-8.35.0.ebuild 12870 BLAKE2B d325c4e6f8869b92d02fb73ded6a59753e0f62b2e19c2820e7f8e081b41c1d9caf1058f342dd08a344623360591dd12e610ae3543a4c8d82cd0cb87c0e20e06f SHA512 672f1ce2e7e93282a4b09cbae884f33b5daef08d5c91a7d40bb2766a08abde53c6d0660e3e947042c61fafa6b31cd8d369780ae4e1fe7e196a9b3879db90b47c
+EBUILD rsyslog-8.35.0.ebuild 12932 BLAKE2B 3a56f185b54cc17b5b5883a4858c79622126676e092ce92e48b8ef2ceb6aacf4bfbe73cf42cf91b19d2652a082c4a0879c0ac1caaed01fb4ae0c2fbe3c583507 SHA512 d0d87b086a901191da78397444a390f74234faa125dd68009f01ae1231e047997c675f447b8970869e87d0b18c1772b84735440f9166dae0d6ea3591ef5da11d
 MISC metadata.xml 3501 BLAKE2B c9fb5e712f905e55b44cf43322a24bda7d1d0063f560029e0c3fb5da464f9e2f35c5031ab592ff958db262f48b511d8c1a0267ce0d8a9e47a14b03588351bdd4 SHA512 c167c0829aa16e2baf1758a75762cfe7aa1a9c48c6d9cbc32a1a3338ba7c0ba71f112d27173bb126bb1a6fbb75716d478e0b69539a735f8cb8f020a555a5907d
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
new file mode 100644
index 000000000000..eaec239c3839
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
@@ -0,0 +1,41 @@
+From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins@redhat.com>
+Date: Thu, 17 May 2018 18:38:25 -0600
+Subject: [PATCH] mmkubernetes test python must encode response
+
+https://github.com/rsyslog/rsyslog/issues/2721
+Was not working on python3 - must use `encode()` to convert the
+string to a `bytes` object.
+Also run the server with python -u to make sure we get the log
+output from the kubernetes test server.
+---
+ tests/mmkubernetes-basic.sh       | 2 +-
+ tests/mmkubernetes_test_server.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh
+index 0bbfd08ca..d320c343f 100755
+--- a/tests/mmkubernetes-basic.sh
++++ b/tests/mmkubernetes-basic.sh
+@@ -4,7 +4,7 @@
+ . $srcdir/diag.sh init
+ 
+ testsrv=mmk8s-test-server
+-python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
++python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
+ BGPROCESS=$!
+ . $srcdir/diag.sh wait-startup $testsrv
+ echo background mmkubernetes_test_server.py process id is $BGPROCESS
+diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py
+index 0de215603..24f4e1b0e 100644
+--- a/tests/mmkubernetes_test_server.py
++++ b/tests/mmkubernetes_test_server.py
+@@ -104,7 +104,7 @@ def do_GET(self):
+             self.log_error(resp)
+         self.send_response(status)
+         self.end_headers()
+-        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
++        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode())
+ 
+ port = int(sys.argv[1])
+ 
diff --git a/app-admin/rsyslog/rsyslog-8.35.0.ebuild b/app-admin/rsyslog/rsyslog-8.35.0.ebuild
index b225c3969c67..6c81d3b33a1e 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0.ebuild
@@ -48,7 +48,10 @@ else
 		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"
 
-	PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch )
+	PATCHES=(
+		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch
+		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch
+	)
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 8f10c765f684..948d69f8362a 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,4 +1,3 @@
 DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
-EBUILD sxid-4.2-r1.ebuild 739 BLAKE2B 73a6885a13d9fc488d24c88f2dd46e1837fa9cf2e1f26cb19bfd7255602cc0404d2a597f94852d7282d16829f05aca36ee15a25d1f344413b966eb74fa02e418 SHA512 cc0118b764ca45567a04920b8263b2f10596f18fa458b007b5648094b254307dd440cbe33b5e441496a1f0669e235d11fe732d6ea2e59e91f4a3c72e094cff3c
 EBUILD sxid-4.2-r2.ebuild 742 BLAKE2B c7614bb1724fca040f2977c4e6df40e15c97f48319128859081d1529bf1fcb70434feaf24b7a20396bd8937476fdb3ff2ee2e82863c818ca7fea54af397133bb SHA512 eef8fc9083ccee3ddf0264510a50803a36a66d50c0ba482ffe2e69407756963cf01314be2e32a432297cbefb22be4a4e4261fce2edb88e269320924dbdd4138e
 MISC metadata.xml 239 BLAKE2B 2c20ec7073e95bd9e1cc847b1e1fa0e79e8f22177834ae4ec3c9f4f6599ef0b626fe6eb76aa8684fe5e6493278a508f3c48552d8184a1da955078848df42a1c6 SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323
diff --git a/app-admin/sxid/sxid-4.2-r1.ebuild b/app-admin/sxid/sxid-4.2-r1.ebuild
deleted file mode 100644
index da19f4b987ae..000000000000
--- a/app-admin/sxid/sxid-4.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="suid, sgid file and directory checking"
-HOMEPAGE="http://freshmeat.net/projects/sxid"
-SRC_URI="http://linukz.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="virtual/mailx"
-DEPEND=""
-
-DOCS=( docs/sxid.{conf,cron}.example )
-
-src_prepare() {
-	# this is an admin application and really requires root to run correctly
-	# we need to move the binary to the sbin directory
-	sed -i s/bindir/sbindir/g source/Makefile.in || die
-	eautoreconf
-}
-
-pkg_postinst() {
-	elog "You will need to configure sxid.conf for your system using the manpage and example"
-}