gentoo resync : 29.05.2018

3 files changed, 2 insertions, 83 deletions

diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 8e77db50ca6e..6f8826913fb4 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,8 +1,6 @@
 AUX tripwire 466 BLAKE2B 1fca6945b6b8ce959b7c617eef9454690662676020ce7451396f8cd365d093fa687896c3f22ac2e3df3d370cb42aa55967198de573172b79d023711b59951404 SHA512 1df37364a84ab26ca0a3f2637e9f4938333c394979c2ccadb69401b7e6a93d03911ce737b25bb6e76c1963e4b7eaffd35b3551aa141b51bc9b3a8a00d9c828cf
 AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe34925c29ef3e93541e66516ba59b1c04120979a4edc1f31bf166ac72998f2adba571d64ffa7c7008fd3 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47
 AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
-DIST tripwire-2.4.3.6.tar.gz 1001145 BLAKE2B aa1392d29d782266e26f605c621def8cffb67112db9151b3f098211f4243a671e5f7fc15ab5868c35794a8dbac2284f564815874aafb2b9323fd1191edb249db SHA512 4757827b908fd56a014de81609be9cfdf3631d34cbc02214ac800bf6d9c413d85d812bc3211f9dc32ceee97e1f13decd955037a0cbbaf2f8e3020699492bd9bf
 DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
-EBUILD tripwire-2.4.3.6.ebuild 2407 BLAKE2B 0a66c5e4d1d460fe9af18bcbbdc916ba1b9648c56e130ec55152fef10581f04242c24f4c74504e33f339e2ae4d5df4350a77cf7828ce8aa1f3677dd167978300 SHA512 a16a7873ce32ee7c86afb14488c439257f5697b84dd20fc9321ab5bb99603b0a614202ef37916e2ce3df3d6b777af06c3e680caec160f9d50add847f06aa9d59
-EBUILD tripwire-2.4.3.7.ebuild 2412 BLAKE2B 5a5c71120ba7ab2b2c62bd664481aa710c6b8c92c5f5f95bcc23aa5e2bf1b9861aa6b6b3122a3a038b80fc4035c60269dbf1ad3c6ef16e40ed616dc1c70586e9 SHA512 01451e6b08b4f9e75daf5e65149e0cafad7ea00d980c95a8a7026d3bd07c34c59d797e3839f29d97af9b2c159188350b8f4b3ee94927cdaca64aff59342ec412
+EBUILD tripwire-2.4.3.7.ebuild 2411 BLAKE2B 9646cb96ee17a4e2a31d7c4ac065a72b363aa89c809a41ac94bc2d414b4679053378c6697a758e515691eaebb094ee2bdc65c38240f0a18c903f3c4e061e3b0d SHA512 09e8911547b7a629e5bc546005b9a17aae84057d93dd956a6fe687819f1fe5e09720d48caa72844a8736e2cfa23bb6b4387a19e31e1b8e587e6da792836a5838
 MISC metadata.xml 1616 BLAKE2B bd19945c4dfb57c6e1102e5d2460f5784fbc4eb54c53a04052a08f45c4131edf8117e834d1b964a350512618e875aab3323f986ea71a893fee19ec08b54a0da2 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2
diff --git a/app-admin/tripwire/tripwire-2.4.3.6.ebuild b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
deleted file mode 100644
index 58e3201aa752..000000000000
--- a/app-admin/tripwire/tripwire-2.4.3.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Open Source File Integrity Checker and IDS"
-HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="libressl selinux ssl static +tools"
-
-DEPEND="sys-devel/automake
-	sys-devel/autoconf
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="virtual/cron
-	virtual/mta
-	selinux? ( sec-policy/selinux-tripwire )
-	ssl? ( dev-libs/openssl )"
-PDEPEND="tools? ( app-admin/mktwpol )"
-
-S="${WORKDIR}/tripwire-open-source-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# tripwire can be sensitive to compiler optimisation.
-	# see #32613, #45823, and others.
-	# 	-taviso@gentoo.org
-	strip-flags
-	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-	econf $(use_enable ssl openssl) $(use_enable static)
-}
-
-src_install() {
-	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
-	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
-	dodir /etc/tripwire /var/lib/tripwire{,/report}
-	keepdir /var/lib/tripwire{,/report}
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/tripwire
-
-	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
-		"${FILESDIR}"/tripwire.txt
-
-	insinto /etc/tripwire
-	doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
-
-	fperms 750 /etc/cron.daily/tripwire
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Tripwire needs to be configured before its first run. You can"
-		elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
-		elog "the package to suit your needs. A quickstart guide is provided"
-		elog "in tripwire.txt file to help you with this."
-		elog "To configure tripwire automatically, you can use the twsetup.sh"
-		elog "script provided by the app-admin/mktwpol package. This package is"
-		elog "installed for you by the \"tools\" USE flag (which is enabled by"
-		elog "default."
-else
-		elog "Maintenance of tripwire policy files as packages are added"
-		elog "and deleted from your system can be automated by the mktwpol.sh"
-		elog "script provided by the app-admin/mktwpol package. This package"
-		elog "is installed for you if you append \"tools\" to your USE flags"
-	fi
-}
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
index 20adf761e12b..4339d2ac489c 100644
--- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="libressl selinux ssl static +tools"
 
 DEPEND="sys-devel/automake