Clean up after sec stabilization, bug #543754

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 48406bc18bcbbac76d02d915769b5aee5164ea42..174416ac48eabb150eb1aa1efcdc4c294a0189fc 100644 (file)
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.161 2015/03/24 09:12:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.162 2015/03/24 09:20:29 jlec Exp $
+
+  24 Mar 2015; Justin Lecher <jlec@gentoo.org> -django-1.4.19.ebuild,
+  -django-1.6.10.ebuild:
+  Clean up after sec stabilization, bug #543754
 
   24 Mar 2015; Agostino Sarubbo <ago@gentoo.org> django-1.4.20.ebuild,
   django-1.6.11.ebuild:

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5e4e17bfe79f1eec5f4820f04d153225574ddef4..7fe665b946098b2e9b00634ac1862d0a696f75af 100644 (file)
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX django-1.4.19-bashcomp.patch 1124 SHA256 08fa240a2991b7b89926ed14dc9a50992a5ca0e1b44f932d27d8ec7c68db4f2b SHA512 b1c2382f202dcf290cb8996ea174a1539783478fbf2feab18433f0cedc6c9dd0e088b3241131dc0fb1a5c621a45003ccb62146591ccac42218dbe38cf56f53d4 WHIRLPOOL a6805c97326853bf30f5c00906d13222532744cf07a182efc7bd0fecfb13a0076156517c1c31e88c4d44482a0db36ae3d666ac880fb4cdbdd78bfe93f1a84474
 AUX django-1.4.19-test.patch 469 SHA256 e0631931a8aa42434963944976a5c8505a259f7aa5884be1842100ca32f8be15 SHA512 3a7f8dd24a0cbfeab6e9c04e5079538c2058e677f46bad05324cdfd2fb644585e917d92389e8dabce410c3e8e97a390ede04c217d9eca32440b942bf32c91706 WHIRLPOOL e007c8379e7c64308ab40847bf92bba275cd6644f3e1d9fabefafe710536b9082a3c30961d2619fcb36be75b3a5daa8133537aaeaf41fe180d76337aac650b32
@@ -10,35 +10,33 @@ AUX django-1.6-objects.patch 729 SHA256 ea217c069a28b19063fcf216433cab48bd693fa5
 AUX django-1.6.10-bashcomp.patch 1090 SHA256 1bf3b71b231a0ed772fc47c21d41e97f72c0ba6e5a7108a851087be4bc35e7e4 SHA512 43e6a0a23d713dfb2b002ee89f68fc8cfe5f18bbfb84e9addd37ca0aa25aaa704238833c9be781da0b71fe708fbe2831ef61952638874fd3b6d10298d9076118 WHIRLPOOL d1ff83d8919b957df1491ef17d27f828ceb708cef07d483c7549fbf2106dcfb3f66178ab2a7a248bddc70814a130ca5e583e86f2f7e477f93547f1796d984548
 AUX django-1.6.10-test.patch 3955 SHA256 c27cf60632d0ea76b5e595d20ea6d8b6030c65b4461e9594b21e9e071cef23d8 SHA512 22e46dc5e48dacac609b3fa5161362691cafe2344393188983df08fd1e8f6b01ab02f3db35f3426b20621e0ea270da8a29a1fbbc2daf514b950062e7e9e36a2b WHIRLPOOL bd2add0207b9d783aaf1fc2629d0e963e0ddcd498acfbfa67565e067c8f32d6b591e5c6d660fd1d4fa984e43e260ad6d458eb2ec7d8c9d9fbb0f487c8d0a7f1f
 AUX django-1.7.6-bashcomp.patch 1090 SHA256 7097b55ef456d7bd228fc08ba7430b37b966170baafab521edcca5a1d2725556 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532 WHIRLPOOL 8a03ba9fd619acf6d1b041e84b26df436b594e952acea5c3cde7b62e83cbdc03ab75b28189b1bb49cba508e664976529d6e4403ceb475d0b36ecd70d948bc6b5
