From: Benedikt Boehm Date: Mon, 25 Jul 2011 09:19:37 +0000 (+0000) Subject: version bump wrt #369391 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=02f089997a727a371790605a297dca1d6891dae6;p=gentoo.git version bump wrt #369391 Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64 --- diff --git a/app-admin/chef-server-api/ChangeLog b/app-admin/chef-server-api/ChangeLog index 6aea328bd0de..f430eb39aa65 100644 --- a/app-admin/chef-server-api/ChangeLog +++ b/app-admin/chef-server-api/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/chef-server-api # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.8 2011/02/03 13:12:50 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/ChangeLog,v 1.9 2011/07/25 09:16:54 hollow Exp $ + +*chef-server-api-0.10.2 (25 Jul 2011) + + 25 Jul 2011; Benedikt Böhm + -chef-server-api-0.9.6.ebuild, -chef-server-api-0.9.8.ebuild, + +chef-server-api-0.10.2.ebuild, +files/initd/chef-server-api-r1: + version bump wrt #369391 03 Feb 2011; Benedikt Böhm chef-server-api-0.9.12.ebuild: diff --git a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild b/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild similarity index 79% rename from app-admin/chef-server-api/chef-server-api-0.9.6.ebuild rename to app-admin/chef-server-api/chef-server-api-0.10.2.ebuild index 44367c9bf3d7..2b602e10992c 100644 --- a/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild +++ b/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.9.6.ebuild,v 1.3 2010/08/30 17:44:25 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.10.2.ebuild,v 1.1 2011/07/25 09:16:54 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -18,21 +18,21 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +RDEPEND=">=dev-db/couchdb-0.10.0 + >=net-misc/rabbitmq-server-1.7.0" + ruby_add_rdepend "~app-admin/chef-${PV} + >=dev-ruby/dep_selector-0.0.3 >=dev-ruby/json-1.4.4 + <=dev-ruby/json-1.4.6 + >=dev-ruby/mixlib-authentication-1.1.3 >=dev-ruby/merb-assets-1.1.0 >=dev-ruby/merb-core-1.1.0 >=dev-ruby/merb-helpers-1.1.0 >=dev-ruby/merb-param-protection-1.1.0 - >=dev-ruby/merb-slices-1.1.0 >=dev-ruby/uuidtools-2.1.1 www-servers/thin" -pkg_setup() { - enewgroup chef - enewuser chef -1 -1 /var/lib/chef chef -} - each_ruby_install() { each_fakegem_install ruby_fakegem_doins -r app @@ -43,7 +43,7 @@ each_ruby_install() { all_ruby_install() { all_fakegem_install - doinitd "${FILESDIR}/initd/chef-server-api" + newinitd "${FILESDIR}/initd/chef-server-api-r1" ${PN} doconfd "${FILESDIR}/confd/chef-server-api" keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef \ diff --git a/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild b/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild deleted file mode 100644 index 6a405ae5dac7..000000000000 --- a/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-0.9.8.ebuild,v 1.2 2010/09/20 09:30:31 hollow Exp $ - -EAPI="2" -USE_RUBY="ruby18" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit ruby-fakegem - -DESCRIPTION="Configuration management tool" -HOMEPAGE="http://wiki.opscode.com/display/chef" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_rdepend "~app-admin/chef-${PV} - >=dev-ruby/json-1.4.4 - >=dev-ruby/mixlib-authentication-1.1.3 - >=dev-ruby/merb-assets-1.1.0 - >=dev-ruby/merb-core-1.1.0 - >=dev-ruby/merb-helpers-1.1.0 - >=dev-ruby/merb-param-protection-1.1.0 - >=dev-ruby/uuidtools-2.1.1 - www-servers/thin" - -pkg_setup() { - enewgroup chef - enewuser chef -1 -1 /var/lib/chef chef -} - -each_ruby_install() { - each_fakegem_install - ruby_fakegem_doins -r app - ruby_fakegem_doins -r config - ruby_fakegem_doins -r public - - # create unversioned path for passenger/rack integration - dodir /var/lib/chef/rack - dosym $(ruby_fakegem_gemsdir)/gems/${P} /var/lib/chef/rack/api -} - -all_ruby_install() { - all_fakegem_install - - doinitd "${FILESDIR}/initd/chef-server-api" - doconfd "${FILESDIR}/confd/chef-server-api" - - keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef \ - /etc/chef/certificates - - insinto /etc/chef - doins "${FILESDIR}/server.rb" - - fperms 0700 /etc/chef/certificates - fowners chef:chef /etc/chef/{,server.rb,certificates} - fowners chef:chef /var/{lib,log,run}/chef -} - -pkg_postinst() { - elog - elog "You should edit /etc/chef/server.rb before starting the service with" - elog "/etc/init.d/chef-server-api start" - elog -} diff --git a/app-admin/chef-server-api/files/initd/chef-server-api-r1 b/app-admin/chef-server-api/files/initd/chef-server-api-r1 new file mode 100644 index 000000000000..4847f577a6b6 --- /dev/null +++ b/app-admin/chef-server-api/files/initd/chef-server-api-r1 @@ -0,0 +1,40 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net couchdb rabbitmq chef-expander + before chef-client +} + +CHEF_SERVER_BINARY=${CHEF_SERVER_BINARY:-/usr/bin/chef-server} +CHEF_SERVER_PIDFILE=${CHEF_SERVER_PIDFILE:-/var/run/chef/server.%s.pid} +CHEF_SERVER_LOGFILE=${CHEF_SERVER_LOGFILE:-/var/log/chef/server.log} +CONFIGFILE=${CONFIGFILE:-/etc/chef/server.rb} +CLUSTER_NODES=${CLUSTER_NODES:-1} +CHEF_USER=${CHEF_USER:-chef} +CHEF_GROUP=${CHEF_GROUP:-chef} + +CHEF_DIRS=( /etc/chef /var/lib/chef /var/log/chef /var/run/chef ) + +fix_owners() { + for i in ${CHEF_DIRS[@]} ${CONFIGFILE}; do + chown ${CHEF_USER}:${CHEF_GROUP} ${i} + done + chmod 0600 ${CONFIGFILE} +} + +start() { + ebegin "Starting Chef server" + fix_owners + ${CHEF_SERVER_BINARY} -d -P ${CHEF_SERVER_PIDFILE} -C ${CONFIGFILE} \ + -u ${CHEF_USER} -G ${CHEF_GROUP} --name chef-server \ + -c ${CLUSTER_NODES} -L ${CHEF_SERVER_LOGFILE} ${CHEF_SERVER_OPTS} > /dev/null + eend $? +} + +stop() { + ebegin "Shutting down Chef server" + ${CHEF_SERVER_BINARY} -K all -P ${CHEF_SERVER_PIDFILE} > /dev/null + eend $? +} diff --git a/app-admin/chef-server-webui/ChangeLog b/app-admin/chef-server-webui/ChangeLog index b2fcf3b459fc..4b4ae08d5e1a 100644 --- a/app-admin/chef-server-webui/ChangeLog +++ b/app-admin/chef-server-webui/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/chef-server-webui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.6 2011/01/07 14:15:08 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/ChangeLog,v 1.7 2011/07/25 09:13:38 hollow Exp $ + +*chef-server-webui-0.10.2 (25 Jul 2011) + + 25 Jul 2011; Benedikt Böhm + -chef-server-webui-0.9.6.ebuild, -chef-server-webui-0.9.8.ebuild, + +chef-server-webui-0.10.2.ebuild: + version bump wrt #369391 *chef-server-webui-0.9.12 (07 Jan 2011) diff --git a/app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild similarity index 92% rename from app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild rename to app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild index 98661e598c75..8e75f14723c3 100644 --- a/app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild +++ b/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-0.9.8.ebuild,v 1.2 2010/09/20 09:26:49 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-0.10.2.ebuild,v 1.1 2011/07/25 09:13:38 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -24,6 +24,7 @@ RDEPEND=">=dev-db/couchdb-0.10.0 ruby_add_rdepend "dev-ruby/coderay dev-ruby/haml >=dev-ruby/json-1.4.4 + <=dev-ruby/json-1.4.6 >=dev-ruby/merb-assets-1.1.0 >=dev-ruby/merb-core-1.1.0 >=dev-ruby/merb-haml-1.1.0 diff --git a/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild b/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild deleted file mode 100644 index 058d00541a21..000000000000 --- a/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-0.9.6.ebuild,v 1.2 2010/08/30 17:43:17 graaff Exp $ - -EAPI="2" -USE_RUBY="ruby18" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit ruby-fakegem - -DESCRIPTION="Configuration management tool" -HOMEPAGE="http://wiki.opscode.com/display/chef" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-db/couchdb-0.10.0 - >=net-misc/rabbitmq-server-1.7.0" - -ruby_add_rdepend "dev-ruby/coderay - dev-ruby/haml - >=dev-ruby/json-1.4.4 - >=dev-ruby/merb-assets-1.1.0 - >=dev-ruby/merb-core-1.1.0 - >=dev-ruby/merb-haml-1.1.0 - >=dev-ruby/merb-helpers-1.1.0 - >=dev-ruby/merb-param-protection-1.1.0 - >=dev-ruby/merb-slices-1.1.0 - dev-ruby/ruby-openid - www-servers/thin" - -pkg_setup() { - enewgroup chef - enewuser chef -1 -1 /var/lib/chef chef -} - -each_ruby_install() { - each_fakegem_install - ruby_fakegem_doins -r app - ruby_fakegem_doins -r config - ruby_fakegem_doins config.ru - ruby_fakegem_doins -r public -} - -all_ruby_install() { - all_fakegem_install - - doinitd "${FILESDIR}/initd/chef-server-webui" - doconfd "${FILESDIR}/confd/chef-server-webui" - - keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef - - insinto /etc/chef - doins "${FILESDIR}/webui.rb" - - fowners chef:chef /etc/chef/{,webui.rb} - fowners chef:chef /var/{lib,log,run}/chef -} - -pkg_postinst() { - elog - elog "You should edit or create /etc/chef/webui.rb before starting the service" - elog "with /etc/init.d/chef-server-webui start" - elog -} diff --git a/app-admin/chef-server/ChangeLog b/app-admin/chef-server/ChangeLog index f5eb280fb968..2f3db2dc1bb5 100644 --- a/app-admin/chef-server/ChangeLog +++ b/app-admin/chef-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/chef-server # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/ChangeLog,v 1.3 2011/01/07 14:17:53 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/ChangeLog,v 1.4 2011/07/25 09:18:19 hollow Exp $ + +*chef-server-0.10.2 (25 Jul 2011) + + 25 Jul 2011; Benedikt Böhm -chef-server-0.9.6.ebuild, + -chef-server-0.9.8.ebuild, +chef-server-0.10.2.ebuild: + version bump wrt #369391 *chef-server-0.9.12 (07 Jan 2011) diff --git a/app-admin/chef-server/chef-server-0.9.8.ebuild b/app-admin/chef-server/chef-server-0.10.2.ebuild similarity index 74% rename from app-admin/chef-server/chef-server-0.9.8.ebuild rename to app-admin/chef-server/chef-server-0.10.2.ebuild index e1032eac2d4b..fde8837be704 100644 --- a/app-admin/chef-server/chef-server-0.9.8.ebuild +++ b/app-admin/chef-server/chef-server-0.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/chef-server-0.9.8.ebuild,v 1.1 2010/09/19 14:28:16 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/chef-server-0.10.2.ebuild,v 1.1 2011/07/25 09:18:19 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -19,4 +19,5 @@ KEYWORDS="~amd64 ~x86" IUSE="" ruby_add_rdepend "~app-admin/chef-server-api-${PV} - ~app-admin/chef-solr-${PV}" + ~app-admin/chef-solr-${PV} + ~app-admin/chef-expander-${PV}" diff --git a/app-admin/chef-server/chef-server-0.9.6.ebuild b/app-admin/chef-server/chef-server-0.9.6.ebuild deleted file mode 100644 index 631e6038ebf6..000000000000 --- a/app-admin/chef-server/chef-server-0.9.6.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/chef-server-0.9.6.ebuild,v 1.1 2010/07/03 12:57:16 hollow Exp $ - -EAPI="2" -USE_RUBY="ruby18" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit ruby-fakegem - -DESCRIPTION="Configuration management tool (meta package)" -HOMEPAGE="http://wiki.opscode.com/display/chef" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-db/couchdb-0.10.0 - >=net-misc/rabbitmq-server-1.7.0" - -ruby_add_rdepend "~app-admin/chef-server-api-${PV} - ~app-admin/chef-solr-${PV}" diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog index 1352ed840d02..d7e2f7353c5b 100644 --- a/app-admin/chef-solr/ChangeLog +++ b/app-admin/chef-solr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/chef-solr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.5 2011/01/07 14:19:52 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.6 2011/07/25 09:19:37 hollow Exp $ + +*chef-solr-0.10.2 (25 Jul 2011) + + 25 Jul 2011; Benedikt Böhm -chef-solr-0.9.6.ebuild, + -chef-solr-0.9.8.ebuild, +chef-solr-0.10.2.ebuild: + version bump wrt #369391 *chef-solr-0.9.12 (07 Jan 2011) diff --git a/app-admin/chef-solr/chef-solr-0.9.8.ebuild b/app-admin/chef-solr/chef-solr-0.10.2.ebuild similarity index 74% rename from app-admin/chef-solr/chef-solr-0.9.8.ebuild rename to app-admin/chef-solr/chef-solr-0.10.2.ebuild index 45604e8c4b84..79482860df7e 100644 --- a/app-admin/chef-solr/chef-solr-0.9.8.ebuild +++ b/app-admin/chef-solr/chef-solr-0.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.8.ebuild,v 1.1 2010/09/19 14:24:55 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2.ebuild,v 1.1 2011/07/25 09:19:37 hollow Exp $ EAPI="2" USE_RUBY="ruby18" @@ -18,18 +18,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=net-misc/rabbitmq-server-1.7.0 +RDEPEND=">=net-misc/rabbitmq-server-1.7.2 virtual/jre:1.6" ruby_add_rdepend "~app-admin/chef-${PV} >=dev-ruby/libxml-1.1.3 >=dev-ruby/uuidtools-2.0.0" -pkg_setup() { - enewgroup chef - enewuser chef -1 -1 /var/lib/chef chef -} - each_ruby_install() { each_fakegem_install ruby_fakegem_doins -r solr @@ -41,9 +36,6 @@ all_ruby_install() { doinitd "${FILESDIR}/initd/chef-solr" doconfd "${FILESDIR}/confd/chef-solr" - doinitd "${FILESDIR}/initd/chef-solr-indexer" - doconfd "${FILESDIR}/confd/chef-solr-indexer" - keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef insinto /etc/chef diff --git a/app-admin/chef-solr/chef-solr-0.9.6.ebuild b/app-admin/chef-solr/chef-solr-0.9.6.ebuild deleted file mode 100644 index 019ba1636689..000000000000 --- a/app-admin/chef-solr/chef-solr-0.9.6.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.6.ebuild,v 1.2 2010/07/03 12:59:55 hollow Exp $ - -EAPI="2" -USE_RUBY="ruby18" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_TASK_TEST="" - -inherit ruby-fakegem - -DESCRIPTION="Configuration management tool" -HOMEPAGE="http://wiki.opscode.com/display/chef" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=net-misc/rabbitmq-server-1.7.0 - =virtual/jre-1.6.0" - -ruby_add_rdepend "~app-admin/chef-${PV} - >=dev-ruby/libxml-1.1.3 - >=dev-ruby/uuidtools-2.0.0" - -pkg_setup() { - enewgroup chef - enewuser chef -1 -1 /var/lib/chef chef -} - -each_ruby_install() { - each_fakegem_install - ruby_fakegem_doins -r solr -} - -all_ruby_install() { - all_fakegem_install - - doinitd "${FILESDIR}/initd/chef-solr" - doconfd "${FILESDIR}/confd/chef-solr" - - doinitd "${FILESDIR}/initd/chef-solr-indexer" - doconfd "${FILESDIR}/confd/chef-solr-indexer" - - keepdir /etc/chef /var/lib/chef /var/log/chef /var/run/chef - - insinto /etc/chef - doins "${FILESDIR}/solr.rb" - - fowners chef:chef /etc/chef/{,solr.rb} - fowners chef:chef /var/{lib,log,run}/chef -}