gentoo resync : 29.06.2020

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index bcedaf98371d..2c27f332b6ad 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,10 +3,8 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.222.4.war 66239216 BLAKE2B 0272f91b4460ac9f9cd0235df59f55e3135f593d8098d35aae4db6571e171d3c38c6b3e0ac0ae2f7825a3ac3e56c8e76cc4e15e28743cd2aa007395921eb7100 SHA512 8f82d8c69807c46eb0f0638d59777f10e1017b197a1d88295882e6b8aef6376609ed9da625691eafca786ed0a7314e7ab2abb000a39dcfb6da2d250bbd5e0c76
-DIST jenkins-bin-2.228.war 66137156 BLAKE2B acd1414745f0ffe12ca3025149d5ef8dcdebe6415e54e18f71eb4ef05bb578279409fbf5605763d86144726a82057ba796ea8ce3b79301ea33ddfed1f03ad9f4 SHA512 899c5838cc46f87020c18b0863b8f160c22b0422e7adec1bfd48dce5f06264b5e33ec8411bf9133e28fa8723daeeb5d2cd14a92c261d82e2b2b804d0b1c21250
 DIST jenkins-bin-2.235.1.war 66437256 BLAKE2B 900f5616db3e4e1913e9e07f1d40951fdb0a467e2acd93441a52fed7d9f5961103c46b34627e0add76da11a3e4787535d0a47e5eee20a474f65c14b03fefe9a4 SHA512 1be1f1845de87316107469b9b7c4d0e1e6b0f014f495981f2ecc2ce3acbfd820275c187c61b3f9664ad2a61312e4504171c45edf05e1711bbf61554c5f3fd653
-EBUILD jenkins-bin-2.222.4.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.228.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.242.war 67003152 BLAKE2B cc20efde5196ed66af3cfb0b52404e35bf3954422734278ce2c3bfad5402c0f005579a1c406e519e8e04b28e3d0f26cff2d4fb5a40c2b722dd3a93d54cf86cb4 SHA512 22e138d4c3291b2885b9cb9db51e5dedcca13ca93a2fb8b11bd1dc81da981e9404717ff791fa2a1d9dd4530fb806e8cf9c79931cdb968723f02177fc00321f92
 EBUILD jenkins-bin-2.235.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.242.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
index e3e0cd1a4eda..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild