Bump to test 1.50.18.1

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 175 insertions, 0 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
new file mode 100644
index 0000000..dc88b28
--- /dev/null
+++ b/app-admin/webapp-config/ChangeLog
@@ -0,0 +1,5 @@
+
+
+  14 Jun 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Bump to test 1.50.18.1
+
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
new file mode 100644
index 0000000..458852c
--- /dev/null
+++ b/app-admin/webapp-config/Manifest
@@ -0,0 +1,5 @@
+AUX webapp-config-1.50.16-update-servers.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
+DIST webapp-config-1.50.18.1.tar.bz2 79352 RMD160 29a884d9905fdf9da8ec349f0d079227f55b47ff SHA1 d00e6a49f2d42f181c818b428928857660f3cde0 SHA256 d90f54f8bc56595dbd165561aaac1f692aafd3e4fb920d930cd6b96eb869e4c8
+EBUILD webapp-config-1.50.18.1.ebuild 2079 RMD160 37c2601764a68bee4fdf30d4a089b25a6bc0c183 SHA1 1cbd465668ae46d2df5fcabf9a501de792c44c93 SHA256 6942a556495f7441c7da8d18585cd209c4c455932f4fb81cc9ec31576d525239
+MISC ChangeLog 94 RMD160 dc921ff0e7b021f83484da1b1a8d7ec78cbae72c SHA1 a66d3a605f3cb747db4c51f703b3257011639991 SHA256 0fb4172d9972b58913d3d8069fbb47114b8274b4ed6002ce6b76956e5b989502
+MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch
new file mode 100644
index 0000000..f6e7bbd
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch
@@ -0,0 +1,80 @@
+--- WebappConfig/config.py	2006-12-30 13:38:36.000000000 -0500
++++ config.py	2009-05-28 12:08:53.000000000 -0400
+@@ -1289,8 +1289,9 @@
+ 
+         allowed_servers = {'apache'   : WebappConfig.server.Apache,
+                            'lighttpd' : WebappConfig.server.Lighttpd,
+-                           'aolserver': WebappConfig.server.Aolserver,
+-                           'cherokee' : WebappConfig.server.Cherokee}
++                           'cherokee' : WebappConfig.server.Cherokee,
++			   'nginx'    : WebappConfig.server.Nginx,
++			   'gatling'  : WebappConfig.server.Gatling}
+ 
+         server = self.config.get('USER', 'vhost_server')
+ 
+--- WebappConfig/server.py	2009-05-28 12:06:48.000000000 -0400
++++ server.py	2009-05-28 12:10:54.000000000 -0400
+@@ -316,16 +316,6 @@
+         self.vhost_server_uid = get_user('lighttpd')
+         self.vhost_server_gid = get_group('lighttpd')
+ 
+-class Aolserver(Basic):
+-
+-    name   = 'Aolserver'
+-    desc   = 'supports installation on Aolserver'
+-    dep    = 'www-servers/aolserver'
+-
+-    def set_server_user(self):
+-        self.vhost_server_uid = get_user('aolserver')
+-        self.vhost_server_gid = get_group('aolserver')
+-
+ class Cherokee(Basic):
+ 
+     name   = 'Cherokee'
+@@ -336,9 +326,30 @@
+         self.vhost_server_uid = get_user('cherokee')
+         self.vhost_server_gid = get_group('cherokee')
+ 
++class Nginx(Basic):
++           
++    name   = 'Nginx'
++    desc   = 'supports installation on Nginx'
++    dep    = 'www-servers/nginx'
++                              
++    def set_server_user(self):          
++        self.vhost_server_uid = get_user('nginx')
++        self.vhost_server_gid = get_group('nginx')
++
++class Gatling(Basic):
++           
++    name   = 'Gatling'
++    desc   = 'supports installation on Gatling'
++    dep    = 'www-servers/gatling'
++                              
++    def set_server_user(self):          
++        self.vhost_server_uid = get_user('gatling')
++        self.vhost_server_gid = get_group('gatling')
++
+ def listservers():
+ 
+     OUT.notice('\n'.join(['apache',
+-                          'aolserver',
+                           'lighttpd',
+-                          'cherokee']))
++                          'cherokee',
++			  'nginx',
++			  'gatling']))
+--- config/webapp-config	2006-12-30 13:39:13.000000000 -0500
++++ webapp-config	2009-05-28 12:11:24.000000000 -0400
+@@ -65,9 +65,10 @@
+ # your choices are:
+ #
+ # apache
+-# aolserver
+ # lighttpd
+ # cherokee
++# nginx
++# gatling
+ #
+ # you can override this setting by using the -s switch to webapp-config
+ 
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
new file mode 100644
index 0000000..bee101f
--- /dev/null
+++ b/app-admin/webapp-config/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+<maintainer>
+  <email>web-apps@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/webapp-config/webapp-config-1.50.18.1.ebuild b/app-admin/webapp-config/webapp-config-1.50.18.1.ebuild
new file mode 100644
index 0000000..e96f126
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.50.18.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.18.ebuild,v 1.1 2011/02/04 18:45:13 robbat2 Exp $
+
+EAPI="3"
+
+inherit distutils eutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://www.gentoo.org/proj/en/webapps/webapp-config.xml"
+SRC_URI="http://dev.gentoo.org/~blueness/webapp-config/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-text/xmlto"
+RDEPEND=""
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="WebappConfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.50.16-update-servers.patch"
+	# Do not build nor install eclass manual, bug 322759
+	rm -f doc/webapp.eclass.5*
+	sed -e '/MAN_PAGES/s/webapp.eclass.5//' \
+		-e '/HTML_PAGES/s/webapp.eclass.5.html//' \
+		-i doc/Makefile || die
+}
+
+src_compile() {
+	distutils_src_compile
+	cd "${S}"/doc
+	emake
+}
+
+src_install() {
+	# According to this discussion:
+	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+	# distutils does not provide for specifying two different script install
+	# locations. Since we only install one script here the following should
+	# be ok
+	distutils_src_install --install-scripts="/usr/sbin"
+
+	python_convert_shebangs 2 "${ED}usr/sbin/webapp-config"
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS CHANGES
+	dodoc AUTHORS CHANGES
+	doman doc/webapp-config.5 doc/webapp-config.8
+	dohtml doc/webapp-config.5.html doc/webapp-config.8.html
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "Now that you have upgraded webapp-config, you **must** update your"
+	elog "config files in /etc/vhosts/webapp-config before you emerge any"
+	elog "packages that use webapp-config."
+}