diff --git a/dev-java/plantuml/Manifest b/dev-java/plantuml/Manifest
index 0d92d7a..1351418 100644
--- a/dev-java/plantuml/Manifest
+++ b/dev-java/plantuml/Manifest
@@ -1,3 +1,2 @@
-AUX DateEvent.patch 759 SHA256 21bb473fcff1b2079265ae6fc2508bba5afbc105a3d3c898e518b80ea83efe8e SHA512 f91dc0d2e8e79d3bb3f7e0cbf438b704f57e97bc5e46ca5d019da0412b1ed522c14e0e7542bcadc2da1e3a1dcc342e4806dab82bdfd4445a487ce3d0ae2796e2 WHIRLPOOL 60d06d0a93c1bbdc01cfb31462f0f20c6bfd6ab08630c158f9476cbaae5c0fbfcae0bd30b6304a9ab185b2e4a45abe91e30963f5982f9b8408f4ae64685a2ea3
-DIST plantuml-7985.tar.gz 890218 SHA256 85a2be10fa906563c1d4b6c401e1d49fa85334b8c92155fe62ed36a2a2828b58 SHA512 00d3427c3b01306298e68636fc1c942d0b364c01260f80c66ebe6380c21688a7e8f4c3ff11ae5791f8fbc4a20cc78674d092863733b828cbcebbaf2f1f9993d8 WHIRLPOOL 4d7fc16397dfcc8dc4cf006023d4f99f10db68de554f3312e1d624f20ef7d859cffc5fb8425d763a6fa5f0a057ca46e595a50556fdaf154e1cebca56a401df30
-EBUILD plantuml-7985.ebuild 808 SHA256 de9dabbb8dc36925ef3b72cb00ac12539d40e9a29e25e608e6beea2baf29cbfc SHA512 64989d038f48c45711379cc1e4fa17589c06caf256be3c49c7a4828e602613954caafbae47e73f218824e19abf384d64a6945388aa2fc7a9925aa33f612283c6 WHIRLPOOL 45d91fbfbc1c41314cee3036ef742f1dd9231dc8b691bcd931dcee5d28d5d688015286b140fe69e869bc716cce7a5244c3e390328fd0840bf62e0c664567ec40
+DIST plantuml-8004.tar.gz 990230 SHA256 4641e0145402ceb031d25e6e3bd2f2fdbf6392a42c7afa2fb25bf1c95f4cbf6f SHA512 01c972e27559aed0cce5fad7c876f68ff1f354b3ea1b545d43652e0d3da8e9e3d4cd84e6dbc8e195eeb9913e3d522d708eeedbca7dc8cdc11076010386bf5ef1 WHIRLPOOL 495c9ad786390c9796489a114c875e1d054e70fcb9ea6df758520d25f2538ffda7e5c96aacff3bc0d8bfa7d21364330a5d645d5b5bfe1fd2a44d461b792939b7
+EBUILD plantuml-8004.ebuild 809 SHA256 ae6ad6522157f0c19033a8efe2a728391207b777106afef8306b51c01f0039fc SHA512 ebddcd366b1dcb686d6c58ec16d3751a007acc39a259d7746f646a4300c7c05ad75596fcb4096f52e68e00960588e2f0ebaf623858e57ed9663df3b0f09fabfa WHIRLPOOL db4b91582cc1536c50408493180a7c02cc0f9ac2679883dc520081a5f9884eb029e216f3a1d2c7d5c9050edcaa3916bf5d2bbea0f6995b3dcaddf998b8ed6872
diff --git a/dev-java/plantuml/files/DateEvent.patch b/dev-java/plantuml/files/DateEvent.patch
deleted file mode 100644
index a50b848..0000000
--- a/dev-java/plantuml/files/DateEvent.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/net/sourceforge/plantuml/graphic/DateEventUtils.java.orig	2013-11-07 14:46:19.046926326 +0100
-+++ ./src/net/sourceforge/plantuml/graphic/DateEventUtils.java	2013-11-07 14:46:29.669925555 +0100
-@@ -63,7 +63,7 @@ public class DateEventUtils {
- 			final List<String> asList = Arrays.asList("<u>June 29th, 1975",
- 					"\"It was the first time in history that anyone had typed",
- 					"a character on a keyboard and seen it show up on their",
--					"own computer’s screen right in front of them.\"", "\t\t\t\t\t\t\t\t\t\t<i>Steve Wozniak");
-+					"own computer's screen right in front of them.\"", "\t\t\t\t\t\t\t\t\t\t<i>Steve Wozniak");
- 			return TextBlockUtils.mergeTB(textBlock, getComment(asList, color), HorizontalAlignment.LEFT);
- 		}
- 
diff --git a/dev-java/plantuml/plantuml-7985.ebuild b/dev-java/plantuml/plantuml-8004.ebuild
similarity index 95%
rename from dev-java/plantuml/plantuml-7985.ebuild
rename to dev-java/plantuml/plantuml-8004.ebuild
index 2cf8489..92dca70 100644
--- a/dev-java/plantuml/plantuml-7985.ebuild
+++ b/dev-java/plantuml/plantuml-8004.ebuild
@@ -32,7 +32,7 @@ EANT_GENTOO_CLASSPATH="ant-core"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/DateEvent.patch"
+#	epatch "${FILESDIR}/DateEvent.patch"
 }
 
 src_install() {
diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
index a344272..e3ed0e4 100644
--- a/www-apps/trac-mercurial/Manifest
+++ b/www-apps/trac-mercurial/Manifest
@@ -1,4 +1,4 @@
 EBUILD trac-mercurial-0.12.0.28.ebuild 749 SHA256 980b8516c77aa4733b39a9579bf9d218099be0c391c035d4c85824045b2c69e4 SHA512 89efde69bebe8b9b54faac1aae3080e7be59cdaa03aeb7b76a055c106f8ebdf112a9b0e2fefd1493af4f0a6f8860ff0db1da781f8bccf69f7328da3de09ca3e8 WHIRLPOOL 5596e03e84aba23b125023a1939df37ed8ca2b39741792bc67776555be4cfc4862ffedec788a011fe00e4bf38ff5e68a4aed454e76ba9184f339a3d035bcad8a
-EBUILD trac-mercurial-1.0.0.3.ebuild 609 SHA256 db3904d4bbca6d3d6c2bf5e7d53c241b82d60439ee55758e42c68c8539ba67f6 SHA512 d63bc2ee038629fdefec590e49abbc66653bd8c72c87426df29acb9fa54277be568cc77964ac3db17df1cafebf58b0805f69a23421bbb7284ddb229fc1730a49 WHIRLPOOL 9b760ee5b8b5e2d0a822f98acb4425725889acb2c93cf139ac5ddb03d57428a8ed1569cec034b54fd041aee9e92f625096ec19e2195c23ebbc941cb54fb1e0c1
+EBUILD trac-mercurial-1.0.0.3-r1.ebuild 633 SHA256 c4ddb8b0b6af1ba356fc9e9c60c742781fb7956d91588c312dafaf7e5cba4e74 SHA512 10237141117c5071990ed0d101a3b62278d8be4d98fccee3f20393dbb3f634880fac485220a2229066d29fb00b6e810c8262d6a16c153e6fe14f67c9fc410072 WHIRLPOOL aa620efedbc549760e8774f32172c1d52b164146472563fef9478246282444924a86841958115775ea26e661fc483a69feed7b31c08c824b24ad046a549a90f5
 MISC ChangeLog 397 SHA256 e2059c12c36a5251781938b5f912c4ac0e2046c9a0c4b2362148cb14a67dbacb SHA512 848b0131cb88a9d80a2c94d286277a8d2bc6a8d38f4202a570f64b3c87640a0420444bd00d46f70f01a5d5634edbe4ab1592426cd06d6a2c57534c99d99807eb WHIRLPOOL 8b9486f41669ac571fce66b1466fbda9961639e0e130dd94408a6e9eac2cbadd598f017a6a1be3ba72c1f5fad296a36bdaa2069814d0f0524657148886b4217e
 MISC metadata.xml 273 SHA256 3d3f08ce7408e697bd4cd26a7159b3678cf3747111488a38f9dcbef96689e707 SHA512 47621b053955c031e6cd8e1119efc97943a8c1aa2672e72af422b1d1ff247fe1255240f2d0a7043c7e89a3eda65b3fc10525975398ba3e43b92bc7711a0e2870 WHIRLPOOL 91f0b9228efbdc87df2823e87b2d24cfd6b7398d3f5d490d7f88c2140d64896b766bc48c8b746bd46bc017bc93a99dfc3fc04a80ef35866f29bcee865877f979