Version bump

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 97 insertions, 28 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index 65838baada63..c93f1de30004 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.89 2013/07/05 00:29:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.90 2013/08/03 13:56:20 blueness Exp $
+
+*webapp-config-1.51 (03 Aug 2013)
+
+  03 Aug 2013; Anthony G. Basile <blueness@gentoo.org>
+  +webapp-config-1.51.ebuild, webapp-config-9999.ebuild:
+  Version bump
 
   05 Jul 2013; Anthony G. Basile <blueness@gentoo.org>
   webapp-config-9999.ebuild:
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index d17b3a820e64..34e3543d161f 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -10,27 +10,29 @@ AUX webapp-config-1.50.16-update-servers.patch 2565 SHA256 4fb781ffd1670de3978f0
 DIST webapp-config-1.50.16.tar.gz 103576 SHA256 cd5cf95d0abc9b469b08e6fffa885df10d3651d558164d35efe8e45df1fc8a5f SHA512 5dee7ee47a228af42d1f417ec004057559f2afbe2ffed668c4c2ecc16a63aae4f7e2b4a56fbe701db15e18c7bd207aed4c5505dff9245b25a9868e0ceef9aeea WHIRLPOOL c605be239c8dfa7422580e8e6932c2ae6b311a972783e93cb1dcf0af2d5ad76be57d71316ad212a094a1b0139fdcb0f64304446c2eb4e56b9eeb3af379afa35d
 DIST webapp-config-1.50.18.tar.gz 107458 SHA256 4fdc1f714025a00de237fd494dc7529890cb396cfdc5306d5478fba1745dd797 SHA512 b32d71de5c2b33a0d3ebc9a42951fc8d9ea3febe71945fabc0c95782da0fe6e108c8abdc6c3debfa083ee6be6b4624ad0cfc28abea05c4e8501b89845484e003 WHIRLPOOL d073866ab02655af2fa7fc82f34f68ee47c69eaa9c3b2e3e4e29c7457c7acc7766631aaff41419857f1cdb3ebd657917f83172ca4568d7dc09db1633aadd92ec
 DIST webapp-config-1.50.19.tar.bz2 58884 SHA256 9346d2c37e06da43d083b09bb5d908692ead14b5ef7393a5d18a57f4d4b2ac58 SHA512 ce11181cedf09e8c297a11a7f72bc9c9a76b832052ad2d908f6132f4dc8f660cf234315499400b0e5499ecd2bda3d01cd1ba7ab10e874dccd704154d216b8088 WHIRLPOOL 899ec0c320bc6c8714196b829cf8850e644f3293c9525cfe999ae6406dd2d487386a08823d2be95d09048114b16434f46eafca42d7b0b8b070b1aebc155559be
+DIST webapp-config-1.51.tar.bz2 430080 SHA256 34804d352b501508709b93520b423cdfbc69567c16d6c89079e83d525791949d SHA512 6c678ff8d91425c4957d44b1ff36d1fc3380644b6de2b48a986c91af6604f01e73bfb664675dfbd4ab5cfbda95020f4649d511ac6199bfb1858d4279fdb3bb08 WHIRLPOOL 13ebefcb5462f61c4431e0e2ebbf3fdbea3eba09e32e3a4434ca8c7a302fa1a6a557608f183e5dbbb465bd41d4a414ed870a8460c023bbcfad61072b3015571b
 EBUILD webapp-config-1.50.16-r4.ebuild 2108 SHA256 e251d057903b0bd0ded6def7497641e3af5c4610898a2c73deee32ddb315a1f2 SHA512 5e1573f27267f4d6c98b60cf7c8efcd2e033bd682889fa1f53164fd80a120ce9c9465c4c29f830439844bd17be2763f081fdc9c45403052f30885ff8ea92bc49 WHIRLPOOL e18a2300257a4eac8f1cc1842c53ea1f6fa62cbd51d55d514bf84ba6bf2bcc3256bd03732525e48761bc6d8660cc79705d893f1683b39e83c8cd3fe50a5bbaa7
 EBUILD webapp-config-1.50.18.ebuild 2170 SHA256 acdbc537bd5b905ee96c8f96be53e7fe970fb5de6d4ddd82a07ff8a4569ebd52 SHA512 07739f429a06e7ab5afe109d34219e2bded4b9cfcec54dabb9295b768e59cd6c7966847670921a2b74fdb43033081abe660d814d5abf8134e0800af727924792 WHIRLPOOL ccd63e4b7af97ccd2d3b7b97154a136b1033122b253877c8525ef53936f678ca197c988a5cfd3a768ed8c1ff2f914aeb3a8a0b41f406629fe7856b3e16c36efa
 EBUILD webapp-config-1.50.19-r1.ebuild 1672 SHA256 f9e5435539fdd08707a88c24fb2a9f09a092732f7e2c47023083d6df8ee0293c SHA512 bea156cdeaea8cc91316a9025515989f3c0bed4ee247fab67b2dcbeaacb1f7131015ad9acd707a591edaceb287bd279ad9d232c69f35c28ba4041dd663263efd WHIRLPOOL abbbf43ab8521642fcbe4d2e061fd5b2eea7796236722dcba4a12e49b15c00012b2790bc1049fa37603c06d046274982e9374990d51c722caa83f19a47bbdf4c
 EBUILD webapp-config-1.50.19.ebuild 1681 SHA256 c0b63c8cf0aea2c9e519429d04e8a98666572fa74462e68ddc32b7449656ff69 SHA512 95bf28cc08a6e4c305c5458ac3a4509585213ebb8d9c78a3b6cdf9806dd709b448d0b3fe6da861348ee6edade64a76762f183de14e2777778a44f27d09028d58 WHIRLPOOL ead08bbebcf14aa3fd65275bbb8aea3a8e5faac26c3ae8a8b61b1bd2f6f25899da8e70d87959af301d2ae7a89c5525bcac9115230e82cd4c7a68f14c18c728c2
