Restore stable ebuild.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 77 insertions, 9 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 2dbe49785c52..c88094f57b1d 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.118 2014/12/28 02:14:16 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.119 2014/12/28 06:33:54 floppym Exp $
+
+*webapp-config-1.52-r1 (28 Dec 2014)
+
+  28 Dec 2014; Mike Gilbert <floppym@gentoo.org> +webapp-config-1.52-r1.ebuild:
+  Restore stable ebuild.
 
   28 Dec 2014; Devan Franchini <twitch153@gentoo.org>
   -webapp-config-1.52-r1.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 1d08c87715e4..ac844f40df71 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -10,19 +10,17 @@ AUX webapp-config-1.50.16-update-servers.patch 2565 SHA256 4fb781ffd1670de3978f0
 AUX webapp-config-1.51-fix-indentation.patch 820 SHA256 ba492885bdcb0263152a727f0ab790873a29208491573c02bb432d92930d82f1 SHA512 7a07df87a8304e2154b9a03dd4eb648eaadd4be8db70adf3c9c80fb46f2652b6ed67454ccfe64bec37d576f088eac88b829e33a81879dca06b6f9ded02587e3c WHIRLPOOL fa1b0a8dc72ecd7757a2dcb0ba2cc5d56611d10914c231a98871aa3873a0a559fe30724113a298b235ea6a4f0143198c0b4367d973db1c0f03be45c69df01324
 AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c
 AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 SHA256 83ad478f41ee6a6035a5c3d492129cee8dc28ce068216ca36db8e7ce323e04b9 SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d WHIRLPOOL 13f4d1462456d6dd6097fe36a537a931a751056ca5e9281cd2e7476311cbe4ce776305532d876bacf86f95b137d61d3d2691d624c75fa61d4d78ea8476371fee
+DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee
 DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc
+EBUILD webapp-config-1.52-r1.ebuild 1745 SHA256 f21a4eac9b19d109c5d0f5f7781c2186d186415b3e3e7374cd6a401ad8cdde75 SHA512 403a256892d3f907017377e15bf86feff7c1244bc83ba7f7829f62d7948038f668d62c1cbb56267e2379bd2b5c2d648f9152724de273a5630e96beb6ad9a671c WHIRLPOOL 5b64c675ac688807adc5f0a9fb087ca05db4122b348e250fa80bd80b79362000ae2cf688fcb4ea0b1b333e3c6915c3d43503b0790b06ec8e8cd9a444db20aa04
 EBUILD webapp-config-1.53-r1.ebuild 1770 SHA256 c43a09c7b98b2e8e40b7bc849b607a8a5585d730483f04d2bb90f9cd8d6ee28a SHA512 3c110abe48e8a1a55820fd8af1b380b0d2f27a73826d12b18a2b077c8004bf9c6c869e87e0a955ade0df7b22fed7cde66c33d401501f1b3f989d6fa30c704116 WHIRLPOOL f664a80168e049682015a912fddefbd9e148466fe6a60b33df797b1e0a9c25a3e40f7897fa54e6d46debbef3ed9fee3de09e4052f8537606da318404e9a8f088
 EBUILD webapp-config-9999.ebuild 1818 SHA256 0dd52b62b5f0b3a0f495434317c65e4a7a15a4e669b79a6e79f55f6fb7a67860 SHA512 b2b0a5ec1826fe7cb24f2041f58f9118b2f6e0dab15f3b092446319e91ebd6770029d14a06adb30d2669b44afd3778c5a44f5c092c4a63072994b0f1603582e2 WHIRLPOOL 15d70a19e84285bf89e22ce9bf52b6f70639e79526c7aebba01b0267ac1331594b7a919fba4d11c3a4377d3cf8be6efa2b287e7a6fa19efe9fc752f52c9f5c3c
-MISC ChangeLog 31215 SHA256 d0fd6fd6db70e0f94654a4e2fe1ddab20296229694adb05ee4302057fba6aa71 SHA512 77d6147969ae38d665cf2917f23aa9e7c58e4d373cd185ed2a053fd3c87dc22eb86c24f8aa283a5fb11d5fc8c58a06ceb19f848af853a8f4f704cf3dca0475cc WHIRLPOOL 881b441c593704872b42d9a984889928657434a888621b86b4d3f9600d30d57a350c91d75b127f15ea9b9b4f2b13ee702f5fcbe9abd8fdaa0eb19a8010a50de4
+MISC ChangeLog 31357 SHA256 b72441ad52bd418c17bd5c2507938971498d5e24a9f105299bdb083a183ec890 SHA512 0ddfae3fa4fd7b786729d651f9be2f6e7ffa16df8ebae00f26fbef5e6eb13096d18d1f53a36af63c5ffbe2583fa2c01dc8b6aa8dfdb8eef6704b6b9ba2682134 WHIRLPOOL 8cf82db98b7e811ff255db1385a0f397a161bce153680c08d671a2f3fdbfa8cbccd3be403d31b5ed1d7962e05ad2b4be6ee54353e9c9bf7c02b0240f43826a62
 MISC metadata.xml 462 SHA256 c8bfbdf08140c41fd24a684e7e9642298dde3060c52054768f77a53ec78e125e SHA512 82fa9c21e551dab1bf71ee7ef2cf7ddf3bad6b3478a3701c2e90eaf06175f13d6b0965f163a2f30993ee6be582d9044cf947777c25b077f8424bcc09a96cb117 WHIRLPOOL 2e3efe5f154cbc0b68ad51da216b0bca2e2ce06d92c10166d8ec04b71ec63b532f8237c4d35cf1532e6a15fa41d3731147c05c46e036a14aceff58e3b5da85b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUn2eAAAoJEOf5eU+oyPvPkdoH/RehQYgbbx/XyCikOm2ewF8l
-nN8wuXQqP8qo9WAJS9B4WJ6BYv1hG8nTnYPdTUHxtrb7BB54zG7Kx7bTzVPA8xJd
-k7Up5ABRvkLF5g1pXn4DHct5OQM4SderGRyQ1FeWpmdQKnDUF8cm2gT5hp+an1lx
-Kj6lMRlydgi7ErNcV+5MPfn7CSSGUX0Gr2udUJg/ggEU3UH55H0LbF1xa4Dek7dN
-JTFc6rGDJsuGL5eSlo5TzW5u5EbzNPzUnLo38b2WkvwPx9HZQk+A+E/vVQeRoHdt
-R48mkndJonUCEk6gxCTP9ZxAr/ILIXSpWo2d0RckM3v22XLSkbbpvCoWr05Fjso=
-=Iw1B
+iF4EAREIAAYFAlSfpFUACgkQC77qH+pIQ6TWVwD/RyBfIrmOlHyowycUMvb49ieA
+xlJSZmMQiTDcmyldez8A/1n1pySBJ7XUsRi+GkLH54Qt4FO4ltTpLNGkFhyyQTHw
+=wz0S
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
new file mode 100644
index 000000000000..a45dd8743529
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 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.52-r1.ebuild,v 1.12 2014/12/28 06:33:54 floppym Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+SRC_URI="http://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+	!dev-python/configparser"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	epatch "${FILESDIR}/${P}-nulls-doctest.patch"
+}
+
+python_compile_all() {
+	emake -C doc/
+}
+
+python_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-r1_python_install --install-scripts="/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/vhosts
+	doins config/webapp-config
+
+	keepdir /usr/share/webapps
+	keepdir /var/db/webapps
+
+	dodoc AUTHORS
+	doman doc/*.[58]
+	dohtml doc/*.[58].html
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+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."
+}