-DIST Django-1.4.19.tar.gz 7877522 SHA256 d75d605e574305e1c2864c392e1454963ead4552477ce14e67e64b9ef9faa1a6 SHA512 811267ec1ad99a8eaf4daa098cd5140970718f5814ed1e7e9ab706ff049c508a788cf186aafe208947e6350e17baef4a205f549bba744ef53c7e365a101a9391 WHIRLPOOL 67b24ddd89a31294cb260923b58e31dadfd6b4fe654a625586bc9341ba95f9bb2960befdd58dfae91128149fba1b95c3dcef9f72510e3e904cb03de8b685d63c
 DIST Django-1.4.20.tar.gz 7877794 SHA256 58ac719464c4c8b13d664ded6770450602528bf4c36f9fd5daabdae8d410ebb1 SHA512 b4625547af0a7d53fa00f801239858619015ba990b50cb859168814a2cc385c867ce570192e762ef1399518407958c687e607536259e420b238a5dd587d2d4bd WHIRLPOOL 8b6bd9912fd27c03d7d06df29314eeb4ad1efbc1347780d2414f324b83f7869bdd7e322b11eecfc32a7fb0189eedf37f69774157292b92163f3fa0e78f24417c
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
-DIST Django-1.6.10.tar.gz 6760152 SHA256 54eb59ce785401c7d1fdeed245efce597e90f811d6a20f6b5c6931c0049d63a6 SHA512 4ef44f2f4d0537443125765ab0e13b0d4798f828b09e7f881f2841d8e7078e4a8f0ac4750ebbd4586190feacd13490d4657575411737d2dc1e3c2cf046c2dadf WHIRLPOOL 8cbcfd690aa813b72da2f8480fcf66de87179a92a802450d354c1c383a7df415b3346d1a8a913a717b39db6edb67bcafd0fa0f45da55a2284e3e23c4fe45803f
 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
 DIST Django-1.7.7.tar.gz 7603286 SHA256 4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33 SHA512 e08446e7b6a0c64594dca2411b8b3fe16a8fe9b951bd33ae4c1f5187c83a2ce36bd7e0a07e169c338236d6f258362861e868a62f59d9d86bea679d9d42722ceb WHIRLPOOL bf38ff3730d20107e7f25d8793c7ce487edf66407f3c4dda906eca98eb6d8d9ff080338e20d2e418d82b217ef7611511be838a398737717bbad97fca6c8acc5e
-EBUILD django-1.4.19.ebuild 3230 SHA256 e2e6d4e1dddadf693e17bc55bad6533cac8d111c2f7d0927addd4e92bd18a0e9 SHA512 6b824d514f61a802ee150bfa4f73014afa268ff910d2e682e329fec24c89a59553c59bf02e584d5bd72713de2be7800cbdd559f9eff46b528f9a700a0c1fae4c WHIRLPOOL 9d7d72cd91e5fb7602bdc6c4e51c8e3c26adea764a96228d077e9a88b55b93c289ba7940b9339f41495a5bddfbe2073b545b5d0a4d8f1ccb3d70bc0343e6d373
 EBUILD django-1.4.20.ebuild 3207 SHA256 d6cca178b5a178f9e5e6b107340f50ae29f60cd0d53f84ebec83ce6c5d5ca917 SHA512 ff475cee1ae71628e3fa2c62b9da99141de4538550262ef86af5adb29150fda64b6e6b9e8e37782a2949ff5efd4a40aad8337ce26697e92ed101c29a18ceda13 WHIRLPOOL 0570c5336747088e7ff64dcb3678892d446759911876934a5d73856fa2db859a27b84909a24e84711a63f8cc0a25bb30c61508da52fb6eca94da8834a5349475
 EBUILD django-1.5.10.ebuild 2570 SHA256 4516728575bf4f4386d18ff8b7b3dfc528988a2613314ed652cbaefaac85ee87 SHA512 81c02f0e126ba9c193bce65e06b51a903f927f1b313b34b789b48e6f70ee09bfee38821fe607597e240726fc5d5a9e47a50dd6d2c60ccdd2d22aef5c9da8207d WHIRLPOOL 9cd10f6cf0686cacbc1f74c22a3bbdd66aecb7db7484f392e2b643e322bfac65b34af4fbb631734ba8f62efdf5cb52f8841a56188f072fc3f808cfe5e2430c86
