Version bump. Move freetype dep to RDEPEND. Remove old.

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

6 files changed, 18 insertions, 107 deletions

diff --git a/dev-util/jenkins-bin/ChangeLog b/dev-util/jenkins-bin/ChangeLog
index bdb2b1e03505..e44bee504e29 100644
--- a/dev-util/jenkins-bin/ChangeLog
+++ b/dev-util/jenkins-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2015/03/10 18:25:49 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.22 2015/03/11 17:44:15 mrueg Exp $
+
+*jenkins-bin-1.602 (11 Mar 2015)
+
+  11 Mar 2015; Manuel Rüger <mrueg@gentoo.org> +jenkins-bin-1.602.ebuild,
+  -jenkins-bin-1.580.3.ebuild, -jenkins-bin-1.598.ebuild,
+  -jenkins-bin-1.600.ebuild, jenkins-bin-1.596.1.ebuild:
+  Version bump. Move freetype dep to RDEPEND. Remove old.
 
   10 Mar 2015; Patrice Clement <monsieurp@gentoo.org> jenkins-bin-1.600.ebuild:
   Get DEPENDs right this time round by adding media-libs/freetype. Fix bug
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index afdc18c27049..1d2d0bd88210 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,13 +1,9 @@
 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
-DIST jenkins-bin-1.580.3.war 68035755 SHA256 9033f96268d126ac8e5eb81a6e33e767163ccf5efa58ff987ca745c7ee67380d SHA512 f500cc97ba7365bbc384f6c3ba7624b68506466e875ee0673d341b5d9d79ca58ee0797af78b43cf7fe821a9f38922e5806be40de549469d76e6cad49d63384bd WHIRLPOOL bf33b94b642c9115361cb729188a2b20a2db43f44ffdb514b4eb7dd00ac6a0a6cbeedb9679fc7834fcb363739f2feb0a7d0262e072c4735567ce443bf5805bcc
 DIST jenkins-bin-1.596.1.war 68552101 SHA256 7ef24648ba0bdf7562034d467687afb2b7e7d168d65b61a2c4242bb7103351ec SHA512 11ce5a14f2a6258ced64a816f44370710522653874cc1291d51a77551283e9f7c6ff03014a3abc7c392b309a2f639fe33979ccb6d23043c014b23a2f18347165 WHIRLPOOL c419bed31a6360a5d3e66ccba03db7e5e49f6b37904133a630326c5964ca76b9eef1737e4123b03576d70a0251a2367c153ba06db448b66f7b5d3be10f8767d3
