Version Bump; fix bashcompletions, #526272

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

5 files changed, 163 insertions, 4 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index f41a5fec4692..5410929059ca 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.150 2015/02/06 03:41:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.151 2015/02/28 12:59:28 jlec Exp $
+
+*django-1.7.5 (28 Feb 2015)
+
+  28 Feb 2015; Justin Lecher <jlec@gentoo.org> +django-1.7.5.ebuild,
+  +files/django-1.7.5-bashcomp.patch, metadata.xml:
+  Version Bump; fix bashcompletions, #526272
 
 *django-1.7.4 (06 Feb 2015)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c7cfbc127bbc..a98d7c9e11fd 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,17 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX django-1.5-objects.patch 1470 SHA256 6b0ce991c1b9c97d642faf9f5aa554796c2fdec52cc0f78b6447626a4f9f6816 SHA512 c82592ba39b121111c86d8713a24e6120a27991e057f9c034722e2054ff51a09e4cdce997a9059245a602c9343ab8b8930e14cb36cfd088da2b5e44e11d13cc4 WHIRLPOOL 84bd83ae54f8cd62dec2973e064511814205789fd8031fb6ad142bf0e865f4af32e34dfcb1bf82476a2e0e58df75ed6424d646fc618c353dedf8015f0c2bdb70
 AUX django-1.5-py3tests.patch 959 SHA256 62fbb00c8d919306b48c8fcc82c7fa5e8aa38589f5271c526757da0ff2acbaa7 SHA512 cc746d43c2cc1c7f88fbffbf07ffc1f3b3fdcb738547658623c763e302c69372f8c8c014ac2a7196382d21aee0ba2ede92860a59a76ad3e14541015969935a92 WHIRLPOOL 4da24b4006ff233fea8041127a2842485d7d178d5abba2b429f537a66feb21384a59678188451089429af355118f06fc7083cbdd61d12905f9dfdb4e831d668b
 AUX django-1.5.4-objects.patch 1467 SHA256 237d0ee4e9f2af1d98b0b230977a41d061cbdbefc153193bc1539c4ad82622ee SHA512 09bdaab452f692679a15d0fbadf3c044417aeda0ce65b30bd2994d86b33ae93c13eb159fdad373a031ab2e0563861e29d1f9935b52c33af34a6afd25461e904d WHIRLPOOL d8a18947bd826c28836ce5180a6f9de758722fcc45ba11ca6a887c65711e7fa23827dcab734b6bfe51c330dd05a2d67a5d82e6e2d85130cdb05fcb4ca0622f26
 AUX django-1.6-objects.patch 729 SHA256 ea217c069a28b19063fcf216433cab48bd693fa51db0585881905532575a0875 SHA512 e7dc3cc8e50b4b0d546983dd79f1fa2bf7680d04d1e401267334ce72ee065e0fac2b00f9287ccafc3fabca29bca4c1d6475021b5da19d145a2d90fd491bb7ae7 WHIRLPOOL 00b4f579809206c78ce1648059c56a3af146c883c1b36f4febede15b4d3075a3686b30a6feac8d03c1df5e45994da5a2fdece6bdb71afb8d16bb72e139d67931
+AUX django-1.7.5-bashcomp.patch 1090 SHA256 7097b55ef456d7bd228fc08ba7430b37b966170baafab521edcca5a1d2725556 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532 WHIRLPOOL 8a03ba9fd619acf6d1b041e84b26df436b594e952acea5c3cde7b62e83cbdc03ab75b28189b1bb49cba508e664976529d6e4403ceb475d0b36ecd70d948bc6b5
 DIST Django-1.4.15.tar.gz 7754429 SHA256 aa57ceb345091c25648b41c98a6f46fffd7884695fa884c7039291177ded14e9 SHA512 6552173269b5c86b3ee20e31d70bd1e0b5c8dc21ee82af0ce3b75f374d2a9adbe3ec28cf39c44156782ae9a0cc64aeac80a938f6d3efbf29d4affe3f0354348c WHIRLPOOL cb19b9e1e17ec60e5db06a40b78681a43714b40e2caad6d87cc3f150d123826552a289d96a35c72b9596fec1279714d26b2f9950a7d75ecb72c3f068134564c6
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
 DIST Django-1.6.7.tar.gz 6647301 SHA256 9a64211c96a3262bb2545acc82af5d8f3da0175299f7c7e901e4ed455be965fb SHA512 7806562853c1c2db1decc597ec62f1e91689a6a3668030ed8dc0a757e5bf1603f4be945cef277ce564d26665a39d5c4151060b7889822e66671345d973dd256d WHIRLPOOL 6cbac5dbea4a37e88beeec3402ce264fdc889fcc6ec319fdc7436b45a538ad9a4ccb4fc01bf4c122407700e7cf6f8223bd40aa94af16bfa801dc93aa46576484
 DIST Django-1.7.4.tar.gz 7592584 SHA256 f33255afbb9ee0977d9095ab0b50fde1f8ddff4220b57e8d19c6620b3e316170 SHA512 ae4ce59987926622ced6a18b4f3d0689ec505eb38ba434dc1812d7261eb6bceaaa9d8ee6b12a871c1fab7c14f7618be283fce83d09856656aea388b634a10f77 WHIRLPOOL 583454f5662cdbb63556fca1c1939b66c8946587b47d4adc734c6814cd22b55734160baafda5cfbc0d7735f17d1bbb12d3a5e8cbe94cf84a43b2396829f54ee1
