gentoo resync : 03.01.2018

3 files changed, 0 insertions, 121 deletions

diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index ede4648f7bea..7fcba45c7717 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,6 +1,3 @@
-AUX 1.3.26-tests.patch 4195 BLAKE2B d1ebbbd87fd55634c54c92c80b07e33da95e56d6181ca5b72ba2a5e23ab8e60002d6df1dc8d6cd41dc82cd58b03eb520c5f497ee3452e7597ed007e763594b14 SHA512 1eef360d23f0647319aeb4f4157318c6b91f3ee0bce34f9afb9ea82f74d57aa02328bdde066d0e68b56194301dad483f962436fdd349694991d1f9334d9fc13a
-DIST django-pipeline-1.3.26.tar.gz 41054 BLAKE2B 0082186d742b0fd965546e7aba8275b2381c34239a164f73c8507cafaa68ba9f242c281dba27896bc080f43f28c731fb36dbbb83449e2976acaa593981f1b08e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284
 DIST django-pipeline-1.6.0.tar.gz 41822 BLAKE2B 4917c527103522114b31afb0e9dbdcb202b0181d6634eaa4baac632a05c0ecab4502a3d4e13e97413268db582833df71f3f6df088b07ae8a354574331d2a9026 SHA512 4cf89f34a56aeb7cd5042617c265fb4bccfe7a0c32c26d50a0820d35c18207cdbf68b43e8f51ef7145fc48576ae0fe0a21553a75ec8a0a21a3c62e7699268d73
-EBUILD django-pipeline-1.3.26.ebuild 1481 BLAKE2B d62f9331160b5925ad1cffba894ce2ceabef74614eef5eaf502b32e75b49767e8fab81dc267727cf2d31b4d17bf3ea4c600655431ae3dbed67b4a9e0d8dcbfbb SHA512 c84cb9b8ccfe25850ad1d883b335ff1efa4f81dd1a538fa46c0bc8f06393b16b950634ec02774da851265b3bfb927492df4fa306601e047fff03cec4cc8d8d07
 EBUILD django-pipeline-1.6.0.ebuild 1444 BLAKE2B 0a48b1959b43aa29a8535a059a7ca3ddefea6c6fd7cb48c1bcb67e947651d484daa8a3f9018d4bc5aea8ffbeb440481403234443608f132fd5a14d8bf6c17daa SHA512 771b9af45df176258f07a850a21d87402bc1fb678f77ef5d784e41df66e38dfb648a10e302daf19d012012530bd310df1dffd3d16be7b673f363e4b7b7412cb8
 MISC metadata.xml 341 BLAKE2B 63efd8486a9e20bc6a8f085295595e8c3cbc389bb3c0153ecd6ccff6c17835f00cab2a34a22005148d84e0e900d3f6f6bff055a6c691eb83d014e459654798e9 SHA512 7cef597f45253dd0e25392fbb3bd20090ef6a522d506380be2a925948275bbf2348c5d114f84020ad132e84c72d2dd125fd487d591eb33d45a137d0be215ff09
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
deleted file mode 100644
index 5f1e37ee8775..000000000000
--- a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
-
-# PyPi releases lack docs/ subdir:
-# https://github.com/cyberdelia/django-pipeline/pull/254
-SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
-	dev-python/jsmin[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PV}-tests.patch )
-
-# As usual for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# https://github.com/cyberdelia/django-pipeline/issues/381
-	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
-		|| die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
-	distutils-r1_python_install
-}
diff --git a/dev-python/django-pipeline/files/1.3.26-tests.patch b/dev-python/django-pipeline/files/1.3.26-tests.patch
deleted file mode 100644
index 5cdf5e760c96..000000000000
--- a/dev-python/django-pipeline/files/1.3.26-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://github.com/cyberdelia/django-pipeline/commit/ba7b8d0d1cb621521a2025fed3e60786a010836d
-diff --git a/docs/configuration.rst b/docs/configuration.rst
-index 4385e23..e200bc3 100644
---- a/docs/configuration.rst
-+++ b/docs/configuration.rst
-@@ -185,7 +185,7 @@ Other settings
-     (
-       (b'text/coffeescript', '.coffee'),
-       (b'text/less', '.less'),
--      (b'application/javascript', '.js'),
-+      (b'text/javascript', '.js'),
-       (b'text/x-sass', '.sass'),
-       (b'text/x-scss', '.scss')
-     )
-diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
-index 84b6957..a303d03 100644
---- a/tests/tests/test_template.py
-+++ b/tests/tests/test_template.py
-@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
- 
-     def test_package_js(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
--        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_async(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
--        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_defer(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
--        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
- 
-     def test_package_js_async_defer(self):
-         template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
--        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
-+        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
- 
- 
- class DjangoTest(TestCase):
-@@ -64,16 +64,16 @@ def test_compressed_css(self):
- 
-     def test_compressed_js(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
--        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_async(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
--        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_defer(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
--        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
- 
-     def test_compressed_js_async_defer(self):
-         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
--        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
-+        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
-