-DIST jenkins-bin-1.598.war 67619385 SHA256 c7c431cf1e305fb19cd47065eaf980d3667df4d587b370508a55403167556e3d SHA512 b059869971dc14db0398fa1727df8ed1446fa21b0ed25697c1eef8fe9044ca720b61cfa3b4a38ba8e3101bb0c34f82ec8cb18516f80c9c2359a7e04fe040cfe2 WHIRLPOOL 9a41684a2cee178ec810d9688b75b077004a5e7e6f859f06418b5e3a0b0b2ab7bac58edb95de5d8d7de09b9fcac9ef53ab5556cda10abdeb8e58868e20b5a814
-DIST jenkins-bin-1.600.war 68808007 SHA256 9b7d9d1fd6dce1077599a31468b1ef2ebe7b849f6d2f52f943541b944d9c29f9 SHA512 beed9d44ed678aa642fc372ec905e917950d52954245769e81996952d828756a39a5a8b67506550963670ddc1041d5d6f9b77637b5e4f6ddade59c64f3967045 WHIRLPOOL 0570916da1ebfa3a33435473382579cc8499ad6efef4f98caf220ebce4564af59677fa1dd7c976d8afa5e69299885a6b6dcb263cb2f6d83a22379cb09f1109f9
-EBUILD jenkins-bin-1.580.3.ebuild 1135 SHA256 90c4924701df8ef912e3bbdf364daf3124fb9958b58fc25d1ff8c3d5ec1f0635 SHA512 0ea584401ff517910a50755f9e633d5b58322c561ddca4b30bf5f29ebc65db5f9ab7c15e95d896f35fb25f018db27223ca51e4ce073f55cb92ce2bf546a4128a WHIRLPOOL 1effdb8b07ed4e11bd3025c683146e43c501b5a40d89765028d396dce9587c311b8fae7ff281f556491febdddee8c4f8e4146451b0ff5c0b21b488ff04622cb1
-EBUILD jenkins-bin-1.596.1.ebuild 1135 SHA256 6e1380a39b029ebaa3c23a5d416945b436a8271e7c372425cdf4f6ce56ff0ae5 SHA512 3871fc358460a00cb5ae82761d25ae7deaea83f33be7d7e17b6a8e3da346951d90c885450ad256eec2ce932dbeca5ac6ba53466abf63cc37ea0667d7bcc6980b WHIRLPOOL f04f9ae9bd2fdacd0e3d1b2de4a975949905c7d752e3a9c8a871edbdfca65a3267e3fdab1f456ada57e9daabfd4baacd7ee1b3e787001e3ccb8f91538759b9b8
-EBUILD jenkins-bin-1.598.ebuild 1126 SHA256 3ffcc0b3563b7deb91d44766c5b5fc761229a39ce2bef62a64aeb7a9c18ba6cf SHA512 ea9708546c5fb93a284a566c65ae677f57dd075cbb27bae834d4d890f24fb1f2e5b4f4dd8831b8e7950cbfcc2bd4dc7d180c6cd249dbb6ae235fa6abd4e6b60e WHIRLPOOL 22dd3cd161671671ba42c82ae0b8ccbb05d10d33ee9126209870fe68f013ceab7a6100225b6683fcb768a596428b9724fb28784fdf82580025b0851586fc06c2
-EBUILD jenkins-bin-1.600.ebuild 1152 SHA256 9f7ee1e1486f985ef3732990ade4307d9ba4e3010bdf31bc6a8e02febbf49edd SHA512 dda6ac2e9faaef1d82b6a0958bc7306b65c9a460d25f255511e9a5d92d3316db6ed2085cef58f905966de863df1e85f1a546ce417493e40b24de29dd8ba28b7d WHIRLPOOL e99ab66e59366a9469fe0f1f49e25613b21879b759076bafbd41ed9c85cc9495c284e82e8a616432fd0971944bf2a6972a0190775fadcd1d90859e325d61ef75
-MISC ChangeLog 4452 SHA256 292d0dedc7c774b19fb899559f4c871e9c7ef23e5f630b92150b79ad7fbd2e78 SHA512 b4557ca95ff614b6ae049ef0f75e88b007ad633e94ea439553868e4e29bb43e6c9625eb37bceb19bd1de5801574692c9d4aad07cf7fbaa1c4ad726d102962bf2 WHIRLPOOL 3d6e0ceeb2c3afc50cced2452289404679b80d8ca31ebc4a5f534f6e7988883863cc24efdbd95e4b4965d43ea79edb95ec52f28a3e0817fb79586374a79d37d4
+DIST jenkins-bin-1.602.war 68840062 SHA256 2054597a64d850e3e0ef277e3dac756951485a4cba26f000e05c5c86427bf8a9 SHA512 fc65ac6cb2b1ef90d9fcdfb869f0378a6aa5cce77e3084b07e3aa984941902fd672da2119b284e760450bf1c9d7a25d871868e26699f75ff24114991bc9e3e87 WHIRLPOOL e753c8632ae9ee409b387febd989b325cdb8bf65cd304b969e21b8e6a1fad1af1a177b029bc4f0517176d235b1e0b81c1ea1c7988fa12b3898ac8c092151180a
+EBUILD jenkins-bin-1.596.1.ebuild 1137 SHA256 e7860996a55ac95a05e40f2a140b3d8abced867a6c4d89dac1bdbb91e044fdcd SHA512 399a79515f37b40b82f40c218115170c31ee486bee3cf4dbb2e9ed728017b5ec8c872c2b6bbf6a51745f03c49573a3c2c520258c14b8654ec45de64e06a351f7 WHIRLPOOL c99437e543fb5680934dee4c6e3312a5ef56dd95e02c941ab9f45bd2b64bf73a40deb0fb07b4d66be4720d5c568fe81b132dd4dc6f42d15e186f346bfcc70098
+EBUILD jenkins-bin-1.602.ebuild 1128 SHA256 ca66c85da7e1e1e58edfa19b8d39dac08a0ec38ab0470470fb55b961272a3267 SHA512 41e1600635a1b0fdd86d0dd6d019a9ec846b72491ad6c4114e00b4104ad49ff0e91466cc775f22fc40641efc21c0ab6154fe18eb0f8813d40f9d44b8461d9e66 WHIRLPOOL 1b4446ef23f60ea1b8c44dbde5a6731549db740b37dbdd59281263a3b9fc1a79e1be597629e53f7c0d46b0816171198fc1376cf2043e0d1464e66c16fe71698d
+MISC ChangeLog 4731 SHA256 ec0a18164fc3f87d3fbbdb555817f29c0045d5179a85ec8e1e0af55c59e364f3 SHA512 8cfe98a230a189cfae3d08707638e7a160a94a294869da1150ef7ee718d82415770acb6e456de3921a65f21c995433e4e79c9a5f398a404cf8ce102880e80179 WHIRLPOOL 0e34f0a80ebbd06420ff76044a6ad5d3b668887ae831af6f5f1c8202bed29ddf7738b33952981b31abe4c50ba237c2c851e048597787d1352f7fba528deedb2b
 MISC metadata.xml 323 SHA256 1fe2512e65f90ccec2e80123923bdb2c3cb6f597c45754f6c9f8246761234a48 SHA512 3d0a3145eca160f429e10f2b48ae1415143f2175cc06a3569a8d7fb646dd14fab750c8f8df4ad71ae085915bc075fa0e3ed35ee20a84fd04deb9590bed8fd940 WHIRLPOOL 830a0c6f0046034b335756b21f7a00b081254e190e288db88161fc26ceb48f0652b2418b67022ec394489b1e23028e50bef67e808d771518bf4ac2076d7f403b
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild
deleted file mode 100644
index a02bd6bc9429..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.580.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.580.3.ebuild,v 1.1 2015/02/10 15:40:59 mrueg Exp $
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-fonts/dejavu"
-RDEPEND="${DEPEND}
-	!dev-util/jenkins-bin:0
-	virtual/jre"
-
-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}.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.596.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.596.1.ebuild
index e19e1c1340b6..fbbe0c0353c1 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.596.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.596.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2015/03/01 16:05:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.596.1.ebuild,v 1.2 2015/03/11 17:44:15 mrueg Exp $
 
 EAPI=5
 
@@ -15,8 +15,8 @@ SLOT="lts"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-fonts/dejavu"
-RDEPEND="${DEPEND}
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
 	!dev-util/jenkins-bin:0
 	virtual/jre"
 
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.600.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.600.ebuild
deleted file mode 100644
index b35fcdd2f22c..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.600.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.600.ebuild,v 1.2 2015/03/10 18:25:49 monsieurp Exp $
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-fonts/dejavu
-	media-libs/freetype"
-
-RDEPEND="${DEPEND}
-	!dev-util/jenkins-bin:lts
-	virtual/jre"
-
-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}.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.598.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.602.ebuild
index 5717bf2cb571..df8ce32a0a9e 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.598.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.602.ebuild
@@ -1,6 +1,6 @@
 # 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.598.ebuild,v 1.1 2015/01/27 02:26:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.602.ebuild,v 1.1 2015/03/11 17:44:15 mrueg Exp $
 
 EAPI=5
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-fonts/dejavu"
-RDEPEND="${DEPEND}
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
 	!dev-util/jenkins-bin:lts
 	virtual/jre"