+DIST Django-1.7.5.tar.gz 7599017 SHA256 1c391f9349c97df503dac3461599f24235e4d04393498e6060e74dd2721460bc SHA512 b54c8afaf1a07475fc4952c9af94fa77cb9d18fcdbc98c3d61406201fdcff3fc997d831b26914fbd1db05cdeeafeda67de7476c1bf4ec125c6f00aa69a127f77 WHIRLPOOL b3e957dc0bc852a0983d3aa01e82183de4dc7eda68dc1e893d4fee8df4f04e39979fd6285ac615d9e8ec8d2fe4d75e120b9dd06ae1e77cd5d61ab795f67db1a6
 DIST Django-1.7.tar.gz 7486550 SHA256 33f781f17f145f79ee8e0b8d753498e0e0188f0b53b2accad4045d623422d5e1 SHA512 9eb96812b913372f2e95e70fb498109d42d74a7df2a8b26083c5b372b421d897ef4119f45bfeb1cf2ef224448e9e0cfb801842441454b9b16c524e94d80d509a WHIRLPOOL a462e153501e572ef00c4319165b953ab3658d2bf1250eae05b75b8ff3ade0621b1a58943ac1fee4441c239cb3384e2ee73764c8255090a7a419675d09c19260
 EBUILD django-1.4.15.ebuild 2557 SHA256 7248e0267a58f4b5a35fe2d7d4b164750921f0bccc2260bc572c23dc0a8894c2 SHA512 58380a2443d8966ff78616ff4a90645cca4cf0e1cf672077b928542931b96230caa85dbf395ae4e0af80aa962383167885a9cb1779d3cab96ccc1d3e5998742a WHIRLPOOL 8792466779f3e249ae584d32bb54f42dc990558b26b288129024b6e66e5b06c23cbed04d922c06e73b7067f6ee8fcbbe86e8ebc82dc0976811f32bef984c4640
 EBUILD django-1.5.10.ebuild 2570 SHA256 4516728575bf4f4386d18ff8b7b3dfc528988a2613314ed652cbaefaac85ee87 SHA512 81c02f0e126ba9c193bce65e06b51a903f927f1b313b34b789b48e6f70ee09bfee38821fe607597e240726fc5d5a9e47a50dd6d2c60ccdd2d22aef5c9da8207d WHIRLPOOL 9cd10f6cf0686cacbc1f74c22a3bbdd66aecb7db7484f392e2b643e322bfac65b34af4fbb631734ba8f62efdf5cb52f8841a56188f072fc3f808cfe5e2430c86
 EBUILD django-1.6.7.ebuild 2686 SHA256 2d4cbba335e51b7ae41580ffee14246d402684b376dd40bad70a70d7386a377a SHA512 49c124e8abcfb9e3e921f88dc7924968469939eb85581a12aaa628108d15375c79970a75f0aa936212fe6e8f4d6edd42f6044f51cd597284eb41311942d6e1c0 WHIRLPOOL 608ec69095c1e771c8a26089ae8a7584b3506a2231a620dc0f38ace5e097e31ec22bf99c0ac7ab5fa6cc632bee4cba45cb459364f81b97eaadecbc71bc0191df
 EBUILD django-1.7.4.ebuild 2990 SHA256 377fc921d466b948840529e986a7f4545da413081284963dcb97caa7298f5789 SHA512 f34cb566109b6e8a95cfd1a6cb353b0ebea132bd64c0893db87fbb09b11c45ec5de2344cf6d4e2d5beec0eebaccb226b0978970f11560bc0830e334db4d60b2e WHIRLPOOL dd51d873574880ee919ff827d92f5e2dd42d36f5bce30dc36003449bbfa44adf96b8e04d05ac3788c7819ab86c70effb9f5f24bf6f6fcaba5e27a289b7bb9bb6
