Version bump. Add systemd unit file. Fixes bug #536296.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

6 files changed, 34 insertions, 28 deletions

diff --git a/dev-util/jenkins-bin/ChangeLog b/dev-util/jenkins-bin/ChangeLog
index 9d933fb933c5..2f183e92fd32 100644
--- a/dev-util/jenkins-bin/ChangeLog
+++ b/dev-util/jenkins-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/jenkins-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.30 2015/05/22 22:23:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.31 2015/06/01 15:15:17 mrueg Exp $
+
+*jenkins-bin-1.616 (01 Jun 2015)
+*jenkins-bin-1.596.3-r1 (01 Jun 2015)
+
+  01 Jun 2015; Manuel Rüger <mrueg@gentoo.org> +files/jenkins-bin.service,
+  +jenkins-bin-1.596.3-r1.ebuild, +jenkins-bin-1.616.ebuild,
+  -files/jenkins-bin.logrotate, -jenkins-bin-1.596.3.ebuild,
+  -jenkins-bin-1.612.ebuild:
+  Version bump. Add systemd unit file. Fixes bug #536296.
 
 *jenkins-bin-1.614 (22 May 2015)
 *jenkins-bin-1.596.3 (22 May 2015)
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6e3cf2bea202..9869416617a6 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,12 +1,12 @@
 AUX jenkins-bin-r1.logrotate 483 SHA256 8bc2cb9759a54f2674abb1264dca452c295295554f76080c77d29586c1a8fa0c SHA512 74423d3c66e2312eb3a1590e0582ccd82fc01b410d3bfc0627bef56fe6f4e7f4ea01a7a2d92a7a0c4870a1a1c48e911fe7eab3073e14db4910b52158182e5856 WHIRLPOOL 9477206b581ca1d48a9460c1c53ff2fa7d30b3c7fd4daac4fd2aef13374eb999301f62fda7e865f4605b3e5e018e1cfa2cf3b82247f4c4bd40ca3c6c09c7bc76
 AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7209b19a2f14dccb3b SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b WHIRLPOOL 5c0dee7d648c22c65fcad7ec678ac839d1ab2d61aa52c8e54dccb6a9d58bcda5cca9685e570f0fe5b5f0fd6dd6ce0a47acc616cb9c5f6568758f92125a38f8c8
 AUX jenkins-bin.init2 1781 SHA256 75f8a4dc5c3c03b2f3ac52860b11bf2a245976b4b726b35cfe20ec2acbbb7e08 SHA512 edd83f1d92433441ee2021ab096367ffa17808a4e5564cabec8d9e00276abaec8916bb55bc842ad49ffc9fe6f5b24b8e93a20b247100e96f667fb90f87e6e33c WHIRLPOOL 22735e7b9ad35cec7b7a6e9ba146345786e0d3abf25b8c7d7b93228a779e99458b10831edacc372cef62770687835f7f4096cff3ebdc2b0dfc398e2da6d31996
-AUX jenkins-bin.logrotate 502 SHA256 2c18c2a6757246fe4a1e87191ac6ca529126ab6f0b85c48f6d350c4802a71194 SHA512 86262c89495ed26b4996a55b39bd7f57826010500ef5f668ea28ffcdc3bbce73481158340d24876a3dfc6f7ea6ec872edd40f89bfd9a0bea3aa2d61eeeeddbdd WHIRLPOOL 920b5fe2e776c0a43c964c0c43209c7f2d7cef4bb2a9bfc0a4a4d99797f4be9c78b489b76c3928248ccfeadb10213d643eb12e6ffeb45824ef4f92e9d7924582
+AUX jenkins-bin.service 499 SHA256 51de27d125003a65ff9f8680e741e5f92ccd56e0a2f8a95a4fd0050204f2c3ba SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506 WHIRLPOOL 684d39cd7a2fb9b8e9c1efd29fc6b30ffc1f65b045ec271743c9eeba06a267b4a9e0d54154024308917f0fcbde6d070bd9f68a6437d9de1e592147b650a2d1b7
 DIST jenkins-bin-1.596.3.war 68396864 SHA256 85409f83b81ba90094ecc9e3ea6df0920ecfb3064b731a6a5c9b397eda18b47f SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe WHIRLPOOL ac6401ebe42a42495dc148d71a61daf49905292e6cbcbb5d8e41f520a01c8f1f783fd75baf908a3e99fbd9f25483366a3a5a005fa04b5843550c8e211f4d8e2d
