Version bump, incorporate patches from FILESDIR, address bug #243260

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 78 insertions, 10 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 96ce066d8bbb..670cb840b18e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.79 2012/06/27 11:56:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.80 2012/06/28 00:55:52 blueness Exp $
+
+*webapp-config-1.50.19 (28 Jun 2012)
+
+  28 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  +webapp-config-1.50.19.ebuild:
+  Version bump, incorporate patches from FILESDIR, address bug #243260
 
   27 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   webapp-config-1.50.16-r4.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 20afef7fdb3f..0066dda8b38c 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX webapp-config-1.50.16-absolute-paths.patch 1707 RMD160 80f07c8b98c69e13d1c5f7714adeff5a1bc63ff3 SHA1 e3f6b479066b071d6c7d622cba158d9ccc93dcda SHA256 695583ae83a76f7b747cbd3da34a505df2bf0fbac11369d8b0b731b35ce67105
 AUX webapp-config-1.50.16-apache-move.patch 507 RMD160 f86f9a966c0848c36a4404a93e2974357b4e9d6a SHA1 b963fb9cc2b6f10e6dbcf5a3db1178be20268fd6 SHA256 9a78c618d750c79a16d216e00f0b8a9c4058e7ba3d23011d999206e9de825790
@@ -9,19 +9,17 @@ AUX webapp-config-1.50.16-htdocs-symlink.patch 509 RMD160 ad53b2107e5f51626f3996
 AUX webapp-config-1.50.16-update-servers.patch 2565 RMD160 1547ba9dc6731eb7276bf9257beea5c1ea304096 SHA1 d4fd082058cc3e5b662efd848282efc889dec575 SHA256 4fb781ffd1670de3978f054de9f9c4c9de47f5f760a8b116835343c88b8f1fc7
 DIST webapp-config-1.50.16.tar.gz 103576 RMD160 d3ab1b27d9b279241d2c9ff3b764ac0b9699b0a0 SHA1 dae0b27bf731116516aed16fd10dc75c0146d332 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f
 DIST webapp-config-1.50.18.tar.gz 107458 RMD160 8687d2e82ff08fc1b02252fb1ffd2ef40a4fc51a SHA1 84ff4bd6b9a18b6ff5c8ac368e99baa9497bfc57 SHA256 4fdc1f714025a00de237fd494dc7529890cb396cfdc5306d5478fba1745dd797
+DIST webapp-config-1.50.19.tar.bz2 58884 RMD160 61cb9bcb9045804fef5b8d3d542174bed0bf9f21 SHA1 9123bcc787802d78bd94b31efc7d817dce220583 SHA256 9346d2c37e06da43d083b09bb5d908692ead14b5ef7393a5d18a57f4d4b2ac58
 EBUILD webapp-config-1.50.16-r1.ebuild 1869 RMD160 91be6b2c332dcdfa182a255389faa21ddff3a562 SHA1 ba63d99f3c806d8bf4c62fe1192d2dbf31df44ac SHA256 e8eb9ea5550c47013cf1525820ee4e20e11faaba901cdcb4fec046463176a970
 EBUILD webapp-config-1.50.16-r4.ebuild 2109 RMD160 51533431c0a19f85f2fb2d86202bb6b203bd8d14 SHA1 d99400ce79cb50b730a53d8677236b587f9c76fa SHA256 8ee6e6f9eeebc6a238414a33a8f17fb21c1486d69be2d82c958dab1f524f5c3a
 EBUILD webapp-config-1.50.18.ebuild 2170 RMD160 aae70b55130e8268cba4c5d2b4d9cfc9e103fe8e SHA1 5a231bd215b98d4d7446b1ff29e1421d94d8afa7 SHA256 acdbc537bd5b905ee96c8f96be53e7fe970fb5de6d4ddd82a07ff8a4569ebd52
-MISC ChangeLog 25298 RMD160 35769b9f268163dcd5aafbf541daeeee13f67887 SHA1 ecfb537522a42d615082302cbae9106c9d5fc922 SHA256 6b653c911a9174169fde2ec258d5c56154e5022c444ff9136368f2c7b324d1dc
+EBUILD webapp-config-1.50.19.ebuild 1616 RMD160 b5639142f7ce6a9e0d12146954b1bec6ac409220 SHA1 25693a303f789f1981aab81528e3150f250076ff SHA256 48b6e6b24495cec60602698db80399941b6a16af53f543779e0ccb8de32cafaf
+MISC ChangeLog 25501 RMD160 3aaaef7663eef543adc6dca0a9a547b1230145f5 SHA1 f31ffe7d5d3c02a86a7a74aa594ba2a7df37269d SHA256 b5586ad8dacb94bdc2bb7ff55930138fd4f5cbcc292db4413d9dc5f5d3a24e33
 MISC metadata.xml 261 RMD160 2b05c21e79c3272e8d25db4339acbaba883aa65e SHA1 0bc12930918ce109eea376b06fba451c4596726f SHA256 1f116d2ec1e4df7fe23a3a338ff26a26335fd1b01c8c9cb0fea8786c3dc06918
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP6vThAAoJEOTDgjZ80txdW9cIAJ8vFEkZCtqFLNU+VajGnjNT
-Ydtq+iwwlDgazzTKwGKb2ZViu54MgT1+4TMda7YbdX63TMM0N3gwPmbsthLAtLSb
-2vE0eH0p1Fr9crhfcz6c8EtFqigyUAkkEr2jfxFi8/3p09vrt5Oc4NscwBH5767+
-8VeCB+cF+rY943uZO2/3cFyogbcwJXqipNngJ+9snXvxzplf1ka1TjO4ITbPlTKM
-Nuvz8M2IhM010h6s49tTJZ4i29nGcLKnlVk8+M7z4P8jcfLP8VfOS9dz0+Spm3lj
-Uwjh+Y6K3c0UJpW0Qlz9rCFo94RLbZlRiobk5waELXclEawtPCg8Gb+Cq57pUv0=
-=Sg5b
+iEYEAREIAAYFAk/rq6IACgkQl5yvQNBFVTUSFwCeIXO/yMQrNbCA9U2msqeBd9S0
+diIAnjMzZOhlxSOKe55ki6Hzt8NUZucz
+=ESWK
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/webapp-config-1.50.19.ebuild b/app-admin/webapp-config/webapp-config-1.50.19.ebuild
new file mode 100644
index 000000000000..1e1cf630f514
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.50.19.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 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.19.ebuild,v 1.1 2012/06/28 00:55:52 blueness Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+
+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_compile() {
+	distutils_src_compile
+	emake -C doc/
+}
+
+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"
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS TODO
+	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."
+}