+EBUILD django-1.7.5.ebuild 2550 SHA256 63f3662d616aa4fe19883390fa2b2186cb556bf925892d033975710864ef8f5f SHA512 0b149a033e6b9540d6911df62a99f5da698081fdf8cc12283055159a6b40d4374b7a5bceb0ab7181f83ea131592790d32f5206c1b64a876b45d63b528861004f WHIRLPOOL 67b7d35162200f0032dff62830503701be202b30185e4e147c4e10d9230d62d704550d6b94e60e06eeb11f4900dad27700f88003a8eb18c840b1985517054039
 EBUILD django-1.7.ebuild 2988 SHA256 c0159d87d9b22bfa26c00bbe6ffaa5e964835eeef6c5f74559c769d38ac77df7 SHA512 7228d335886157e9089497ebddbbcbdbafc480b9240ba8ad1f997e640d077baeb5708f336026fee996d6010baa4669200d63b1edcfff063825bfa8693dee9ffd WHIRLPOOL 33351542a145be1f50f4f0fdc2ae3525ae66a934bad0151334a7ec50911d562cf55cb14182c6aa3597b45b1ca9bde5069a0157c4c36f7f31d15a8dc3e371645b
 EBUILD django-9999.ebuild 2378 SHA256 53f3f83d91d9fba975d5ee353a91b9ecadb874b2da551b234baeed7747bfae20 SHA512 521cac5140c8ddd2529c9a103ded73427e83a1107804639090cbfb186a7a691aa49c02587fa06081218960f9e34c6b971e4dc2805d160e6c2b775c3c7498afc1 WHIRLPOOL 892b0145749a5446b4b75ee41045795ddd63459d5c0024657d7477c02c8f3c32fafdab8a5e586e623f26c9554fb98a69525ba00e5c43a5e0cdfd6149fa348f86
-MISC ChangeLog 23569 SHA256 823f6aac14235a824a29abe5b0fbf1a84df9cf9d7a37261ffa7a2b6f93656620 SHA512 2700a771bf63865afb5f4f92c6f43c5c4cc2a54789133896f65ba6ae5f1be44c59e0b88c0fbec33a65c97b22daf05225293fd0b02f15f4e6dc73f103bb4d56a3 WHIRLPOOL e33ffe10918d8c0ab82c00a27f4409f753044945d50f14540e04e1f3b43bf1fab6d67b239324791c377c57ed0b234f5665a684463579c323a631ad9193853940
-MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+MISC ChangeLog 23762 SHA256 05a0c971d6a1d7f9384e65912517ab8b90f533f5339211c81a3b90eaaa68bea2 SHA512 e697ccf9bf9be76af902556f0b085e82c57ba655702e6bdafd52dff8a8473b2846ae0984148b6de4ef19e513618d63f7196185bffe9f4eea2fe72166391b6066 WHIRLPOOL a0687f900ffae1b2c4abf7d5052f2967b839f1df8b543f1866e41ac3bbb0ead26a9b2c5b05e657d98e4bfe7cd368609367bdee662dbb93aa45471a461a3c6e93
+MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJU8bu3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPpwP/iXpAWq7Qtjk8E4NvRycP2ab
+PnKDPUK0qW9agNIL3hIyaLxJK+kg4wusFHD9xTK4YYWSfDFxDxTNemIER3IWeepA
+9sFiqtaREb3ASdH56JbznovXu13nGnk8Cssv00fngaWLofRJyVFD8052LNfBxsCA
+9QHCv+BZtM8kebxT/lhVnsucEiXJsSe3hVI95QK5kKLNWWTJ0N/36hnDbbaA4qdw
+utHSv8j7vVrsMpvzD6Qosc0u1Ny7G80YTbCTGePiNaDjz9t5iztop19S450sDeX4
+N2n5xq7oC2eBarRjiBwnwC7VBmLKihAno3YOc/Ux1DbOOh4QxMwSLprBks3IAzmw
+wRPJ+ChXio1jSqyIGqCuCVtyJDKO/ryO6vfq5JniVcXCtZf3lefd11rEDEawOZW+
++JFlhPvQ/HFaaPtZZ5v9UkLBdss3fQwL4eHl9QTiNn8vJM2sHmbpUue/NSyOSOim
+C+yEykOssWqRtyVYetpSALpUPG3BchhuHr9n42W0Ml67YHKuF37EFkQF/KLnMLQY
+T/2kiYhINhP680ZEvZI2maytWkvXTYctfYv/qTe37sRz3Yi/05hUAHDp3pDsdMbg
+nGpJvYhFTrhg3zQ9wGX3P3BFaG8nAANmaIU2N3qwEJP4aYAK00T9CsZtUDeZWsT4
+XOfd2RFfpwL1YRAEaISh
+=4X7v
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.7.5.ebuild b/dev-python/django/django-1.7.5.ebuild
new file mode 100644
index 000000000000..a32aacc520a9
--- /dev/null
+++ b/dev-python/django/django-1.7.5.ebuild
@@ -0,0 +1,94 @@
+# 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.7.5.ebuild,v 1.1 2015/02/28 12:59:28 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="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-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() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+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 -v1 \
+		|| 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
+	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
+		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/files/django-1.7.5-bashcomp.patch b/dev-python/django/files/django-1.7.5-bashcomp.patch
new file mode 100644
index 000000000000..ef76f8a873c7
--- /dev/null
+++ b/dev-python/django/files/django-1.7.5-bashcomp.patch
@@ -0,0 +1,34 @@
+ extras/django_bash_completion | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index 3e02d8e..5a33938 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,7 +37,7 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
++complete -F _django_completion -o default django-admin.py django-admin
+ 
+ _python_django_completion()
+ {
+@@ -55,17 +55,3 @@ _python_django_completion()
+         fi
+     fi
+ }
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        pythons="${pythons} ${python##*/}"
+-    done
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index 301d2207cc29..ee7e8b2450a8 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+  <herd>python</herd>
 </pkgmetadata>