www-apps/trac: Add missing PYTHON_USEDEP on python modules, add patch for babel test suite

Package-Manager: portage-2.2.1

4 files changed, 155 insertions, 11 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index bc7bfc3d..f8a6de70 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,3 +1,8 @@
+  02 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/trac-1.0.1-test-suite.diff, trac-1.0.1.ebuild:
+  www-apps/trac: Add missing PYTHON_USEDEP on python modules, add patch for
+  babel test suite
+
   21 Aug 2013; Bertrand Jacquin <beber@meleeweb.net> files/tracd.initd:
   www-apps/trac: Move /var/run to /run
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 221418ea..b3e0dfbb 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,9 +1,10 @@
 AUX 1.0.1-git-identity.patch 1691 SHA256 2ffbc7093cbdb6eefa7e4e936f25bdbbbf8b34a145c21e49116fb374c5e5b82b WHIRLPOOL 1a294cd7cca5cccfee2b3dacd251e55ae918fa28efad15f98013ab45730e2965fd1875af6ba1b21a4ef8d52472b0a24109e4ab9dda0ee204c54fb943f10f17bc
 AUX postinst-en.txt 1331 SHA256 1799cf63e70e2ed7c3b1a1148b29ce456dda8e84ef137605549de7f1e2856a95 WHIRLPOOL d082aec44d057e3e0a7ccae6989a09c6c2e259bcc896cdd2bbea650c69c069fb9cbae7abd0db46f6c1cf6888cc36656a6a7271e2dfc962e21c5fa74708740ad8
 AUX postupgrade-en.txt 665 SHA256 aec1179a04056a650a4f7429a927f510cd0e7256f889fdae2575ef471634ba41 WHIRLPOOL 512578b971cee45e0699e7461dd12ee37844bda48e69018d8956f81768e13a31ff30f91421697228410e61fa7159dc1a07e0831d8f4941e6d1bf1855d8d08207
+AUX trac-1.0.1-test-suite.diff 7331 SHA256 4d0aee5d17fac17dbac66c132580cfa996a8306c123035f16c984fea74e1138d WHIRLPOOL 5617dcd661d34e5239101bcf155f10ce0b2e9d0b346d76e08237177012e05c41424d771b1f7bb654ca7456ff2930d7d2467a2df3965d90079b037abbd558252d
 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 2720 SHA256 f1cbe3fd116c8d47c10178615c44ae2912caf716e5286e8401f3feb422f3b9a7 WHIRLPOOL 18add219a051b80dd21fb7d17ca022a3344cdaa2e311eb67f0d77b8371d62655f96a15c37b0e037b82fb05b3960f2114769c1fb12c8fc44b237dacfb4acc1223
-MISC ChangeLog 837 SHA256 a08cf2d9c6dac16043bcf7ea889a013064116d1cc02de9dfba184ab0b7592d6e WHIRLPOOL 19c40942372e36d21795373af3e595dd5ff959845ccfdb43ea548abf9793e171e5e20d2835f394882892ba6055fb9c4eb57d5497a77311958cfb72a6f93a78f6
+EBUILD trac-1.0.1.ebuild 2811 SHA256 126d893aa471f0ac33374942c930eb1eb8bdfa7e5850868915c79e0b14e85bdb WHIRLPOOL 644abfe8212cdcbaff941bd7e3173d6a43916516e9788cbbf05d45becc38bd6db86a1ea34d2cdc6d3a620560e571891cd4d6272a6580d7186e9fce667b42c37f
+MISC ChangeLog 1042 SHA256 547d8a1103919d356afb5e536773a4e289d1133c1bc9b7881e0dd77671761541 WHIRLPOOL 56a7233e2c23840a59c9caad3dec319f2d0140530285dd3b6eed35d252283dec9f645d7276f6630a0d70f14a014e1264570b37d7a4c65784433dd51c9ea4d73b
 MISC metadata.xml 375 SHA256 78fb655170713d45b48caf62f60ed1ec424aeb74fbd905f4b81595824ea456c7 WHIRLPOOL 051cbc8a2631a997006e63ea42639a4ece76b390c857bb771bf1061b950c4b876fa7e13c369800bac9f72bd5cdc62cde09a843a232369ceb2f188e2868c24f34
diff --git a/www-apps/trac/files/trac-1.0.1-test-suite.diff b/www-apps/trac/files/trac-1.0.1-test-suite.diff
new file mode 100644
index 00000000..7b8c5f04
--- /dev/null
+++ b/www-apps/trac/files/trac-1.0.1-test-suite.diff
@@ -0,0 +1,138 @@
+Index: /trunk/trac/util/datefmt.py

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

+--- /trunk/trac/util/datefmt.py	(revision 11932)

++++ /trunk/trac/util/datefmt.py	(revision 11933)

+@@ -540,6 +540,7 @@

