Use correct category for blocker. dev-util instead of dev-utils.

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

5 files changed, 15 insertions, 54 deletions

diff --git a/dev-util/jenkins-bin/ChangeLog b/dev-util/jenkins-bin/ChangeLog
index 5a67cd095d28..cca463f950bf 100644
--- a/dev-util/jenkins-bin/ChangeLog
+++ b/dev-util/jenkins-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/jenkins-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.7 2014/10/27 18:08:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/ChangeLog,v 1.8 2014/10/27 21:37:17 mrueg Exp $
+
+*jenkins-bin-1.565.3-r1 (27 Oct 2014)
+*jenkins-bin-1.586-r1 (27 Oct 2014)
+
+  27 Oct 2014; Manuel Rüger <mrueg@gentoo.org> +jenkins-bin-1.565.3-r1.ebuild,
+  +jenkins-bin-1.586-r1.ebuild, -jenkins-bin-1.565.3.ebuild,
+  -jenkins-bin-1.585.ebuild, -jenkins-bin-1.586.ebuild:
+  Use correct category for blocker. dev-util instead of dev-utils.
 
 *jenkins-bin-1.565.3 (27 Oct 2014)
 *jenkins-bin-1.586 (27 Oct 2014)
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index fc7827d7d0ba..5bf4ddcc021f 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,10 +2,8 @@ AUX jenkins-bin.confd 998 SHA256 8cd3e217ae11f47b73f8a3f28beb2f94b14e24da4e822f7
 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.565.3.war 67867391 SHA256 a7d6f7dfc39374490861499589d5b4dfff2538f663a4f50a69f22601bf5bba7f SHA512 cef127050b39b294f7fe7f3eb627adabac9b5469af0c9fd016064ce8ab7ef51c387b9b0b618d91cd9231a38ddffcf42e0599201a6627a7601a183d9c0b2fe1d0 WHIRLPOOL 8fdebc5704099335e6d55f8831e57eab7454abc2b16e8701dfd52e414f60b8f8c796d1f65f2c39b0d5e4adc7f7a14981c18acc8a5402a651d5bb58e9ba5d592a
-DIST jenkins-bin-1.585.war 67939529 SHA256 1ba85e5c05fa6083b1642518c7628de51c4e61c34648787db4a8eb522344368e SHA512 568a7b2a6f5e946f1df79c8a93fd7b1708a94478e8616e230c8b32506e01134e726c6bb564eda37b00b7ea1127192e1d1d059719318cb58c94ae3ae677a9ab23 WHIRLPOOL df865daa51c02262435469b4e5ee24f53e1672b99ef070f9862c6016179c8235462e75c39af61f57f06d4423102af3ba658551dbdd3dc3d46baa7dbf4c253830
 DIST jenkins-bin-1.586.war 67995785 SHA256 d7959b5ac134aa6e49e577e824856c53966df400903ac5b0f31d6bf0a47eb8ba SHA512 5fe1c58f458a991cc8f9751ca9c77b374606e1e23c24528db9e1a65d0aafa620de17bc4dd3bf8580aac829a59d0f0b2bc9b17369f3d4e4fe121a8ff8d1bc1241 WHIRLPOOL 457badf5fbef9c4fe74d5c0bd54bc1d888f419af0bb04bde55651e4761a720c26b98d3e88498668ff5a8e669b2e24ad898b8acab3cf920f86a5afc95e2f7233c
