gentoo resync : 11.05.2018

7 files changed, 4 insertions, 141 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f57121aa4c9c..8196ef68ab10 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index aaa0ef2fdfbd..ba33d5c579d2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,7 +2,7 @@ DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2
 DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
 DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
-EBUILD sudo-1.8.22-r2.ebuild 5992 BLAKE2B b3f2ec002c07c333ef54316e7b529f4367c59c92db03f9c3889d8a16d2b0cfd7540360a518c29ea7ec5881c39ebadadd47aeb7c111d990c345eb3f9fba33705d SHA512 6f8dc6106231ba4758875105bc38b446b9a8ea71c61c44037d27f01536c667dbc997ec8748b18ccf20e0d01c1f301291af711c04a33f87ff172c969f8ba8da34
+EBUILD sudo-1.8.22-r2.ebuild 5990 BLAKE2B 3e9d5827271f71362f4e3a9664e6f22437764a49fd2c20c79d2e8c211058627bf288b885b65a8a3ca4768460074871d0269c13cddd186605f063bbffa7d39f50 SHA512 a165bdbca3ce48e969bfa9fc2d8d1768343fd3570735ab874237c0a0378fd0b3ec64820586d9040fe4ad19ae91ddad0a62e04626e3c4b38c336a44bce47b7690
 EBUILD sudo-1.8.23.ebuild 5962 BLAKE2B e65fc8e35531d64bd7ad8bc3954018164359513b54b2868f2215006a4dcc907d1355fec8c1b3327fae57f2642e72e99ed11709281a88579d68c53629bcf5841f SHA512 a83a23a13b892f661bfd467078e2b390d455d2e3228d60e1045a58091724c6939daa063549a66b669b8240d90cf69bb28812d5b9db91ffd34acf17bb005afa4c
 EBUILD sudo-9999.ebuild 6103 BLAKE2B 18b0a129996f223d607bb0cd7783729ac340e0e4ad8b0ebf4311598f6ca1766e892e981d895da63713ed5dcd574b54b72c0705862f481d8b70f0a1f691dd804b SHA512 256e303eac4f944d3845fd75481121f90036b8848eb201b83b5841edbb3b3850c67e7d1ecef63ca7b86d86cff0e8ccb37ab9f6dee72026ae8c0d08ea4b725f59
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
index 2c2b755b3d11..5c8f882a27c0 100644
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
 
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 92159ca1ded3..8f10c765f684 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,4 +1,4 @@
 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 743 BLAKE2B 20616515b67bc2d1a2816db81b02fa39d8a90b8643f931d8aa7d37ff314ba1b734181e1de92eaaca74ca5faa13bde30286fb0c6d3a16cac3e3cc628f049b56e0 SHA512 9a2b80cfa3c5a03cc4717df6b2df7f114d043f7d40507d0d488675c812b01347f734131db4376498cab406f2ee2ebbcfc9dcd2896f3e35bb8e6c8ea6b7dbee93
+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-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
index 2fc3745c93db..5351273bef83 100644
--- a/app-admin/sxid/sxid-4.2-r2.ebuild
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linukz.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/mailx"
 
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 662623e5adc2..18c5742e9050 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,12 +1,8 @@
 AUX apache.webalizer 203 BLAKE2B fd92b85d0cd5a3bb0118ca3e47f616aa4f68cf3b954d1a8ad21ccc3cd229cc66e12e7f461497eb740c9a5ad5b34f8cf4c81d7e86e9725d6789568d15de10265c SHA512 19145c1d74322f2f6724bde7c5ef0c0111489566ba3ba8dcdeba38681332250e77e26652ccc2b6ff1a41f7dc7795c34a4c5e189cf92b24fe0ad544c4afac40b0
 AUX webalizer-language-list.txt 1520 BLAKE2B 303cffa208d2375c37b3f105a67d22cde6612219ddba20e816fb64ec4eee98b6dcbec0e534402587a108c805b0de3b67ad99d46103dae46f507b319f11ba117f SHA512 52abca2565a8d06d8bf538b8c168b32dbb065e655a4c849d6ff1e1299c4e84d6f9717b7e74ef730a9c68cd63f2d03232ae5c9d1ba391f68e3f1314444e41c29a
-DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 BLAKE2B 0e5bbbb8d93e71d6f8101d3a54d53880a1c0e9f4f8d21333e8e7a45fa4a772800770396db8927265600c0657ef71c4ee11b19652548fc5cb6284b4fecfe1bed3 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759
-DIST webalizer-2.23-05-src.tar.bz2 308238 BLAKE2B 42aeb3650d912cbe0bfcb3894342e640359e57b094df9528696d4dd765b5d2f0c29450f99e6e9fb9d874438b707e83cc263715adf26faeee9d72403f5f97493f SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b
 DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e442184010edb0e2fbb7bb9738297c0689acd32e55a1720bdf7bcea3a21cc73aa8ecd0b9d0a8b1a7b336227003dee5abfff9d5288a5250d7 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949
 DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
 DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