-EBUILD django-1.6.10.ebuild 3052 SHA256 6c6360d2bf31a0e0b38736060c85c4e06162ee320e3631bdd82dd610c35ca6dc SHA512 2e94c95c82623e7122c4ac732ed1f31c9598180e8b495b36bb9eb4d227c6cfad03b3d32da7b004eb8aa6bfa07bd2a6c22a4d3b4e8d8fc57cb75f4d5ff40a13db WHIRLPOOL 659e598cea13529d5e9a91658f07e3b906d0bf515a86cdd2ffdb6b1d935a5b68ac02ef2fff1e4e6bbeb5a38322cc98c8a511e5cca996294e0cf72ebc49ce2cbf
 EBUILD django-1.6.11.ebuild 3028 SHA256 882cb26062244da01d0be070d50df2b0f231825197e0bd13c30dac3dbf0b3204 SHA512 b5c2fda60ea16a6b63a0e51d30738f7d22aa33850ec6b7ed5331a423646454df0408c1f4d941c12f6dedca55b7c7eb55b71540b1eea3af4300bcb645f98d066f WHIRLPOOL f72e7d9c79c30c01667351f889b4d3e2f560b156cb87f98695e81b7d720b5244b416505c69c76f9424bc5d16d1d44747f5fe43648490742b1307eeaabfba54fa
 EBUILD django-1.7.7.ebuild 3034 SHA256 863736fff670c3d073f80423fbcd2b3633dfb8a852717fbd0eeb1feca1dbb52a SHA512 0f4b2afe4bd0985fd744598cb8484327a25d55091ed674d2edfa156861c395daadcb7f9170cb54c83c6a7c39fdd02153e6513aa6a10f38bfeca1537f1fc75ed8 WHIRLPOOL cf9adf5549bce0457bf66416409e180e6e85ad3f4ecb739d56549b074e21f8fff01cbddf0f0823e9ffd4fa60d1f1d75aad58e46ed6de1984f91b4094c6fc277e
 EBUILD django-9999.ebuild 2952 SHA256 3af5db49da1d0eb1d06b6813f0d6012a8ca840d3cb5ddfc1787ff843ac6f8bc9 SHA512 4a32d259578ae1e7a113ad898187e43d577528210bb7d8eb3224c844466d3df631e656110a2de374cdc6366ea447e0977cefa331c161306bda8a855ee878f0e6 WHIRLPOOL 16f2ee8ec70f5e6c91cc2dcd5f364a59ee321fe1c5ccedcfdd01ecc4e1911ed7e7517093c4aa86e18b7d6628ae6e6ae4653fcfcf06f331cf94a965cbcc745ec2
