Added support to www-servers/{nginx,gatling}. Thanks to Fernando V. (bug #211996)

Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64

4 files changed, 94 insertions, 4 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 94cc06d7dd2e..adc1d010678b 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.67 2010/10/04 00:01:32 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.68 2010/12/19 18:31:55 rafaelmartins Exp $
+
+*webapp-config-1.50.16-r4 (19 Dec 2010)
+
+  19 Dec 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -webapp-config-1.50.16-r3.ebuild, +webapp-config-1.50.16-r4.ebuild,
+  +files/webapp-config-1.50.16-update-servers.patch:
+  Added support to www-servers/{nginx,gatling}. Thanks to Fernando V. (bug
+  #211996)
 
   03 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
   webapp-config-1.50.16-r1.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 6b805b4b2a0a..ea07f070d17b 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -2,8 +2,9 @@ AUX webapp-config-1.50.16-absolute-paths.patch 1707 RMD160 80f07c8b98c69e13d1c5f
 AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a SHA1 b963fb9cc2b6f10e6dbcf5a3db1178be20268fd6 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790
 AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360
 AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996925c9562d77fc1fdb5 SHA1 0adaefe78f272f32a939f56f941634c7f3c8ed6a SHA256 24e48a42f2b08010ad25f5f83bf4f3f47686fbcd786c0547e95c054cf7021b75
+AUX webapp-config-1.50.16-update-servers.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
 EBUILD webapp-config-1.50.16-r1.ebuild 1926 RMD160 fa1be7b2e9d11adc4abaa6b81f3c3eb8edd6e6a5 SHA1 991f609d362503bf43bd3329f5583811cf45a1fa SHA256 9c0e3e66f28c8b0732038fab94aefa148bad4eea14151d1b54cede8cc222f365
-EBUILD webapp-config-1.50.16-r3.ebuild 2079 RMD160 d7f2cbdd6dcab5c5114b5a8827a00b919779fc40 SHA1 a708fff98f08d71e5a943e79a2edb11eedae12e1 SHA256 a9e23c9d8cd17b8eb6aad2f48c93025fd3e440ed0beb98cefc70fa80214fc39c
-MISC ChangeLog 23531 RMD160 a940d6a624885ddc8acc7d0f38cc8ab2b98a99de SHA1 82c6d924acbbf6eb1ee2af0ee80f75b12fbf375d SHA256 092b1200ce310188375358a1e755b2b2d2f8e14f3c1291a820a3d68a64428a5e
+EBUILD webapp-config-1.50.16-r4.ebuild 2132 RMD160 f01f67461d6131672489339b1cd660708619895b SHA1 ce0409138b94698faa3b7834dba84d468d9969a3 SHA256 ac922725facefebbab930cfc0b8713069fa230abfba5a0359e44b778dccc3e6f
+MISC ChangeLog 23847 RMD160 a0398d6b6730af71f0539b08ce19641c2a57ea16 SHA1 aaacf281b213cb04ce9d9709c2aa60c0d065135e SHA256 b24adbeb8068222e444cfd90c70723e053701df8fddeb3004b5e5e4d70f36433
 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 000000000000..f6e7bbd54144
--- /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/webapp-config-1.50.16-r3.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
index 1e943605f09c..a0508306003c 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.16-r3.ebuild,v 1.5 2010/10/03 23:49:12 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.1 2010/12/19 18:31:55 rafaelmartins Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -28,6 +28,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-baselayout2.patch"
 	epatch "${FILESDIR}/${P}-htdocs-symlink.patch"
 	epatch "${FILESDIR}/${P}-absolute-paths.patch"
+	epatch "${FILESDIR}/${P}-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//' \