fix #213436

Package-Manager: portage-2.1.4.4

5 files changed, 20 insertions, 80 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 276651c431f5..a8a12a393e8c 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.62 2008/02/17 18:06:02 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.63 2008/04/03 10:24:04 hollow Exp $
+
+  03 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  webapp-config-1.50.16-r1.ebuild, -webapp-config-1.50.16-r2.ebuild,
+  webapp-config-1.50.16-r3.ebuild:
+  fix #213436
 
 *webapp-config-1.50.16-r3 (17 Feb 2008)
 
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 0197acf35716..0131d8b75529 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -6,15 +6,14 @@ AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93
 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
 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
-EBUILD webapp-config-1.50.16-r1.ebuild 1944 RMD160 8f419a2b5b2ed2025f1219c3d3977c818f3e09a3 SHA1 3701c901854ba8baf2a84e1cb1c3e567e32987bb SHA256 90a1400ec225dcd57c0e5fffab61c387fa0cc513feb4812e7eef2a0ca22c65c9
-EBUILD webapp-config-1.50.16-r2.ebuild 2001 RMD160 fccd162bb156d737cff33712321f8cfa9da6f329 SHA1 454eee2688299acdf144d52e63e6f4984593b00b SHA256 6537e9a4b99d5d843cbb0c8e77d969df15ddff455119a7cea060cf09a8cf6563
-EBUILD webapp-config-1.50.16-r3.ebuild 1960 RMD160 b4eff315c5138556c6515322f52f70d8e3bc73cb SHA1 f1c9861b1cb6d28b725849ec7f2c58399a216d37 SHA256 73253c29139dc4312b253615a6576151c8501a4b6ba60132b459bc3956ac4651
-MISC ChangeLog 22713 RMD160 56c670ec0fd0e36241ec06ff90b970a57967b149 SHA1 a97e074aae7674024ff54bd6c5e56fe4ae5922d2 SHA256 427a870dcc6e854a4f7a3ae4d115b9264a77c84ceb96346b9e821ee638f4b881
+EBUILD webapp-config-1.50.16-r1.ebuild 1892 RMD160 942e45965f1a87287ad3263455da83a0b3edf676 SHA1 2e41db232543e594907210c4ee8912c2d7535dee SHA256 015b926b2c295178c95e288b3c79b0e32ac635a5f072e118acb62ce2e1e6db90
+EBUILD webapp-config-1.50.16-r3.ebuild 1995 RMD160 82f031dd6dcbcf6353357f07a275f61ae7699bbf SHA1 a2a78ab9e1ad99f4a0895eb625e17a4b3f391ac1 SHA256 0fbf594b16dcb7a10fdc7c48d72453aaae3baa2a4d130a7392b9c3039e5299e3
+MISC ChangeLog 22882 RMD160 e440af3b28dd85124e3c59e30dd3af516d956428 SHA1 296662a567a39daf40fec42d84e3f589df757ae0 SHA256 80626049dfff1a8970bf48971236db987ca2eab95215d07fdaeaafdf0799a793
 MISC metadata.xml 225 RMD160 7081530104e84534030353cb15c4a541bb8d5e05 SHA1 af63626385169ab58c44695ebe4df705d455f94b SHA256 0986f8971072c8d055fccbc67cc59ac43eecd1f5592cd9c0ae729b23e550cc96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAke4d5MACgkQmPFBzbX68WGjsQCgmgnksjugFKUw0Cv2iMtU6gfu
-DCYAnjEGEK4zYOiLPjaaY7ffA/vODhn7
-=sdev
+iD8DBQFH9LBKmPFBzbX68WERAmSRAJ45UC5FJH39Z5yUIyGBvTSWOenEzQCdG5Yc
+E7+b/2pxNkv8TmwBUalwThE=
+=IuCy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
index f1b8d7829ec4..26e37bddfd15 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r1.ebuild,v 1.10 2007/08/25 11:44:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r1.ebuild,v 1.11 2008/04/03 10:24:04 hollow Exp $
 
 inherit eutils distutils
 
@@ -31,16 +31,15 @@ src_install() {
 	distutils_src_install --install-scripts="/usr/sbin"
 
 	dodir /etc/vhosts
-	cp config/webapp-config ${D}/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
+	doman doc/webapp-config.5 doc/webapp-config.8
+	dohtml doc/webapp-config.5.html doc/webapp-config.8.html
 }
 
 src_test() {
-	cd ${S}
 	distutils_python_version
 	if [[ $PYVER_MAJOR -gt 1 ]] && [[ $PYVER_MINOR -gt 3 ]] ; then
 		elog "Running webapp-config doctests..."
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild
deleted file mode 100644
index 4bd529fdb9f8..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.16-r2.ebuild
+++ /dev/null
@@ -1,64 +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.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/${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=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-apache-move.patch
-	epatch "${FILESDIR}"/${P}-baselayout2.patch
-}
-
-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 -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"
-			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-r3.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
index 12eb57b92aa7..341727325b79 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/02/17 18:06:02 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r3.ebuild,v 1.2 2008/04/03 10:24:04 hollow Exp $
 
 inherit eutils distutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-baselayout2.patch
 	epatch "${FILESDIR}"/${P}-htdocs-symlink.patch
 	epatch "${FILESDIR}"/${P}-absolute-paths.patch
+	rm -f doc/webapp.eclass.5{,.html}
 }
 
 src_install() {