www-apps/trac: trac-1.0.1-r1: Stick more better to upstream dependency, Add a USE flag highlight, Add a USE flag markdown, src_prepare() now called epatch and then distutils-r1_src_prepare instead of defining python_prepare_all(). So it's more readable and classic., Use python_doscript in a python_install() to install every cgi with the correct libexec wrapper and make the cgi usable by the best python version. I don't use python_install_all so the cgi available for other python version than only the best one, Drop DISTUTILS_SINGLE_IMPL. trac-1.0.1-r2: Add a working FEATURES=test, Drop ~ppc64 and ~sparc since USE=test DEPEND on dev-python/twill that is not keyworded for those arches

Package-Manager: portage-2.2.10

20 files changed, 229 insertions, 37 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index f14784aa..c861f9fa 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,3 +1,39 @@
+*trac-1.0.1-r2 (15 May 2014)
+
+  15 May 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/1.0.1-changeset_11684.diff, +files/1.0.1-changeset_11689.diff,
+  +files/1.0.1-changeset_11690.diff, +files/1.0.1-changeset_11691.diff,
+  +files/1.0.1-changeset_11712.diff, +files/1.0.1-changeset_11769.diff,
+  +files/1.0.1-changeset_11771.diff, +files/1.0.1-changeset_11773.diff,
+  +files/1.0.1-changeset_11776.diff, +files/1.0.1-changeset_11783.diff,
+  +files/1.0.1-changeset_11816.diff, +files/1.0.1-changeset_11876.diff,
+  +files/1.0.1-changeset_11892.diff, +files/1.0.1-changeset_11893.diff,
+  +files/1.0.1-changeset_12275.diff, +trac-1.0.1-r2.ebuild,
+  -files/trac-1.0.1-changeset_11684.diff,
+  -files/trac-1.0.1-changeset_11689.diff,
+  -files/trac-1.0.1-changeset_11690.diff,
+  -files/trac-1.0.1-changeset_11691.diff,
+  -files/trac-1.0.1-changeset_11712.diff,
+  -files/trac-1.0.1-changeset_11769.diff,
+  -files/trac-1.0.1-changeset_11771.diff,
+  -files/trac-1.0.1-changeset_11773.diff,
+  -files/trac-1.0.1-changeset_11776.diff,
+  -files/trac-1.0.1-changeset_11783.diff,
+  -files/trac-1.0.1-changeset_11816.diff,
+  -files/trac-1.0.1-changeset_11876.diff,
+  -files/trac-1.0.1-changeset_11892.diff,
+  -files/trac-1.0.1-changeset_11893.diff,
+  -files/trac-1.0.1-changeset_12275.diff, metadata.xml, trac-1.0.1-r1.ebuild:
+  www-apps/trac: trac-1.0.1-r1: Stick more better to upstream dependency,  Add a
+  USE flag highlight, Add a USE flag markdown, src_prepare() now called epatch
+  and then distutils-r1_src_prepare instead of defining python_prepare_all(). So
+  it's more readable and classic., Use python_doscript in a python_install() to
+  install every cgi with the correct libexec wrapper and make the cgi usable by
+  the best python version. I don't use python_install_all so the cgi available
+  for other python version than only the best one, Drop DISTUTILS_SINGLE_IMPL.
+  trac-1.0.1-r2: Add a working FEATURES=test, Drop ~ppc64 and ~sparc since
+  USE=test DEPEND on dev-python/twill that is not keyworded for those arches
+
   15 May 2014; Bertrand Jacquin <beber@meleeweb.net> trac-1.0.1-r1.ebuild:
   www-apps/trac: Restore trac-1.0.1-changeset_12275.diff
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 9c735b6b..bcc64cfc 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,23 +1,24 @@
+AUX 1.0.1-changeset_11684.diff 1189 SHA256 7d23c01ae67b78b23714d259d2ec66a9db9f0ce20b6c7f500645fff019d89ef3 WHIRLPOOL 995992141caca82fb95fe5ca2b19cf1ab2f6d184ad24e0aadd1efbbf78512a4a5f3032ba29d5e3f78db606e8595effff347bdfd4b67c616736d0aeb037c9525e
+AUX 1.0.1-changeset_11689.diff 2297 SHA256 c0f6c0de63e17c43b3c10238a7edd43ce6984d6a119116e648b45557b561f8f3 WHIRLPOOL 9c638ef1a1ed1737a99d0f158fe5f164a2efa7adab62524f22ece3beb3336efe2e63a3ce292b43b9245963b62635a0e0aa41e7bcb14086ae01c20fa3e2926071
+AUX 1.0.1-changeset_11690.diff 1700 SHA256 b72161bd34fbc71c4dd7653e1a03f3cc7d5c05c652ca989ff5f38018d1a41fac WHIRLPOOL a46d654528be8d2edb406f59f3800dbf7314c39655564f554712ad3464644406c0c182b8cf095ffc56a12a9d1d5ef492e36190e1add137445ea4fb3abeb64efe
+AUX 1.0.1-changeset_11691.diff 3207 SHA256 1025ee5fe466e5d7cb52b9f1df7cc5eb19566302beece9c93b088fc139c13663 WHIRLPOOL 71c94dd8e10ea96c2302effa35499cb2b520a1f7d2d8b4432e16476a0d7d780d52e217a0c9bb3a23fe5c895f0af352b2379620d3c064c67be3031fff3b28768e
+AUX 1.0.1-changeset_11712.diff 2286 SHA256 876055bc12cdf427dfb5d1522e9d40d429dfb1698c57c2e55ca3dffa6e226c50 WHIRLPOOL 7992a8f783dd7b4243ad481eb67754c610f6faa015284d0418475afe559786008458503ff4ab40da07c0d64a9417b6e93b66bb4fd153b37a6abf548ad05963c1
+AUX 1.0.1-changeset_11769.diff 3155 SHA256 2f9e215e08afa5c929f1a2a55d656a82daebb3ea29f57085bc318e6ab0f3f19d WHIRLPOOL 55dea8410bcb838c51ad0a117a9278f550638c6d316453663c44b318bb4553ae54cb344009cb7e628cf459bb503ea53d50af2e85ecc832a6bd62cd470cafa505
+AUX 1.0.1-changeset_11771.diff 7422 SHA256 559a9b12942833964dbd390eb6fea5c75232f94957c77105552d377f742e8818 WHIRLPOOL 2add7c156cbf014b4d2ff7b6603905555c6b4faa039d4e50f224e6219079ef26226b94a3031e3b9b33a799e80cc94f98d2e95ec98489aedca300a02adf16b38a
+AUX 1.0.1-changeset_11773.diff 1393 SHA256 35202d2e6e68456d8ef45d41d727eb8ac518f149a0f479b8c6135c00e7818cce WHIRLPOOL 0cad4f7125d3ac8b4e882f205f91a68f2e872ff398770ab3d55218aa24a76e1aefdc76e65154187f857ee649581946d9224bbb3aabb393e3bf07fee368ffae6d
+AUX 1.0.1-changeset_11776.diff 1708 SHA256 72a8ab96903ca3bf135008cbd513e51954c55acbc2662c6083de1494d0c9e236 WHIRLPOOL f3ca4f67e9a0344596610b715af5e77a1275f631ed786218793950e4dd03566650138a84e0c3012ebb2aeb84321b45bfc7a54cbcda974cd1008edb4a1e091b09
+AUX 1.0.1-changeset_11783.diff 950 SHA256 952a3d9d580572d65dd2010a7946157cf995a61c97df07cd27386fcb18be1a58 WHIRLPOOL ac9ea68692fa413a79784427f54e603b0ebcebef843f62cf5c2c47b3ebf047a8cea7cdff7fdd20b919afebb0db2c0d8ccfc58d3a70d349cbae47e3c90eab7b96
+AUX 1.0.1-changeset_11816.diff 1707 SHA256 480c3cbdc94aee2bece6bf6286bb37daeac7456bb6c93ea93b2ffa70a75ecc73 WHIRLPOOL 2dfafb7a4526ec662e698cfa4d0d3513a91f811bc1a5edf4a84e46812cb42247ebf50ceee04e672efc0523523aacb7ae38008f6c12226757560f0abbf64da3fd
+AUX 1.0.1-changeset_11876.diff 1949 SHA256 52c93f148d90e0a84d465db186ff64ba7c14d799c65997774840a61ef37dccd6 WHIRLPOOL 6e20e40a56a36536f53276aa0fccd0e0c0b88f8e65ea2ef7d6d4e7a94e247b655660623b305d6fce7eb94c4b646720195f0f79c4098306c98f63cfac86d64ee8
+AUX 1.0.1-changeset_11892.diff 7701 SHA256 c8bd891ee12b94aa35abc0a336a01ff07a6f991241945a2a89f36647b23284a7 WHIRLPOOL be632efa06e8a2cd1bd3a390b38de6ea6275a04a811b1a5b0000114a5b6e61c1619a2d2a4a2bb5a40c608ad402d0046edb42bf814d98339c5db6e0a7aa2400b2
+AUX 1.0.1-changeset_11893.diff 955 SHA256 f3e253c5bac4df10a714adad5d7df87aed937872c3e18e596738f1df3cd27a6a WHIRLPOOL 1466d07dc71512c5aeccd1d99dfb2b76caef586de49d3ab10c44213c34695ae4b94e643ce8291d01a0eb5920f7dbc76a437e124fde5053a83549fdde82245263
+AUX 1.0.1-changeset_12275.diff 5479 SHA256 ecab1fcebb9ac61174d2741cbad2dba7ffab0183b886c1cebe317eaff4f89db3 WHIRLPOOL 3250a4185d8ef575d52e638f19cbd44239259e3009de32c964866e566d01153239a3026ecbded22a1913f2d498e6542823d5cff1b74991d531614e1c7353cad3
 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
