fix functions.sh usage for baselayout-2

(Portage version: 2.1.3.7)

6 files changed, 32 insertions, 66 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/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"