-EBUILD webapp-config-9999.ebuild 2014 SHA256 6acf04083f159fafc1ea40cb2050bcd5f8e2b82aba3114591e99cd4a8475f2df SHA512 f36d7acaa3e4989eb294ea6a1ff49266ef5bb7da657050f6132630a7ff1889a7b967d506604d6ef3d97ff87df18062d875ed017b9443b6d4827d58a9e52e027f WHIRLPOOL 2055424bf04fc59c3fe98c10f7b749f04a6d9de1935fa794e9fee2cdd47106a6d51152c847091ebf61fea124da636e9a667e931604115f3f97233c2455c1a6ef
-MISC ChangeLog 26839 SHA256 1d05e3d19d107c354b142f003eca9a0b76d29c980164e4b1cf81697c93e263dc SHA512 c766ec2b31c3378b200837dfd45b746cb41fe4e0189dc185a994d5d536343b665909833561f1efa78fb8fcc7e43a68f438b470e1b89dd6265d4e18ae65094254 WHIRLPOOL e9434671dc6b9334c774aa4c145da405ef23da16923a50c8e433d888ed136000e9e89ae2440ce4c0d7a6343dbcf7352056b5f180e9c044eb9bd5382f48c70d16
+EBUILD webapp-config-1.51.ebuild 1842 SHA256 8af97fa457d31020257d4bf2326f74fcb9d843316b1c6650ae61b8b2ff6b8663 SHA512 ca358dc375b4b16204e705268fbc75f0805c1231ddd5cbb4e0cf82ecda3b1c9d88acedce755ec0ed4480be24f99f96b0d10c6829e10bfc6ff1fbfd29ea60186f WHIRLPOOL 104fdfdce57275969301b581c5302416da19f2a2df2bf8177c27b6983666555d26aaaca9d4c6858ed324807cc32ac21c3a87389506ab8923b1dd47d75508dc40
+EBUILD webapp-config-9999.ebuild 1842 SHA256 e315523cbcb6d777ce917e570b71b3f586b3e422f9a1e02278b4d53ca53ad17f SHA512 9bdf86dae788885f19d92d6f8f8ed8aa9dc2839e6da8dec6f63800264e1acb8af981a92729edfeb6724a4294cf6158858ee1c924ffafa7bb0e236b97060e6180 WHIRLPOOL 9fe6e48260151216d689fa08e64214fa086bf768d9e9c31fbf128e422ac85f94dcf09f222040b6a07b33a70b017128e45fe002a121ab1e8e9aa64862bfdc0538
+MISC ChangeLog 27002 SHA256 8d5abde8124783c7cc800cfe26b41e61ab417ddea174e3db43f85809fdb6e3fe SHA512 d275dbff47f81b869b557d4e1ddcf6b9242c74fd60ec336b195c6971b3b7ed2adf40ef0fb1a190743b445bca352322cfed6263d58c997ae1c8a899815172ab35 WHIRLPOOL fd2edad1d08d0b0d5789c48ceb52ac3486c84a12139269542947d333e24487115ac69594268c59e0c0ee0723a07ce5940217ff6dd4a1003bcdadfd207c7515e6
 MISC metadata.xml 495 SHA256 7b8ad9bcc33e72a602ef7e967253ce9f055540bab99a3ee8150252c4042e62f3 SHA512 61fe29d051522886ccb7770f08be9005e75d72a510c4039aa94af281f61194c1e84891d34736671d2217307addd27a142bde3e01d8d091fc9a77dd2c482b7541 WHIRLPOOL 7dfe40bea1de9d725b99f15766344483eb8842bf55fcaf93dc134a7d9dbd00a3fc33fedcb34b8c2f74f3d5907e8dea3d4ab93260ef887708c9710b0b9949cccb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR1hPIAAoJEJOE+m71LUu63f8QALK5/MXpsGJbFMLOWon/Nm6G