-AUX trac-1.0.1-changeset_11689.diff 2297 SHA256 c0f6c0de63e17c43b3c10238a7edd43ce6984d6a119116e648b45557b561f8f3 WHIRLPOOL 9c638ef1a1ed1737a99d0f158fe5f164a2efa7adab62524f22ece3beb3336efe2e63a3ce292b43b9245963b62635a0e0aa41e7bcb14086ae01c20fa3e2926071
-AUX trac-1.0.1-changeset_11690.diff 1700 SHA256 b72161bd34fbc71c4dd7653e1a03f3cc7d5c05c652ca989ff5f38018d1a41fac WHIRLPOOL a46d654528be8d2edb406f59f3800dbf7314c39655564f554712ad3464644406c0c182b8cf095ffc56a12a9d1d5ef492e36190e1add137445ea4fb3abeb64efe
-AUX trac-1.0.1-changeset_11691.diff 3207 SHA256 1025ee5fe466e5d7cb52b9f1df7cc5eb19566302beece9c93b088fc139c13663 WHIRLPOOL 71c94dd8e10ea96c2302effa35499cb2b520a1f7d2d8b4432e16476a0d7d780d52e217a0c9bb3a23fe5c895f0af352b2379620d3c064c67be3031fff3b28768e
-AUX trac-1.0.1-changeset_11712.diff 2286 SHA256 876055bc12cdf427dfb5d1522e9d40d429dfb1698c57c2e55ca3dffa6e226c50 WHIRLPOOL 7992a8f783dd7b4243ad481eb67754c610f6faa015284d0418475afe559786008458503ff4ab40da07c0d64a9417b6e93b66bb4fd153b37a6abf548ad05963c1
-AUX trac-1.0.1-changeset_11769.diff 3155 SHA256 2f9e215e08afa5c929f1a2a55d656a82daebb3ea29f57085bc318e6ab0f3f19d WHIRLPOOL 55dea8410bcb838c51ad0a117a9278f550638c6d316453663c44b318bb4553ae54cb344009cb7e628cf459bb503ea53d50af2e85ecc832a6bd62cd470cafa505
-AUX trac-1.0.1-changeset_11771.diff 7422 SHA256 559a9b12942833964dbd390eb6fea5c75232f94957c77105552d377f742e8818 WHIRLPOOL 2add7c156cbf014b4d2ff7b6603905555c6b4faa039d4e50f224e6219079ef26226b94a3031e3b9b33a799e80cc94f98d2e95ec98489aedca300a02adf16b38a
-AUX trac-1.0.1-changeset_11773.diff 1393 SHA256 35202d2e6e68456d8ef45d41d727eb8ac518f149a0f479b8c6135c00e7818cce WHIRLPOOL 0cad4f7125d3ac8b4e882f205f91a68f2e872ff398770ab3d55218aa24a76e1aefdc76e65154187f857ee649581946d9224bbb3aabb393e3bf07fee368ffae6d
-AUX trac-1.0.1-changeset_11776.diff 1708 SHA256 72a8ab96903ca3bf135008cbd513e51954c55acbc2662c6083de1494d0c9e236 WHIRLPOOL f3ca4f67e9a0344596610b715af5e77a1275f631ed786218793950e4dd03566650138a84e0c3012ebb2aeb84321b45bfc7a54cbcda974cd1008edb4a1e091b09
-AUX trac-1.0.1-changeset_11783.diff 950 SHA256 952a3d9d580572d65dd2010a7946157cf995a61c97df07cd27386fcb18be1a58 WHIRLPOOL ac9ea68692fa413a79784427f54e603b0ebcebef843f62cf5c2c47b3ebf047a8cea7cdff7fdd20b919afebb0db2c0d8ccfc58d3a70d349cbae47e3c90eab7b96
-AUX trac-1.0.1-changeset_11816.diff 1707 SHA256 480c3cbdc94aee2bece6bf6286bb37daeac7456bb6c93ea93b2ffa70a75ecc73 WHIRLPOOL 2dfafb7a4526ec662e698cfa4d0d3513a91f811bc1a5edf4a84e46812cb42247ebf50ceee04e672efc0523523aacb7ae38008f6c12226757560f0abbf64da3fd
-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-r1.ebuild 2507 SHA256 129abbd696f5fb2e43a3206d36225c9c6cf89192335d3370e7f268a6ce5ff06e WHIRLPOOL f83e65097a166aab0049f1e3e85b76830627225f22b2a8e612d7666ec1bfd82b93ba07dd66e78f3f62d0da639937b611ed9c46152666584f6f3beb499da95489
-MISC ChangeLog 3339 SHA256 4165f4c0aeb812c2a0a75858024750b16d75fcac5efe5665b52effbaa85dd476 WHIRLPOOL c0905b3601331b63d837c4ebe117ee59de4189a88a2718e3a1bb6e3cec9be6039b28e2d2f14a2f1defb0c053370340633193a1c8f92c0781af9f388f9bc3bd40
-MISC metadata.xml 375 SHA256 78fb655170713d45b48caf62f60ed1ec424aeb74fbd905f4b81595824ea456c7 WHIRLPOOL 051cbc8a2631a997006e63ea42639a4ece76b390c857bb771bf1061b950c4b876fa7e13c369800bac9f72bd5cdc62cde09a843a232369ceb2f188e2868c24f34
+EBUILD trac-1.0.1-r1.ebuild 2821 SHA256 cb2025ed8a6c83b91166c6e4118ca1d7f1b9205f71a027eaae65fbcea7c4fe64 WHIRLPOOL d35365536c2509ef1f5dde54e590de731bac4a7a45e6ed1d432ec1c9407005921a7f6c36db1aa759bdceea019213879f0b5d919bf3077e05ed0c871d3965f725
+EBUILD trac-1.0.1-r2.ebuild 3742 SHA256 4d069c0c659fdf37c024a18a63fecb961e840d310fdae3fdecfbbe7987587abd WHIRLPOOL 78b050182e2036e996a715c54079024760596def5ff367aa0653dc55dcc316afb3fa47bf6fba2dabf34b20ffedd2700ca9fd7f24135fab4419b8f6c98380d629
+MISC ChangeLog 5364 SHA256 eedba8ba630ab66f5f1dcd39e44cdc515edc6b3f6ac847fd448c2c26dd7ee2d8 WHIRLPOOL d92d1e23f19535eab704f1b55c3043949f7cb9defd3de438c239c12f1940b1d946adedd2e7a7f3b0f5e3baa584de6094407b376b58cae0872242ea1e0cc00739
+MISC metadata.xml 499 SHA256 7a5b18660b460642c4999f70decc78d428c283c218e7b1f41900969d5892fbf6 WHIRLPOOL a0089165226a9d00929b73926446269f3be34e0e92c8a3e7f42f16b2fe16ea4dd806ce5072f576eeddc7d9f47d1ad86cd9fb99d1604b394415cf0346ac9f43c2
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11684.diff b/www-apps/trac/files/1.0.1-changeset_11684.diff
index 61bd93b5..61bd93b5 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11684.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11684.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11689.diff b/www-apps/trac/files/1.0.1-changeset_11689.diff
index 7d574814..7d574814 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11689.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11689.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11690.diff b/www-apps/trac/files/1.0.1-changeset_11690.diff
index 9b39f8d6..9b39f8d6 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11690.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11690.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11691.diff b/www-apps/trac/files/1.0.1-changeset_11691.diff
index cb9b4137..cb9b4137 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11691.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11691.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11712.diff b/www-apps/trac/files/1.0.1-changeset_11712.diff
index 5e700f2a..5e700f2a 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11712.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11712.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11769.diff b/www-apps/trac/files/1.0.1-changeset_11769.diff
index cc0e24d8..cc0e24d8 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11769.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11769.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11771.diff b/www-apps/trac/files/1.0.1-changeset_11771.diff
index f9b1a0aa..f9b1a0aa 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11771.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11771.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11773.diff b/www-apps/trac/files/1.0.1-changeset_11773.diff
index 119b2c7c..119b2c7c 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11773.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11773.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11776.diff b/www-apps/trac/files/1.0.1-changeset_11776.diff
index 869c7266..869c7266 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11776.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11776.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11783.diff b/www-apps/trac/files/1.0.1-changeset_11783.diff
index b3abbd86..b3abbd86 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11783.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11783.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11816.diff b/www-apps/trac/files/1.0.1-changeset_11816.diff
index 30b80e84..30b80e84 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11816.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11816.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11876.diff b/www-apps/trac/files/1.0.1-changeset_11876.diff
index c092dfd3..c092dfd3 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11876.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11876.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11892.diff b/www-apps/trac/files/1.0.1-changeset_11892.diff
index 5a967f9b..5a967f9b 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11892.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11892.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_11893.diff b/www-apps/trac/files/1.0.1-changeset_11893.diff
index 16f64d02..16f64d02 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_11893.diff
+++ b/www-apps/trac/files/1.0.1-changeset_11893.diff
diff --git a/www-apps/trac/files/trac-1.0.1-changeset_12275.diff b/www-apps/trac/files/1.0.1-changeset_12275.diff
index e72e2853..e72e2853 100644
--- a/www-apps/trac/files/trac-1.0.1-changeset_12275.diff
+++ b/www-apps/trac/files/1.0.1-changeset_12275.diff
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 999b5eb7..434d8735 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/metadata.xml
@@ -8,5 +8,7 @@
     </maintainer>
     <use>
         <flag name="i18n">Enable support for i18n with dev-python/Babel</flag>
