diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest
index ec341ec..ac96cb1 100644
--- a/dev-cpp/libvmime/Manifest
+++ b/dev-cpp/libvmime/Manifest
@@ -1,8 +1,14 @@
-DIST libvmime-0.7.1-zarafa-gentoo-4.tar.bz2 12834 RMD160 3d981f73d72bd86b5f8dd02ffcfcae84f7f8e176 SHA1 c740b5453b93c65d3939ad6c4f4bc1b90c4605f1 SHA256 e087d38c0b5ebf539979c584f6aca2a8ef5bcd7c27ab721df57a6618a1749f64
-DIST libvmime-0.7.1.tar.bz2 418302 RMD160 259983c8844108c8040bcbae2ea53e453a811124 SHA1 30fefbdd31c2fa46976984f18d4d21bf3c2ec20a SHA256 fc3476aec565341594c7c4dca982539695b61ecb92a438f19860e9130ca019e3
-DIST libvmime-0.9.2+svn581.tar.bz2 520479 RMD160 64a5da0aab87cc8d8c3af1684424419144906f63 SHA1 fb5f73f471b3904bb5f8c0b9a31403b27dfaec68 SHA256 f1aaa124d40f10b71910cacb059aa77f146094a5ecddc70e46409196b26b26c7
-DIST libvmime-0.9.2_pre581-zarafa-3.tar.bz2 4425 RMD160 5ada2269b81cac7530a312f29d1e621091c8ffb9 SHA1 8cd3b72cfc82ac8f68a334799134e4eadda87833 SHA256 8e6f94c7957d989e01a80ab42b80f0f5bbac1cad9e656c7344ab5e1624a95215
-EBUILD libvmime-0.7.1.ebuild 1594 RMD160 25e780130b70564bbd084e081a6c942e18daddfa SHA1 986cf884f04ab88f9ebba2a98265308ba63f47a5 SHA256 7c5855190244c71487059fa0fd4755eb19d04daacb72ae3a19442eeaaffbac41
-EBUILD libvmime-0.9.2_pre581-r1.ebuild 2027 RMD160 63500e583d0da2e62ba78344516498d124eac530 SHA1 0f51257179667fc8a7a5aed471ab3c4238096f5f SHA256 c4ef40870376352e1b19c1f102982f4e38793ead497b4feffac6c102b1a16205
-MISC ChangeLog 1036 RMD160 60420954125c7568592e4f1a749e7b9c0a2fc078 SHA1 789e4bb7a2298bfd1f7059025984563f452f58f5 SHA256 b35d0ed282fabc6fad57ae70b5e6c55922203d93ef8de87af73dbf397d7f39f5
-MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc
+AUX 0.9.2_pre603/vmime-0.9.2-header-value-on-next-line.diff 1257 SHA256 514796bc5cd9f0694c4235db4093957d9bfa9e5de7145e8188d721f350206350 SHA512 7c83a80ddf0f2a45aee41ff6f48c5c5c2114d497c7e2fed94f2c58b14a93892c79c5f33ff4207d77717b2decf225899526ad013c3862ad950f56aec3502a3c52 WHIRLPOOL 0f7e4159519c0637109a985e9a096bb9e7ff829a7af889a1dda6fa71866d5555c0218925638ff5ebd4494052f4d78c35568bb372a91e5bb93bd64ff6ba1a0234
+AUX 0.9.2_pre603/vmime-0.9.2-phf-stop-on-whitespace.diff 841 SHA256 243e0ed141d82e953be3c35893049bd3c8fbac9facd76d9919fe667f7be81a9d SHA512 c218c9f9c48b464cae9574dc8e6646bf222e2718a9ab555ebac6f9d5b0de446800cf28f6542ff9095547a80d1bb751c85d2878169749184a0ed171b4dce57307 WHIRLPOOL 395507fa89a9d8b56c9dfc4292b4c3139986f9a993b84e3f09a445aed70fb4277b50f49ba429b34ea48e45d5a38221c7621a43831c4f1caac79e9d4edc7d4a78
+AUX 0.9.2_pre603/vmime-0.9.2-qp-in-buffers.diff 515 SHA256 e29874174fcaa1773040a54facccf40044f0cb4156ca0861cfb256059396f041 SHA512 005e536934e9c781991cdea74ad5328e10a03a52fe61e5a61add77a9bc9538923fa8f1db07d194af3f9f57d6ca77cd0a4f4682797bac9c00219999d0023aae8c WHIRLPOOL 20fcd4aeab55a6a72da421314ba9fed2d6983e4a2104dbd34e60016bf05e3bed1cac7e10044901327918e21ca423a08ab75958c73c16c3a55ccf5107e5edb1fd
+AUX 0.9.2_pre603/vmime-mixed-qp-in-parameter.diff 882 SHA256 4dde7014856c14e9c34ef6f728c00646d6d5d41438dbb81b57b032522b5295f8 SHA512 b0573425ab49a53fc07910c8b1aecc6b84d03565b43544e1b096253446df7a573e21ced05c22998b4d423ec7b8952c73cc08aec2824c9ccb22bcb8f8318b674e WHIRLPOOL 84200bd59602c5bc08d1b9e08dea29f7c99806866bfac39567f39a58d13ad621953f8c52c9d40c8c5ebead67d5e11b08dd95bdf4c550316d08bae5ffeac20844
+DIST libvmime-0.7.1-zarafa-gentoo-4.tar.bz2 12834 SHA256 e087d38c0b5ebf539979c584f6aca2a8ef5bcd7c27ab721df57a6618a1749f64
+DIST libvmime-0.7.1.tar.bz2 418302 SHA256 fc3476aec565341594c7c4dca982539695b61ecb92a438f19860e9130ca019e3
+DIST libvmime-0.9.2+svn581.tar.bz2 520479 SHA256 f1aaa124d40f10b71910cacb059aa77f146094a5ecddc70e46409196b26b26c7
+DIST libvmime-0.9.2+svn603.tar.bz2 522350 SHA256 bd4f4498904ce7bfd811c7ca9325aaefb6e73920987ca0af74ff31c1908f1dca SHA512 662202c115b94c38192b672167c9f993d102258d1e192bbd9ce92e7c5bf4a38aedf67f0b419ab76431cb307fd1f745e5ca0b25b17bff785f785c5d4bbe0be569 WHIRLPOOL 526904ca95cc00042af8e602d85e12c82e369d3b384344a237aa7c75057d6d3f5f7be671b0ac4154e97f65f1607935bda262e7f46ef74b4f2a229801a838b6e8
+DIST libvmime-0.9.2_pre581-zarafa-3.tar.bz2 4425 SHA256 8e6f94c7957d989e01a80ab42b80f0f5bbac1cad9e656c7344ab5e1624a95215
+EBUILD libvmime-0.7.1.ebuild 1594 SHA256 7c5855190244c71487059fa0fd4755eb19d04daacb72ae3a19442eeaaffbac41 SHA512 41d261e3de26a2bf518d1e25a44d77f4864102582ea6fef9fff9d3dbe4e53f5632cbf59a764e718794875f3cffa3630fa0292445577c61c27e057e190e72eba5 WHIRLPOOL 2953fba5fcd144d11125a696e9d259b3644e483d8e20874da196276ac7cad7bb2ef12b9f28fbcc1f1d534c5326055735147226c83a4dcb0bfc205688a5d561d5
+EBUILD libvmime-0.9.2_pre581-r1.ebuild 2027 SHA256 c4ef40870376352e1b19c1f102982f4e38793ead497b4feffac6c102b1a16205 SHA512 ba7aa1a4922a11b83ba6983e47240324a9a74707c268d25f4df37d34defd7c8350bc1d795420e2ea7698be57e51a8ff18dc59c7835e8babec3f3d07ec873f528 WHIRLPOOL 0f87c619f5d8a22e6fb8c7aeb4fe054d248f53c55ee59d44dcf08ae8b40b527b1e834faa78522c7d2e3aaf01c086a02e623e30ca592593841def5ed469dcfc2e
+EBUILD libvmime-0.9.2_pre603.ebuild 1812 SHA256 45f3be36f947abc79c56fa08a2a5c1761a4257a54c5221ea6d60c02f43ae5ff3 SHA512 e177d400f169290235f6fc34839b7ac5990f4a7ebfa97cfc3318045b8542a6d8dbd9a4f85ba694f25acb404050411c2137c260757e551a5f89ba0a95828f2e54 WHIRLPOOL 985f7cb21325396ff38cf989ba103b9d5dc7f6bd44f33709d58d0f01491a781d8a27421bb7049bb9bd585c3a6f9f2fdbd1a7d037b0ea68c2600f0b44c160a9c1
+MISC ChangeLog 1036 SHA256 b35d0ed282fabc6fad57ae70b5e6c55922203d93ef8de87af73dbf397d7f39f5 SHA512 94975b0d1b1d7f0f4b6745f3a7698066bb53d96b8b7de6c4126ee449f3554cf5d1da41ea8df9c51dabc54a326030f6104e04576ee66d36cf7c32997837db7463 WHIRLPOOL a2c37664a11ff6d9a210a9f709156385afdcc8932767c0550b4e50ffff9f37583d134cb7b56c377502623c766ea432ab8dee35466730623996e5d858ca510a44
+MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
diff --git a/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-header-value-on-next-line.diff b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-header-value-on-next-line.diff
new file mode 100644
index 0000000..eca7699
--- /dev/null
+++ b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-header-value-on-next-line.diff
@@ -0,0 +1,45 @@
+diff -Nurb libvmime-0.9.2.orig/src/headerField.cpp libvmime-0.9.2.patched/src/headerField.cpp
+--- libvmime-0.9.2.orig/src/headerField.cpp	2010-05-20 05:33:45.000000000 -0700
++++ libvmime-0.9.2.patched/src/headerField.cpp	2011-08-29 12:10:08.438497914 -0700
+@@ -157,14 +157,12 @@
+ 					{
+ 						contentsEnd = pos;
+ 						pos += 2;
+-						break;
+ 					}
+ 					else if (c == '\n')
+ 					{
+ 						contentsEnd = pos;
+ 						++pos;
+-						break;
+-					}
++					} else {
+ 
+ 					while (pos < end)
+ 					{
+@@ -186,24 +184,13 @@
+ 
+ 						++pos;
+ 					}
++					}
+ 
+ 					// Handle the case of folded lines
+ 					if (buffer[pos] == ' ' || buffer[pos] == '\t')
+ 					{
+ 						// This is a folding white-space: we keep it as is and
+ 						// we continue with contents parsing...
+-
+-						// If the line contains only space characters, we assume it is
+-						// the end of the headers. This is not strictly standard-compliant
+-						// but, hey, we can't fail when parsing some malformed mails...
+-						while (pos < end && (buffer[pos] == ' ' || buffer[pos] == '\t'))
+-							++pos;
+-
+-						if ((pos < end && buffer[pos] == '\n') ||
+-						    (pos + 1 < end && buffer[pos] == '\r' && buffer[pos + 1] == '\n'))
+-						{
+-							break;
+-						}
+ 					}
+ 					else
+ 					{
diff --git a/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-phf-stop-on-whitespace.diff b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-phf-stop-on-whitespace.diff
new file mode 100644
index 0000000..803b47b
--- /dev/null
+++ b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-phf-stop-on-whitespace.diff
@@ -0,0 +1,23 @@
+diff -Nurb libvmime-0.9.2.orig/src/parameterizedHeaderField.cpp libvmime-0.9.2.patched/src/parameterizedHeaderField.cpp
+--- libvmime-0.9.2.orig/src/parameterizedHeaderField.cpp	(revision 603)
++++ libvmime-0.9.2.patched/src/parameterizedHeaderField.cpp	(working copy)
+@@ -97,7 +97,7 @@
+ 	// Advance up to ';', if any
+ 	string::size_type valueLength = 0;
+ 
+-	while (p < pend && *p != ';')  // FIXME: support ";" inside quoted or RFC-2047-encoded text
++	while (p < pend && *p != ';' && (!parserHelpers::isSpace(*p)))  // FIXME: support ";" inside quoted or RFC-2047-encoded text
+ 	{
+ 		++p;
+ 		++valueLength;
+@@ -118,6 +118,10 @@
+ 	{
+ 		std::map <string, paramInfo> params;
+ 
++		if (*p != ';')
++			while (p < pend && *p != ';')  // FIXME: support ";" inside quoted or RFC-2047-encoded text
++				++p;
++
+ 		while (*p == ';')
+ 		{
+ 			// Skip ';'
diff --git a/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-qp-in-buffers.diff b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-qp-in-buffers.diff
new file mode 100644
index 0000000..7634edd
--- /dev/null
+++ b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-0.9.2-qp-in-buffers.diff
@@ -0,0 +1,16 @@
+--- svn/src/wordEncoder.cpp     (revision 603)
++++ svn/src/wordEncoder.cpp     (working copy)
+@@ -239,6 +239,13 @@
+ 	if (buffer.find_first_of("\n\r") != string::npos)
+ 		return true;
+ 
++	// If the string contains a QP string, we need to encode this.
++	// Not a 100% check, but we'd only get more encoded strings.
++	std::string::size_type pos = buffer.find("=?");
++	std::string::size_type end = buffer.find("?=");
++	if (pos != string::npos && end != string::npos && end > pos)
++		return true;
++
+ 	return false;
+ }
+ 
diff --git a/dev-cpp/libvmime/files/0.9.2_pre603/vmime-mixed-qp-in-parameter.diff b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-mixed-qp-in-parameter.diff
new file mode 100644
index 0000000..78e6c70
--- /dev/null
+++ b/dev-cpp/libvmime/files/0.9.2_pre603/vmime-mixed-qp-in-parameter.diff
@@ -0,0 +1,28 @@
+Index: svn/src/parameter.cpp
+===================================================================
+--- svn/src/parameter.cpp	(revision 597)
++++ svn/src/parameter.cpp	(working copy)
+@@ -239,8 +239,21 @@
+ 			{
+ 				value << t.getWholeBuffer();
+ 
+-				if (!foundCharsetChunk)
+-					ch = t.getWordAt(0)->getCharset();
++				if (!foundCharsetChunk) {
++					// this is still wrong. each word can have it's
++					// own charset, and can be mixed (eg. iso-8859-1
++					// and iso-2022-jp), but very unlikely.
++					// real fix is to have parameters store a
++					// vmime::text in stead of a vmime::word in
++					// m_value.  but that changes the interface
++					for (size_t i = 0; i < t.getWordCount(); i++) {
++						if (t.getWordAt(i)->getCharset() != ch && ch == charsets::US_ASCII) {
++							ch = t.getWordAt(i)->getCharset();
++							break;
++						}
++					}
++						
++				}
+ 			}
+ 		}
+ 	}
diff --git a/dev-cpp/libvmime/libvmime-0.9.2_pre603.ebuild b/dev-cpp/libvmime/libvmime-0.9.2_pre603.ebuild
new file mode 100644
index 0000000..8d589e7
--- /dev/null
+++ b/dev-cpp/libvmime/libvmime-0.9.2_pre603.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils autotools
+
+MY_PV=${PV/_pre/+svn}
+MY_PVV=${PV/_pre*/}
+
+DESCRIPTION="Library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP"
+HOMEPAGE="http://www.vmime.org"
+SRC_URI="http://download.zarafa.com/community/final/7.1/7.1.4-41394/sourcecode/${PN}-${MY_PV}.tar.bz2"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc examples +imap +maildir +pop sasl sendmail +smtp ssl static"
+
+RDEPEND="virtual/libiconv
+	ssl? ( >=net-libs/gnutls-1.2.0 )
+	sasl? ( virtual/gsasl )
+	sendmail? ( virtual/mta )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${MY_PVV}"
+
+src_prepare() {
+	sed -i \
+		-e "s|doc/\${PACKAGE_TARNAME}|doc/${PF}|" \
+		-e "s|doc/\$(GENERIC_LIBRARY_NAME)|doc/${PF}|" \
+		configure Makefile.in || die "sed failed"
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="diff" \
+	EPATCH_FORCE="yes" epatch
+#	AT_M4DIR="m4" eautoreconf
+#	die
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable static) \
+		$(use_enable sasl) \
+		$(use_enable ssl tls) \
+		$(use_enable pop messaging-proto-pop3) \
+		$(use_enable smtp messaging-proto-smtp) \
+		$(use_enable imap messaging-proto-imap) \
+		$(use_enable maildir messaging-proto-maildir) \
+		$(use_enable sendmail messaging-proto-sendmail)
+}
+
+src_compile() {
+	default
+	if use doc ; then
+		doxygen vmime.doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog || die "dodoc failed"
+	if use doc ; then
+		dohtml doc/html/* || die "dohtml failed"
+	fi
+
+	insinto /usr/share/doc/${PF}
+	if use examples ; then
+		doins -r examples || die "doins examples failed"
+	fi
+}
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
deleted file mode 100644
index 38d79bd..0000000
--- a/dev-libs/icu/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for dev-libs/icu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*icu-4.4.2 (26 Jul 2011)
-
-  26 Jul 2011; Mario Fetka <mario.fetka@gmail.com> +files/icu-4.4.1-arm.patch,
-  +files/icu-4.4.1-et_EE.patch, +files/icu-4.4.1-pkgdata.patch,
-  +icu-4.4.2.ebuild, +files/icu-4.4.2-gcc-4.5.patch:
-  add 4.4 libs only package
-
-  26 Jul 2011; Mario Fetka <mario.fetka@gmail.com> +metadata.xml:
-  initial commit
-
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
deleted file mode 100644
index 37497ec..0000000
--- a/dev-libs/icu/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX icu-4.0.1-TestDisplayNamesMeta.patch 8259 RMD160 4eb64876eee0ff21577f8330326ba96010545cc1 SHA1 d8fe22be87fbb99f8c1a0bbb9d94bc2d93ca083a SHA256 cfcedc486f4c530e43b5fffacf4068f76d026ab73dd4aa1dff253fc87c2e462c
-AUX icu-4.0.1-fix_parallel_building.patch 145 RMD160 d7e74631383b01a7cd9d18f9fda2949e1b3ec198 SHA1 5edcb46b7730b11aeaf5ed2e8e968e588eb1d492 SHA256 244bee4fcabe5c1bcf95af2d9a01d87b2de27407e662f2c1663c5ce15ac8a561
-AUX icu-4.4.1-arm.patch 991 RMD160 b3c38623023414e47280c5418744f05a96cd049e SHA1 84e4a7702c90fb4d7ca04e9f59ec6a84cea2098b SHA256 06b829f497b1bedf96db76a34720a548b10ffafc2101b19a0f756b2048771b8e
-AUX icu-4.4.1-et_EE.patch 861 RMD160 bd2041795f3b1781fb5ddef85566487912c92c77 SHA1 730cae8657a162d6410be41580d86c9203183a4b SHA256 4719ac0e19e89b6bf48e17af9ccc7c7bb26e8e171576c348eb7b68664459b80c
-AUX icu-4.4.1-pkgdata.patch 2316 RMD160 4dda06ef2791a5f986c4f0baada2e13e979ddf2c SHA1 9d40795b94650c76f5c5eebb7ce57ed8634059e0 SHA256 6eef0649b635286ea94d84076ea76c26049b97bfa9f858b3e1479bb7de7229c4
-AUX icu-4.4.2-gcc-4.5.patch 1040 RMD160 2b59457c373693ccf07fa57af20d59347df19a52 SHA1 cc2b853a85e6f2b427f248bcd2cb9590bd0f8bb2 SHA256 2ce96779636acbf6eb189b2953368b397297f04160f0cc80b5faf52240935f10
-AUX icu-CVE-2009-0153.patch 38423 RMD160 38889946cf0b7b67d0489ed4b0cf636da57c18f0 SHA1 f05a37da72fd234639f18e6f7781c9ce8693d38f SHA256 4f25508d4b50d65e9cc113b0d84f0c1b63ae936413b21a79ff2925395320acf8
-AUX icu4c-3_6-src-setBreakType-public.diff 458 RMD160 f4c5c242aa03d17453d35612049177af997a8e43 SHA1 f6f5c6cea5bda013c20e002d63b15c5cb71d6b62 SHA256 c643c3c9eca3943e8987048dd3800eef823bd68bc7ec34d7c0fb5bb61650c648
-DIST icu4c-4_0_1-src.tgz 12356471 RMD160 e40e7ffddd3134a34fe7e7bc98d776c5b67b637c SHA1 65a65e9cd5670e113031def9448f65fb8f84f47a SHA256 fe4d33cc7393c355df7b13080e1c3717ec1acac2f8cfe452b691f33c5f467259
-DIST icu4c-4_4_2-src.tgz 16446776 RMD160 eb228e6fa9606855bbd881d98da738a61d72b74b SHA1 adc19231810eff2836a08b0e1f1a31a128d7a834 SHA256 2ecefdfb134b5b364ed01c2f613a9ccb11489dbae5857d63cd17ba5b6caca789
-EBUILD icu-4.0.1.ebuild 1914 RMD160 e283821126e475b568f1d5004e905735c5d2aa0c SHA1 439e5afde5d05150f083393b33da64f43f3228a9 SHA256 15594dce8e8a7833bc96ecd718e3fd2cecf94dc6d52d2bd0cdbc38f10fb905a8
-EBUILD icu-4.4.2.ebuild 1919 RMD160 20c395566df739b6a0c7b9e64cc20141c32d6f40 SHA1 f16e3c676493e6523bcffc03ba283bd7e75c2cb9 SHA256 00e6fc7e94e4fc64da93bf2dafc8ef970a70c470dc40ab3ea41c2084b75a9bde
-MISC ChangeLog 448 RMD160 77a7eb37febd49e4bf00939a98dd22e439f7ea8a SHA1 f9e76cd0901b740543e53e071b2427d4cefb127e SHA256 e3ee29f32d21a7bd6ab8835f83acc5cbab1ccf71de32b91c836f16b367e6e128
-MISC metadata.xml 278 RMD160 bbc1c0098322bba7d2edbf4d41f05e1c010026c2 SHA1 1dcc071f84b18baeca49a6a29ab79a44ac18baa0 SHA256 2b995d31dcd9de1724232025cd606514b27a59bb28a9d6b6bcc8ac42c4cb9e9d
diff --git a/dev-libs/icu/files/icu-4.0.1-TestDisplayNamesMeta.patch b/dev-libs/icu/files/icu-4.0.1-TestDisplayNamesMeta.patch
deleted file mode 100644
index be1f7ec..0000000
--- a/dev-libs/icu/files/icu-4.0.1-TestDisplayNamesMeta.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-https://bugs.icu-project.org/trac/ticket/6814
-https://bugs.icu-project.org/trac/changeset/25681
-
---- i18n/olsontz.cpp
-+++ i18n/olsontz.cpp
-@@ -1,6 +1,6 @@
- /*
- **********************************************************************
--* Copyright (c) 2003-2008, International Business Machines
-+* Copyright (c) 2003-2009, International Business Machines
- * Corporation and others.  All Rights Reserved.
- **********************************************************************
- * Author: Alan Liu
-@@ -526,8 +526,8 @@
-         if (transitionTimes[i] >= limit) {
-             break;
-         }
--        if (transitionTimes[i] >= start &&
--            dstOffset(typeData[i]) != 0) {
-+        if ((transitionTimes[i] >= start && dstOffset(typeData[i]) != 0)
-+                || (transitionTimes[i] > start && i > 0 && dstOffset(typeData[i - 1]) != 0)) {
-             return TRUE;
-         }
-     }
---- i18n/timezone.cpp
-+++ i18n/timezone.cpp
-@@ -1,6 +1,6 @@
- /*
- *******************************************************************************
--* Copyright (C) 1997-2008, International Business Machines Corporation and    *
-+* Copyright (C) 1997-2009, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
- *******************************************************************************
- *
-@@ -1240,6 +1240,8 @@
-         }
-     } else {
-         // The display name for standard time was requested, but currently in DST
-+        // or display name for daylight saving time was requested, but this zone no longer
-+        // observes DST.
-         tz = new SimpleTimeZone(rawOffset, tempID);
-         if (U_FAILURE(status) || tz == NULL) {
-             if (U_SUCCESS(status)) {
---- test/intltest/tztest.cpp
-+++ test/intltest/tztest.cpp
-@@ -34,6 +34,11 @@
- // class TimeZoneTest
- // *****************************************************************************
- 
-+// TODO: We should probably read following data at runtime, so we can update
-+// the these values every release with necessary data changes.
-+const int32_t TimeZoneTest::REFERENCE_YEAR = 2009;
-+const char * TimeZoneTest::REFERENCE_DATA_VERSION = "2009d";
-+
- void TimeZoneTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
- {
-     if (exec) logln("TestSuite TestTimeZone");
-@@ -579,18 +584,13 @@
-  */
- void TimeZoneTest::TestShortZoneIDs()
- {
--    // TODO: This test case is tzdata sensitive.
--    // We should actually put the data version in this test code
--    // at build time.  For now, we just hardcode the version string
--    // and display warning instead of error if non-reference tzdata
--    // version is used.
--    const char *REFERENCE_DATA_VERSION = "2008i";
--
-     UErrorCode status = U_ZERO_ERROR;
-+
-+    // This test case is tzdata version sensitive.
-     UBool isNonReferenceTzdataVersion = FALSE;
-     const char *tzdataVer = TimeZone::getTZDataVersion(status);
-     if (failure(status, "getTZDataVersion")) return;
--    if (uprv_strcmp(tzdataVer, REFERENCE_DATA_VERSION) != 0) {
-+    if (uprv_strcmp(tzdataVer, TimeZoneTest::REFERENCE_DATA_VERSION) != 0) {
-         // Note: We want to display a warning message here if
-         // REFERENCE_DATA_VERSION is out of date - so we
-         // do not forget to update the value before GA.
-@@ -603,11 +603,11 @@
-     // Note: useDaylightTime returns true if DST is observed
-     // in the time zone in the current calendar year.  The test
-     // data is valid for the date after the reference year below.
--    // If system clock is before the year, some test cases may fail.
--    const int32_t REFERENCE_YEAR = 2009;
-+    // If system clock is before the year, some test cases may
-+    // fail.
-     GregorianCalendar cal(*TimeZone::getGMT(), status);
-     if (failure(status, "GregorianCalendar")) return;
--    cal.set(REFERENCE_YEAR, UCAL_JANUARY, 2); // day 2 in GMT
-+    cal.set(TimeZoneTest::REFERENCE_YEAR, UCAL_JANUARY, 2); // day 2 in GMT
- 
-     UBool isDateBeforeReferenceYear = ucal_getNow() < cal.getTime(status);
-     if (failure(status, "Calendar::getTime")) return;
-@@ -1898,6 +1898,15 @@
-     };
- 
- void TimeZoneTest::TestDisplayNamesMeta() {
-+    UErrorCode status = U_ZERO_ERROR;
-+    GregorianCalendar cal(*TimeZone::getGMT(), status);
-+    if (failure(status, "GregorianCalendar")) return;
-+
-+    UBool isReferenceYear = TRUE;
-+    if (cal.get(UCAL_YEAR, status) != TimeZoneTest::REFERENCE_YEAR) {
-+        isReferenceYear = FALSE;
-+    }
-+
-     UBool sawAnError = FALSE;
-     for (int testNum   = 0; zoneDisplayTestData[testNum].zoneName != NULL; testNum++) {
-         Locale locale  = Locale::createFromName(zoneDisplayTestData[testNum].localeName);
-@@ -1908,20 +1917,33 @@
-                              locale,
-                              displayName);
-         if (displayName != zoneDisplayTestData[testNum].expectedDisplayName) {
--            sawAnError = TRUE;
-             char  name[100];
-             UErrorCode status = U_ZERO_ERROR;
-             displayName.extract(name, 100, NULL, status);
--            errln("Incorrect time zone display name.  zone = \"%s\",\n"
--                  "   locale = \"%s\",   style = %s,  Summertime = %d\n"
--                  "   Expected \"%s\", "
--                  "   Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
--                                     zoneDisplayTestData[testNum].localeName,
--                                     zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
--                                        "SHORT" : "LONG",
--                                     zoneDisplayTestData[testNum].summerTime,
--                                     zoneDisplayTestData[testNum].expectedDisplayName,
--                                     name);
-+            if (isReferenceYear) {
-+                sawAnError = TRUE;
-+                errln("Incorrect time zone display name.  zone = \"%s\",\n"
-+                      "   locale = \"%s\",   style = %s,  Summertime = %d\n"
-+                      "   Expected \"%s\", "
-+                      "   Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
-+                                         zoneDisplayTestData[testNum].localeName,
-+                                         zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
-+                                            "SHORT" : "LONG",
-+                                         zoneDisplayTestData[testNum].summerTime,
-+                                         zoneDisplayTestData[testNum].expectedDisplayName,
-+                                         name);
-+            } else {
-+                logln("Incorrect time zone display name.  zone = \"%s\",\n"
-+                      "   locale = \"%s\",   style = %s,  Summertime = %d\n"
-+                      "   Expected \"%s\", "
-+                      "   Got \"%s\"\n", zoneDisplayTestData[testNum].zoneName,
-+                                         zoneDisplayTestData[testNum].localeName,
-+                                         zoneDisplayTestData[testNum].style==TimeZone::SHORT ?
-+                                            "SHORT" : "LONG",
-+                                         zoneDisplayTestData[testNum].summerTime,
-+                                         zoneDisplayTestData[testNum].expectedDisplayName,
-+                                         name);
-+            }
-         }
-         delete zone;
-     }
---- test/intltest/tztest.h
-+++ test/intltest/tztest.h
-@@ -1,6 +1,6 @@
- 
- /********************************************************************
-- * Copyright (c) 1997-2008, International Business Machines
-+ * Copyright (c) 1997-2009, International Business Machines
-  * Corporation and others. All Rights Reserved.
-  ********************************************************************/
-  
-@@ -98,6 +98,11 @@
-     // internal functions
-     static UnicodeString& formatOffset(int32_t offset, UnicodeString& rv);
-     static UnicodeString& formatTZID(int32_t offset, UnicodeString& rv);
-+
-+    // Some test case data is current date/tzdata version sensitive and producing errors
-+    // when year/rule are changed.
-+    static const int32_t REFERENCE_YEAR;
-+    static const char *REFERENCE_DATA_VERSION;
- };
- 
- #endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/dev-libs/icu/files/icu-4.0.1-fix_parallel_building.patch b/dev-libs/icu/files/icu-4.0.1-fix_parallel_building.patch
deleted file mode 100644
index 0e09fd9..0000000
--- a/dev-libs/icu/files/icu-4.0.1-fix_parallel_building.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/Makefile.in
-+++ data/Makefile.in
-@@ -355,6 +355,7 @@
- endif
- endif
- 
-+$(BUILD_DIRS): build-dir
- 
- build-dir:
- 	@list='$(BUILD_DIRS)'; \
diff --git a/dev-libs/icu/files/icu-4.4.1-arm.patch b/dev-libs/icu/files/icu-4.4.1-arm.patch
deleted file mode 100644
index 20f4852..0000000
--- a/dev-libs/icu/files/icu-4.4.1-arm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=329439
-https://bugs.icu-project.org/trac/ticket/7664
-https://bugs.icu-project.org/trac/changeset/28107
-
---- tools/toolutil/pkg_genc.c
-+++ tools/toolutil/pkg_genc.c
-@@ -1,5 +1,5 @@
- /******************************************************************************
-- *   Copyright (C) 2009, International Business Machines
-+ *   Copyright (C) 2009-2010, International Business Machines
-  *   Corporation and others.  All Rights Reserved.
-  *******************************************************************************
-  */
-@@ -118,10 +118,10 @@
- } assemblyHeader[] = {
-     {"gcc",
-         ".globl %s\n"
--        "\t.section .note.GNU-stack,\"\",@progbits\n"
-+        "\t.section .note.GNU-stack,\"\",%%progbits\n"
-         "\t.section .rodata\n"
-         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
--        "\t.type %s,@object\n"
-+        "\t.type %s,%%object\n"
-         "%s:\n\n",
- 
-         ".long ","",HEX_0X
diff --git a/dev-libs/icu/files/icu-4.4.1-et_EE.patch b/dev-libs/icu/files/icu-4.4.1-et_EE.patch
deleted file mode 100644
index 25f2106..0000000
--- a/dev-libs/icu/files/icu-4.4.1-et_EE.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=260127
-https://bugs.icu-project.org/trac/ticket/6934
-https://bugs.icu-project.org/trac/changeset/28160
-
---- Makefile.in
-+++ Makefile.in
-@@ -219,8 +219,8 @@
- 	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
- 	chmod u+w $@
- 	@echo "# Following from @platform_make_fragment@" >> $@
--	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
--	sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
-+	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
-+	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
- 	cat $(top_srcdir)/config/icu-config-bottom >> $@
- 	echo "# Rebuilt on "`date` >> $@
- 	chmod u-w $@
diff --git a/dev-libs/icu/files/icu-4.4.1-pkgdata.patch b/dev-libs/icu/files/icu-4.4.1-pkgdata.patch
deleted file mode 100644
index 8a1a5bc..0000000
--- a/dev-libs/icu/files/icu-4.4.1-pkgdata.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://bugs.icu-project.org/trac/ticket/7663
-https://bugs.icu-project.org/trac/changeset/28002
-https://bugs.icu-project.org/trac/ticket/7680
-https://bugs.icu-project.org/trac/changeset/28124
-
---- source/tools/pkgdata/pkgdata.cpp
-+++ source/tools/pkgdata/pkgdata.cpp
-@@ -98,6 +98,7 @@
- #endif
- 
- #define LARGE_BUFFER_MAX_SIZE 2048
-+#define MEDIUM_BUFFER_MAX_SIZE 1024
- #define SMALL_BUFFER_MAX_SIZE 512
- 
- static void loadLists(UPKGOptions *o, UErrorCode *status);
-@@ -472,29 +473,48 @@
- }
- 
- static int runCommand(const char* command, UBool specialHandling) {
--    char cmd[SMALL_BUFFER_MAX_SIZE];
-+    char *cmd = NULL;
-+    char cmdBuffer[SMALL_BUFFER_MAX_SIZE];
-+    int32_t len = strlen(command);
-+
-+    if (len == 0) {
-+        return 0;
-+    }
- 
-     if (!specialHandling) {
-+#if defined(USING_CYGWIN) || defined(OS400)
-+#define CMD_PADDING_SIZE 20
-+        if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
-+            cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
-+        } else {
-+            cmd = cmdBuffer;
-+        }
- #ifdef USING_CYGWIN
-         sprintf(cmd, "bash -c \"%s\"", command);
- 
- #elif defined(OS400)
-         sprintf(cmd, "QSH CMD('%s')", command);
-+#endif
- #else
-         goto normal_command_mode;
- #endif
-     } else {
- normal_command_mode:
--        sprintf(cmd, "%s", command);
-+        cmd = (char *)command;
-     }
--    
-+
-     printf("pkgdata: %s\n", cmd);
-     int result = system(cmd);
--    if (result != 0) { 
--        printf("-- return status = %d\n", result); 
-+    if (result != 0) {
-+        printf("-- return status = %d\n", result);
-     }
--    return result; 
--} 
-+
-+    if (cmd != cmdBuffer && cmd != command) {
-+        uprv_free(cmd);
-+    }
-+
-+    return result;
-+}
- 
- #define LN_CMD "ln -s"
- #define RM_CMD "rm -f"
-@@ -586,7 +606,7 @@
-             pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE);
-             if (pkgDataFlags != NULL) {
-                 for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) {
--                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE);
-+                    pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * MEDIUM_BUFFER_MAX_SIZE);
-                     if (pkgDataFlags[i] != NULL) {
-                         pkgDataFlags[i][0] = 0;
-                     } else {
diff --git a/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch b/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch
deleted file mode 100644
index 0b5d2eb..0000000
--- a/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://ssl.icu-project.org/trac/ticket/7932
-https://ssl.icu-project.org/trac/changeset/28667
-https://ssl.icu-project.org/trac/ticket/8011
-https://ssl.icu-project.org/trac/changeset/28772
-
---- test/cintltst/cnumtst.c
-+++ test/cintltst/cnumtst.c
-@@ -405,7 +405,12 @@
-         log_err("parse failed. The error is  : %s\n", myErrorName(status));
-     }
- 
--    if(d1!=462.12345)
-+    /*
-+     * Note: "for strict standard conformance all operations and constants are now supposed to be evaluated in precision of long double".  So,  we assign a1 before comparing to a double. Bug #7932.
-+     */
-+    a1 = 462.12345;
-+
-+    if(d1!=a1)
-         log_err("Fail: Error in parsing\n");
-     else
-         log_verbose("Pass: parsing successful\n");
---- test/intltest/numfmtst.cpp
-+++ test/intltest/numfmtst.cpp
-@@ -6144,7 +6144,7 @@
-        ) 
-     { 
-         errln("ERROR: parse failed - expected 123.0, 3  - returned %d, %i", 
--               result.getDouble(), parsePos); 
-+               result.getDouble(), parsePos.getIndex()); 
-     } 
- } 
- 
diff --git a/dev-libs/icu/icu-4.0.1.ebuild b/dev-libs/icu/icu-4.0.1.ebuild
deleted file mode 100644
index bc15d9e..0000000
--- a/dev-libs/icu/icu-4.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/Attic/icu-4.0.1.ebuild,v 1.11 2010/10/02 22:30:45 arfrever dead $
-
-EAPI="2"
-
-inherit eutils versionator
-
-DESCRIPTION="International Components for Unicode (4.0 Libs only)"
-HOMEPAGE="http://www.icu-project.org/ http://ibm.com/software/globalization/icu/"
-
-BASEURI="http://download.icu-project.org/files/${PN}4c/${PV}"
-DOCS_PV="$(get_version_component_range 1-2)"
-DOCS_BASEURI="http://download.icu-project.org/files/${PN}4c/${DOCS_PV}"
-DOCS_PV="${DOCS_PV/./_}"
-SRCPKG="${PN}4c-${PV//./_}-src.tgz"
-
-SRC_URI="${BASEURI}/${SRCPKG}"
-
-LICENSE="BSD"
-SLOT="4.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc examples"
-
-DEPEND="doc? ( app-arch/unzip )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/source"
-
-src_prepare() {
-	# Do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
-	# Bug 202059
-	# http://bugs.icu-project.org/trac/ticket/6102
-	for x in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS ; do
-		sed -i -e "/^${x} =.*/s:@${x}@::" config/Makefile.inc.in || die "sed failed"
-	done
-
-	# Bug 258377
-	sed -i -e 's:^#elif$:#else:g' ${S}/layoutex/ParagraphLayout.cpp || die 'elif sed failed'
-
-	epatch "${FILESDIR}/${P}-fix_parallel_building.patch"
-	epatch "${FILESDIR}/${P}-TestDisplayNamesMeta.patch"
-#	epatch "${FILESDIR}/icu-CVE-2009-0153.patch"
-	epatch "${FILESDIR}/icu4c-3_6-src-setBreakType-public.diff"
-}
-
-src_configure() {
-	econf \
-		--enable-static \
-		$(use_enable debug) \
-		$(use_enable examples samples)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/bin
-	rm -rf "${D}"/usr/include
-	rm -rf "${D}"/usr/lib*/*.so
-	rm -rf "${D}"/usr/lib*/*.a
-	rm -rf "${D}"/usr/lib*/icu
-	rm -rf "${D}"/usr/sbin
-	rm -rf "${D}"/usr/share
-	dohtml ../readme.html
-	dodoc ../unicode-license.txt
-}
diff --git a/dev-libs/icu/icu-4.4.2.ebuild b/dev-libs/icu/icu-4.4.2.ebuild
deleted file mode 100644
index 041ea5c..0000000
--- a/dev-libs/icu/icu-4.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/Attic/icu-4.4.2.ebuild,v 1.10 2011/04/03 11:54:10 arfrever dead $
-
-EAPI="3"
-
-inherit eutils flag-o-matic versionator
-
-MAJOR_MINOR_VERSION="$(get_version_component_range 1-2)"
-MICRO_VERSION="$(get_version_component_range 3)"
-
-DESCRIPTION="International Components for Unicode (4.4 libs only"
-HOMEPAGE="http://www.icu-project.org/"
-
-BASE_URI="http://download.icu-project.org/files/icu4c/${PV}"
-DOCS_BASE_URI="http://download.icu-project.org/files/icu4c/${MAJOR_MINOR_VERSION}"
-SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz"
-
-SRC_URI="${BASE_URI}/${SRC_ARCHIVE}"
-
-LICENSE="BSD"
-SLOT="4.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/source"
-
-QA_DT_NEEDED="/usr/lib.*/libicudata.so.${MAJOR_MINOR_VERSION/./}.${MICRO_VERSION:-0}"
-
-src_unpack() {
-	unpack "${SRC_ARCHIVE}"
-}
-
-src_prepare() {
-	# Do not hardcode used CFLAGS, LDFLAGS etc. into icu-config
-	# Bug 202059
-	# https://bugs.icu-project.org/trac/ticket/6102
-	for x in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
-		sed -i -e "/^${x} =.*/s:@${x}@::" "config/Makefile.inc.in" || die "sed failed"
-	done
-
-	epatch "${FILESDIR}/${PN}-4.4.1-pkgdata.patch"
-	epatch "${FILESDIR}/${PN}-4.4.1-et_EE.patch"
-	epatch "${FILESDIR}/${PN}-4.4.1-arm.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.5.patch"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable debug)
-}
-
-src_test() {
-	emake check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/bin
-	rm -rf "${D}"/usr/include
-	rm -rf "${D}"/usr/lib*/*.so
-	rm -rf "${D}"/usr/lib*/icu
-	rm -rf "${D}"/usr/sbin
-	rm -rf "${D}"/usr/share
-	#die
-	dohtml ../readme.html
-	dodoc ../unicode-license.txt
-}
diff --git a/dev-libs/icu/metadata.xml b/dev-libs/icu/metadata.xml
deleted file mode 100644
index 0fca363..0000000
--- a/dev-libs/icu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>arfrever@gentoo.org</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
new file mode 100644
index 0000000..701f1ed
--- /dev/null
+++ b/dev-util/google-perftools/Manifest
@@ -0,0 +1,4 @@
+AUX gperftools-2.0+glibc-2.16.patch 604 SHA256 abb19fd87ce092fc0cb0a4a5964834ec97b12d2462bc2b8bd8668c4ca71fcea5 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964 WHIRLPOOL 75866b1e0e17ccc206459b31e284f7892d7e03c4cd862f8f6d66b374887aab938e9d79115228b7a7258f6bddd2439348fb48f67581744b9fdad1b4f6ae8079ef
+AUX gperftools-2.0-32bit-barrier.patch 792 SHA256 224776d529f1a1d11a036f16f04d4f01e3fd805d6fdd361c7d4b714f5bfbb87c SHA512 a39fd183d76a76e5c4cb3915f966e008250b4c72098bd2a9d13f10e01efd8dd1e36a51e0d4ef5f712d20398fa8605aa40e2529af085e80f918a1e227d7c92def WHIRLPOOL dafa07810d202816462603457395491a7d5901c0faf3134383635ef9a267aeba9f6635e687659dd1634ef7219970334a485350d6f8cad33f6792d87b779c21a3
+DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
+EBUILD google-perftools-2.0-r2.ebuild 2171 SHA256 cdc8804dd40b9888a4a299abdbb383e5e6cb1f4771b6a34ad396aacdfafc5cb0 SHA512 360d6ecda38d2f61b4375a0df0c5f4f285e250bda3fc089da5f8eea96966746ac9aa265b04575cf3ce8215a8363fdece4662c3cfd4590b3b909cc8c3f6b93ee7 WHIRLPOOL efe0cabc4c399af5794c06dd525a0e08d3e9af49982e729afa4afe234cb0226616e0104ea9c8b0926c2c92f0a40e077b7f6113c9f8398999fda84c4c2536932b
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
new file mode 100644
index 0000000..b17e0d5
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
@@ -0,0 +1,13 @@
+Index: gperftools-2.0/src/base/linuxthreads.cc
+===================================================================
+--- gperftools-2.0.orig/src/base/linuxthreads.cc
++++ gperftools-2.0/src/base/linuxthreads.cc
+@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
+ /* Signal handler to help us recover from dying while we are attached to
+  * other threads.
+  */
+-static void SignalHandler(int signum, siginfo_t *si, void *data) {
++static void SignalHandler(int signum, struct siginfo *si, void *data) {
+   if (sig_pids != NULL) {
+     if (signum == SIGABRT) {
+       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
new file mode 100644
index 0000000..df89a92
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
@@ -0,0 +1,17 @@
+Atomic64 not available on all architectures.
+Use AtomicWord instead.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar gperftools-2.0.orig/src/base/spinlock_internal.cc gperftools-2.0/src/base/spinlock_internal.cc
+--- gperftools-2.0.orig/src/base/spinlock_internal.cc	2012-02-02 21:36:23.000000000 +0000
++++ gperftools-2.0/src/base/spinlock_internal.cc	2013-01-20 23:44:01.629077919 +0000
+@@ -80,7 +80,7 @@
+ static int SuggestedDelayNS(int loop) {
+   // Weak pseudo-random number generator to get some spread between threads
+   // when many are spinning.
+-  static base::subtle::Atomic64 rand;
++  static AtomicWord rand;
+   uint64 r = base::subtle::NoBarrier_Load(&rand);
+   r = 0x5deece66dLL * r + 0xb;   // numbers from nrand48()
+   base::subtle::NoBarrier_Store(&rand, r);
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
new file mode 100644
index 0000000..dcf876f
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0-r1.ebuild,v 1.1 2013/01/20 23:48:29 robbat2 Exp $
+
+EAPI=4
+
+MY_P="gperftools-${PV}"
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="http://code.google.com/p/gperftools/"
+SRC_URI="http://gperftools.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* ~arm ~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="largepages debug minimal test"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		makeopts="${makeopts} noinst_PROGRAMS= "
+
+	# don't install _anything_ from the documentation, since it would
+	# install it in non-standard locations, and would just waste time.
+	makeopts="${makeopts} dist_doc_DATA= "
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
+	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
+}
+
+src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	econf \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		$(use_enable debug debugalloc) \
+		$(use_enable minimal)
+}
+
+src_compile() {
+	emake ${makeopts}
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sanbox is enabled."
+			ewarn "See http://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install ${makeopts}
+
+	dodoc README AUTHORS ChangeLog TODO NEWS
+	pushd doc
+	dohtml -r *
+	popd
+}
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
new file mode 100644
index 0000000..21c7f24
--- /dev/null
+++ b/eclass/rpm.eclass
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.20 2010/07/18 21:57:20 vapier Exp $
+
+# @ECLASS: rpm.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: convenience class for extracting RPMs
+
+inherit eutils
+
+DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
+
+# @FUNCTION: rpm_unpack
+# @USAGE: <rpms>
+# @DESCRIPTION:
+# Unpack the contents of the specified rpms like the unpack() function.
+rpm_unpack() {
+	[[ $# -eq 0 ]] && set -- ${A}
+	local a
+	for a in "$@" ; do
+		echo ">>> Unpacking ${a} to ${PWD}"
+		if [[ ${a} == ./* ]] ; then
+			: nothing to do -- path is local
+		elif [[ ${a} == ${DISTDIR}/* ]] ; then
+			ewarn 'QA: do not use ${DISTDIR} with rpm_unpack -- it is added for you'
+		elif [[ ${a} == /* ]] ; then
+			ewarn 'QA: do not use full paths with rpm_unpack -- use ./ paths instead'
+		else
+			a="${DISTDIR}/${a}"
+		fi
+		rpm2tar -O "${a}" | tar xf - || die "failure unpacking ${a}"
+	done
+}
+
+# @FUNCTION: srcrpm_unpack
+# @USAGE: <rpms>
+# @DESCRIPTION:
+# Unpack the contents of the specified rpms like the unpack() function as well
+# as any archives that it might contain.  Note that the secondary archive
+# unpack isn't perfect in that it simply unpacks all archives in the working
+# directory (with the assumption that there weren't any to start with).
+srcrpm_unpack() {
+	[[ $# -eq 0 ]] && set -- ${A}
+	rpm_unpack "$@"
+
+	# no .src.rpm files, then nothing to do
+	[[ "$* " != *".src.rpm " ]] && return 0
+
+	eshopts_push -s nullglob
+
+	# unpack everything
+	local a
+	for a in *.tar.{gz,bz2} *.t{gz,bz2} *.zip *.ZIP ; do
+		unpack "./${a}"
+		rm -f "${a}"
+	done
+
+	eshopts_pop
+
+	return 0
+}
+
+# @FUNCTION: rpm_src_unpack
+# @DESCRIPTION:
+# Automatically unpack all archives in ${A} including rpms.  If one of the
+# archives in a source rpm, then the sub archives will be unpacked as well.
+rpm_src_unpack() {
+	local a
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*)     unpack "${a}" ;;
+		esac
+	done
+}
+
+# @FUNCTION: rpm_spec_epatch
+# @USAGE: [spec]
+# @DESCRIPTION:
+# Read the specified spec (defaults to ${PN}.spec) and attempt to apply
+# all the patches listed in it.  If the spec does funky things like moving
+# files around, well this won't handle that.
+rpm_spec_epatch() {
+	local p spec=${1:-${PN}.spec}
+	local dir=${spec%/*}
+	grep '^%patch' "${spec}" | \
+	while read line ; do
+		set -- ${line}
+		p=$1
+		shift
+		EPATCH_OPTS="$*"
+		set -- $(grep "^P${p#%p}: " "${spec}")
+		shift
+		epatch "${dir:+${dir}/}$*"
+	done
+}
+
+EXPORT_FUNCTIONS src_unpack
diff --git a/www-apps/z-push/Manifest b/www-apps/z-push/Manifest
index c6ffe29..4a4f015 100644
--- a/www-apps/z-push/Manifest
+++ b/www-apps/z-push/Manifest
@@ -1,16 +1,12 @@
-AUX postinstall-en.txt 1221 SHA256 e7b4e230a6aa4fe5d36ae0be9386a8dde99806c24459bd50f8e87e81bdb3a7a9 SHA512 c24af3702a72d85cb9e4f35cd89449fcf6b4d165ec3d203d74b0f0576f0cfe859bd9b5b6c5eb2f57c3bbcee6c8d0001e546169a5c7c1900f03fe3cf319e313b3 WHIRLPOOL 539efe5d3026ceca04a26ee7c9b15839ffea3270aef5dd1ed33d27399b37b4f5a8940552e0d850dcec27726711824eb3ca0c8894775b0dc294ff7b3abb4eb4e4
-AUX postupgrade-en.txt 931 SHA256 b2327357aec4043a349314b31a40e2e2702d4898bcc1be34daf1567f1f28cca3 SHA512 3227078067ead2047b4b1172d1b53e00333bd0921317bb6526baf6372f1e4b86dbce42b2da59079a0c0b42e195da6d158f2781661a839a65a80c3f13b3f28e41 WHIRLPOOL 0b56f02b13a962950c3285f30fc34614ca6ddcba282a998156969e3d2006e9cb7029537529568ad4daf8af1468524087128d6e63a19014494e02071aa0a97333
-DIST z-push-1.5.12-1450.tar.gz 166526 SHA256 801c8e4bf81c2dfc12d91286e03362647c409dca8c34c8cffd8a53ff04b50a49 SHA512 23b40d85be44ebb68316c1d7816500fdf2bccdf7913484df5485785ce8d11956f97f739956423bb33208cf891f16a08484424edc06608b6fde744fed5189824e WHIRLPOOL 13c1ddef86cae6814805746531c660fcda46a29372a1e334da00452f66ba256c7cd95a24bf36558a5259b21f5c81bbe27e4720abaf70100012a8a2f08bc75b24
-DIST z-push-1.5.2.tar.gz 161024 SHA256 735097dc3e5872215cbe20f93cd4cb0d782e3730018130bbcfdb1aa0247ed65d
-DIST z-push-1.5.3-685.tar.gz 161849 SHA256 fe72785d3259085abdb967f0a12b2beaf64a6ed1c588557249c2ad80112d08c5
-DIST z-push-1.5.4-707.tar.gz 162385 SHA256 f3040f804679a6ce2e34ed9f9de4082c9783aa66df051a263026b71e59252dc4
-DIST z-push-1.5.6-954.tar.gz 163928 SHA256 14c997053470866fffab5461819dfa60be0c853f59660ede06de5814d0c006da
+DIST z-push-2.0.2-1437.tar.gz 442344 SHA256 df7a534acfca69a8d44de42dd8703a0dec26dd22ed0e725bf6fd6c083777a972 SHA512 0faa13d5b18b57ae975b7210c925f1001b2ea15f1916915c6cd180bf694ec2ee494b7f55039744397b22cae94a4466ce49c803f45905591eea180ef393b58104 WHIRLPOOL f5dbc263096592fad18edcf3d38ded1e4a312322767d154238d0f77f46af4e0e9fe5fd7161c24380cd3b1f5bdd3db32f40bd82515814bfcbff4157c02568d614
+DIST z-push-2.0.3-1467.tar.gz 446163 SHA256 e14be3bb166ffb5fa94f0b1e01ae43b52cc0e127a2e757227f2c5da7b322c264 SHA512 47b9a10b3d05ed1e284f772aadc7f91585124ba37807fdd0f17c54f0367b47d7f0e4435c4bf59fdf8c6deda2e69274bcacd62df8eac79cc1033a09667af449cf WHIRLPOOL d7df011f0a81103b0cfa7889bbbac0f60fbb68174906ed0cdf7b5abab389346e6e288b6f83c6fa3180c26811fd9cd0aa40096b10b762018afd846432b42c9902
 DIST z-push-2.0.4-1497.tar.gz 443904 SHA256 c8cc889c253d9c8cfb70245b9d2da46c126deb09a060939864f4e9cfcfdbf98a SHA512 412a79726b23ccd896f1208a1373f9419d79e4af3731865d24b2fc812237b401df3690ccbe9873ce75037ce1d84d23ec96c0cbcecb0246d532881fb4050b2e9d WHIRLPOOL 96682967f4dcbe86be902bb002a640a7c8c90df2248e75c94a116e52ce6c6a372a78c86b024ba9c102fe7d1288826c6ddf5bcf17f18b9086cddd7343dea42ef9
-EBUILD z-push-1.5.12.1450.ebuild 940 SHA256 242bfbc702f50ef5dcf2c776a99de40df6f78a2dfe712900b63615582d48c38d SHA512 a77cda5580c02ee30470ea81ee7f521a692fedfa8b9955e2555a2aa103aebd89365fb642a7d827c3dd6b971732f4650b1db33dfbb98f1e0fb643e8e1dc818ad1 WHIRLPOOL 17f74160d86c5744c97ba3e905ec41878f7d3d52340c80ffa227307278e11e5d0ce67002559600ec23993644ef7966296e4a6334a13cc91a42ae1b5963db667a
-EBUILD z-push-1.5.2.ebuild 832 SHA256 21e50e9e4cbbdf1dacd1ac2525719c172af9d4031c9e78ce04674d34bd2ba804 SHA512 2df7aed56a2ce9cee8244ec3a014a93e1555201d1c05318e6f0c2782932214010aa625a83ecca058327ca4159319b4387e9ac57d781e1159c5cdf0cf1e9aa871 WHIRLPOOL f7a05a77a8b430e57b073a1920a330ed4ff54c21347e7356c8798490ce7afbff51aa10025d609f7fae6d3e80a5140c8cce184ff2a99e59bc8d7287154312f824
-EBUILD z-push-1.5.3.685.ebuild 908 SHA256 95519c4d4a6913dc89563873dc493dd3f6c2536c8db3a53d048cf60d61e32f2f SHA512 e7c59531f9c77aba7c6e98d9c2fdf66aafcc47d678ab2f012ad9e838f25050a5a47bcda954242ceed5db789fc5df31caf0707d4300df968b1d3f3db951a75d7b WHIRLPOOL 8bacf97aef3aec0a41d31d581bdf141658b4c375c5aa927264fb32b07194bd406b4e044626a2e20d3842cb031e9dff9128f8cc60d0e3e4b9b731826c78219ca4
-EBUILD z-push-1.5.4.707.ebuild 908 SHA256 95519c4d4a6913dc89563873dc493dd3f6c2536c8db3a53d048cf60d61e32f2f SHA512 e7c59531f9c77aba7c6e98d9c2fdf66aafcc47d678ab2f012ad9e838f25050a5a47bcda954242ceed5db789fc5df31caf0707d4300df968b1d3f3db951a75d7b WHIRLPOOL 8bacf97aef3aec0a41d31d581bdf141658b4c375c5aa927264fb32b07194bd406b4e044626a2e20d3842cb031e9dff9128f8cc60d0e3e4b9b731826c78219ca4
-EBUILD z-push-1.5.6.954.ebuild 908 SHA256 17258b7e418171fa2d972ab05deb27300c67d7ff2f39c99e6b49173c40149e11 SHA512 de9500535d4d021d4b74493ce49a7b7bde9cfe2e4f070ec1180a0c348dd0498e88d3278cb425eeb7329da2842aeedf2a02f0d3b26dfe8588cfd88395e3ffdc5b WHIRLPOOL fa8c048fa5c3e122226459af2a402dcec16a10b579cd1cb786aba2bcb2427a0294fbaf19eb90f5da27219cac70aa9c7b856b02a4a3fb64f1e1a19c33cec11b8b
-EBUILD z-push-2.0.4.1497.ebuild 1019 SHA256 261bde0dfb5f0f4485fdb50cf11fc856c5a245c8a3852dc14b33faf9cf5592b9 SHA512 1fa6e6846e72cf0b6802bae2a657fddfaaaf2261e5247642a20268670732feeba3092cefb08fe5c3281d9f24b51db123c26b0aef06c15c3df6f6a6840ccb3983 WHIRLPOOL 93eab9ce1adfcf92c4870ddab8853f4da00b07088c2d324ae0a23ea23d230beb5c48d5ab12fb7431c8d2de1e6c11a7bb73482cd5eb8e6741e43ab9b3fba5e4c1
-MISC ChangeLog 787 SHA256 77d444e5319dbf1e7b50d547eea2b54ac000bd6263a908db4946946fd8cc37df SHA512 1500a7d42004608d63f3c1493ed7c027e7e11498509fb9808d66a8ac5ecffe6b10e02bb06f13fa55b4a7e4cda469d3f3adf0364a14e42172904b8b3ac5724816 WHIRLPOOL 8cdbb335e0a03df7b04244bc76abdcfaa7d5e539aa46d562af319eb7c834c3804d9fdb886069ad7b893df8f0b88adfe0b8443876343ca611a6d2becb7f6ded05
-MISC metadata.xml 233 SHA256 4eb836fc2d96512595bf637662ecca90ff28d126415b9be2ac0e8292adb48850 SHA512 1fd437832c3aad4293357a8fad1a9214fee530ab6ded70ae2c117924895ae48eebaa4ff1f1720c7e373b3dee57eb88174a554f5a68f3255047a564c6d1e049f0 WHIRLPOOL 46139294667fb1421723373f8b77941388b6e37dc5c83a1002f96607baf047ace582de403cd36a285b20291c5f1ef900aff96bd094d7aaa7a5adcc8763b76a41
+DIST z-push-2.0.5-1541.tar.gz 448615 SHA256 033ef24bd187e2a72a65a3f0d375035c712db45ff0bb117c177181acb6717f20 SHA512 bdacdab4161fb48733a582b6287457a6fa126d7d368d7144e964df9409ced5fc3d3b687dadc5e2d239a7d5077eac5e1318ea26a013c6a3d4e8ecd7a5ff3d0772 WHIRLPOOL 27c45aef408ccc6108196f09a3e5ed256affa5a9897dd4364e97b228b2b44ff099497eaca0beb4d6ee783e4349e3738d105c7a24545772ee8b7b872d90da0be8
+DIST z-push-2.0.6-1616.tar.gz 426170 SHA256 82907e598aa228dc860cd5b854ffd89a51577cbd0c938f3d3132d61cf74afd8f SHA512 dba9aa8d19bf34d124ae954a00803531c31065033b7b403342cbaa395442c46d915a4ece0b1a8126fb9f79985d8a12b4b8e8db067d856f049110d618ebbeb545 WHIRLPOOL 7ee87d46c98c39a08456c38b4a7892d2d99f5e6480ffefc265435ca547939d2fe061096bbf36175b306ae867fc2ddaea3166a876801f2e58bab1e6f198e94c5f
+DIST z-push-2.0.7-1690.tar.gz 432012 SHA256 026528a7ab5d3c4b678b18e35404026da31ca81200a08c3735417b28e3ab2865 SHA512 1df2880a07b6fd96a2a1222f793e852216d5c9481c9e31ba59361690b56ffbbdd91051188fa75a5a359a28b70f9ec0953ca6251d64a90622714c1bef93d9a6a8 WHIRLPOOL fff79a5a9cd7970d431e8625ca643c160a9b12698f6296711d833d192fbaa07091e09a8c348f453c6e476d0b4d0e9dad5efba548e8e16a5fff36b47927b59a86
+EBUILD z-push-2.0.2.ebuild 925 SHA256 a3c0febae340473825400c90b32c54443197f29177bd34ba42bbf543a74475b1 SHA512 4ab0a9c1231beb55d9112bc5d6e4abf6f4b4e2291ae826906bd50b4cd236e0fd5c80b2878c95853338a2bd09c6bedab4a04682a7b16c79cb2cba7bb7a7e12be9 WHIRLPOOL baa2537a0eb785d990424a99083b6a1bcfd303287e050a7d2a81faec751f1348c88885160dd3fcb4e2c9b6ebe2ef285ee10bc444b5519d1fb56a65e9eb1fd410
+EBUILD z-push-2.0.3.ebuild 925 SHA256 f750786de2ec10a75abe0efb9d4eeb94d76f06d8acedfb986403f54e4fc2e2c9 SHA512 f6ba94a7ce23a7732addef75eade8054330963d93fa23a2b2a635c936d0439e9840484c5703e98cba25598b7e3dd9449a48dae89161aac12bb0dad8ac42089de WHIRLPOOL fa5eabe9e24439fcb678435b376d4096e918c856c06f19b27b4887376c98bde012af9469ec89d34cca063380f6511e972e96003c8bcb7280c13b137bed0236d9
+EBUILD z-push-2.0.4.ebuild 925 SHA256 8e2918c0be8abb0921022ae0e241972b11c081924fdc6d6bebc85a93dc414915 SHA512 9f4fa5558c30b6186ea85c228eda75b1c4212c22547c9088c1fd5d33ace40789b0e2eb567a3afc78c3c4dcd8216ec0c2df6b79e0a10d45fe4cbd25ea4bb71d93 WHIRLPOOL bd324b63e70b81a6870aa3fd098d1d9bdcf8f262132b964ca6dc0ccc27e8c1fcf5e42069bb41a4357c00f529bc1c97a7c746baeaec8bb307427cc3f60f619db4
+EBUILD z-push-2.0.5.ebuild 925 SHA256 8dde77a306d80b214d0134f4eb0c68b5c4e1d70553fa8d20ca6acaf4d4aa4253 SHA512 96d69d7b017cd718ce4e86231fdb9eb52047273480a176a793e4b8446ca36b89195f36604b1830fd46ebf16ecc505b3fa07f6d24027437e2d98bd15cf9466c2e WHIRLPOOL 01033e1e5c0ac1941f8c7e36813618d0699cf529022b83d6095fc50d76424479a38f3e35a8c50441260dd708a4099ef15c20063c68bebf892945aad103213835
+EBUILD z-push-2.0.6.ebuild 925 SHA256 c7074505c4a8b6608bebda15aba3803b861650945a1d1af6a6d06d1eefda1faa SHA512 d301b045cea204d38b5c7558537c0f179c481eea4e30dafa633eb65f0b754929c7d20b7b43ab9c7d93ae44e10b04b063258746f163dcfbf8ce3c080e0e54bed7 WHIRLPOOL 81176984925204d6a55cbca3dac067c6ace338a482ebc3ad909b898710b77e2d38c4f1010e04c0a2a223c35559ba1e72e08f9d8192ca3e9956b1d2da60200c3b
+EBUILD z-push-2.0.7.ebuild 925 SHA256 b85da497fce25dc0878931dea04bf1045b29686cb8d4ff6143f240cc5c385e9e SHA512 725950668dd82706cb9301304feda3437b9a5a1a46cac75b36fc1331f3783af3faaf8a865b65e0134c07ed153d71d218f5f0b7b4b118c9e13c0da157c81b1aa2 WHIRLPOOL 09e9dd3e2202940706962ef3d3235b67e576e2f403dd3ba543dab76b89f8cc6d8c175042e83af5a67e4fb04e866c3bcf89480828390dbae711a552eb39c0014b
diff --git a/www-apps/z-push/z-push-2.0.2.ebuild b/www-apps/z-push/z-push-2.0.2.ebuild
new file mode 100644
index 0000000..78f6cdf
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1437"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-2.0.3.ebuild b/www-apps/z-push/z-push-2.0.3.ebuild
new file mode 100644
index 0000000..781d7d3
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1467"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-2.0.4.ebuild b/www-apps/z-push/z-push-2.0.4.ebuild
new file mode 100644
index 0000000..8819b9c
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1497"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-2.0.5.ebuild b/www-apps/z-push/z-push-2.0.5.ebuild
new file mode 100644
index 0000000..b00f606
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1541"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-2.0.6.ebuild b/www-apps/z-push/z-push-2.0.6.ebuild
new file mode 100644
index 0000000..5425c77
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1616"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/z-push/z-push-2.0.7.ebuild b/www-apps/z-push/z-push-2.0.7.ebuild
new file mode 100644
index 0000000..2d3fd91
--- /dev/null
+++ b/www-apps/z-push/z-push-2.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="Z-Push - open source push technology"
+HOMEPAGE="http://z-push.sourceforge.net"
+
+ZPUSH_RELEASE="final"
+ZPUSH_BUILD="-1690"
+
+SRC_URI="http://zarafa-deutschland.de/z-push-download/${ZPUSH_RELEASE}/2.0/${P}${ZPUSH_BUILD}.tar.gz"
+S="${WORKDIR}/${P}${ZPUSH_BUILD}"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir "/var/log/z-push"
+	dodir "/var/lib/z-push"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/log/z-push"
+	webapp_serverowned -R "/var/lib/z-push"
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php
+
+	webapp_src_install
+}
diff --git a/www-apps/zarafa-webapp-plugins/Manifest b/www-apps/zarafa-webapp-plugins/Manifest
new file mode 100644
index 0000000..f347818
--- /dev/null
+++ b/www-apps/zarafa-webapp-plugins/Manifest
@@ -0,0 +1,2 @@
+DIST zarafa-webapp-1.3-41013.noarch.rpm 3101068 SHA256 f7105e46015f4f9b275b9100bdf00a63decb495c6594295b9430a77adc6cbf9d SHA512 7e342860bf0dcec64e66d76ffc8fe1bc0bf18bea361b5a057e69489000b61cddd9861fcf7200c9a09fb9d5237fb4941c07906286430d773d9d7168cd07741261 WHIRLPOOL aec384ec39750d7299765781920d9c9f89718cebf5a6a88dc16884333fdd6d8e50590667f02ca63727e8d00987ee7621faf4951bc5c5b4277f32cfa7b4ee1eb1
+EBUILD zarafa-webapp-plugins-1.3.ebuild 1190 SHA256 a6543ee55bda8d0b2671dfce9780aa76d3121fe2a00aa77b78cc2627247a14a1 SHA512 caa622eae84029b7dc82a595541e611ff18b0973ce13859428735d2b5553dd6c3f68f52c2cffee57ea816b17cb962eb05bc5f4f8fe8d3025664657f988f7e379 WHIRLPOOL 9a22908699136b92655570e1a2435e21623ee67b82c8ca994b32122bb1270165b12fff30f9b6aa896b0a6d3f026056cc61a8dc27b4cde29a5b890da3c9b1c9a1
diff --git a/www-apps/zarafa-webapp-plugins/zarafa-webapp-plugins-1.3.ebuild b/www-apps/zarafa-webapp-plugins/zarafa-webapp-plugins-1.3.ebuild
new file mode 100644
index 0000000..fe0d6ac
--- /dev/null
+++ b/www-apps/zarafa-webapp-plugins/zarafa-webapp-plugins-1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils rpm
+
+DESCRIPTION="Zarafa WebApp plugins"
+HOMEPAGE="http://zarafa.com/"
+
+ZARAFA_WEBAPP_BUILD="final"
+ZARAFA_WEBAPP_BUILDV="41013"
+
+if [[ ${ZARAFA_WEBAPP_BUILD} == "final" ]] ; then
+	SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/${PV}/rhel/zarafa-webapp-${PV}-${ZARAFA_WEBAPP_BUILDV}.noarch.rpm"
+else
+	SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/zarafa-webapp-${PV}-${ZARAFA_WEBAPP_BUILDV}.noarch.rpm"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="plugin_extbox plugin_pdfbox"
+
+RESTRICT="mirror"
+
+DEPEND="www-apps/zarafa-webapp"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/usr/share/zarafa-webapp"
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	einfo "Installing plugins..."
+	dodir "/var/lib/zarafa-webapp/plugins"
+	for plugin in extbox pdfbox; do
+		if use "plugin_${plugin}"; then
+			einfo " ${plugin}"
+			cp -R "${S}/plugins/${plugin}" "${D}/var/lib/zarafa-webapp/plugins/"
+			fowners -R apache:apache "/var/lib/zarafa-webapp/plugins/${plugin}"
+		fi
+	done
+}
diff --git a/www-apps/zarafa-webapp/Manifest b/www-apps/zarafa-webapp/Manifest
new file mode 100644
index 0000000..ea5c800
--- /dev/null
+++ b/www-apps/zarafa-webapp/Manifest
@@ -0,0 +1,5 @@
+AUX zarafa-webapp-phpautologin.patch 1381 SHA256 bcc153214c869f41743159f32286b551d85ff2b4e792ea310a7459369c25a368 SHA512 44ce9126fd510f13a2fd167ce1df2d3d6cf047d5b31da4748d500d0bbd5fdaa6c297aa69841bf29de49712e0f836e37d446fb69dbc9bce7862a5b0e49f8f06fc WHIRLPOOL b44595f025f744cd72d5b6caf69789ba88a8314f50c2c664ae9ac544262527f18030289215d5a4885ff16a73fd70a1b24af67cc28e48d05beac4d1669cd8e895
+DIST zarafa-webapp-1.2.1-37967.noarch.rpm 3032253 SHA256 2aa68a31314e34a758c39ef658b5065d4ce2dbe77cbc04160d69e889b9120f4b SHA512 b4d44601633d8e14182b513c463f0eadbeddd27853a9b44038927af786248293142764a17e2cb16bc057fcae531245003f7a5b77513ac8c4a57ceeabbbf1a4b3 WHIRLPOOL 3a1bcc92a0234726e4dc43facb2550f98567d93c1e6aa04918940ceaebf984eeb7c57c983809a31d82c05446b9be3357a87247d7c53a1dab1406681e6d429d4b
+DIST zarafa-webapp-1.3-41013.noarch.rpm 3101068 SHA256 f7105e46015f4f9b275b9100bdf00a63decb495c6594295b9430a77adc6cbf9d SHA512 7e342860bf0dcec64e66d76ffc8fe1bc0bf18bea361b5a057e69489000b61cddd9861fcf7200c9a09fb9d5237fb4941c07906286430d773d9d7168cd07741261 WHIRLPOOL aec384ec39750d7299765781920d9c9f89718cebf5a6a88dc16884333fdd6d8e50590667f02ca63727e8d00987ee7621faf4951bc5c5b4277f32cfa7b4ee1eb1
+EBUILD zarafa-webapp-1.2.1.ebuild 1405 SHA256 be00a40417fd4d97059e60c4c0cf5dfda347e7a481c7786fdd9e7d067209756d SHA512 47a8c36390c7f6ead531a4c5720d138d07fec20bfc35eae9f05997102778b789e473bbd1b25720dc4601503fce9d2a84e0529af324d48a0d446a4e005de9e64e WHIRLPOOL 8369286a3b72e69f7873d466e2876499c870685f8e3cc363bf44c4efd608983bf7d339a4530468c4545397da2872189282b132a5bca741c304fd051fbe742822
+EBUILD zarafa-webapp-1.3.ebuild 1597 SHA256 0f0d744b6e9cf474754ec5f9864a5223f7aadeb6bf8e79631167e9e1835ce2aa SHA512 fd5e4b1b10d9879f28728496ae1fdfa366ac05c42f06cfe323bb62a06bde8b0c8ca617e89e400c8ba205595896178034b98c428aa8a85b2172ad9ebfa3b31354 WHIRLPOOL d02fb696e8da24b0178ce2490078b348cdfec957445c94eb48dc3810dbddee176ec61305d62c373c37553d6d07709a617810fc675c3b621c66b995c38ab1b428
diff --git a/www-apps/zarafa-webapp/files/zarafa-webapp-phpautologin.patch b/www-apps/zarafa-webapp/files/zarafa-webapp-phpautologin.patch
new file mode 100644
index 0000000..8af016f
--- /dev/null
+++ b/www-apps/zarafa-webapp/files/zarafa-webapp-phpautologin.patch
@@ -0,0 +1,28 @@
+diff -rupN zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php
+--- zarafa-webapp-1.3-40290/usr/share/zarafa-webapp/index.php	2013-01-21 13:39:43.000000000 +0100
++++ zarafa-webapp-1.3-40290.patched/usr/share/zarafa-webapp/index.php	2013-01-23 09:53:02.828723573 +0100
+@@ -96,7 +96,7 @@
+ 		// and request the logon page.
+ 		header('Location: index.php' . $actionURI, true, 303);
+ 		exit;
+-	} else if ($logon) {
++	} else if ($logon || !isset($_SESSION['username'])) {
+ 		// The user requested to logon. Check if credentials were provided
+ 		// or if the a remote user login is possible.
+ 		$username = ($_POST && array_key_exists('username', $_POST)) ? $_POST['username'] : '';
+@@ -117,12 +117,12 @@
+ 
+ 		if (!DISABLE_REMOTE_USER_LOGIN){
+ 			// REMOTE_USER is set when apache has authenticated the user
+-			if (!$_POST && $_SERVER && array_key_exists('REMOTE_USER', $_SERVER)) {
+-				$_SESSION['username'] = $_SERVER['REMOTE_USER'];
++			if (!$_POST && $_SERVER && array_key_exists('PHP_AUTH_USER', $_SERVER)) {
++				$_SESSION['username'] = $_SERVER['PHP_AUTH_USER'];
+ 				if (LOGINNAME_STRIP_DOMAIN) {
+ 					$_SESSION['username'] = ereg_replace('@.*', '', $_SESSION['username']);
+ 				}
+-				$_SESSION["password"] = '';
++				$_SESSION["password"] = $_SERVER['PHP_AUTH_PW'];
+ 			}
+ 		}
+ 	}
diff --git a/www-apps/zarafa-webapp/zarafa-webapp-1.2.1.ebuild b/www-apps/zarafa-webapp/zarafa-webapp-1.2.1.ebuild
new file mode 100644
index 0000000..caee9a6
--- /dev/null
+++ b/www-apps/zarafa-webapp/zarafa-webapp-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils rpm depend.php
+
+DESCRIPTION="Open Source Groupware Solution"
+HOMEPAGE="http://zarafa.com/"
+
+ZARAFA_WEBAPP_BUILD="final"
+ZARAFA_WEBAPP_BUILDV="37967"
+
+SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/${PV}/rhel/zarafa-webapp-${PV}-${ZARAFA_WEBAPP_BUILDV}.noarch.rpm"
+S="${WORKDIR}/usr/share/zarafa-webapp"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-phpautologin.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# rearrange files and remove unneeded ones
+	rm config.php || die "Unexpected source layout; ebuild needs update"
+	rm -r plugins || die "Unexpected source layout; ebuild needs update"
+	cp "${S}/../../../etc/zarafa/webapp/config.php" "${S}/config.php" || die "Unexpected source layout; ebuild needs update"
+	
+	dodir "/var/lib/zarafa-webapp/plugins"
+	dosym "/var/lib/zarafa-webapp/plugins" "${MY_HTDOCSDIR}"/plugins
+	dodir "/var/lib/zarafa-webapp/tmp"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/lib/zarafa-webapp"
+	webapp_serverowned "${MY_HTDOCSDIR}/config.php"
+	webapp_configfile "${MY_HTDOCSDIR}/config.php"
+
+	webapp_src_install
+}
diff --git a/www-apps/zarafa-webapp/zarafa-webapp-1.3.ebuild b/www-apps/zarafa-webapp/zarafa-webapp-1.3.ebuild
new file mode 100644
index 0000000..c789541
--- /dev/null
+++ b/www-apps/zarafa-webapp/zarafa-webapp-1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp eutils rpm depend.php
+
+DESCRIPTION="Open Source Groupware Solution"
+HOMEPAGE="http://zarafa.com/"
+
+ZARAFA_WEBAPP_BUILD="final"
+ZARAFA_WEBAPP_BUILDV="41013"
+
+if [[ ${ZARAFA_WEBAPP_BUILD} == "final" ]] ; then
+	SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/${PV}/rhel/zarafa-webapp-${PV}-${ZARAFA_WEBAPP_BUILDV}.noarch.rpm"
+else
+	SRC_URI="http://download.zarafa.com/community/${ZARAFA_WEBAPP_BUILD}/WebApp/zarafa-webapp-${PV}-${ZARAFA_WEBAPP_BUILDV}.noarch.rpm"
+fi
+S="${WORKDIR}/usr/share/zarafa-webapp"
+
+LICENSE="AGPL-3"
+KEYWORDS="~x86"
+RESTRICT="mirror"
+IUSE=""
+
+need_php_httpd
+
+pkg_setup () {
+	webapp_pkg_setup
+	require_php_with_use iconv session xml
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-phpautologin.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# rearrange files and remove unneeded ones
+	rm config.php || die "Unexpected source layout; ebuild needs update"
+	rm -r plugins || die "Unexpected source layout; ebuild needs update"
+	cp "${S}/../../../etc/zarafa/webapp/config.php" "${S}/config.php" || die "Unexpected source layout; ebuild needs update"
+	
+	dodir "/var/lib/zarafa-webapp/plugins"
+	dosym "/var/lib/zarafa-webapp/plugins" "${MY_HTDOCSDIR}"/plugins
+	dodir "/var/lib/zarafa-webapp/tmp"
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r "${S}"/*
+
+	webapp_serverowned -R "/var/lib/zarafa-webapp"
+	webapp_serverowned "${MY_HTDOCSDIR}/config.php"
+	webapp_configfile "${MY_HTDOCSDIR}/config.php"
+
+	webapp_src_install
+}