-MISC ChangeLog 25626 SHA256 93226e9cfbfafe068fed7a2ae1ecec4e5635b1c50ca7120159e73c7ab0fb1bc7 SHA512 a93fe19ef5a8c41ea1b0ca7886c125f0ce2f71a03df2c98d1d1b53d8252e961a2a5366dd316692c5216b62116814e86c59a1d2ed2ff6055813f0772b3e427555 WHIRLPOOL fc66fb68ee01d68959af37e31277e1949cd216cdb0126d16e8d770d4aeefd7da139199e03d79b4fc5cc4f4e534c6e7d2529c65f8f48c37d6c5c1cf86d53dba0d
+MISC ChangeLog 25771 SHA256 46068b5f28b81c7883e65c37d75f85d98913b87c55dfe68883d65be1e96b72fa SHA512 36ec73c67848bd80504b4abf9912d57ab9982014059cba87f3a8677373073aac9598f319ee4f263cf5c3e284e038a79278cab80d6b2c0048f1231f56d847431f WHIRLPOOL d62a094be5c9b2364a646badb57d58384197943d8c1f13670870b67e5d5550bffa39fcd048c7de2b95fd5f9c1c089821ec1c8248ffd2b61d2ff9f231c415a529
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVESqCAAoJELp701BxlEWfL6AQAIHLUCtUAr/SEKt6Pe94MXrN
-sSBL0asLvGv7O9jiZbZ+FhHYSDrnYT1wMHKqOE3B2IDiliaVbVzx/jxdw4jTTrMr
-+iL75YoDs2uRwY3b5q57SJRy8M1PIYYVCIbVt7iv/4Es82U3fjGzlltyPWfM606I
-AMoyz9HKuKDBTq2ovnWMAmM55RclnmW/YyMkCNgR5LhO0dbeOM27ZUGiUl1CgiOp
-kuORSdUEmbn2X8vbP4Ja9x6xed/3RqoBLJ/CpdvZO+L8ryAw3xDxenZWOjeQQAao
-GMUfw7WRzyltkFNQwPLs83nuE8QY5NwFkc1KK0kcc2zXI6queZWFTzYct6CovjZO
-b2eLqiqjxmahscIzVKwNJS9iHuVnYCqBQwAMpW4s1RamItg/rXzpSEo9KMlGbxXH
-jkWU286s0Qv5usKrSBeIkr/2ATspwusvoZoWdT5mkLRRpKPq1+uLSeX/JFoHxSaM
-yr9j2dKHBCP9Z0Bl7uu6NkAjlpWo90oRQzBWs7nKH38RIxJbEe9SnTk27u9Wy7nu
-kn2oSfq9GD6X09veYXwgfdcLvSlCLONToGA4jZOEySXfC05xe4RbidpdGKIXt2u5
-GlCJ5F7MtK52rJSajU8tO8OUHQ3mIPNAY7VRUSlbAFhex3Ulac7374zY9cz59kF4
-lsjoRox09NSrlCUfe5ib
-=jwy0
+iQJ8BAEBCgBmBQJVESxeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsVgP/1hGmAL8aSTXE9PFHvYCVa0O
+9u7EpGvbgPnJxlzxwznP0NUU/33tR7nHbYhG/d91w/J8V+lkWSqwSBtSpyQjjbjG
+YbgcW1ur1YxZ1MJPzmCiOg18722Woi554bz0Qg4bbNXKd5lJTYLOvkoKRKu2A15v
+6FX7VPpYMTwvTNtD99XejYjOYkrMr0kjI70fo1Jj1t4nrtYTdZ9bYDraOwoGAVlz
+Bf6e6r4lO0wuQLctQbGPNSUXyiAN2LgaM57ZkbxSXAGlx5HmSSAY1u2Gkrw4oArW
+e7ulVVz33XtJ/TBQCCtMLfo2//w0Q7evafTC5qZB6NpDoeX0xAidEEsSJ1XFbiOy
+XTzlUGnJPeD2qWp4tCWED0/nHyY6rY3ziM5PDM8IBcWLdcFSvRHUEaSB0p4AgmYa
+wx7PGz75cz7r6Hb2qy4665fmGdXhbeD2QPo4czH9fMemsQAP9iO5v26RazWl2RSu
+DHtkuXfOoK0Xa9vfV8dbxKmc5R5N142swzL1eDSxkHpYgAu09o2njvlT2VAUNsDn
+ok3W0QDVI0izXAR6+DBgFe1E1xWGiVkBZol6ebcv9MrhgIHV6JA4bktvWuVS91Ic
+BSeUeCSCAx4SL85gh5QxTJcOCV2PQOm+M9NMDrydM8LJyovGtr2liVJWLRwA8G9+
+oaYN/xE+P06Fh5DwrAZ2
+=xqzD
 -----END PGP SIGNATURE-----

