* [gentoo-commits] proj/webapp-config:overlay commit in: app-admin/files/, app-admin/
@ 2011-06-14 17:33 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2011-06-14 17:33 UTC (permalink / raw
To: gentoo-commits
commit: cf250861c9796df7bc2d920acb92e9a1a224e4fe
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 17:33:32 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 17:33:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=cf250861
Fixed repo/git stupidity
---
app-admin/Manifest | 5 -
.../webapp-config-1.50.16-update-servers.patch | 80 --------------------
app-admin/metadata.xml | 44 +++++++++--
app-admin/webapp-config-1.50.18.ebuild | 58 --------------
4 files changed, 37 insertions(+), 150 deletions(-)
diff --git a/app-admin/ChangeLog b/app-admin/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/app-admin/Manifest b/app-admin/Manifest
deleted file mode 100644
index d03d06b..0000000
--- a/app-admin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX webapp-config-1.50.16-update-servers.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
-DIST webapp-config-1.50.18.tar.gz 107458 RMD160 8687d2e82ff08fc1b02252fb1ffd2ef40a4fc51a SHA1 84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57 SHA256 4fdc1f714025a00de237fd494dc7529890cb396cfdc5306d5478fba1745dd797
-EBUILD webapp-config-1.50.18.ebuild 1874 RMD160 d7b43504cc66cfab38e51a52fe67b1bad5ea8337 SHA1 8566ef2e9d1f51ce867f063299bd7508ba74e453 SHA256 f24e24eb92990bf921bda03e155beb879e243ec3177c625b67f9a3b47f0b934a
-MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
diff --git a/app-admin/files/webapp-config-1.50.16-update-servers.patch b/app-admin/files/webapp-config-1.50.16-update-servers.patch
deleted file mode 100644
index f6e7bbd..0000000
--- a/app-admin/files/webapp-config-1.50.16-update-servers.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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/metadata.xml b/app-admin/metadata.xml
index bee101f..b15417f 100644
--- a/app-admin/metadata.xml
+++ b/app-admin/metadata.xml
@@ -1,8 +1,38 @@
<?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>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-admin category contains non-core applications which relate to
+ system administration.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría app-admin contiene aplicaciones para la administración
+ del sistema.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-admin enthält Applikationen zur Systemadministration,
+ die nicht Bestandteil des Basissystems sind.
+ </longdescription>
+ <longdescription lang="ja">
+ app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
+ </longdescription>
+ <longdescription lang="nl">
+ De app-admin categorie bevat applicaties met betrekking tot systeem
+ administratie.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm app-admin category chứa các ứng dụng liên quan
+ đến quản trị hệ thống (không tính các ứng dụng lõi).
+ </longdescription>
+ <longdescription lang="it">
+ La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-admin contém aplicações para a administração
+ do sistema.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-admin zawiera aplikacje dla administratorów systemu.
+ </longdescription>
+</catmetadata>
+
diff --git a/app-admin/webapp-config-1.50.18.ebuild b/app-admin/webapp-config-1.50.18.ebuild
deleted file mode 100644
index eb6a2c8..0000000
--- a/app-admin/webapp-config-1.50.18.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2006 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.14.ebuild,v 1.2 2006/04/22 21:41:52 flameeyes Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-S=${WORKDIR}/${PF}
-
-DEPEND=""
-
-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"
-
- dodir /etc/vhosts
- cp config/webapp-config ${D}/etc/vhosts/
- keepdir /usr/share/webapps
- keepdir /var/db/webapps
- dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt CHANGES.txt examples/postinstall-en.txt
- doman doc/webapp-config.5 doc/webapp-config.8 doc/webapp.eclass.5
- dohtml doc/webapp-config.5.html doc/webapp-config.8.html doc/webapp.eclass.5.html
-}
-
-src_test() {
- cd ${S}
- distutils_python_version
- if [[ $PYVER_MAJOR > 1 ]] && [[ $PYVER_MINOR > 3 ]] ; then
- einfo "Running webapp-config doctests..."
- if ! PYTHONPATH="." ${python} WebappConfig/tests/dtest.py; then
- eerror "DocTests failed - please submit a bug report"
- die "DocTesting failed!"
- fi
- else
- einfo "Python version below 2.4! Disabling tests."
- fi
-}
-
-pkg_postinst() {
- echo
- einfo "Now that you have upgraded webapp-config, you **must** update your"
- einfo "config files in /etc/vhosts/webapp-config before you emerge any"
- einfo "packages that use webapp-config."
- echo
- epause 5
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-14 17:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-14 17:33 [gentoo-commits] proj/webapp-config:overlay commit in: app-admin/files/, app-admin/ Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox