gentoo resync : 29.10.2017

3 files changed, 2 insertions, 83 deletions

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 96d71b072381..ac4937c24265 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,7 +1,5 @@
-DIST icingaweb2-2.4.1.tar.gz 7176640 SHA256 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6 SHA512 21ac8faea3e339cfc668407cef826cf4a8f01c964ad102e2c9bc9716e20c3177cea10ec575b99a5a4bb0a9681032b83427c250c5288b037a70d27dc919d0f641 WHIRLPOOL 40c5e48f0c7b6b32cb1eb02c1a447512bdba397eda8c20110a1e4d0c0b794265fe413c2c3a1a56d3f009e4245e211322a5b97a16449af4a1ff90bb4831f781fb
 DIST icingaweb2-2.4.2.tar.gz 7180122 SHA256 8ce42b4f0fb3ddd93c56d70c642512af13db1d5db2ad0227ec7567a4413daa94 SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53 WHIRLPOOL 0f350e796e5b03c5d3e0c501cdae8c485c2eb745da87e308f57066cfe507d24482799ab9e6fe1ed621c19f14fcca3b97c7f57d67a28ac51e42c13aa7094afe83
-EBUILD icingaweb2-2.4.1-r1.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
-EBUILD icingaweb2-2.4.2.ebuild 2551 SHA256 f8eb44b0693890012405e741cb712ad0fd1547be90021414026bcabacfd39e89 SHA512 4b59c96f553f19d648c4444e94372f88bb69da38c8f1d9e8d5c57a4720f48ce81e1f72742a2db29f8c5e8f02b3323457abc96b80f7b737cee2418721034dce12 WHIRLPOOL 11c14cc483109b185946c70590f51be02503a6862e72b9238e7af5a07ea1ffee2f27883871d969b16388a203e6f8cce559612a7ace3996fbfc59a59aecdc7764
+EBUILD icingaweb2-2.4.2.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
 EBUILD icingaweb2-9999.ebuild 2546 SHA256 cf85e05cdf795c6ccf373bb0d4e3d00a6c97a8acedd331dc72526854d1a44e4f SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc WHIRLPOOL 6e168c77c068b5cad0f9d1f9dda10b546501f802f0d6fedadb737f6b213757cad8500fd7e985cbed1d6cbf37eca6ba6686060865f4877f7eaa707e45e6b62cd4
 MISC ChangeLog 5943 SHA256 9eadd672b6c42d1fe6693377dd99ef67a692b7d4069e21a4e683700866e2d43b SHA512 f3726691410d5de8c4d3f3aef22903f4b418eb8b80adc4933f564e6a4179288bf9ea625d135129e6d309b810aa417fbef88426e1fe00ff360ccaafc626448225 WHIRLPOOL cfd9631fccd26df693305c2b26563577c8dc985a084cf11d2214ed3c601d6650daf72d60221373f6ff4c7e98222b1eadee818284f1f493ab55bffafaf03ce6c1
 MISC metadata.xml 407 SHA256 b9ad2e9df3e4db89dc3e44032cf06cec95938ec8c990b7abea53f2c0e8ae5e62 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961 WHIRLPOOL 15cb580f93914e0c73c25d3cc5e0c3d2fd24e0e5ae5c3c3c2369e85dcbb141828e4b5f0ce59efe01c0d8899339314695e701e9aeedd9f4c15560156598bbd74a
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
deleted file mode 100644
index 796ba177fbff..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.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 depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		nginx? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
index 9c54138b2b4f..796ba177fbff 100644
--- a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick