[gentoo-commits] repo/gentoo:master commit in: www-servers/thin/, www-servers/thin/files/

[Manuel Rüger]

commit:     db3f18d7297258ca636c3667aa55eef5f3a1a829
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 13:30:59 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed May  4 13:30:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3f18d7

www-servers/thin: Remove old

Package-Manager: portage-2.2.28

 www-servers/thin/files/thin.confd     | 20 --------
 www-servers/thin/files/thin.confd-1   | 32 -------------
 www-servers/thin/files/thin.initd     | 63 -------------------------
 www-servers/thin/files/thin.initd-1   | 70 ----------------------------
 www-servers/thin/files/thin.initd-2   | 83 ---------------------------------
 www-servers/thin/files/thin.initd-3   | 88 -----------------------------------
 www-servers/thin/thin-1.6.4-r1.ebuild | 84 ---------------------------------
 7 files changed, 440 deletions(-)

diff --git a/www-servers/thin/files/thin.confd b/www-servers/thin/files/thin.confd
deleted file mode 100644
index ca517d6..0000000
--- a/www-servers/thin/files/thin.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/conf.d/thin: Configuration for /etc/init.d/thin*
-# Copy this file to /etc/conf.d/thin.SERVERNAME for server specific options.
-
-# Set the configuration file location.
-# In start-all mode (/etc/init.d/thin), this must point to the directory where
-# all the thin configurations are located.
-# When starting a specific server (/etc/init.d/thin.SERVER), point to the exact
-# location of the .yml configuration file.
-# CONFIG="/etc/thin/${SVCNAME#*.}.yml"
-
-# Disable looking for a configuration file.
-# You can use THIN_OPTS instead for setting command line options.
-# NOCONFIG=0
-
-# Set the Ruby interpreter to use.
-# RUBY="/usr/bin/ruby"
-
-# Set command line options to pass to thin.
-# In specific server mode, '--tag SERVER_NAME' is automatically appended.
-# THIN_OPTS=

diff --git a/www-servers/thin/files/thin.confd-1 b/www-servers/thin/files/thin.confd-1
deleted file mode 100644
index 16eddf2..0000000
--- a/www-servers/thin/files/thin.confd-1
+++ /dev/null
@@ -1,32 +0,0 @@
-# /etc/conf.d/thin: Configuration for /etc/init.d/thin*
-# Copy this file to /etc/conf.d/thin.SERVERNAME for server specific options.
-
-# Set the configuration file location.
-# In start-all mode (/etc/init.d/thin), this must point to the directory where
-# all the thin configurations are located.
-# When starting a specific server (/etc/init.d/thin.SERVER), point to the exact
-# location of the .yml configuration file.
-# CONFIG="/etc/thin/${SVCNAME#*.}.yml"
-
-# Disable looking for a configuration file.
-# You can use THIN_OPTS instead for setting command line options.
-# NOCONFIG=0
-
-# Set the Ruby interpreter to use.
-# RUBY="/usr/bin/ruby"
-
-# Set the user for this instance.
-# (Should mirror "user" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_USER=
-
-# Set the group for this instance.
-# (Should mirror "group" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_GROUP=
-
-# Set the pidfile for this instance.
-# (Should mirror "pid" value in /etc/thin/${SVCNAME#*.}.yml)
-# THIN_PID=
-
-# Set command line options to pass to thin.
-# In specific server mode, '--tag SERVER_NAME' is automatically appended.
-# THIN_OPTS=

