Bug #353231: Version bump.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

2 files changed, 82 insertions, 2 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index adc1d010678b..0c4d51c2649b 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webapp-config
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.68 2010/12/19 18:31:55 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.69 2011/02/04 18:45:13 robbat2 Exp $
+
+*webapp-config-1.50.18 (04 Feb 2011)
+
+  04 Feb 2011; Robin H. Johnson <robbat2@gentoo.org>
+  +webapp-config-1.50.18.ebuild:
+  Bug #353231: Version bump.
 
 *webapp-config-1.50.16-r4 (19 Dec 2010)
 
diff --git a/app-admin/webapp-config/webapp-config-1.50.18.ebuild b/app-admin/webapp-config/webapp-config-1.50.18.ebuild
new file mode 100644
index 000000000000..7ab2d6b64daa
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.50.18.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 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.18.ebuild,v 1.1 2011/02/04 18:45:13 robbat2 Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+		 mirror://sourceforge/${PN}/${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=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="WebappConfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.50.16-apache-move.patch"
+	epatch "${FILESDIR}/${PN}-1.50.16-baselayout2.patch"
+	epatch "${FILESDIR}/${PN}-1.50.16-htdocs-symlink.patch"
+	#UPSTREAM-MERGED#epatch "${FILESDIR}/${PN}-1.50.16-absolute-paths.patch"
+	epatch "${FILESDIR}/${PN}-1.50.16-update-servers.patch"
+	# Do not build nor install eclass manual, bug 322759
+	rm -f doc/webapp.eclass.5*
+	sed -e '/MAN_PAGES/s/webapp.eclass.5//' \
+		-e '/HTML_PAGES/s/webapp.eclass.5.html//' \
+		-i doc/Makefile || die
+}
+
+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"
+
+	python_convert_shebangs 2 "${ED}usr/sbin/webapp-config"
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc examples/phpmyadmin-2.5.4-r1.ebuild AUTHORS.txt CHANGES.txt examples/postinstall-en.txt
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="." "$(PYTHON)" WebappConfig/tests/dtest.py
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	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."
+}