+         names = get_period_names(locale=locale)

+         for period, name in names.iteritems():

+-            name = name.lower()

+-            period_names[name] = period

++            if period in ('am', 'pm'):

++                name = name.lower()

++                period_names[name] = period

+     regexp.extend(period_names.iterkeys())

+ 

+Index: /trunk/trac/util/tests/datefmt.py

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

+--- /trunk/trac/util/tests/datefmt.py	(revision 11932)

++++ /trunk/trac/util/tests/datefmt.py	(revision 11933)

+@@ -852,11 +852,18 @@

+ else:

+     class I18nDateFormatTestCase(unittest.TestCase):

++

++        if not hasattr(unittest.TestCase, 'assertIn'):

++            def assertIn(self, member, container, msg=None):

++                if member not in container:

++                    raise self.failureException(msg or '%r not in %r' %

++                                                       (member, container))

++

+         def test_i18n_format_datetime(self):

+             tz = datefmt.timezone('GMT +2:00')

+             t = datetime.datetime(2010, 8, 28, 11, 45, 56, 123456, datefmt.utc)

+             en_US = Locale.parse('en_US')

+-            self.assertEqual('Aug 28, 2010 1:45:56 PM',

+-                             datefmt.format_datetime(t, tzinfo=tz,

+-                                                     locale=en_US))

++            self.assertIn(datefmt.format_datetime(t, tzinfo=tz, locale=en_US),

++                          ('Aug 28, 2010 1:45:56 PM',

++                           'Aug 28, 2010, 1:45:56 PM'))  # CLDR 23

+             en_GB = Locale.parse('en_GB')

+             self.assertEqual('28 Aug 2010 13:45:56',

+@@ -873,7 +880,7 @@

+                              datefmt.format_datetime(t, tzinfo=tz, locale=vi))

+             zh_CN = Locale.parse('zh_CN')

+-            self.assertEqual(u'2010-8-28 下午01:45:56',

+-                             datefmt.format_datetime(t, tzinfo=tz,

+-                                                     locale=zh_CN))

++            self.assertIn(datefmt.format_datetime(t, tzinfo=tz, locale=zh_CN),

++                          (u'2010-8-28 下午01:45:56',

++                           u'2010年8月28日 下午1:45:56'))

+ 

+         def test_i18n_format_date(self):

+@@ -896,6 +903,6 @@

+                              datefmt.format_date(t, tzinfo=tz, locale=vi))

+             zh_CN = Locale.parse('zh_CN')

+-            self.assertEqual(u'2010-8-7',

+-                             datefmt.format_date(t, tzinfo=tz, locale=zh_CN))

++            self.assertIn(datefmt.format_date(t, tzinfo=tz, locale=zh_CN),

++                          (u'2010-8-7', u'2010年8月7日'))

+ 

+         def test_i18n_format_time(self):

+@@ -919,6 +926,6 @@

+             self.assertEqual('13:45:56',

+                              datefmt.format_time(t, tzinfo=tz, locale=vi))

+-            self.assertEqual(u'下午01:45:56',

+-                             datefmt.format_time(t, tzinfo=tz, locale=zh_CN))

++            self.assertIn(datefmt.format_time(t, tzinfo=tz, locale=zh_CN),

++                          (u'下午01:45:56', u'下午1:45:56'))

+ 

+         def test_i18n_datetime_hint(self):

+@@ -930,16 +937,17 @@

+             zh_CN = Locale.parse('zh_CN')

+ 

+-            self.assert_(datefmt.get_datetime_format_hint(en_US)

+-                         in ('MMM d, yyyy h:mm:ss a', 'MMM d, y h:mm:ss a'))

+-            self.assert_(datefmt.get_datetime_format_hint(en_GB)

+-                         in ('d MMM yyyy HH:mm:ss', 'd MMM y HH:mm:ss'))

+-            self.assert_(datefmt.get_datetime_format_hint(fr)

+-                         in ('d MMM yyyy HH:mm:ss', 'd MMM y HH:mm:ss'))

+-            self.assertEqual('yyyy/MM/dd H:mm:ss',

+-                             datefmt.get_datetime_format_hint(ja))

+-            self.assertEqual('HH:mm:ss dd-MM-yyyy',

+-                             datefmt.get_datetime_format_hint(vi))

+-            self.assertEqual('yyyy-M-d ahh:mm:ss',

+-                             datefmt.get_datetime_format_hint(zh_CN))

++            self.assertIn(datefmt.get_datetime_format_hint(en_US),

++                          ('MMM d, yyyy h:mm:ss a', 'MMM d, y h:mm:ss a',

++                           'MMM d, y, h:mm:ss a'))

++            self.assertIn(datefmt.get_datetime_format_hint(en_GB),

++                          ('d MMM yyyy HH:mm:ss', 'd MMM y HH:mm:ss'))

