www-apps/trac: Add fix from http://trac.edgewall.org/ticket/11345 for errors like

AttributeError: NullTranslationsBabel instance has no attribute 'isactive'

Package-Manager: portage-2.2.8

4 files changed, 149 insertions, 3 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 967f801f..db7629e1 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,3 +1,9 @@
+  07 Jan 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/trac-1.0.1-changeset_12275.diff, trac-1.0.1.ebuild:
+  www-apps/trac: Add fix from http://trac.edgewall.org/ticket/11345 for errors
+  like   AttributeError: NullTranslationsBabel instance has no attribute
+  'isactive'
+
   04 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
   -files/1.0.1-git-identity.patch, trac-1.0.1.ebuild:
   www-apps/trac: Remove patch breaking tests included in 1.0.2-dev, need more
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 2acf3826..72638129 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -14,9 +14,10 @@ AUX trac-1.0.1-changeset_11816.diff 1707 SHA256 480c3cbdc94aee2bece6bf6286bb37da
 AUX trac-1.0.1-changeset_11876.diff 1949 SHA256 52c93f148d90e0a84d465db186ff64ba7c14d799c65997774840a61ef37dccd6 WHIRLPOOL 6e20e40a56a36536f53276aa0fccd0e0c0b88f8e65ea2ef7d6d4e7a94e247b655660623b305d6fce7eb94c4b646720195f0f79c4098306c98f63cfac86d64ee8
 AUX trac-1.0.1-changeset_11892.diff 7701 SHA256 c8bd891ee12b94aa35abc0a336a01ff07a6f991241945a2a89f36647b23284a7 WHIRLPOOL be632efa06e8a2cd1bd3a390b38de6ea6275a04a811b1a5b0000114a5b6e61c1619a2d2a4a2bb5a40c608ad402d0046edb42bf814d98339c5db6e0a7aa2400b2
 AUX trac-1.0.1-changeset_11893.diff 955 SHA256 f3e253c5bac4df10a714adad5d7df87aed937872c3e18e596738f1df3cd27a6a WHIRLPOOL 1466d07dc71512c5aeccd1d99dfb2b76caef586de49d3ab10c44213c34695ae4b94e643ce8291d01a0eb5920f7dbc76a437e124fde5053a83549fdde82245263
+AUX trac-1.0.1-changeset_12275.diff 5479 SHA256 ecab1fcebb9ac61174d2741cbad2dba7ffab0183b886c1cebe317eaff4f89db3 WHIRLPOOL 3250a4185d8ef575d52e638f19cbd44239259e3009de32c964866e566d01153239a3026ecbded22a1913f2d498e6542823d5cff1b74991d531614e1c7353cad3
 AUX tracd.confd 359 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e WHIRLPOOL 591394e732d39bc13f97004cfb3c18128aa16a55557172d872797b5ca5c69e5f15d1420e697a4e40215b2a893ed684ba6b6388abacd97874fd6f04953b579e1a
 AUX tracd.initd 919 SHA256 21a2f301ec584917628a62a0809b9603a5f0b460f902b23b3867174a710bb132 WHIRLPOOL 06fc2a8833786d86821180d010de4b69fbc9eeee0c7bafd4c7ab77599740f84caec1b6bbde79ab6349100da21e246a0cf05dd1a767fafae75d02f2c8c058ebb9
 DIST Trac-1.0.1.tar.gz 3479896 SHA256 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb WHIRLPOOL c795fab244c42752e1c7d2a0e488b1c062333a6de01e607b749271f0124c16746b55ad35a69b6844db272f7223179d6f29f9115abb5289f6af1bdf467394b1a5
-EBUILD trac-1.0.1.ebuild 3448 SHA256 345bca46988451a90df270f496d45f03199e4ad9c0850fd1ef22115d722d112e WHIRLPOOL 4a4ab3ce44bd1f5117e0ce43501398fab3433e967f9c94c684ba989a1948ed779a489e2316e8a8f5e0426f967020a35c5ac738be219a13d4906b95c9ba71e10a
-MISC ChangeLog 2458 SHA256 6d98dc53582261ff769b5396beac6b7033de9029d85de4a0c7901df4e8ca1b71 WHIRLPOOL 89d52c0faade6137cd85db4b5a79d4f0a85c7b6e9cd6cb00218f4de35d71eb1af8d1b3ca8e4136862bcb508f4a713099202dc619f991db095babbac20bb7d307
+EBUILD trac-1.0.1.ebuild 3496 SHA256 dbae09dda3580da908c4f951652695ad83c07d97d3beb9c58885dfd2a4523e19 WHIRLPOOL 6f24d54bb65f2411a311d5657fd827683384073cceec27ac20fc5e19e98c6039944fd47012c315154477bdea87e89fb18f9d97a4b58c2e7c2891c2ba815d597a
+MISC ChangeLog 2738 SHA256 a2e113bfd8fa8f7700b9d448dd1a2052861439b02faae4d37a6cb0b52ede86e3 WHIRLPOOL 512a0ad50b6adc1f8c11439b7e3fd8d6b98a843e0cfaeadf8be465f2b213570674da52555819d25f79d289f01617508183b0777476bf8329b2fe8fdf8847f295
 MISC metadata.xml 375 SHA256 78fb655170713d45b48caf62f60ed1ec424aeb74fbd905f4b81595824ea456c7 WHIRLPOOL 051cbc8a2631a997006e63ea42639a4ece76b390c857bb771bf1061b950c4b876fa7e13c369800bac9f72bd5cdc62cde09a843a232369ceb2f188e2868c24f34
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_12275.diff b/www-apps/trac/files/trac-1.0.1-changeset_12275.diff
new file mode 100644
index 00000000..e72e2853
--- /dev/null
+++ b/www-apps/trac/files/trac-1.0.1-changeset_12275.diff
@@ -0,0 +1,138 @@
+Index: /branches/1.0-stable/trac/util/tests/__init__.py

