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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 12 insertions, 49 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/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
-}