-DjIjJkFmn33toWYaGvomGPCXLpfDuuz7BssaK9DkYI6i/wqrujlJlUGSErGpdBBK
-aA71RAT4k2/HjzeZTpitr0CJfGEhiRsGIuq6fYQcYeSDvrBMoDE+Fw5W1iNcFX0Q
-2C3duklbT9JqqpU2dbngEX5xnVkfa6K/PMK5k0EM2DyUICvLk/Rug+KfOy/H7dCo
-eUOYCqtmy0DCV1eXI5aH9GozWkl6wy7vOKjWVoIP1n8kyUdV63vq0xF/p7SOqYAb
-UyklETdSaxiNyLGhW8XwMke2d9t3mMjgHQv+khmrRnsnZLbqiT7eLxZwX2jsMLoa
-CnmSlnKzmhSiasGTGQR5liHW2HDnvlLe2IOxDMz6laaNe/MNaAZ5Cqnnh6fNZSgL
-EVNBzDsnRRCy8WcskGB2Hcp5TFMl5F5bxKmknvLHMvtPIuIAIwaOvg9eICGFVGd4
-ozs4QkyF00eClNgCtRLj7baravlLBucR/q5neemt8UiuwmGh5Y/SguxnB2fHhS0P
-+90aVyITtMP4vESDivnMaJidQm8b6pdeOwdKNyizHJdt7ZWgid1K6JDwcTnH0CB2
-FnguYDriuYylbCkuXe62N8WbHUTo9fBjA+geOOLwaRf8WltDGczxeps9+sSer0Ls
-aiYz69Yl9FJC/Wl27g/O
-=lRO+
+iQIcBAEBCAAGBQJR/QzKAAoJEJOE+m71LUu6DiMQAKxnhsbtSF4qbIlCaeuwIGhk
+1fzS37o3ypSZTKQ1wGZpunII9aqyx4lWN7Fy3bB1av1juJT+q/vU8ssV1pbzOxIt
+UiA4ADl7Lj/OMJJSDVwp4YBgtp8k2eHnkJeImwds2R3KGZyMrkw4JDghe5ypSV30
+kFnZuRJg2Tr/PxIVz+mD/atlR91MWKOqPXr26qOQrkMJE20u35QbM+Y3XSF49U32
+mTPLL5FXgCnqCSNZwem32Zx49PNiGOPx6jl9Yp4156ZU/QWW4OCNoqHOdOxPuuSc
+7BGmq6OLl1RVOyJZEAxlMP60egzcqYCyomGcYhWFFnrWGjhcHsJGbG1AdOjjO5Uc
+gCSA5rZXd3KUL7X8gk7MD5Iv1qdGZZf3I0GaYmQbYfHNmMW8jVqrNvX8ReX7LgIz
+AoMnew6l2Cm0NAXmeyR1zjuSzt1V3xG7mFExXbBLFC75dnwby2lGEI8Bv91AyMxh
+wqBa6h/iWQ30/6MoUNLyN75HKpBbs25/gXwzpVTPVNYHdas3ozNV7P+wXTkylLa4
+2QYUwBFhxMNyLInJTkaGlgSs5+wQG4GUEhCJlZRgtQB6+wDcSVO9kfCFgH2H9FVV
+3uW2wv0J/VGCw3Y8oiKlIxhxSi2EpojR5l8DvnTb3Fe88+6noFfKDlInUkUuC/JX
+rwZP+wPzysP9DvBIdKBC
+=HtVS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/webapp-config-1.51.ebuild b/app-admin/webapp-config/webapp-config-1.51.ebuild
new file mode 100644
index 000000000000..a3ca993a782b
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.51.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 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.51.ebuild,v 1.1 2013/08/03 13:56:20 blueness Exp $
+
+EAPI="5"
+
+# We need to fix 'import md5' for the tests before
+# we can be 3.x compat.  Uncomment when done.
+#PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="app-text/xmlto"
+
+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."
+}
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 685a54fb8fd7..666f64919cd9 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.2 2013/07/05 00:29:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.3 2013/08/03 13:56:20 blueness Exp $
 
 EAPI="5"
 
@@ -30,16 +30,6 @@ SLOT="0"
 
 DEPEND="app-text/xmlto"
 
-# We can't use-dep on portage for 9999 else we make repoman angry!
-if [[ ${PV} = 9999* ]]
-then
-	IUSE=""
-	RDEPEND=""
-else
-	IUSE="+portage"
-	RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-fi
-
 python_compile_all() {
 	emake -C doc/
 }
@@ -54,13 +44,15 @@ python_install() {
 }
 
 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 TODO
+	dodoc AUTHORS
 	doman doc/*.[58]
 	dohtml doc/*.[58].html
 }