+===================================================================

+--- /branches/1.0-stable/trac/util/tests/__init__.py	(revision 12274)

++++ /branches/1.0-stable/trac/util/tests/__init__.py	(revision 12275)

+@@ -22,5 +22,6 @@

+ 

+ from trac import util

+-from trac.util.tests import concurrency, datefmt, presentation, text, html

++from trac.util.tests import concurrency, datefmt, presentation, text, \

++                            translation, html

+ 

+ 

+@@ -182,4 +183,5 @@

+     suite.addTest(doctest.DocTestSuite(util))

+     suite.addTest(text.suite())

++    suite.addTest(translation.suite())

+     suite.addTest(html.suite())

+     return suite

+Index: /branches/1.0-stable/trac/util/tests/translation.py

+===================================================================

+--- /branches/1.0-stable/trac/util/tests/translation.py	(revision 12275)

++++ /branches/1.0-stable/trac/util/tests/translation.py	(revision 12275)

+@@ -0,0 +1,83 @@

++# -*- coding: utf-8 -*-

++#

++# Copyright (C) 2013 Edgewall Software

++# All rights reserved.

++#

++# This software is licensed as described in the file COPYING, which

++# you should have received as part of this distribution. The terms

++# are also available at http://trac.edgewall.org/wiki/TracLicense.

++#

++# This software consists of voluntary contributions made by many

++# individuals. For the exact contribution history, see the revision

++# history and logs, available at http://trac.edgewall.org/log/.

++

++import shutil

++import tempfile

++import unittest

++from pkg_resources import resource_exists, resource_filename

++try:

++    import babel

++except ImportError:

++    babel = None

++    locale_identifiers = lambda: ()

++else:

++    try:

++        from babel.localedata import locale_identifiers

++    except ImportError:

++        from babel.localedata import list as locale_identifiers

++

++from trac.test import EnvironmentStub

++from trac.util import translation

++

++

++class TranslationsProxyTestCase(unittest.TestCase):

++

++    def setUp(self):

++        self.env = EnvironmentStub()

++        self.env.path = tempfile.mkdtemp(prefix='trac-tempenv-')

++

++    def tearDown(self):

++        translation.deactivate()

++        self.env.reset_db()

++        shutil.rmtree(self.env.path)

++

++    def _get_locale_dir(self):

++        return resource_filename('trac', 'locale')

++

++    def _get_available_locales(self):

++        return sorted(locale

++                      for locale in translation.get_available_locales()

++                      if resource_exists('trac',

++                                         'locale/%s/LC_MESSAGES/messages.mo'

++                                         % locale))

++

++    def test_activate(self):

++        locales = self._get_available_locales()

++        if locales:

++            translation.activate(locales[0], self.env.path)

++

++    def test_activate_unavailable_locale(self):

++        unavailables = sorted(set(locale_identifiers()) -

++                              set(translation.get_available_locales())) or \

++                       ('en_US',)

++        locale_dir = self._get_locale_dir()

++        translation.add_domain('catalog1', self.env.path, locale_dir)

++        translation.add_domain('catalog2', self.env.path, locale_dir)

++        translation.activate(unavailables[0], self.env.path)

++

++    def test_activate_with_non_existent_catalogs(self):

++        locales = self._get_available_locales()

++        if locales:

++            locale_dir = self._get_locale_dir()

++            translation.add_domain('catalog1', self.env.path, locale_dir)

++            translation.add_domain('catalog2', self.env.path, locale_dir)

++            translation.activate(locales[0], self.env.path)

++

++

++def suite():

++    suite = unittest.TestSuite()

++    suite.addTest(unittest.makeSuite(TranslationsProxyTestCase, 'test'))

++    return suite

++

++if __name__ == '__main__':

++    unittest.main(defaultTest='suite')

+Index: /branches/1.0-stable/trac/util/translation.py

+===================================================================

+--- /branches/1.0-stable/trac/util/translation.py	(revision 12274)

++++ /branches/1.0-stable/trac/util/translation.py	(revision 12275)

+@@ -150,6 +150,6 @@

+                 t = self._null_translations

+             else:

+-                t.add(Translations.load(locale_dir, locale or 'en_US',

+-                                        'tracini'))

++                self._add(t, Translations.load(locale_dir, locale or 'en_US',

++                                               'tracini'))

+                 if env_path:

+                     with self._plugin_domains_lock:

+@@ -157,5 +157,6 @@

+                         domains = domains.items()

+                     for domain, dirname in domains:

+-                        t.add(Translations.load(dirname, locale, domain))

++                        self._add(t, Translations.load(dirname, locale,

++                                                       domain))

+             self._current.translations = t

+             self._activate_failed = False

+@@ -184,4 +185,10 @@

+             return self._current.translations is not None \

+                    or self._activate_failed

++

++        # Internal methods

++

++        def _add(self, t, translations):

++            if isinstance(translations, Translations):

++                t.add(translations)

+ 

+         # Delegated methods

diff --git a/www-apps/trac/trac-1.0.1.ebuild b/www-apps/trac/trac-1.0.1.ebuild
index 9c50d9f0..5af03646 100644
--- a/www-apps/trac/trac-1.0.1.ebuild
+++ b/www-apps/trac/trac-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -73,6 +73,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-changeset_11876.diff"
 	epatch "${FILESDIR}/${P}-changeset_11892.diff"
 	epatch "${FILESDIR}/${P}-changeset_11893.diff"
+	epatch "${FILESDIR}/${P}-changeset_12275.diff"
 }
 
 python_test() {