+        <flag name="highlight">Enable source code highlighting</flag>
+        <flag name="markdown">Markdown support</flag>
     </use>
 </pkgmetadata>
diff --git a/www-apps/trac/trac-1.0.1-r1.ebuild b/www-apps/trac/trac-1.0.1-r1.ebuild
index 40c1ed4c..1499c800 100644
--- a/www-apps/trac/trac-1.0.1-r1.ebuild
+++ b/www-apps/trac/trac-1.0.1-r1.ebuild
@@ -7,8 +7,6 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='sqlite?'
 
-DISTUTILS_SINGLE_IMPL=Yes
-
 inherit distutils-r1 eutils user webapp
 
 MY_PV=${PV/_beta/b}
@@ -21,19 +19,26 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion"
+IUSE="cgi fastcgi i18n +highlight +markdown mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]
+	>=dev-python/genshi-0.6[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
+	highlight? (
+		|| (
+			>=dev-python/pygments-0.6[${PYTHON_USEDEP}]
+			>=app-text/silvercity-0.9.4
+			>=app-text/pytextile-2.0
+			app-text/enscript
+		)
+	)
+	markdown? ( >=dev-python/docutils-0.3.9[${PYTHON_USEDEP}] )
 	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
 	cgi? ( virtual/httpd-cgi )
 	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
 	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
@@ -45,7 +50,6 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
 	webapp_pkg_setup
 
 	enewgroup tracd
@@ -53,8 +57,25 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Babel-1.3 lead to errors like
+	# AttributeError: NullTranslationsBabel instance has no attribute 'isactive'
 	# http://trac.edgewall.org/ticket/11345
-	epatch "${FILESDIR}/${P}-changeset_12275.diff"
+	epatch "${FILESDIR}/${PV}-changeset_12275.diff"
+
+	distutils-r1_src_prepare
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+
+	distutils-r1_python_install
 }
 
 # the default src_compile just calls setup.py build