diff --git a/dev-python/django/django-1.4.19.ebuild b/dev-python/django/django-1.4.19.ebuild
deleted file mode 100644 (file)
index b85ac33..0000000
--- a/dev-python/django/django-1.4.19.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.19.ebuild,v 1.4 2015/03/01 11:22:47 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               ${PYTHON_DEPS//sqlite?/sqlite}
-               dev-python/docutils[${PYTHON_USEDEP}]
-               <dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-               dev-python/pillow[${PYTHON_USEDEP}]
-               dev-python/pytz[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               virtual/python-imaging[${PYTHON_USEDEP}]
-               )"
-
-#              app-text/pytextile[${PYTHON_USEDEP}]
-#              dev-python/markdown[${PYTHON_USEDEP}]
-#              dev-python/selenium[${PYTHON_USEDEP}]
-#              dev-python/py-bcrypt[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-bashcomp.patch
-       "${FILESDIR}"/${P}-test.patch
-)
-
-python_prepare_all() {
-       # Disable tests requiring network connection.
-       sed \
-               -e "s/test_correct_url_value_passes/_&/" \
-               -e "s/test_correct_url_with_redirect/_&/" \
-               -i tests/modeltests/validation/tests.py || die
-       sed \
-               -e "s/test_urlfield_3/_&/" \
-               -e "s/test_urlfield_4/_&/" \
-               -e "s/test_urlfield_10/_&/" \
-               -i tests/regressiontests/forms/tests/fields.py || die
-
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       # Tests have non-standard assumptions about PYTHONPATH,
-       # and don't work with ${BUILD_DIR}/lib.
-       PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-               || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-       distutils-r1_src_install
-       webapp_src_install
-
-       elog "Additional Backend support can be enabled via"
-       optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-       optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-       optfeature "PostgreSQL backend support" dev-python/psycopg:2
-       optfeature "Memcached support" dev-python/python-memcached
-       optfeature "ImageField Support" virtual/python-imaging
-       echo ""
-}
-
-python_install_all() {
-       newbashcomp extras/django_bash_completion ${PN}-admin
-       bashcomp_alias ${PN}-admin django-admin.py
-
-       insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-       doins -r django/contrib/admin/static/admin/.
-       distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-       elog "A copy of the admin media is available to"
-       elog "webapp-config for installation in a webroot,"
-       elog "as well as the traditional location in python's"
-       elog "site-packages dir for easy development"
-       elog
-       ewarn "If you build Django ${PV} without USE=\"vhosts\""
-
-       # XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
-       ewarn "webapp-config will automatically install the"
-       ewarn "admin media into the localhost webroot."
-}

diff --git a/dev-python/django/django-1.6.10.ebuild b/dev-python/django/django-1.6.10.ebuild
deleted file mode 100644 (file)
index 4795be8..0000000
--- a/dev-python/django/django-1.6.10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.10.ebuild,v 1.5 2015/03/01 17:19:31 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-PYTHON_REQ_USE='sqlite?'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-       test? (
-               ${PYTHON_DEPS//sqlite?/sqlite}
-               dev-python/docutils[${PYTHON_USEDEP}]
-               <dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-               dev-python/pillow[${PYTHON_USEDEP}]
-               dev-python/pyyaml[${PYTHON_USEDEP}]
-               dev-python/pytz[${PYTHON_USEDEP}]
-               )"
-
-#              dev-python/bcrypt[${PYTHON_USEDEP}]
-#              dev-python/selenium[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.5-py3tests.patch
-       "${FILESDIR}"/${PN}-1.6-objects.patch
-       "${FILESDIR}"/${P}-bashcomp.patch
-       "${FILESDIR}"/${P}-test.patch
-)
-
-pkg_setup() {
-       webapp_pkg_setup
-}
-
-python_prepare_all() {
-       # Disable tests requiring network connection.
-       sed \
-               -e "s:test_sensitive_cookie_not_cached:_&:g" \
-               -i tests/cache/tests.py || die
-
-       distutils-r1_python_prepare_all
-}
-python_compile_all() {
-       use doc && emake -C docs html
-}
-
-python_test() {
-       # Tests have non-standard assumptions about PYTHONPATH,
-       # and don't work with ${BUILD_DIR}/lib.
-       PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-               || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-       distutils-r1_src_install
-       webapp_src_install
-
-       elog "Additional Backend support can be enabled via"
-       optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-       optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-       optfeature "PostgreSQL backend support" dev-python/psycopg:2
-       optfeature "Memcached support" dev-python/python-memcached
-       optfeature "ImageField Support" virtual/python-imaging
-       echo ""
-}
-
-python_install_all() {
-       newbashcomp extras/django_bash_completion ${PN}-admin
-       bashcomp_alias ${PN}-admin django-admin.py
-
-       if use doc; then
-               rm -fr docs/_build/html/_sources || die
-               local HTML_DOCS=( docs/_build/html/. )
-       fi
-
-       insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-       doins -r django/contrib/admin/static/admin/.
-       distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-       elog "A copy of the admin media is available to webapp-config for installation in a"
-       elog "webroot, as well as the traditional location in python's site-packages dir"
-       elog "for easy development."
-       webapp_pkg_postinst
-}