gentoo resync : 22.05.2021

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 075148ebd7ac..d9140f371697 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,10 +2,8 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-DIST jenkins-bin-2.277.3.war 70887043 BLAKE2B 4801be0af417044ca2bbd07f5768594d7cd3ea980ae3cde32bffd9bef1851abd3d7134dd748f9d539e4d717a146d4c53c04a2604ae4398653d83ce4e4fe011cc SHA512 e0d364e619e183b745e08e1e72531d59dc6a92927dcb3b3372d2575d6020e465673d91fd650ad8805260037675623655f0cde9de95c22988be514d6314ffc668
 DIST jenkins-bin-2.277.4.war 70918017 BLAKE2B 990222bedb5ad58e8a00f29194b0f201395545fa70af22485a88c55e0898abdd218e501222689abbdf5cc8f4f3dc32dae7e54198b43a8c46172501017018eea6 SHA512 eb635bc0767c242063e88aa6f91a6daa8fbf23f74333f2dd73535a7ff3a4e690e3a456fba2e92b44ee883378b783896f8052a1b26536dac5954d74a62a63597a
-DIST jenkins-bin-2.289.war 74326992 BLAKE2B 60d8523bc0ec3022cfc152c00059bd153d3d0888640a66502385fb318c90ef1b43b3cb8fb621263f440c7852ac46f796840bac4f602e7f12b6de845af2bf9a45 SHA512 76a6785346f14e86e43f0c2e5ebf2ce2dd14ceb45c780ac650374a5a15615d5256567def6db0eed87a3ca6d853bda360f011cdd7972084fc76cc3ad3d4831c92
-EBUILD jenkins-bin-2.277.3.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
+DIST jenkins-bin-2.293.war 71937427 BLAKE2B 26d4bef9860df513d95900404909a3342183ee0c131a9319fb8a637f2a59be5867737ba476d156fb092cdd8c97f07328bb4a13e2f0bde700cae00d755a8851ab SHA512 bba17be80e8cbd9cd81b08e6df1fc142b7c944ea3998014211c6f0a2f6bb10e56278e2ecc2c800f0a0455b352026f7405f956545c78258d8ae225abb35fd0787
 EBUILD jenkins-bin-2.277.4.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
-EBUILD jenkins-bin-2.289.ebuild 1099 BLAKE2B dbfe00baf90085bb5698d8177b2aed42707e30a8b10648b09f32b996df9368a6cfaab778efd20fc40dc0932acab808c96f1de298688bb1826a52f1b8f6c17701 SHA512 c52d261e0d89664065376ae28961aa43ba2d6b6d2073792e3c1cf4b8e7603fbfe0c58d6ff887e2ae0e70cc29bf0e2ef2d072460bc40521cc4c605419ef8ce7f3
+EBUILD jenkins-bin-2.293.ebuild 1099 BLAKE2B dbfe00baf90085bb5698d8177b2aed42707e30a8b10648b09f32b996df9368a6cfaab778efd20fc40dc0932acab808c96f1de298688bb1826a52f1b8f6c17701 SHA512 c52d261e0d89664065376ae28961aa43ba2d6b6d2073792e3c1cf4b8e7603fbfe0c58d6ff887e2ae0e70cc29bf0e2ef2d072460bc40521cc4c605419ef8ce7f3
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.3.ebuild
deleted file mode 100644
index 10778d0c4f4a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.277.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	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}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service 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.289.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.293.ebuild
index 6272140cb584..6272140cb584 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.289.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.293.ebuild