-DIST webalizer-geodb-latest.tgz 639447 BLAKE2B a4a604f8ead42c403ce750c9f373e8ffc4a7510aab6cfd43b88f39b93f5636460860b72fcfcb9468a5a06739b830149878c948e5b3dd0748e14ee9cbfb2be9d4 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
-EBUILD webalizer-2.23.05.ebuild 3813 BLAKE2B 73b3e795b6463598b432ed32a2cb9cb58c14824141c6edade11786c54bb52449cd13da01d68f930ece01376a8581c16e3779c394e3641ff9de2086a80e91ee35 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24
 EBUILD webalizer-2.23.08.ebuild 4222 BLAKE2B abf62b488d87de185333e3900fe995400416acca263ede382d5da791304d154d95d0651a4531d453fbcf9d674f5733585044ba428bf80705bc13c1573310067d SHA512 8267cb7a29cb7cb006a631b6e04cb01c701f14c602ede2a0ab0dd40da6d15edc70adf118a2fcc4561cc8db975c71642f9fb97e99dfaa44ee5957d8eade13f862
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.05.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
deleted file mode 100644
index 5dbba1424e70..000000000000
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# uses webapp.eclass to create directories with right permissions
-# probably slight overkill but works well
-
-EAPI="2"
-
-inherit versionator eutils webapp db-use
-
-WEBAPP_MANUAL_SLOT="yes"
-XTENDED_VER="RB29"
-XTENDED_URL="rb29"
-
-MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Webserver log file analyzer"
-HOMEPAGE="http://www.webalizer.org/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
-	ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz
-	mirror://gentoo/${PN}.conf.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
-IUSE="geoip nls xtended"
-SLOT="0"
-
-DEPEND=">=sys-libs/db-4.2
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gd-1.8.3[png]
-	dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# USE=nls has no real meaning if LINGUAS isn't set
-	if use nls && [[ -z "${LINGUAS}" ]]; then
-		ewarn "you must set LINGUAS in /etc/portage/make.conf"
-		ewarn "if you want to USE=nls"
-		die "please either set LINGUAS or do not use nls"
-	fi
-}
-
-src_prepare() {
-	if use xtended; then
-		epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
-	fi
-}
-
-src_configure() {
-	# really dirty hack; necessary due to a really gross ./configure
-	# basically, it just sets the natural language the program uses
-	# unfortunatly, this program only allows for one lang, so only the first
-	# entry in LINGUAS is used
-	if use nls; then
-		local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
-		local myconf="${myconf} --with-language=${longlang:3}"
-	else
-		local myconf="${myconf} --with-language=english"
-	fi
-
-	econf --enable-dns \
-		--with-db=$(db_includedir) \
-		--with-dblib=$(db_libname) \
-		${myconf} \
-		$(use_enable geoip) \
-		--with-geodb=/usr/share/webalizer/geodb \
-		|| die "econf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-
-	insinto /etc
-	doins "${WORKDIR}"/${PN}.conf
-	dosed "s/apache/apache2/g" /etc/webalizer.conf
-
-	insinto /usr/share/webalizer/geodb
-	doins "${WORKDIR}"/GeoDB.dat
-
-	dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog
-	elog "It is suggested that you restart apache before using webalizer"
-	elog "You may want to review /etc/webalizer.conf and ensure that"
-	elog "OutputDir is set correctly"
-	elog
-	elog "Then just type webalizer to generate your stats."
-	elog "You can also use cron to generate them e.g. every day."
-	elog "They can be accessed via http://localhost/webalizer"
-	elog
-	elog "A sample Apache config file has been installed into"
-	elog "/usr/share/doc/${PF}/apache.webalizer"
-	elog "Please edit and install it as necessary"
-	elog
-
-	if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
-		ewarn
-		ewarn "You have more than one language in LINGUAS"
-		ewarn "Due to the limitations of this package, it was built"
-		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
-		ewarn "you intended, please place the language you desire"
-		ewarn "_first_ in the list of LINGUAS in /etc/portage/make.conf"
-		ewarn
-	fi
-
-	if use xtended; then
-		ewarn
-		ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
-		ewarn "you will need to delete webalizer.current and process all previous"
-		ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
-		ewarn "For more information about using XTENDED webalizer, see:"
-		ewarn
-		ewarn "    http://www.patrickfrei.ch/webalizer/rb15/INSTALL"
-		ewarn
-	fi
-
-	webapp_pkg_postinst
-}