From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWXV8-0005r7-T6 for garchives@archives.gentoo.org; Tue, 14 Jun 2011 17:34:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 018761C15E; Tue, 14 Jun 2011 17:33:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B50EC1C15E for ; Tue, 14 Jun 2011 17:33:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 332B01BC011 for ; Tue, 14 Jun 2011 17:33:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 950F68003C for ; Tue, 14 Jun 2011 17:33:38 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: Subject: [gentoo-commits] proj/webapp-config:overlay commit in: app-admin/files/, app-admin/ X-VCS-Repository: proj/webapp-config X-VCS-Files: app-admin/ChangeLog app-admin/Manifest app-admin/files/webapp-config-1.50.16-update-servers.patch app-admin/metadata.xml app-admin/webapp-config-1.50.18.ebuild X-VCS-Directories: app-admin/files/ app-admin/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: cf250861c9796df7bc2d920acb92e9a1a224e4fe Date: Tue, 14 Jun 2011 17:33:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d4003d0814aea9aa5f506b39e4151e99 commit: cf250861c9796df7bc2d920acb92e9a1a224e4fe Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jun 14 17:33:32 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jun 14 17:33:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/webapp-config= .git;a=3Dcommit;h=3Dcf250861 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 1547ba9dc6731= eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575= SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7 -DIST webapp-config-1.50.18.tar.gz 107458 RMD160 8687d2e82ff08fc1b02252fb= 1ffd2ef40a4fc51a SHA1 84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57 SHA256 4fd= c1f714025a00de237fd494dc7529890cb396cfdc5306d5478fba1745dd797 -EBUILD webapp-config-1.50.18.ebuild 1874 RMD160 d7b43504cc66cfab38e51a52= fe67b1bad5ea8337 SHA1 8566ef2e9d1f51ce867f063299bd7508ba74e453 SHA256 f24= e24eb92990bf921bda03e155beb879e243ec3177c625b67f9a3b47f0b934a -MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da= 39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996= fb92427ae41e4649b934ca495991b7852b855 -MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SH= A1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccb= c67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 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 @@ -=20 - allowed_servers =3D {'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} -=20 - server =3D self.config.get('USER', 'vhost_server') -=20 ---- 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 =3D get_user('lighttpd') - self.vhost_server_gid =3D get_group('lighttpd') -=20 --class Aolserver(Basic): -- -- name =3D 'Aolserver' -- desc =3D 'supports installation on Aolserver' -- dep =3D 'www-servers/aolserver' -- -- def set_server_user(self): -- self.vhost_server_uid =3D get_user('aolserver') -- self.vhost_server_gid =3D get_group('aolserver') -- - class Cherokee(Basic): -=20 - name =3D 'Cherokee' -@@ -336,9 +326,30 @@ - self.vhost_server_uid =3D get_user('cherokee') - self.vhost_server_gid =3D get_group('cherokee') -=20 -+class Nginx(Basic): -+ =20 -+ name =3D 'Nginx' -+ desc =3D 'supports installation on Nginx' -+ dep =3D 'www-servers/nginx' -+ =20 -+ def set_server_user(self): =20 -+ self.vhost_server_uid =3D get_user('nginx') -+ self.vhost_server_gid =3D get_group('nginx') -+ -+class Gatling(Basic): -+ =20 -+ name =3D 'Gatling' -+ desc =3D 'supports installation on Gatling' -+ dep =3D 'www-servers/gatling' -+ =20 -+ def set_server_user(self): =20 -+ self.vhost_server_uid =3D get_user('gatling') -+ self.vhost_server_gid =3D get_group('gatling') -+ - def listservers(): -=20 - 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 -=20 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 @@ - - -web-apps - - web-apps@gentoo.org - - + + + + The app-admin category contains non-core applications which relate to + system administration. + + + La categor=C3=ADa app-admin contiene aplicaciones para la administraci= =C3=B3n + del sistema. + + + Die Kategorie app-admin enth=C3=A4lt Applikationen zur Systemadministr= ation, + die nicht Bestandteil des Basissystems sind. + + + app-admin=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=81=AB=E3=81=AFnon-cor= =E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E7=AE=A1=E7=90=86=E3=81=AB=E9=96=A2=E9= =80=A3=E3=81=97=E3=81=9F=E3=82=A2=E3=83=97=E3=83=AA=E3=82=B1=E3=83=BC=E3=82= =B7=E3=83=A7=E3=83=B3=E3=81=8C=E5=90=AB=E3=81=BE=E3=82=8C=E3=81=BE=E3=81=99= =E3=80=82 + + + De app-admin categorie bevat applicaties met betrekking tot systeem + administratie. + + + Nh=C3=B3m app-admin category ch=E1=BB=A9a c=C3=A1c =E1=BB=A9ng d=E1=BB= =A5ng li=C3=AAn quan + =C4=91=E1=BA=BFn qu=E1=BA=A3n tr=E1=BB=8B h=E1=BB=87 th=E1=BB=91ng (kh= =C3=B4ng t=C3=ADnh c=C3=A1c =E1=BB=A9ng d=E1=BB=A5ng l=C3=B5i). + + + La categoria app-admin contiene applicazioni per l'amministrazione del= sistema. + + + A categoria app-admin cont=C3=A9m aplica=C3=A7=C3=B5es para a administ= ra=C3=A7=C3=A3o + do sistema. + + + Kategoria app-admin zawiera aplikacje dla administrator=C3=B3w systemu= . + + + diff --git a/app-admin/webapp-config-1.50.18.ebuild b/app-admin/webapp-co= nfig-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=3D"Gentoo's installer for web-based applications" -HOMEPAGE=3D"http://www.gentoo.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~x86-fbsd" -IUSE=3D"" -S=3D${WORKDIR}/${PF} - -DEPEND=3D"" - -src_install() { - - # According to this discussion: - # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.h= tml - # distutils does not provide for specifying two different script instal= l - # locations. Since we only install one script here the following should - # be ok - distutils_src_install --install-scripts=3D"/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 examp= les/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.ecl= ass.5.html -} - -src_test() { - cd ${S} - distutils_python_version - if [[ $PYVER_MAJOR > 1 ]] && [[ $PYVER_MINOR > 3 ]] ; then - einfo "Running webapp-config doctests..." - if ! PYTHONPATH=3D"." ${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 yo= ur" - einfo "config files in /etc/vhosts/webapp-config before you emerge any" - einfo "packages that use webapp-config." - echo - epause 5 -}