diff options
Diffstat (limited to 'app-admin/webapp-config')
| -rw-r--r-- | app-admin/webapp-config/ChangeLog | 10 | ||||
| -rw-r--r-- | app-admin/webapp-config/Manifest | 42 | ||||
| -rw-r--r-- | app-admin/webapp-config/files/digest-webapp-config-1.50.15 | 3 | ||||
| -rw-r--r-- | app-admin/webapp-config/files/digest-webapp-config-1.50.16-r2 (renamed from app-admin/webapp-config/files/digest-webapp-config-1.50.16) | 0 | ||||
| -rw-r--r-- | app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch | 13 | ||||
| -rw-r--r-- | app-admin/webapp-config/webapp-config-1.50.15.ebuild | 58 | ||||
| -rw-r--r-- | app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild (renamed from app-admin/webapp-config/webapp-config-1.50.16.ebuild) | 14 |
7 files changed, 51 insertions, 89 deletions
diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog index 80a6cc946326..337659138137 100644 --- a/app-admin/webapp-config/ChangeLog +++ b/app-admin/webapp-config/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/webapp-config # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.60 2007/08/24 18:19:16 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.61 2007/09/09 21:11:40 hollow Exp $ + +*webapp-config-1.50.16-r2 (09 Sep 2007) + + 09 Sep 2007; Benedikt Böhm <hollow@gentoo.org> + +files/webapp-config-1.50.16-baselayout2.patch, + -webapp-config-1.50.15.ebuild, -webapp-config-1.50.16.ebuild, + +webapp-config-1.50.16-r2.ebuild: + fix functions.sh usage for baselayout-2 24 Aug 2007; Samuli Suominen <drac@gentoo.org> webapp-config-1.50.16-r1.ebuild: diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest index e87699778a76..2bfe325a9f06 100644 --- a/app-admin/webapp-config/Manifest +++ b/app-admin/webapp-config/Manifest @@ -5,41 +5,37 @@ AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93 MD5 c2e150d2872b946a23105d1244449c3e files/webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a files/webapp-config-1.50.16-apache-move.patch 507 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790 files/webapp-config-1.50.16-apache-move.patch 507 -DIST webapp-config-1.50.15.tar.gz 96613 RMD160 4af40ee794af1faed79fdd5bd3ce9805d42580b5 SHA1 8597809920fdc003c7c7b0b7abd47c9fd43c708f SHA256 f64b948fa91f616a29c9cfdab19cd8e942e50156808dadb2278612725cf1d716 +AUX webapp-config-1.50.16-baselayout2.patch 511 RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b SHA1 1d69d0d88a750b05389b71771b371650eaa89913 SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360 +MD5 498c283f04ce9a0c27240811f0ccfee0 files/webapp-config-1.50.16-baselayout2.patch 511 +RMD160 cfe440f27a29d0db4b536db5b3fe5655ccf1120b files/webapp-config-1.50.16-baselayout2.patch 511 +SHA256 b94bbd0075f22b735189bd6af334ee68f563470632f96f53fa055a0655fb0360 files/webapp-config-1.50.16-baselayout2.patch 511 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f -EBUILD webapp-config-1.50.15.ebuild 1879 RMD160 cc2d06c20f9f815a4f7958cd66d64e2f12927f4f SHA1 0cd114fa3a84ed91c698872b8429a224727eb0de SHA256 25bb02dcb43dfc501274d97e2b93f8abeffe19458b098ac58ba298de96bda78c -MD5 3ea0e2500b820fcaafe41f4677042773 webapp-config-1.50.15.ebuild 1879 -RMD160 cc2d06c20f9f815a4f7958cd66d64e2f12927f4f webapp-config-1.50.15.ebuild 1879 -SHA256 25bb02dcb43dfc501274d97e2b93f8abeffe19458b098ac58ba298de96bda78c webapp-config-1.50.15.ebuild 1879 EBUILD webapp-config-1.50.16-r1.ebuild 1944 RMD160 8f419a2b5b2ed2025f1219c3d3977c818f3e09a3 SHA1 3701c901854ba8baf2a84e1cb1c3e567e32987bb SHA256 90a1400ec225dcd57c0e5fffab61c387fa0cc513feb4812e7eef2a0ca22c65c9 MD5 8a6714e521986075b2440649d79a1ff2 webapp-config-1.50.16-r1.ebuild 1944 RMD160 8f419a2b5b2ed2025f1219c3d3977c818f3e09a3 webapp-config-1.50.16-r1.ebuild 1944 SHA256 90a1400ec225dcd57c0e5fffab61c387fa0cc513feb4812e7eef2a0ca22c65c9 webapp-config-1.50.16-r1.ebuild 1944 -EBUILD webapp-config-1.50.16.ebuild 1882 RMD160 0b5ac82fe3eed0b19669229af3f9a7d2333be17a SHA1 1a97a2bde53ed336c76ba5832197963e8ea87d06 SHA256 d48ad4be30d1f9cb2a7ed6792043032fd49c6bd80cfe92a04dd0ed9baa25e017 -MD5 ae42996be315be55c4b583e8a8f6dffb webapp-config-1.50.16.ebuild 1882 -RMD160 0b5ac82fe3eed0b19669229af3f9a7d2333be17a webapp-config-1.50.16.ebuild 1882 -SHA256 d48ad4be30d1f9cb2a7ed6792043032fd49c6bd80cfe92a04dd0ed9baa25e017 webapp-config-1.50.16.ebuild 1882 -MISC ChangeLog 22161 RMD160 60d7d3da8aa1761350b776e803efa5adcf824dc2 SHA1 ac13a51aa4be4624e37a79fa541154581bfc7e3e SHA256 131c0d939a66295214e59a7e3937749e8982d6423f8a06a75a36070ea9df61b7 -MD5 1959a3279ba72ee3252dc58e172200dd ChangeLog 22161 -RMD160 60d7d3da8aa1761350b776e803efa5adcf824dc2 ChangeLog 22161 -SHA256 131c0d939a66295214e59a7e3937749e8982d6423f8a06a75a36070ea9df61b7 ChangeLog 22161 +EBUILD webapp-config-1.50.16-r2.ebuild 2001 RMD160 fccd162bb156d737cff33712321f8cfa9da6f329 SHA1 454eee2688299acdf144d52e63e6f4984593b00b SHA256 6537e9a4b99d5d843cbb0c8e77d969df15ddff455119a7cea060cf09a8cf6563 +MD5 6d996ead9a1d8704fcbd1a28c9698e20 webapp-config-1.50.16-r2.ebuild 2001 +RMD160 fccd162bb156d737cff33712321f8cfa9da6f329 webapp-config-1.50.16-r2.ebuild 2001 +SHA256 6537e9a4b99d5d843cbb0c8e77d969df15ddff455119a7cea060cf09a8cf6563 webapp-config-1.50.16-r2.ebuild 2001 +MISC ChangeLog 22447 RMD160 6207422854eaa5873dfd6de4435effb1d2ab81a0 SHA1 5245aee817209076daf0b162cb2f8e72165f3809 SHA256 6ba428b9fdb490e3f6ebfaa7843a73d4fb2e6c0e5e023e91e48e7c8b44b86a24 +MD5 17316ccb419fe6a80a7d0078d3b20425 ChangeLog 22447 +RMD160 6207422854eaa5873dfd6de4435effb1d2ab81a0 ChangeLog 22447 +SHA256 6ba428b9fdb490e3f6ebfaa7843a73d4fb2e6c0e5e023e91e48e7c8b44b86a24 ChangeLog 22447 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 metadata.xml 225 SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96 metadata.xml 225 -MD5 77699d3b1037d412cf177d6f891f6cd4 files/digest-webapp-config-1.50.15 262 -RMD160 d71cde8b2876cd4a94a04bcd019867d9f793d7b7 files/digest-webapp-config-1.50.15 262 -SHA256 03574feac14d209a304e20a7e18c6a30c0cad2a15ca44c531da28211691762ae files/digest-webapp-config-1.50.15 262 -MD5 9d0c6677cd89cd41836333c4a5ec1723 files/digest-webapp-config-1.50.16 265 -RMD160 a463796b307e9cd1f7e8ff8f31859cb62f5396f2 files/digest-webapp-config-1.50.16 265 -SHA256 ca173a95748f9c13bb67a7cdc3b5a2d4331635d4cd3da463886c0c320d8939b9 files/digest-webapp-config-1.50.16 265 MD5 9d0c6677cd89cd41836333c4a5ec1723 files/digest-webapp-config-1.50.16-r1 265 RMD160 a463796b307e9cd1f7e8ff8f31859cb62f5396f2 files/digest-webapp-config-1.50.16-r1 265 SHA256 ca173a95748f9c13bb67a7cdc3b5a2d4331635d4cd3da463886c0c320d8939b9 files/digest-webapp-config-1.50.16-r1 265 +MD5 9d0c6677cd89cd41836333c4a5ec1723 files/digest-webapp-config-1.50.16-r2 265 +RMD160 a463796b307e9cd1f7e8ff8f31859cb62f5396f2 files/digest-webapp-config-1.50.16-r2 265 +SHA256 ca173a95748f9c13bb67a7cdc3b5a2d4331635d4cd3da463886c0c320d8939b9 files/digest-webapp-config-1.50.16-r2 265 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.5 (GNU/Linux) +Version: GnuPG v2.0.6 (GNU/Linux) -iD8DBQFG0BaEp/wUKkr7RBoRAnerAKCBOsbxFqjcm19nMYx0UByWlBOBhQCgvKFN -hE0sdmJUKKqqiEFpK5DDeIc= -=16aK +iD8DBQFG5GGVmPFBzbX68WERAuMVAJ0cOOeLoUm/SSCTkSSxth6MNM537gCgl/Uk +Z01riUkURp7xVRuwCEB9lAs= +=ZXJg -----END PGP SIGNATURE----- diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.15 b/app-admin/webapp-config/files/digest-webapp-config-1.50.15 deleted file mode 100644 index bf4c237598ea..000000000000 --- a/app-admin/webapp-config/files/digest-webapp-config-1.50.15 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f8d631e81c240c62a4d48b66dbe27596 webapp-config-1.50.15.tar.gz 96613 -RMD160 4af40ee794af1faed79fdd5bd3ce9805d42580b5 webapp-config-1.50.15.tar.gz 96613 -SHA256 f64b948fa91f616a29c9cfdab19cd8e942e50156808dadb2278612725cf1d716 webapp-config-1.50.15.tar.gz 96613 diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.16 b/app-admin/webapp-config/files/digest-webapp-config-1.50.16-r2 index c0d0cea0a270..c0d0cea0a270 100644 --- a/app-admin/webapp-config/files/digest-webapp-config-1.50.16 +++ b/app-admin/webapp-config/files/digest-webapp-config-1.50.16-r2 diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch new file mode 100644 index 000000000000..86274253f0d5 --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch @@ -0,0 +1,13 @@ +Index: webapp-config-1.50.16/sbin/webapp-cleaner +=================================================================== +--- webapp-config-1.50.16.orig/sbin/webapp-cleaner ++++ webapp-config-1.50.16/sbin/webapp-cleaner +@@ -11,7 +11,7 @@ CMD="emerge -Cav" + WEBAPP_DIR="/usr/share/webapps" + WEBAPP_CONFIG= + +-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh ++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh + + function help() { + echo "Remove obsolete and unused versions of web applications" diff --git a/app-admin/webapp-config/webapp-config-1.50.15.ebuild b/app-admin/webapp-config/webapp-config-1.50.15.ebuild deleted file mode 100644 index f06b5ec188cb..000000000000 --- a/app-admin/webapp-config/webapp-config-1.50.15.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2007 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.15.ebuild,v 1.11 2007/01/02 23:08:46 rl03 Exp $ - -inherit eutils distutils - -DESCRIPTION="Gentoo's installer for web-based applications" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="http://dev.gentoo.org/~wrobel/webapp-config/${PF}.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 TODO.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 - elog "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 - elog "Python version below 2.4! Disabling tests." - fi -} - -pkg_postinst() { - echo - 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." - echo - epause 5 -} diff --git a/app-admin/webapp-config/webapp-config-1.50.16.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild index cadaacda1490..4bd529fdb9f8 100644 --- a/app-admin/webapp-config/webapp-config-1.50.16.ebuild +++ b/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild @@ -1,21 +1,27 @@ # Copyright 1999-2007 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.ebuild,v 1.1 2007/01/04 11:05:10 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild,v 1.1 2007/09/09 21:11:40 hollow Exp $ inherit eutils distutils DESCRIPTION="Gentoo's installer for web-based applications" HOMEPAGE="http://www.gentoo.org/" -SRC_URI="http://build.pardus.de/downloads/${PF}.tar.gz" +SRC_URI="http://build.pardus.de/downloads/${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_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-apache-move.patch + epatch "${FILESDIR}"/${P}-baselayout2.patch +} + src_install() { # According to this discussion: @@ -37,7 +43,7 @@ src_install() { src_test() { cd ${S} distutils_python_version - if [[ $PYVER_MAJOR > 1 ]] && [[ $PYVER_MINOR > 3 ]] ; then + if [[ $PYVER_MAJOR -gt 1 ]] && [[ $PYVER_MINOR -gt 3 ]] ; then elog "Running webapp-config doctests..." if ! PYTHONPATH="." ${python} WebappConfig/tests/dtest.py; then eerror "DocTests failed - please submit a bug report" |