5 files changed, 10 insertions, 57 deletions
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index e2c056c312af..6b60d528c4db 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,16 +3,15 @@ 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.138.4.war 75751509 BLAKE2B 2601353b630ad2d7783460a7e5af93ccb9f0e8ce6a277a4413871df73c944e733284f5621a87ca741ab2ef683554700919be767e9ff7cfe7ff7816be3fcb4202 SHA512 4492d9576dbe8364fe2d8f110ee9eff68478f64b397178a96b1d5c427e98c413a8dc1ba574c43b4ff84b3848ca99ff05a24df31d568c367849a35f6b673ba5b3
 DIST jenkins-bin-2.150.1.war 75938045 BLAKE2B 363e359ef627947b2dfa30d164099c2864f2641c1ad3fa83532f9252a030bd973e4af3238fa09ba92f8ad65ab4463a21d86752b159d07049d5ccd88f8895bbdc SHA512 1158713b60923f7c1a3b90e403562a388ec3578f1a7ca267f91137a58571c26721075f63eda97b92bcf3ca360ce68d5129c9bd205b2ee138e13247d73da4e7a3
-DIST jenkins-bin-2.154.war 76032730 BLAKE2B ce107d6afd617c0335f0ec13e004f72fb497ed8a9cd7859169e049f1f62cff34dbffa7bc59b536afabde3dead439a4d3e4cbb4f71107b1752b29451997ab5c77 SHA512 d86723dd0b10a26c7d8764c0717114d990de49b2ade3e8b7af163c13350b55f8ec11e479f4743641d9a6530ffc6e98903d9fac20e964ca70b4795aa26202b720
+DIST jenkins-bin-2.150.2.war 75969613 BLAKE2B a86cffd210ee40ee01a1f4ee03c59b2c6c04a8d03f8f0bc5688118e00fe59bad2c8c1fe4b37de590929f1d36e9b00a0549e391609646b13f32d34769314369a9 SHA512 38e960b895dee3917146f49888ec23cfdc115354327de3ae63a4003641dd80d1d2565e8256dd47fa966c1b5515f1f90eac466ec007cf6d820958ce43147eb4a6
 DIST jenkins-bin-2.155.war 76037370 BLAKE2B 69ca351fe0322564899bc7866174c1d2334c1881cffe49bce06273143b4f5303d544d77d8c372ec5c5380c045bf60566c77b1b9f6be5f9e1e58744d90ff6807d SHA512 b7ce35de687094161d55d50522ccf8f80d8369e383ba97bd2de2082b5b03eea5385ae5d8aa46d80112c4f3df30584c9ba7ab2e58542c9c9c0ce7c2b2e17b481e
-DIST jenkins-bin-2.156.war 76055382 BLAKE2B f02e8b92eea995a66dce9bf2cc8278f6af84cbdcf03ce78ac00601537ded97789f7458c4313c429c4e90abe2b21cc9201e5b9e12b0af5c5bb7b7a2e232bd61b3 SHA512 f9299241ec5e122ea47d7fe6671d13abb66e98c41cc31a47d8363f2ea1845270ab41a100bd5debfd195e24e335253bc2545feaebec976c59a98e8018b31322ef
-EBUILD jenkins-bin-2.138.4.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+DIST jenkins-bin-2.158.war 76009057 BLAKE2B 7ec77f5e6e11fdc354c6a0be0a821e2814b3b442bbecb6410c3be45b4edbbaa62f2992d77a397d109d14827fed243ede42530cc66083f0c9efd4b0365096ba21 SHA512 4ccc8b900cd95ee3b1355401399fdb462c9b38680945015e77ba338004e4c3bf83be9ccfac0539d1b5c8befb19bfc0ac99d4d41ca233c4dd42ab888b16e95a6c
+DIST jenkins-bin-2.160.war 76018620 BLAKE2B e215220e978ac0407c742e3e5989b50f9d18ed387991b2c7c1120d4f9018ea3a24dcfa3127d29291af5d7dbf0155c3a68744c429e53ef3e160d33a5a3296cdac SHA512 7e6f6d1381ab9b46cd62423a607a6c8c05438073cd21cd7827f66fb98300a54c9528e87d00ca2332ec43068aaaa54493bf0469fe81be20fe444c10fb25cc6c96
 EBUILD jenkins-bin-2.150.1-r1.ebuild 1105 BLAKE2B a8a1dab6b1a8cd148c35cd352d04b691dcc712e96d5e3f8946574ab456727960334c60afdee7b71716f3ed0eea1cc8c32c32ce6e3921b90fb068b7a670693087 SHA512 eb011fcde8f1d97dd600731f311245925aa90c6523bfb75db36e92bcf2bd6372ec3c91ed8184af641e3f5c8fde3d40c1fd794e88eb03e368c1391fd88b5fa0ee
 EBUILD jenkins-bin-2.150.1.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
-EBUILD jenkins-bin-2.154.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
-EBUILD jenkins-bin-2.155-r1.ebuild 1098 BLAKE2B 3ad40ac1b63b255dbc8b8861a2c1c05ed8749f8cc2f1e8a9583a33af69e5787d1e071f78feb66f116c790b57dee66c5d4bbb46092e4a96e72a40bdfa963a8988 SHA512 eac9ea6de659e8755f245d2aa6445d945256d334fc3433f81d83cbf9ac1f3c5aeffcf75a6d3f32d63f03aeaaa9b7aa1050d9caf28c48c19ad9273b39a5743c49
+EBUILD jenkins-bin-2.150.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.155.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
-EBUILD jenkins-bin-2.156.ebuild 1098 BLAKE2B 3ad40ac1b63b255dbc8b8861a2c1c05ed8749f8cc2f1e8a9583a33af69e5787d1e071f78feb66f116c790b57dee66c5d4bbb46092e4a96e72a40bdfa963a8988 SHA512 eac9ea6de659e8755f245d2aa6445d945256d334fc3433f81d83cbf9ac1f3c5aeffcf75a6d3f32d63f03aeaaa9b7aa1050d9caf28c48c19ad9273b39a5743c49
+EBUILD jenkins-bin-2.158.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.160.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.2.ebuild
index ff91a974c718..323b88955105 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.4.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.init2 jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+	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.154.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.154.ebuild
deleted file mode 100644
index dfe46af57ae6..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.154.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 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/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=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}.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.155-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.158.ebuild
index 95c4fb759443..7d232cbccacd 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.158.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.156.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.160.ebuild
index 95c4fb759443..7d232cbccacd 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.156.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.160.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7