-DIST jenkins-bin-1.612.war 68918224 SHA256 fc5f27870026b47565d010f6bb941fc5b5ffa115a6a5b56e301ccdf177ce83a9 SHA512 3718d6cd56199c90c01e9847f45f6b5542847e04d50a5ba98e9d792382a276806200dd927d3e2a7df35d46a3b4b37d190dd0733469d37ce336a4cd8a2d2ef6ae WHIRLPOOL 794500ab188bfe3717ec8f60f99f046cc8351ba0ab085ea270e9159156f3f9109779d258f3944f73fc35cd79aae088888903068b73de57b3984efefe234162ef
 DIST jenkins-bin-1.614.war 68978763 SHA256 e7459240a6b2ca99fc820b08df95266d0b7f6ff5a62b2cca7a12da83d62d9d5a SHA512 3cf4e8938ffe14eab3f4100495e65169ed2c1450ed01f897a3f468fb2263d002b3a836eb48ef7e7857ea93d2f1b66ec1d169caf2c1d51a47bc9517c1eb77662b WHIRLPOOL a49d70504f49d2c5f54b6a6c277d688011b5b2348e7c7394f597d37b103d637b9b9f2112b1fe0cde50f1ab1c62ea5b25ec714d4cf3ff50bec4aa802d1d78ee2e
-EBUILD jenkins-bin-1.596.3.ebuild 1137 SHA256 10864d96dcf2678746148b0e60213b95c5b9bb7d85d7495250081a98839ac859 SHA512 32471811b5af3ec0b81912e8966a9a57767421c04b3a83a2160d450b93e7c43fd842c3f7c018cf353046e3f0bb1c4795e49897f0678975a94b645ad3813c0cb5 WHIRLPOOL 802beb95a18596b60139ab04264c99642848e222e036a9365113f8f54975e63c7c86f0fa2c3be807fff7ca172cc0c536ed978185a3c611a321ad8f46cf57bd77
-EBUILD jenkins-bin-1.612.ebuild 1139 SHA256 41b4643e85940f38bb240655cb68fdd14a8d69cdee283af2f4451a5965fc548d SHA512 12d80aaac3d3b2bb1639e2266256621ac6c125743099993b1be0e183e11a769cd587bb9a836051dbb46a8116fb4b1382335bc3dc76c33d0512cbf93861afcebe WHIRLPOOL 985cc3151ce5f65e4c4836f434a6dd013b981fb1d103c2716d440696dde684338a8914e77f5769ca72870647944a313a279864dd3b238bae589b7c1bb2496309
+DIST jenkins-bin-1.616.war 63124136 SHA256 ea8ba42a575c56880c8837032d52137ba3ba6ad6c7efffcb24ae591dddaa0e5e SHA512 db639bbbc957c0bc9c07c279091a1bbe7499c1784e031d631f2f382e5f8283f8ac187a05338ff37166be68459c2e27b5f97df04003c15bcc93c886aad5fb4a3b WHIRLPOOL 7312a648fe31646b790f3674c11b02ef7f5fd632397c15762b2d617842b082b28ce2b4481949d23d9cefdf3db9b7250f1febacdc20b22b5684385d94be1f9db7
+EBUILD jenkins-bin-1.596.3-r1.ebuild 1213 SHA256 59f3c31511f4236832f5aec03b73f742e02ae79fe0f27156142d6f5f12d06eb9 SHA512 e5e6cc330df85f0c0235c0575f73c25f53177439ad5bb3c0a73788ebe51bc59c793a937fdded27562d09acdd8155f2c952c32660e6eea20671ea3278ef9a7167 WHIRLPOOL 97b9ad50e1536a56e6fc31aa9d584c67f97e804e77027dad0fd75662db481195278e48f0db3f1a421a1301e37d3419a46296fede72bc5480936874f81cef78f2
 EBUILD jenkins-bin-1.614.ebuild 1139 SHA256 f2ba74d08915c3a015a3d20c52726daabc312dc47b0b2d98139a0d06c1b69049 SHA512 7087520793cbf03c0f3cff075dd47500d0f0be0127c0abc145be0024e207c06eaff2a884831180a174744ab580028735790287ed3ae047404a6ac8dce3ac8b94 WHIRLPOOL 2bab3fe46eb2230e84bf42e7647d71882f0ac8470f727641ce508bc82f461913738cba9612749b3f40fe49a458ff19c6f10ce68a77e4ed77295628766ef08f97
