www-apps/trac: Remove patch breaking tests included in 1.0.2-dev, need more tests

Package-Manager: portage-2.2.1

4 files changed, 7 insertions, 41 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 2b1925b8..967f801f 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,4 +1,9 @@
   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
+  tests
+
+  04 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
   +files/trac-1.0.1-changeset_11684.diff,
   +files/trac-1.0.1-changeset_11689.diff,
   +files/trac-1.0.1-changeset_11690.diff,
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index cd233fd1..2acf3826 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,4 +1,3 @@
-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-changeset_11684.diff 1189 SHA256 7d23c01ae67b78b23714d259d2ec66a9db9f0ce20b6c7f500645fff019d89ef3 WHIRLPOOL 995992141caca82fb95fe5ca2b19cf1ab2f6d184ad24e0aadd1efbbf78512a4a5f3032ba29d5e3f78db606e8595effff347bdfd4b67c616736d0aeb037c9525e
@@ -18,6 +17,6 @@ AUX trac-1.0.1-changeset_11893.diff 955 SHA256 f3e253c5bac4df10a714adad5d7df87ae
 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 3496 SHA256 4b190cafa46e7da8cf987ba705824229ec6269d8a6c5b49c3cc59e03bd91b5d9 WHIRLPOOL b37728236b9b3fbb3cea99ea481a1ccdce11bdf3bfbad4a3c17474232e0dd3793e9e54e13c704e79344e671cc5b547f20f07431de6a250b0dffe82120908ecce
-MISC ChangeLog 2264 SHA256 0856d37ebc6611c86f2070e589deefd4950a8bd748eacd0ebc74f074b44c12ec WHIRLPOOL 685c531033a7450cea642f74df9b657e06f8d40c887ad2b7a36fecfc1df17dae5c177ba778524a01d51b2bc361b9a279d3870489bed40a3e85fdbc9e2558d0f5
+EBUILD trac-1.0.1.ebuild 3448 SHA256 345bca46988451a90df270f496d45f03199e4ad9c0850fd1ef22115d722d112e WHIRLPOOL 4a4ab3ce44bd1f5117e0ce43501398fab3433e967f9c94c684ba989a1948ed779a489e2316e8a8f5e0426f967020a35c5ac738be219a13d4906b95c9ba71e10a
+MISC ChangeLog 2458 SHA256 6d98dc53582261ff769b5396beac6b7033de9029d85de4a0c7901df4e8ca1b71 WHIRLPOOL 89d52c0faade6137cd85db4b5a79d4f0a85c7b6e9cd6cb00218f4de35d71eb1af8d1b3ca8e4136862bcb508f4a713099202dc619f991db095babbac20bb7d307
 MISC metadata.xml 375 SHA256 78fb655170713d45b48caf62f60ed1ec424aeb74fbd905f4b81595824ea456c7 WHIRLPOOL 051cbc8a2631a997006e63ea42639a4ece76b390c857bb771bf1061b950c4b876fa7e13c369800bac9f72bd5cdc62cde09a843a232369ceb2f188e2868c24f34
diff --git a/www-apps/trac/files/1.0.1-git-identity.patch b/www-apps/trac/files/1.0.1-git-identity.patch
deleted file mode 100644
index 703a2dbc..00000000
--- a/www-apps/trac/files/1.0.1-git-identity.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 62b9c1a5..9c50d9f0 100644
--- a/www-apps/trac/trac-1.0.1.ebuild
+++ b/www-apps/trac/trac-1.0.1.ebuild
@@ -58,8 +58,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-git-identity.patch"
-
 	# http://trac.edgewall.org/ticket/11290
 	epatch "${FILESDIR}/${P}-changeset_11684.diff"
 	epatch "${FILESDIR}/${P}-changeset_11689.diff"