++            self.assertIn(datefmt.get_datetime_format_hint(fr),

++                          ('d MMM yyyy HH:mm:ss', 'd MMM y HH:mm:ss'))

++            self.assertIn(datefmt.get_datetime_format_hint(ja),

++                          ('yyyy/MM/dd H:mm:ss', 'y/MM/dd H:mm:ss'))

++            self.assertIn(datefmt.get_datetime_format_hint(vi),

++                          ('HH:mm:ss dd-MM-yyyy', 'HH:mm:ss dd-MM-y'))

++            self.assertIn(datefmt.get_datetime_format_hint(zh_CN),

++                          ('yyyy-M-d ahh:mm:ss', u'y年M月d日 ah:mm:ss'))

+ 

+         def test_i18n_date_hint(self):

+@@ -951,16 +959,16 @@

+             zh_CN = Locale.parse('zh_CN')

+ 

+-            self.assert_(datefmt.get_date_format_hint(en_US)

+-                         in ('MMM d, yyyy', 'MMM d, y'))

+-            self.assert_(datefmt.get_date_format_hint(en_GB)

+-                         in ('d MMM yyyy', 'd MMM y'))

+-            self.assert_(datefmt.get_date_format_hint(fr)

+-                         in ('d MMM yyyy', 'd MMM y'))

+-            self.assertEqual('yyyy/MM/dd',

+-                             datefmt.get_date_format_hint(ja))

+-            self.assertEqual('dd-MM-yyyy',

+-                             datefmt.get_date_format_hint(vi))

+-            self.assertEqual('yyyy-M-d',

+-                             datefmt.get_date_format_hint(zh_CN))

++            self.assertIn(datefmt.get_date_format_hint(en_US),

++                          ('MMM d, yyyy', 'MMM d, y'))

++            self.assertIn(datefmt.get_date_format_hint(en_GB),

++                          ('d MMM yyyy', 'd MMM y'))

++            self.assertIn(datefmt.get_date_format_hint(fr),

++                          ('d MMM yyyy', 'd MMM y'))

++            self.assertIn(datefmt.get_date_format_hint(ja),

++                          ('yyyy/MM/dd', 'y/MM/dd'))

++            self.assertIn(datefmt.get_date_format_hint(vi),

++                          ('dd-MM-yyyy', 'dd-MM-y'))

++            self.assertIn(datefmt.get_date_format_hint(zh_CN),

++                          ('yyyy-M-d', u'y年M月d日'))

+ 

+         def test_i18n_parse_date_iso8609(self):

+@@ -1144,6 +1152,7 @@

+ 

+             # Converting default format to babel's format

+-            self.assertEqual('Aug 28, 2010 1:45:56 PM',

+-                             datefmt.format_datetime(t, '%x %X', tz, en_US))

++            self.assertIn(datefmt.format_datetime(t, '%x %X', tz, en_US),

++                          ('Aug 28, 2010 1:45:56 PM',

++                           'Aug 28, 2010, 1:45:56 PM'))  # CLDR 23

+             self.assertEqual('Aug 28, 2010',

+                              datefmt.format_datetime(t, '%x', tz, en_US))

diff --git a/www-apps/trac/trac-1.0.1.ebuild b/www-apps/trac/trac-1.0.1.ebuild
index 584026f4..4b0756fc 100644
--- a/www-apps/trac/trac-1.0.1.ebuild
+++ b/www-apps/trac/trac-1.0.1.ebuild
@@ -5,6 +5,8 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite?"
+
 DISTUTILS_SINGLE_IMPL=Yes
 
 inherit distutils-r1 eutils user webapp
@@ -23,20 +25,17 @@ IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools:0
-	dev-python/docutils:0
-	dev-python/genshi:0
-	dev-python/pygments:0
-	dev-python/pytz:0
+	dev-python/setuptools:0[${PYTHON_USEDEP}]
+	dev-python/docutils:0[${PYTHON_USEDEP}]
+	dev-python/genshi:0[${PYTHON_USEDEP}]
+	dev-python/pygments:0[${PYTHON_USEDEP}]
+	dev-python/pytz:0[${PYTHON_USEDEP}]
 	i18n? ( >=dev-python/Babel-0.9.5:0[${PYTHON_USEDEP}] )
 	cgi? ( virtual/httpd-cgi:0 )
 	fastcgi? ( virtual/httpd-fastcgi:0 )
 	mysql? ( dev-python/mysql-python:0[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	sqlite? (
-		>=dev-db/sqlite-3.3.4:3
-		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] )
-	)
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion:0[python,${PYTHON_USEDEP}] )
 	"
 DEPEND="${RDEPEND}
@@ -60,6 +59,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-git-identity.patch"
+	epatch "${FILESDIR}/${P}-test-suite.diff"
 }
 
 python_test() {