add patch, acquired from master since last release, fixes test failures

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 78 insertions, 7 deletions

diff --git a/dev-python/django-pipeline/ChangeLog b/dev-python/django-pipeline/ChangeLog
index f8efc6d9bd6d..5c73e9b697eb 100644
--- a/dev-python/django-pipeline/ChangeLog
+++ b/dev-python/django-pipeline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django-pipeline
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.27 2014/11/03 09:34:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.28 2014/11/03 15:07:01 idella4 Exp $
+
+  03 Nov 2014; Ian Delaney <idella4@gentoo.org> +files/1.3.26-tests.patch,
+  django-pipeline-1.3.26.ebuild:
+  add patch, acquired from master since last release, fixes test failures
 
 *django-pipeline-1.3.26 (03 Nov 2014)
 
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index a4e455f7b35d..38d2b4e9be2d 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.3.26-tests.patch 4195 SHA256 f7761a6758225a461e1571f63bd5b98df584cdc040f0bd65c98dfec856beae3f SHA512 1eef360d23f0647319aeb4f4157318c6b91f3ee0bce34f9afb9ea82f74d57aa02328bdde066d0e68b56194301dad483f962436fdd349694991d1f9334d9fc13a WHIRLPOOL 8ec3d58cef9faaaf7a2d2968e906491eab9bcbe0f70c83d11552b9b93a70c6d66b7efb1593a029ba35f3e37ffd0135f038243d6aeda238942bbf72705f9a48e3
 DIST django-pipeline-1.3.25.tar.gz 41008 SHA256 92c4ba5543d3ad980cd3a65a121ced62a6ad6449a773269a693f54e0ca5c565f SHA512 2c66b8b60076a8d19049947a9465d96fd80098c6e560f6cb6ffa26fd17d267830d87913041f9876da1276b0224ef3e8b0183c56367741e11c0f010a236b87169 WHIRLPOOL 15ac71f71988b2c7f5bb2d7c322843c35f6e34532af526b72bc90c15458b512948b97af333aaa5d52f71fd785f70d9b04018f8337eefc037be2dd24f04c77d7f
 DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285
 EBUILD django-pipeline-1.3.25.ebuild 1512 SHA256 388327d235ebb0e18ca27f6cb4a6a9857d884c0b8ef615222670ec1519144a20 SHA512 0bb5b22c3d76f8d111c57fce86185c85e563a5f505ff83a0bdf9c1d1918921133908c32f4d6c0b30be55ec94f31d98457e9c6b200884c4581f091b7172a75f9a WHIRLPOOL c3f0304b0b4b766f3b9e72aad1146c424fb6d00a2e00fb8188543b8e8cfd56d864e3e839b249b10c5f43460aaf331da517e790de09079748d3111813842d0116
-EBUILD django-pipeline-1.3.26.ebuild 1573 SHA256 cb460412b54f21e9cd82843ebd849b4d3d82005214c9466a300f6561f0617177 SHA512 ef776841c7f518b417c973f08a8b317318bd65c5ffd6f0cbe0c41ef9c176e1f9842be429760b830c0a02854b0d05b6cb66ec51cfdcb422a1a43049b814bbf231 WHIRLPOOL fa6b0179e80996dc855465178890b963fb1a348d2063cfc2a4ce4876fadf9b0c79797d3d099e48b5d0bae68b79406fabb117fccfbe3060231d33fdb7869340e5
-MISC ChangeLog 4721 SHA256 0d1b64af302944a29fedb994bec96f27a0783a71bf32f9dc2387e242d26e1c17 SHA512 40939e0d984d4034199dac1ca54f3e286cba16f207adf1c24b411246fdff6a7b4ac4fe6f85ed1858c82edc1ba3404a5dd9c5bcbba1fefcd99d8c4a940b1c1971 WHIRLPOOL c09b9b14a114343d1edce6e39fc3ab4bb1abb05694844c3833878329940be9fe553b268019a233eff8e0b01cd459224221c09184fc2adf09a6e7ef4f82701fc1
+EBUILD django-pipeline-1.3.26.ebuild 1618 SHA256 70d06f83a0bb66fe7608d59fe8a25128d1c9ea1e481e0777d67df3fb9be6e7c5 SHA512 a941d21be80a9cfc68dc89f7555434e5e2a6ada4827dd74aa86d7b33a933ac6874d3c5840f96ed4f4262961c2a540e8bcae25e24115ace4c2848fed047953546 WHIRLPOOL 2a0c3c5e0b661d09f2faea72fc45043b95b733c93e96365fd337dd37749e2006e55995a596cca494bb19171fa2f54016d50aca51bab236e1f0c13e613a6421cb
+MISC ChangeLog 4904 SHA256 fffcfa2ade57b0a1a68128e67be71e23f7570be2797329f33439387716f1f14a SHA512 432d4e05ddbebaf0e50241de57d010f7aed7d646d5acc9330d631cf5ebf2e6b55ac53c60ceb7e07987779f0e7ca77af690e62c64842d21a7b777f932e0723bac WHIRLPOOL 14776ca62562a2c59bc526e8c6eb804200dd728a4451181a21e2610b9a1b78ac0cc2906965ffcb7c307f70c53fd80c755ed014f6619a636d8194163d6ae805ce
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRXTDIACgkQso7CE7gHKw2NlwCeIePnIhFvu8tFnlnYL+hLNtoD
-DXkAmQHnKZb7iEkMBJ7LG6Z3faLKPWpw
-=irOm
+iEYEAREIAAYFAlRXmiYACgkQso7CE7gHKw0lxgCfbdiHOLlcLlq767P6w9A7pGU1
+uzQAoMcCO5rSpKVygMTT1ImpjYoTzeuh
+=Egnz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
index 51008fecc214..934d27619e45 100644
--- a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
+++ b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild,v 1.1 2014/11/03 09:34:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild,v 1.2 2014/11/03 15:07:01 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -29,6 +29,8 @@ DEPEND="
 	test? ( ${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}] )"
 
+PATCHES=( "${FILESDIR}"/${PV}-tests.patch )
+
 # As usual for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/django-pipeline/files/1.3.26-tests.patch b/dev-python/django-pipeline/files/1.3.26-tests.patch
new file mode 100644
index 000000000000..5cdf5e760c96
--- /dev/null
+++ b/dev-python/django-pipeline/files/1.3.26-tests.patch
@@ -0,0 +1,64 @@
+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)
+