-EBUILD jenkins-bin-1.565.3.ebuild 1142 SHA256 c0a397d3a0ac0c4430a4dd046c407fccdd8d7993ca5299f958c7d90b660f7dab SHA512 e1e080737c649afb11759be95e3789676d4a8dc45fbb78c79287a8db7741cca325f07bda4b709fd4dcdb24c2fe715a4f4af1ce3b8b0946bc38c6be905325f721 WHIRLPOOL 9cb6c72adec7ab38cca7c3d47c7e3b78350bdf13060f3592609b7756492fffc7c805c6bc8b7d1e9804ebedccd63de6a8b1c563fa30b0366e0a24b6486cab4ae5
-EBUILD jenkins-bin-1.585.ebuild 1132 SHA256 9fbb8ee2b96e15085ce17e4749f3a36a0656d238b77626a23a70c442e8bb9be2 SHA512 e79a42f53b9c806cae825b395a32e4bde38e6ac62c4f70dec63504fa2882db0a3231b1f98f825cf3fa54db9354f9acebac2c2c00d2949caf99a17e58e8acb187 WHIRLPOOL 48cdc540913760216cf43b58b89b1e5feed6fcd2ae8ebd55edb46992ca99d3e61d89d0dff0044d9ca39985a405d9785c7453ccfcad261fcf42436b629e688c1d
-EBUILD jenkins-bin-1.586.ebuild 1133 SHA256 bcbd0f9440ecbdc3f9fd07e0f02c13ac24c20096ebdc26ca632059686b877de8 SHA512 57068a711f0975574212e2ef5fd55db893f65411364005cf5523bd2838c1bee87a1581e822e517cd804287599d6a25d5f578aead2dcb0ee8441cda3a75c9f8fb WHIRLPOOL 4ca54e55e589d1ff72891f62e5a42b66ed2ff965d18b1baba3f97a06a8ed93b4d288b85febaeb9e7825a47ecf0db1826394c52a0cfdf5d55b004e15306947ee2
-MISC ChangeLog 1846 SHA256 5a203a4c7fb5966fbb420668d979825167b48bbda8fbf9a45e09f1d3a6f76f64 SHA512 074c7fa5a1bc13488024b87f8956856fafeac52a3b32d0468c48edf34f096135dedfb7d3183e188a9b7e74a5b8e8596f06d5a5989ce2ae64999a1ca5ce068c67 WHIRLPOOL dc57c0fc768f39c9df85449bb5049233f808fdb2f4f231be1e843b406106278ed20f5d2ce12d09bc4b89869569afef3dd2faea05a719d5c82e6b0e3139718ff5
+EBUILD jenkins-bin-1.565.3-r1.ebuild 1144 SHA256 77255ea6328cea656dc727606ac33ad9d68523c5e24dd14e824491298dc259ea SHA512 9a5b472fbc15f685c781a881f890f589ad85907a4b2ffbc125be57ac869f0dcb9c33d675b7d16e3369171c3849fce1deb6777e8801b60d5f63b2dad7d8b52952 WHIRLPOOL 517758976606f1d12e4e2a4e791efc8f73410fe87b8ab8b3059696cda815ee894d5a0d53ef338d8605678eecba5b2f856490e42b55fe616d27a2c1653589565d
+EBUILD jenkins-bin-1.586-r1.ebuild 1135 SHA256 91f8abf934170fcc289998ff189acbfea4d7ecb105452075ece9447ec2180463 SHA512 d15b9ca0668acbef59b140760fa3954a70cdb81dd0d8b0b9c17a2c8c60cc45c4077c18ee0762f6f37ed36982610092966d96d20a1eb030cdf529427ee91ba103 WHIRLPOOL 82c8afeb06bc63a6036aed09a910d2c54b59e51ce7b0bd6ead9e431726759811f40dd5a1446f59d721542053300a13c4e4e3a90ee4db83bcdfdb5dc58e9328f0
+MISC ChangeLog 2186 SHA256 7458472e8b96238ef94f8ccf7385e3b89752f45c4bdcbdca2ac01b628e98fa0e SHA512 361ca94fabe68e7195d5b0659fef92160f89ee6f9b72d4b23ddadeb40691063986a8ebe9f000eddaa55d6a013b49d49c050f25fad32d8904a3f386ce54b0a9f9 WHIRLPOOL 7a6899191285d409f84334b5198fba92290c63dfa2cc9ad8df68ea9381bd6f05c469894e8cd98c8d2ea8dcf1def5f20c2e8e5d47f645e9de04eaf2ed9b157e77
 MISC metadata.xml 323 SHA256 1fe2512e65f90ccec2e80123923bdb2c3cb6f597c45754f6c9f8246761234a48 SHA512 3d0a3145eca160f429e10f2b48ae1415143f2175cc06a3569a8d7fb646dd14fab750c8f8df4ad71ae085915bc075fa0e3ed35ee20a84fd04deb9590bed8fd940 WHIRLPOOL 830a0c6f0046034b335756b21f7a00b081254e190e288db88161fc26ceb48f0652b2418b67022ec394489b1e23028e50bef67e808d771518bf4ac2076d7f403b
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.565.3-r1.ebuild
index cc39bfb6ac61..bbc3368e8b1e 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.565.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.565.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.565.3.ebuild,v 1.1 2014/10/27 18:08:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.565.3-r1.ebuild,v 1.1 2014/10/27 21:37:17 mrueg Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ IUSE=""
 
 DEPEND="media-fonts/dejavu"
 RDEPEND="${DEPEND}
-	!dev-utils/jenkins-bin:0
+	!dev-util/jenkins-bin:0
 	>=virtual/jdk-1.5"
 
 S=${WORKDIR}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.586-r1.ebuild
index 6b48311d8ea7..e543b563c3ce 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.586-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.585.ebuild,v 1.3 2014/10/27 18:08:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.586-r1.ebuild,v 1.1 2014/10/27 21:37:17 mrueg Exp $
 
 EAPI=5
 
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.586.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.586.ebuild
deleted file mode 100644
index 8dec73a58d7e..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.586.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 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.586.ebuild,v 1.1 2014/10/27 18:08:07 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/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-fonts/dejavu"
-RDEPEND="${DEPEND}
-	!dev-utils/jenkins-bin:lts
-	>=virtual/jdk-1.5"
-
-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
-}