-MISC ChangeLog 6285 SHA256 61cde5b7a734b6579c9321de47e66c7461a2c02841769ef7f969672a0b8f6825 SHA512 94c5021f4049e17a48e8ac68054570b80e07ed11652d2f337d9172561ba5e32dc45a32043f1719e39af0286190edd18ef3f21550401c2cdd2eaa317488c0370a WHIRLPOOL 971a206eab72d903d8b31d8bd576db8ee35a0a755c5bccacd6cc4d20f1679f444d5305726c5c28248749973c8055f3fda7f966caec6584bf86d9cdaf1eab55e5
+EBUILD jenkins-bin-1.616.ebuild 1209 SHA256 2b07c2747ece8df0a0723031c98db89308ab864b6f39ceef5709251ba9cc7d2f SHA512 ea402333b437bdef75cbc823134bb10ebe485bb0e6e124674e80075a4f0d25ea3dcac0992003100eb1829e2c65d080672dd96f4f47d0c446ac7d4cdd6ec7bb66 WHIRLPOOL ffe61d1d124d0a7b89f4b2cb3fa3f5d22eaf4c79600f99fbd2ef9935a1b10e32f440db68db71bd959d5ba9cf4588c159d3638c841910a59e47e5b1a41b2364ac
+MISC ChangeLog 6643 SHA256 b1510ecdb2074b9ab3ebefd69ce0c4d4de97e1cfe67a9a102c21d88b53a06acd SHA512 7d96e07286d3ad9f99028c4c3a63a5ed4cd9c3bbbc734865cb392b69f8aaa0bbdb69005724a6c2cfef087f625e47deacd96451aec1617045184e7b9d55afb2d9 WHIRLPOOL 8388c413a7a4907b9495a4a135a153f43d5903fe8e1587af8a84033c81c4f4fa169dd37d16780d153bacbc3fe017bf87733fad2857c9f7eae01f7779cf0af22e
 MISC metadata.xml 323 SHA256 1fe2512e65f90ccec2e80123923bdb2c3cb6f597c45754f6c9f8246761234a48 SHA512 3d0a3145eca160f429e10f2b48ae1415143f2175cc06a3569a8d7fb646dd14fab750c8f8df4ad71ae085915bc075fa0e3ed35ee20a84fd04deb9590bed8fd940 WHIRLPOOL 830a0c6f0046034b335756b21f7a00b081254e190e288db88161fc26ceb48f0652b2418b67022ec394489b1e23028e50bef67e808d771518bf4ac2076d7f403b
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.logrotate b/dev-util/jenkins-bin/files/jenkins-bin.logrotate
deleted file mode 100644
index 1a9497aa02a4..000000000000
--- a/dev-util/jenkins-bin/files/jenkins-bin.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
-    compress
-    dateext
-    maxage 365
-    rotate 99
-    size=+4096k
-    notifempty
-    missingok
-    create 644
-    postrotate
-        [ -r /etc/conf.d/jenkins ] && source /etc/conf.d/jenkins
-        if [ -s /var/run/jenkins/jenkins.pid ]; then
-            JPID=`cat /var/run/jenkins/jenkins.pid`
-            test -n "`find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null`" && kill -s ALRM $JPID || :
-        fi
-    endscript
-}
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service b/dev-util/jenkins-bin/files/jenkins-bin.service
new file mode 100644
index 000000000000..5edaac7da40a
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Jenkins Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/java -Djava.awt.headless=true -DJENKINS_HOME=/var/lib/jenkins/home -jar /opt/jenkins/jenkins.war --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=8080 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log
+User=jenkins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.596.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.596.3-r1.ebuild
index 4d7e9f21bb96..15cc85bc19a5 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.596.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.596.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.596.3.ebuild,v 1.1 2015/05/22 22:23:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.596.3-r1.ebuild,v 1.1 2015/06/01 15:15:17 mrueg Exp $
 
 EAPI=5
 
-inherit user
+inherit user systemd
 
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="http://jenkins-ci.org/"
@@ -36,10 +36,12 @@ src_install() {
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN/-bin/}
+	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-1.612.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.616.ebuild
index 650e39bdba25..473a686abd05 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.612.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.616.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.612.ebuild,v 1.1 2015/05/07 08:54:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.616.ebuild,v 1.1 2015/06/01 15:15:17 mrueg Exp $
 
 EAPI=5
 
-inherit user
+inherit user systemd
 
 DESCRIPTION="Extensible continuous integration server"
 HOMEPAGE="http://jenkins-ci.org/"
@@ -41,5 +41,7 @@ src_install() {
 	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
 }