Fix test failure (upstream issue #11045).

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 53 insertions, 8 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 90ea802b388d..97432e3aacd7 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/trac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.135 2013/02/03 15:17:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.136 2013/02/03 20:36:11 djc Exp $
+
+  03 Feb 2013; Dirkjan Ochtman <djc@gentoo.org> +files/1.0.1-git-identity.patch,
+  trac-1.0.1.ebuild:
+  Fix test failure (upstream issue #11045).
 
 *trac-1.0.1 (03 Feb 2013)
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index c7ddd5bfc4fc..f9605c769337 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.0.1-git-identity.patch 1691 SHA256 2ffbc7093cbdb6eefa7e4e936f25bdbbbf8b34a145c21e49116fb374c5e5b82b SHA512 02f51cec8633195befdb39e10057fafed5faaace6a8e0e4d14334cbb77af0e3a397c531d25c14da6f5851de0974516b9d9ce391329a6b8de8b984fb934ad0c70 WHIRLPOOL 1a294cd7cca5cccfee2b3dacd251e55ae918fa28efad15f98013ab45730e2965fd1875af6ba1b21a4ef8d52472b0a24109e4ab9dda0ee204c54fb943f10f17bc
 AUX postinst-en.txt 1331 SHA256 1799cf63e70e2ed7c3b1a1148b29ce456dda8e84ef137605549de7f1e2856a95 SHA512 6bde40a16545462ef0d8654ffc860e031f5978a253b0fe68df24b18a281f396fd560e4b39a6c53ecee52c9be941ca83dccd1aee9a98dccf570a9f5b0f0c6bbaf WHIRLPOOL d082aec44d057e3e0a7ccae6989a09c6c2e259bcc896cdd2bbea650c69c069fb9cbae7abd0db46f6c1cf6888cc36656a6a7271e2dfc962e21c5fa74708740ad8
 AUX postupgrade-en.txt 665 SHA256 aec1179a04056a650a4f7429a927f510cd0e7256f889fdae2575ef471634ba41 SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f WHIRLPOOL 512578b971cee45e0699e7461dd12ee37844bda48e69018d8956f81768e13a31ff30f91421697228410e61fa7159dc1a07e0831d8f4941e6d1bf1855d8d08207
 AUX tracd.confd 359 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1 WHIRLPOOL 591394e732d39bc13f97004cfb3c18128aa16a55557172d872797b5ca5c69e5f15d1420e697a4e40215b2a893ed684ba6b6388abacd97874fd6f04953b579e1a
@@ -9,14 +10,14 @@ DIST Trac-0.12.3.tar.gz 2239934 SHA256 0eefacc5ebb91158ed7351b8f9b2eec7f45ce03b6
 DIST Trac-1.0.1.tar.gz 3479896 SHA256 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb SHA512 844272eb52a35bf0d8a08d6e9b24d7085adf3c4a5c0433031673b2b754df56985537fe54ce06abee7e6c5ccfd5de40381478edbcd656a7d42e1c40fe8014203a WHIRLPOOL c795fab244c42752e1c7d2a0e488b1c062333a6de01e607b749271f0124c16746b55ad35a69b6844db272f7223179d6f29f9115abb5289f6af1bdf467394b1a5
 DIST Trac-1.0.tar.gz 3041136 SHA256 40ab9d040388fde06714f3618de32c5c22e6fa64106372e4b808d91b03b7f8e8 SHA512 66b5230d3f38b07a1c547df397fc6e301f51c3ce1b2b71eaeec35dff3f94794f02d54f9040f10b60ee87501e2022c0134d6a6358b12031f6ee527cdf47ff7164 WHIRLPOOL 1335d0329239d91131e3a4931b6a3dcd0a9ad4d8b216ace80e5e5f462acc32c35ecf4edbba434f6e4a4939dff94cb34d508d0cb241ae9b691a5f38b10c06c302
 EBUILD trac-0.12.3.ebuild 2537 SHA256 8b69167252acd30ff7e439794c9e047963abe778d2fe5065c437dbfbb47a27e4 SHA512 f6f7305ce449776eca6f69eb131415e6afbfa07e275ff3175b0b0fc27764ac9571f42c506c70960ca74deb8bb2d08974a485579c6a2e3a527a1710dee6655f5d WHIRLPOOL 689a4ff2a433ae3b7028a9d2de36a84ddaa27983a83c07db15c1135ac19787b4ccb24958dcaca3f3a1bd5327c4f4b8ea4204ea081b9f9ab06e3fd6bca940e9a9
-EBUILD trac-1.0.1.ebuild 2554 SHA256 341708f2434dab19aa0d8d4349d4ccc3a8dbcc339afd17b4223610bdbdfaf2bc SHA512 13271541b67c4734ea921d6b89348662b6b0daf87b9ee7a1f8c15d93c06142d2ec78fae2bcab166ca4864ca53307229e3ec1c444c94337321d51ee52934bc9e1 WHIRLPOOL 5cbae694fd94784592eab70ea04ce9f310f70cebc44f5d3de73e543545b643d800a968b9561f734f5bfede9bef39ec24744281ce5e8bb2ee3ce2f30bbea29b49
+EBUILD trac-1.0.1.ebuild 2627 SHA256 d661ba6fd56e7998ccbbbcd0df8bcea09f49518bbff673dda9de9c29d9af416d SHA512 c4861065af9c745afc7fa10a68282ef72c412834eb51770434928e7d61206a0e5e6dc4d0ca03f80b64a9822963b373142f535d2340bf9e501a79cb69424bae77 WHIRLPOOL f4752a22a0e64d67df8628da02a654bbc8b8a634725f4c3268e995f69fa6b32a095e79b11a4f03ff6c83d781874f79e86ee1529b6adb503d58defa12020e579a
 EBUILD trac-1.0.ebuild 2549 SHA256 6dd61a9b634ada6b90a5f8cbaabf51d373620d064af2388e4f36bf556de93e65 SHA512 a9f8f39c8ab23e0635502bff1677480a1d605ed5161a63fe2dcafdd0d07bfe32d607f610a331417c44d48e781cf0b9d5a3f459289b769748b884467a4d166861 WHIRLPOOL c417cc4e962194f50e99c2dec1f94a19d8d9930f0c34dba02abc9583c745e4356ce1cdc3ad0e5944fe5e1ca95bc7f12fab1f47f16a8e1df56dd6910bfbdd6bc2
-MISC ChangeLog 19939 SHA256 c6fefe662d9552d5d20e7f109b27a6ae269c93052179aff71e890373dbd6fc56 SHA512 22a554d3b10c4d386ffdf7ebc969ee634765fbb936d16d7711d342fb5278312f27dcf8aabc3dca66253a825dbf695712db87162c2afd7e442cf7b778acbd8a23 WHIRLPOOL e5c1c1519189b6c098ea4a037adedcb8dfd6a495f287968a53e3c342a742e5223c01e30fea3b9d690fb963f36c231a0c18896b66dbb6c504cb750e1ebd56b38f
+MISC ChangeLog 20086 SHA256 d5e0aeb7ee1751c638cfe3c0579571dbbe88ce08325e8bbe33fc9113bd60261c SHA512 0d293158448390a69d7cad7d402c4914ae0e34f3a334781fdac23017e6ca05148d09db1caf731de6e6945ab7b469e12df98a38f92c4cc0a9d06a685facb3ade6 WHIRLPOOL 5ab64a37d72c317c06f2f4c9d7e07928e5a1420633ec5f5c3ad6f46f596488719ff85e6ca18f33404f1228e0d926b3c7ba6c8f0d645c6d4878fac4505b69ef33
 MISC metadata.xml 353 SHA256 12d6ceeed2212b5daf258a1dc4fee3fb6acd607e866e4062a907c157ac387059 SHA512 91ea81b7eb3471f855e1b697629bcd70c8bd20fbedb601d52580fc8f652d4444ff62fe3ae1052e440b9691962b1a3b942d8c2ca739c432c505f3c798128c1e3c WHIRLPOOL ad21708451d96efaf7aec37feff0e6e4eda8ffda9ee7a8483da15a529aa0ba1eee840efd73638d3a7922c8a33345ef4fd4797dbc22e99be902f1e37559ff9cd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEOf7AACgkQxeMuLWsGW/sL9QCgvJFzUeW1IH/86E5Wt1xw7GyA
-GrQAoKGcW8PJti+X0aRzHn0AxwOHC4D9
-=Dwn/
+iEYEAREIAAYFAlEOymIACgkQxeMuLWsGW/t65ACgvvq7pG/yA0W3cVKHINU6PLu8
+wqsAnRBj3tztNYi2DTqRuk6koPlknsoz
+=Jc/R
 -----END PGP SIGNATURE-----
diff --git a/www-apps/trac/files/1.0.1-git-identity.patch b/www-apps/trac/files/1.0.1-git-identity.patch
new file mode 100644
index 000000000000..703a2dbc67d5
--- /dev/null
+++ b/www-apps/trac/files/1.0.1-git-identity.patch
@@ -0,0 +1,36 @@
+http://trac.edgewall.org/changeset/11675

+

+Index: /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py

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

+--- /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py	(revision 11674)

++++ /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py	(revision 11675)

+@@ -153,4 +153,6 @@

+         # create git repository and master branch

+         self._git('init', self.repos_path)

++        self._git('config', 'user.name', u"Joé")

++        self._git('config', 'user.email', "joe@example.com")

+         create_file(os.path.join(self.repos_path, '.gitignore'))

+         self._git('add', '.gitignore')

+@@ -166,5 +168,5 @@

+                      cwd=self.repos_path)

+         proc.wait()

+-        assert proc.returncode == 0

++        assert proc.returncode == 0, proc.stderr.read()

+         return proc

+ 

+@@ -181,5 +183,6 @@

+         create_file(os.path.join(self.repos_path, 'tickét.txt'))

+         self._git('add', 'tickét.txt')

+-        self._git('commit', '-m', 'unicode-filename')

++        self._git('commit', '-m', 'unicode-filename',

++                  '--date', 'Sun Feb 3 18:30 2013 +0100')

+         storage = self._storage()

+         filenames = sorted(fname for mode, type, sha, size, fname

+@@ -189,4 +192,7 @@

+         self.assertEquals(u'.gitignore', filenames[0])

+         self.assertEquals(u'tickét.txt', filenames[1])

++        # check commit author, for good measure

++        self.assertEquals(u'Joé <joe@example.com> 1359912600 +0100',

++                          storage.read_commit(storage.head())[1]['author'][0])

+ 

+     def test_unicode_branches(self):

diff --git a/www-apps/trac/trac-1.0.1.ebuild b/www-apps/trac/trac-1.0.1.ebuild
index f6771ad3c359..912d8b65504e 100644
--- a/www-apps/trac/trac-1.0.1.ebuild
+++ b/www-apps/trac/trac-1.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-1.0.1.ebuild,v 1.1 2013/02/03 15:17:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-1.0.1.ebuild,v 1.2 2013/02/03 20:36:11 djc Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit distutils user webapp
+inherit distutils eutils user webapp
 
 MY_PV=${PV/_beta/b}
 MY_P=Trac-${MY_PV}
@@ -53,6 +53,10 @@ pkg_setup() {
 	enewuser tracd -1 -1 -1 tracd
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-git-identity.patch"
+}
+
 src_test() {
 	testing() {
 		PYTHONPATH=. "$(PYTHON)" trac/test.py