@@ -78,15 +99,6 @@ src_install() {
 	newconfd "${FILESDIR}"/tracd.confd tracd
 	newinitd "${FILESDIR}"/tracd.initd tracd
 
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-
 	for lang in en; do
 		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
 		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
diff --git a/www-apps/trac/trac-1.0.1-r2.ebuild b/www-apps/trac/trac-1.0.1-r2.ebuild
new file mode 100644
index 00000000..8ecc5acb
--- /dev/null
+++ b/www-apps/trac/trac-1.0.1-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_beta/b}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
+HOMEPAGE="http://trac.edgewall.com/ http://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +markdown mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]
+	>=dev-python/genshi-0.6[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	highlight? (
+		|| (
+			>=dev-python/pygments-0.6[${PYTHON_USEDEP}]
+			>=app-text/silvercity-0.9.4
+			>=app-text/pytextile-2.0
+			app-text/enscript
+		)
+	)
+	markdown? ( >=dev-python/docutils-0.3.9[${PYTHON_USEDEP}] )
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+src_prepare() {
+	# Test suite
+	epatch "${FILESDIR}/${PV}-changeset_11684.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11689.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11690.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11691.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11712.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11769.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11771.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11773.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11776.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11783.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11816.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11876.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11892.diff"
+	epatch "${FILESDIR}/${PV}-changeset_11893.diff"
+
+	# Babel-1.3 lead to errors like
+	# AttributeError: NullTranslationsBabel instance has no attribute 'isactive'
+	# http://trac.edgewall.org/ticket/11345
+	epatch "${FILESDIR}/${PV}-changeset_12275.diff"
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	echo ".python = ${EPYTHON}" > Makefile.cfg
+
+	emake test
+	# Broken ATM
+	emake check
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}