Fixed trailing slashes for the -d flag. Support for symlinked directories. Ebuild now provides src_test

(Portage version: 2.0.53)

11 files changed, 28 insertions, 149 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index ac0f307410fc..5dd0fd278df5 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.5 2005/12/16 15:38:40 stuart Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.6 2006/01/04 21:14:28 wrobel Exp $
+
+*webapp-config-1.50.5 (04 Jan 2006)
+
+  04 Jan 2006; <wrobel@gentoo.org> -webapp-config-1.50.ebuild,
+  -webapp-config-1.50.1.ebuild, -webapp-config-1.50.2.ebuild,
+  -webapp-config-1.50.3.ebuild, +webapp-config-1.50.5.ebuild:
+  Fixed trailing slashes for the -d flag. Support for symlinked directories.
+  Ebuild now provides src_test
 
 *webapp-config-1.50.3 (12 Dec 2005)
 
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index b3cc3b199a50..990b6c89f2ce 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,12 +1,6 @@
+MD5 22cefe943f4ec00480c7c76d769228a9 ChangeLog 14699
+MD5 6aad9c4cd4548cb948cd4035286d6ac7 files/digest-webapp-config-1.11 70
+MD5 e8855335e1cbec026f63ac19fde91963 files/digest-webapp-config-1.50.5 71
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 f50f507ef4796fcd58da343f44578cc2 ChangeLog 14366
-MD5 c5a532ad2426cce530602b71c9ee8b4b webapp-config-1.50.ebuild 1477
-MD5 2eb01b277c1042ffd36347ee2249e45c webapp-config-1.50.1.ebuild 1479
-MD5 cd6d23474b069c6bb48e257f17553240 webapp-config-1.50.2.ebuild 1478
-MD5 78c4d60bcfe473541a1ad73137cd511a webapp-config-1.50.3.ebuild 1478
 MD5 90bba75c31e392fd21e084681aeca6ae webapp-config-1.11.ebuild 1408
-MD5 6aad9c4cd4548cb948cd4035286d6ac7 files/digest-webapp-config-1.11 70
-MD5 e0ab089ccc94a202746357f31ce03c5c files/digest-webapp-config-1.50 70
-MD5 d85bb9dd6a593e172a4815e2a751ae6f files/digest-webapp-config-1.50.1 72
-MD5 b24eeb16cb448bd63df034558278cca0 files/digest-webapp-config-1.50.2 71
-MD5 08c3405d9741fdeedcdf05b41e4db14e files/digest-webapp-config-1.50.3 71
+MD5 659be752eb313d0aac3c2f0a904f8588 webapp-config-1.50.5.ebuild 1523
diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50 b/app-admin/webapp-config/files/digest-webapp-config-1.50
deleted file mode 100644
index afa705e84c68..000000000000
--- a/app-admin/webapp-config/files/digest-webapp-config-1.50
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9df083213eaa286c2ea84c4900df143d webapp-config-1.50.tar.bz2 90519
diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.1 b/app-admin/webapp-config/files/digest-webapp-config-1.50.1
deleted file mode 100644
index 816c8351f8ce..000000000000
--- a/app-admin/webapp-config/files/digest-webapp-config-1.50.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b18c7fc1f60d24c0cd2054bda69de7c1 webapp-config-1.50.1.tar.bz2 90578
diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.2 b/app-admin/webapp-config/files/digest-webapp-config-1.50.2
deleted file mode 100644
index 1754998f70c0..000000000000
--- a/app-admin/webapp-config/files/digest-webapp-config-1.50.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e81f93f63c82a1452038878560368781 webapp-config-1.50.2.tar.gz 84852
diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.3 b/app-admin/webapp-config/files/digest-webapp-config-1.50.3
deleted file mode 100644
index 8de21ee51383..000000000000
--- a/app-admin/webapp-config/files/digest-webapp-config-1.50.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af451b1363e078a12aba861fe5aef0bc webapp-config-1.50.3.tar.gz 84875
diff --git a/app-admin/webapp-config/files/digest-webapp-config-1.50.5 b/app-admin/webapp-config/files/digest-webapp-config-1.50.5
new file mode 100644
index 000000000000..7b7ce807a787
--- /dev/null
+++ b/app-admin/webapp-config/files/digest-webapp-config-1.50.5
@@ -0,0 +1 @@
+MD5 294e87407cb8097f7ea6f242d7003d26 webapp-config-1.50.5.tar.gz 93538
diff --git a/app-admin/webapp-config/webapp-config-1.50.1.ebuild b/app-admin/webapp-config/webapp-config-1.50.1.ebuild
deleted file mode 100644
index 76ae4358954a..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.1.ebuild,v 1.1 2005/11/24 21:25:49 stuart Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~stuart/webapp-config/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-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
-	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
-}
-
-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
-}
diff --git a/app-admin/webapp-config/webapp-config-1.50.3.ebuild b/app-admin/webapp-config/webapp-config-1.50.3.ebuild
deleted file mode 100644
index 4ad54089deb4..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.3.ebuild,v 1.1 2005/12/16 15:38:40 stuart Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~stuart/webapp-config/${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-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
-	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
-}
-
-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
-}
diff --git a/app-admin/webapp-config/webapp-config-1.50.2.ebuild b/app-admin/webapp-config/webapp-config-1.50.5.ebuild
index 539a2bfc4792..8399bb59c451 100644
--- a/app-admin/webapp-config/webapp-config-1.50.2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.ebuild,v 1.1 2005/12/05 00:02:15 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.5.ebuild,v 1.1 2006/01/04 21:14:28 wrobel Exp $
 
 inherit eutils distutils
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~stuart/webapp-config/${PF}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~wrobel/webapp-config/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 S=${WORKDIR}/${PF}
 
@@ -33,6 +33,15 @@ src_install() {
 	dohtml doc/webapp-config.5.html doc/webapp-config.8.html doc/webapp.eclass.5.html
 }
 
+src_test() {
+	cd ${S}
+	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
+}
+
 pkg_postinst() {
 	echo
 	einfo "Now that you have upgraded webapp-config, you **must** update your"
diff --git a/app-admin/webapp-config/webapp-config-1.50.ebuild b/app-admin/webapp-config/webapp-config-1.50.ebuild
deleted file mode 100644
index 8327af66cf33..000000000000
--- a/app-admin/webapp-config/webapp-config-1.50.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.1 2005/11/20 12:22:25 stuart Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~stuart/webapp-config/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-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
-	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
-}
-
-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
-}