# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1491241447 25200
# Node ID f89f64fd350193554bc46e3d1f1018390e411eb9
# Parent  6be79539dae2b2b9df5891c151b9116905dbc9ac# Parent  bbae16c15c226885a442ea87c1e21708e3eec32b
Merge update Djblets into master

diff -r 6be79539dae2 -r f89f64fd3501 dev-python/Djblets/Djblets-0.7.11.ebuild
--- a/dev-python/Djblets/Djblets-0.7.11.ebuild	Mon Apr 03 10:27:19 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/Djblets-0.7.ebuild,v 1.1 2012/08/03 08:03:20 xmw Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit distutils versionator
-
-DESCRIPTION="A collection of useful extensions for Django"
-HOMEPAGE="http://github.com/djblets/djblets"
-SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.4.1
-	dev-python/imaging
-	dev-python/pytz"
-
-PYTHON_MODNAME="djblets"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
diff -r 6be79539dae2 -r f89f64fd3501 dev-python/Djblets/Djblets-0.9.6.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-python/Djblets/Djblets-0.9.6.ebuild	Mon Apr 03 10:44:07 2017 -0700
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="A collection of useful extensions for Django"
+HOMEPAGE="http://github.com/djblets/djblets"
+SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.7[${PYTHON_USEDEP}]
+	!>=dev-python/django-1.9
+	=dev-python/django-pipeline-1.3*[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.1.2[${PYTHON_USEDEP}]
+	dev-python/pillowfight[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
diff -r 6be79539dae2 -r f89f64fd3501 dev-python/Djblets/Manifest
--- a/dev-python/Djblets/Manifest	Mon Apr 03 10:27:19 2017 -0700
+++ b/dev-python/Djblets/Manifest	Mon Apr 03 10:44:07 2017 -0700
@@ -1,1 +1,1 @@
-DIST Djblets-0.7.11.tar.gz 435480 SHA256 862122c72710e086fc4aa6961d61ea3dcc787190e535803ac74e2bd0df2fdcdc SHA512 e43c192cdb79f109dd6e0ef34b82564201bbaa9115a4fd347145255a676a9a3bcc76ec63de28ba44933c4ad80bbf85f4966535906564163995de5f912babc19b WHIRLPOOL b9295227697c2ef98c4bf1745fb8e524c1352534de177224cd838c52eb4fa6f7389cb179515086d26a40240521a234df7bd441816651a4e34453c96fcb9c8955
+DIST Djblets-0.9.6.tar.gz 418551 SHA256 4ec554d4f494f10f01299fee47d55dea598a085280cde589123627e258d59a12 SHA512 825000be7c3289f67985f01a51982ea9754570b8ec62f8010ab3f39a9b82f2cf3270d13233b99fd93fd6d874c1672166e3fe6943c2301edae122583d06be1203 WHIRLPOOL bde438af53e7ebd16a11dcb97134f7e106c1f8ae36404029fb7157cf56255e8e15291dbbe9fa1451ac0e8f144ff643d4465d8b661a9e5fda83412c684b094ff5
diff -r 6be79539dae2 -r f89f64fd3501 dev-python/Djblets/metadata.xml
--- a/dev-python/Djblets/metadata.xml	Mon Apr 03 10:27:19 2017 -0700
+++ b/dev-python/Djblets/metadata.xml	Mon Apr 03 10:44:07 2017 -0700
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+<maintainer type="person">
+	<email>da_risk@geekorum.com</email>
+	<name>Frederic Barthelery</name>
 </maintainer>
 </pkgmetadata>