diff --git a/www-servers/thin/files/thin.initd b/www-servers/thin/files/thin.initd
deleted file mode 100644
index acbb0c7..0000000
--- a/www-servers/thin/files/thin.initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SERVER=${SVCNAME#*.}
-if [ ${SERVER} != thin ]; then
-        CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
-else
-        CONFIG=${CONFIG:-/etc/thin/}
-fi
-NOCONFIG=${NOCONFIG:-0}
-RUBY=${RUBY:-/usr/bin/ruby}
-THIN_OPTS=${THIN_OPTS:-}
-
-depend() {
-        need net localmount
-}
-
-checkconfig() {
-        [ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
-
-        if [ ! -f ${CONFIG} ]; then
-                eerror "Unable to find the server configuration."
-                eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
-                eerror "set NOCONFIG there to 1 to disable looking for a config file."
-                return 1
-        fi
-}
-
-buildargs() {
-        if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
-                echo -n "-C ${CONFIG} "
-        fi
-
-        echo -n "${THIN_OPTS}"
-}
-
-action() {
-        checkconfig || return 1
-
-        if [ ${SERVER} = thin ]; then
-                ebegin "$2 all thin servers in ${CONFIG}"
-                ${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
-                eend $?
-        else
-                ebegin "$2 thin server ${SERVER}"
-                ${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
-                eend $?
-        fi
-}
-
-start() {
-        action start 'Starting'
-}
-
-stop() {
-        action stop 'Stopping'
-}
-
-restart() {
-        action restart 'Restarting'
-}

diff --git a/www-servers/thin/files/thin.initd-1 b/www-servers/thin/files/thin.initd-1
deleted file mode 100644
index 420aa52..0000000
--- a/www-servers/thin/files/thin.initd-1
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SERVER=${SVCNAME#*.}
-if [ ${SERVER} != thin ]; then
-        CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
-else
-        CONFIG=${CONFIG:-/etc/thin/}
-fi
-NOCONFIG=${NOCONFIG:-0}
-RUBY=${RUBY:-/usr/bin/ruby}
-THIN_USER=${THIN_USER:-root}
-THIN_GROUP=${THIN_GROUP:-root}
-THIN_PID=${THIN_PID:-/var/run/thin/thin.pid}
-THIN_OPTS=${THIN_OPTS:-}
-
-depend() {
-        need net localmount
-}
-
-checkconfig() {
-        [ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
-
-        if [ ! -f ${CONFIG} ]; then
-                eerror "Unable to find the server configuration."
-                eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
-                eerror "set NOCONFIG there to 1 to disable looking for a config file."
-                return 1
-        fi
-}
-
-buildargs() {
-        if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
-                echo -n "-C ${CONFIG} "
-        fi
-
-        echo -n "${THIN_OPTS}"
-}
-
-action() {
-        checkconfig || return 1
-
-        if [ ${SERVER} = thin ]; then
-                ebegin "$2 all thin servers in ${CONFIG}"
-                ${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
-                eend $?
-        else
-                ebegin "$2 thin server ${SERVER}"
-                ${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
-                eend $?
-        fi
-}
-
-start() {
-        action start 'Starting'
-}
-
-stop() {
-        action stop 'Stopping'
-}
-
-restart() {
-        action restart 'Restarting'
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o ${THIN_USER}:${THIN_GROUP} $(dirname ${THIN_PID})
-}

diff --git a/www-servers/thin/files/thin.initd-2 b/www-servers/thin/files/thin.initd-2
deleted file mode 100644
index d3cba62..0000000
--- a/www-servers/thin/files/thin.initd-2
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SERVER=${SVCNAME#*.}
-if [ ${SERVER} != thin ]; then
-	CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
-else
-	CONFIG=${CONFIG:-/etc/thin/}
-fi
-NOCONFIG=${NOCONFIG:-0}
-RUBY=${RUBY:-/usr/bin/ruby}
-DO_BUNDLER=${DO_BUNDLER:-0}
-CHDIR=${CHDIR:-}
-THIN_USER=${THIN_USER:-root}
-THIN_GROUP=${THIN_GROUP:-root}
-THIN_PID=${THIN_PID:-/var/run/thin/thin.pid}
-THIN_OPTS=${THIN_OPTS:-}
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	if [ -n ${CHDIR} ]; then
-		cd "${CHDIR}"
-
-		if [ $? -ne 0 ]; then
-			eerror "Cannot cd into requested directory"
-			return 1
-		fi
-	fi
-
-	[ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
-
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Unable to find the server configuration."
-		eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
-		eerror "set NOCONFIG there to 1 to disable looking for a config file."
-		return 1
-	fi
-}
-
-buildargs() {
-	if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
-		echo -n "-C ${CONFIG} "
-	fi
-
-	echo -n "${THIN_OPTS}"
-}
-
-action() {
-	checkconfig || return 1
-
-	[ ${DO_BUNDLER} -ne 0 ] && RUBY="${RUBY} /usr/bin/bundle exec"
-
-	if [ ${SERVER} = thin ]; then
-		ebegin "$2 all thin servers in ${CONFIG}"
-		${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
-		eend $?
-	else
-		ebegin "$2 thin server ${SERVER}"
-		${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
-		eend $?
-	fi
-}
-
-start() {
-	action start 'Starting'
-}
-
-stop() {
-	action stop 'Stopping'
-}
-
-restart() {
-	action restart 'Restarting'
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o ${THIN_USER}:${THIN_GROUP} $(dirname ${THIN_PID})
-}

diff --git a/www-servers/thin/files/thin.initd-3 b/www-servers/thin/files/thin.initd-3
deleted file mode 100644
index 29406ce..0000000
--- a/www-servers/thin/files/thin.initd-3
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-SERVER=${SVCNAME#*.}
-if [ ${SERVER} != thin ]; then
-	CONFIG=${CONFIG:-/etc/thin/${SERVER}.yml}
-else
-	CONFIG=${CONFIG:-/etc/thin/}
-fi
-NOCONFIG=${NOCONFIG:-0}
-RUBY=${RUBY:-/usr/bin/ruby}
-DO_BUNDLER=${DO_BUNDLER:-0}
-CHDIR=${CHDIR:-}
-THIN_USER=${THIN_USER:-root}
-THIN_GROUP=${THIN_GROUP:-root}
-THIN_PID=${THIN_PID:-/var/run/thin/thin.pid}
-THIN_OPTS=${THIN_OPTS:-}
-
-depend() {
-	need localmount
-}
-
-checkconfig() {
-	if [ -n ${CHDIR} ]; then
-		cd "${CHDIR}"
-
-		if [ $? -ne 0 ]; then
-			eerror "Cannot cd into requested directory"
-			return 1
-		fi
-	fi
-
-	[ ${SERVER} = thin -o ${NOCONFIG} != 0 ] && return 0
-
-	if [ ! -f ${CONFIG} ]; then
-		eerror "Unable to find the server configuration."
-		eerror "Please set the CONFIG variable in /etc/conf.d/${SVCNAME} or"
-		eerror "set NOCONFIG there to 1 to disable looking for a config file."
-		return 1
-	fi
-}
-
-buildargs() {
-	if [ ${NOCONFIG} = 0 -a ${SERVER} != thin ]; then
-		echo -n "-C ${CONFIG} "
-	fi
-
-	echo -n "${THIN_OPTS}"
-}
-
-action() {
-	checkconfig || return 1
-
-	[ ${DO_BUNDLER} -ne 0 ] && RUBY="${RUBY} /usr/bin/bundle exec"
-
-	if [ ${SERVER} = thin ]; then
-		ebegin "$2 all thin servers in ${CONFIG}"
-		${RUBY} /usr/bin/thin $1 $(buildargs) --all ${CONFIG}
-		eend $?
-	else
-		ebegin "$2 thin server ${SERVER}"
-		${RUBY} /usr/bin/thin $(buildargs) --tag ${SERVER} $1
-		eend $?
-	fi
-}
-
-start() {
-	action start 'Starting'
-}
-
-stop() {
-	action stop 'Stopping'
-}
-
-restart() {
-	action restart 'Restarting'
-}
-
-start_pre() {
-	# If the path to the pidfile is /var/run/thin/foo/thin.pid
-	# then checkpath will fail if /var/run/thin/ does not exist.
-	# This caught infra...
-	d=$(dirname ${THIN_PID})
-	mkdir -p "$d"
-	checkpath -d -m 0775 -o ${THIN_USER}:${THIN_GROUP} "$d"
-}

diff --git a/www-servers/thin/thin-1.6.4-r1.ebuild b/www-servers/thin/thin-1.6.4-r1.ebuild
deleted file mode 100644
index 1d8e054..0000000
--- a/www-servers/thin/thin-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="spec:main spec:group:0 spec:group:1 spec:group:2"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/eventmachine-1.0.4:0
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 1.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	# nasty but too complex to fix up for now :(
-	use doc || rm tasks/rdoc.rake
-	use test || rm tasks/spec.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd-3 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}