Version BUmp

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

4 files changed, 138 insertions, 25 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 174416ac48ea..06750f7a96bd 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # 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.162 2015/03/24 09:20:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.163 2015/04/02 06:59:07 jlec Exp $
+
+*django-1.8 (02 Apr 2015)
+
+  02 Apr 2015; Justin Lecher <jlec@gentoo.org> +django-1.8.ebuild,
+  django-9999.ebuild:
+  Version BUmp
 
   24 Mar 2015; Justin Lecher <jlec@gentoo.org> -django-1.4.19.ebuild,
   -django-1.6.10.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 7fe665b94609..2ce75cdc43e2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -14,29 +14,31 @@ DIST Django-1.4.20.tar.gz 7877794 SHA256 58ac719464c4c8b13d664ded6770450602528bf
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
 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
+DIST Django-1.8.tar.gz 7258871 SHA256 066bad42cb4c66944e7efcf7304d3d17f7b0eb222e53958cdd866420d2e8b412 SHA512 2e8d5f16caa36f0df752a2ff1b536982bcbeb373a6898d3b7a5d31b7c661324b101051b5eaac59e53055c1dd7f614f99ae966e177afa97aba7028d9ba72c44d4 WHIRLPOOL 93dc57bf7261c3c42fb47abb4cb059865e50c9bd3bbd4e98e204952a575050c035a5d16f4f519261a6d0553e157055c4abd6893a9e274df5295d170eb2c9a94f
 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.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 25771 SHA256 46068b5f28b81c7883e65c37d75f85d98913b87c55dfe68883d65be1e96b72fa SHA512 36ec73c67848bd80504b4abf9912d57ab9982014059cba87f3a8677373073aac9598f319ee4f263cf5c3e284e038a79278cab80d6b2c0048f1231f56d847431f WHIRLPOOL d62a094be5c9b2364a646badb57d58384197943d8c1f13670870b67e5d5550bffa39fcd048c7de2b95fd5f9c1c089821ec1c8248ffd2b61d2ff9f231c415a529
+EBUILD django-1.8.ebuild 3036 SHA256 8f9662e5cfeb23ae80df9c380558663b832b54c713046821a1de3b1afba1b667 SHA512 edc09c791d1d50ccbd84a267b37071046242eb2b7b00304e484a35ef0ba2bceaa7f9fbc7d39dfba27177ec232e04a5aed6a3e6176f2fbd1fdea48bd6337f59a3 WHIRLPOOL d0f4aa057986c722c776d9b103ea842f49605e210a51a43135844c7382eb083a4b55f6b692c15980e66dda9a45b686bd17c0b09dc85ebc3d8f0743e54dc6bec7
+EBUILD django-9999.ebuild 2874 SHA256 42a4c74f7b9ac7ac064e88097d636feea989cab160b9313e13fd18967624e3c7 SHA512 9b8f31d0ebf5aa4eaddd314861a34d18a19c390edcc66c0f12b8fe0f288bfc065f213cd2e953e0db79403cc3ec9ba8e152a5e993d5a71dcc9bb7be512c973465 WHIRLPOOL 91b6f9728a9e30c3717e1dabfaa6469e23c70f3e861d8a6e6cf0ba719c876a7b0899373fc21abe4b55f07fb509d899324cc3e985b7c8c7f914c9f41bd3ca1057
+MISC ChangeLog 25903 SHA256 956406bb742f4be402464b4090e930d9c2231ee3dd411c44fc174ad178b7f980 SHA512 199535c681688a7b462d729f66a4ab914e8c03b071c881289361343b192bc5a47c8748356d6f3233a58e45f6b0a71ca1f6eb6ddf2339d7fc7f4dc314dfe6502c WHIRLPOOL 856c20717b16d499eb59bd3f520db77971551d377f8588351922adae413bf6a7023fe2f7aa8b08e552c2caae7c071d55f23153a990fe5861010996d188a4b3d6
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVESxeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVHOi8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbAIP/ieI2nJwBMm/w5qXLc7R4YpZ
+o5ebg4TW3NR2+dUQ4Y3KlOk/6ML7FH94md7eU4YfLm0jPE0XAJSOQHcLzrHruPCd
+BKhhwyVf1JYHcI/lk6cx1LhPSdFEmInWbvPcOVCyPsjqGrNk67hacBfatep6mk2y
+wUM9ALKKc/t+NRvTmPDmj7e6xvX7xdIONIyEyqOWnT/T5WpAeTSZfrnmVs++TkQE
+WiQ5ZvHCsDfElHcQerB6t8AUvIfbcp7ALUt5MLl2TYb1sdLn4DV2sF/AOAVZ0kVS
+yIKoJ5AqMjw3YVvAUXQj8iGr8zMufZ5EmbahaCLDEbJKLc7yKm+B1Qv6T2ksxKh9
+vqK/MmxN+YeYEXYFcKiAPa3qO7XKkozdFyqJIK2C8RHPSZq/bZEB5Fa5QLGExnDk
+fp0dKzdFruBUDPon4DhGWyo+6k09ik2iIu0lJTp4IALgnElpi1D+1CeLoIANg3lM
+t3gu3ZWdA4bo8XJ9wnV8fx+uZvCectICh0wzPG397aU4PExpKp4nECxvJnwa4mLV
+OAQ4PJaaFADhG2YJBzJMw17+0XNuURJjBh6nx+wV+s2FGqMRgXD+T2aXqU0EOVnS
+fmNilhXpV/79cML2WI1G+bOOmje3p3KbAfzH6Rq8+C1i2rABI0TH30fMizPBTain
+weVPoeVlcYlkGdJU7QdA
+=nJZg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.8.ebuild b/dev-python/django/django-1.8.ebuild
new file mode 100644
index 000000000000..4643ad204c86
--- /dev/null
+++ b/dev-python/django/django-1.8.ebuild
@@ -0,0 +1,107 @@
+# 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.8.ebuild,v 1.1 2015/04/02 06:59:07 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_PN="Django"
+MY_P="${MY_PN}-${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
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${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[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.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/mysqlcient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/python-memcached
+	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "Password encryption" dev-python/bcrypt
+	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
+}
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index de6c7f71f6c6..924d882e1416 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.24 2015/02/28 18:08:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.25 2015/04/02 06:59:07 jlec Exp $
 
 EAPI=5
 
@@ -14,7 +14,6 @@ DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
 SRC_URI=""
 EGIT_REPO_URI="
-	git://github.com/django/django.git
 	https://github.com/django/django.git
 	"
 
@@ -29,16 +28,11 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? (
 		${PYTHON_DEPS//sqlite?/sqlite}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[$(python_gen_usedep 'python*')]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/python-sqlparse[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		sci-libs/gdal[geos,${PYTHON_USEDEP}]
 		)"
 
 S="${WORKDIR}/${MY_P}"
@@ -46,7 +40,7 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.5-bashcomp.patch
+	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
 )
 
 pkg_setup() {
@@ -79,9 +73,13 @@ src_install() {
 	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/mysqlcient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo
+	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/python-memcached
 	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "Extended templating support" dev-python/jinja
 	echo ""
 }