diff --git a/dev-libs/log4c/Manifest b/dev-libs/log4c/Manifest
index dab3f3c..d05459a 100644
--- a/dev-libs/log4c/Manifest
+++ b/dev-libs/log4c/Manifest
@@ -1,4 +1,5 @@
+AUX log4c-fix-m4-quoting.patch 440 RMD160 34f98782e410cb114c1466c43a1e19fbf1af2054 SHA1 71cafa55c03638184448ea69d09e67fc099114ae SHA256 418e27de9eb35bc57cb7852cf2fec90213d36deeb2cf8be270a635e8d19b5b13
 DIST log4c-1.2.1.tar.gz 508139 RMD160 53b55c4f255af4c4b691ef3aea1a947e5783d025 SHA1 b380947047cd6f71bdec1afe57d7b285fb2a3f38 SHA256 6ed40a41307c26d052667e1661437394ab00e29cd24ff2640b502ba8ab1e442b
-EBUILD log4c-1.2.1.ebuild 892 RMD160 7b275ae98d3bc9694e74b1fb42ad86800a0df70f SHA1 1cfe4ef01713ee200512a475a3a55e67eff11f18 SHA256 bad6ccabe16465a0fc69abc71c58ae6d1fb2d2b32fa9e2c820e3cf35d021fb8a
+EBUILD log4c-1.2.1.ebuild 1036 RMD160 24b87d4cc94aee2f1b59be8bcaf5a05673e43187 SHA1 8b6ce080d8cacd08fb6b409cdc26d88238f910ca SHA256 ae66dd5c67806c1443c9ad91db4ed752d07dc14ad63f75dcc3c9ea6434408def
 MISC ChangeLog 272 RMD160 3143a88a92573d0063562b59fd113523b3f24b4c SHA1 57469d52c1b9b9d401ed20ea9cae792bca927736 SHA256 dbf2faa2b5c0b2daef650bc6755eebefdedb946a0c1b5bb1314592d74ba43650
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/dev-libs/log4c/log4c-1.2.1.ebuild b/dev-libs/log4c/log4c-1.2.1.ebuild
index 3bdcefd..2054d7c 100644
--- a/dev-libs/log4c/log4c-1.2.1.ebuild
+++ b/dev-libs/log4c/log4c-1.2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations."
 SRC_URI="mirror://sourceforge/log4c/${P}.tar.gz"
@@ -13,16 +13,24 @@ HOMEPAGE="http://log4c.sourceforge.net/"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE="doc static pic debug"
+IUSE="doc static pic expat debug"
 
 DEPEND="doc? ( >=app-doc/doxygen-1.2.15
 		virtual/tex-base
 		virtual/ghostscript )"
 RDEPEND=">=media-gfx/graphviz-1.7.15-r2"
 
+
+src_prepare() {
+	epatch ${FILESDIR}/log4c-fix-m4-quoting.patch
+#	eautoreconf
+}
+
 src_configure() {
 	econf --enable-test \
+	$(use_with expat) \
 	$(use_with pic) \
+	$(use_with amd64 pic ) \
 	$(use_enable static) \
 	$(use_enable debug) \
 	$(use_enable doc) || die
diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest
index 293d6a6..679ef85 100644
--- a/mail-mta/bongo/Manifest
+++ b/mail-mta/bongo/Manifest
@@ -1,5 +1,7 @@
 AUX 70bongo 30 RMD160 f88bfbb75ec6605b5df06aed861a13b01c094466 SHA1 f1d44d8fab4e7495ec38e85047f7e800cdfc1965 SHA256 d0ee5aef8f668f6341f2a7fa61b758c62ab5f4e81ef252e9fa4858ed09eea12e
 AUX bongo-0.5.2-FORTIFY-1.patch 1660 RMD160 ee7c9d7b5a5ee617cf99cc6e20d4afc371f9697b SHA1 bd71608e91409bd75608d02c42b8600d8ee96bc6 SHA256 082bd297183567705ef7dadb3b0b6c9fa1f8ac88ff3c1e92dbfea20b24db2dea
+AUX bongo-0.6.0-missing_link-1.patch 554 RMD160 76ff65b68e8318586be50bea6839e542ea7fe5e6 SHA1 82d22f6066cf58b1b84b8cd4a7b1df0a4a45cb2b SHA256 c8127ae191fd717364f17ed2c2b0684725b5ca209ea06a3c972494674940af9c
+AUX bongo-0.6.0-uninitialized-1.patch 873 RMD160 e712e43cfff94ba2c7f316b7c1b046ccb209b8d6 SHA1 ef9af7879178992cfb138ddf8567de5e3f251fc9 SHA256 c7aa6dcb5396a0daedf8bd3f2862ed9ca57a425e476d732469400f936895c47c
 AUX bongo-FORTIFY-1.patch 781 RMD160 c0b8cb173aa181f8d04eef6eaf9b2d56704a8d57 SHA1 74f19dc40a0a1a4a5f6d62eb99b042f551afee41 SHA256 6c0ef168e8396322c6ea5fd45d729b87e7d3e7b23a725c39ee33ff912aba8e5d
 AUX bongo-gentoo-1.patch 809 RMD160 8e30e3aeec3bee2fe1fac1d37f920f18a28ac9eb SHA1 c0429f22057c50b27164a051a1874119fe93b9ea SHA256 b03d946b1dbd3912f6b80c2a8a2ba63301000639a3806116fcb7d4b1f0d5fa37
 AUX bongo-missing_link-1.patch 536 RMD160 9070f9cc62a2f11490b27db6fa029b42cf5ff38b SHA1 1f3dcff8c1479fcbaf2ebb56da0bfa9e7772c4f3 SHA256 8adddf778f4be64b4f1873ab671cee6065a2b125269e3c101e323a0717d02434
@@ -7,11 +9,16 @@ AUX bongo-return_value-1.patch 1061 RMD160 c9445a78f5a45b183a26f8873765384054802
 AUX bongo-uninitialized-1.patch 898 RMD160 cdcb340d5f3f47cf1ab76efc1492bccc64030c39 SHA1 53d656689f82968470c642cea92e538c74bead02 SHA256 e091a5eefe1ea3f1292253a0509d51f0b7d3b75eb40cd62f0f2f625a50585e2c
 AUX bongo.conf.d 319 RMD160 52a3753da81e87716d80091fe09ac2a6027123b2 SHA1 c40625f749819ae138372e917562734cdc47afba SHA256 6e1386658d9751f892d1dbb7f43f3606b40200f702d5c26d1592ab327f6205e8
 AUX bongo.init 795 RMD160 17822d677d9861994229d7154bddec29221cc11c SHA1 e017a66f80afd34956d3679b92c287f5ee1aa418 SHA256 61b4bd024eda1bda2cbb095d7b7e43df4c3007715a9b331e9638d8e9a11bd234
+AUX diff.patch 21904 RMD160 ebee032b78eb464398a853f3be85e020399d8bb6 SHA1 03efe5360028e016f4907a7aa318e57b8604bda8 SHA256 542a06b45f2c63560f62accf8859bc5e740898fab69357e60a56876f9a17c619
 AUX mailer.conf 301 RMD160 5fd76d7292dd4df1157c76c612167b741daed16a SHA1 4f5cabe3cefa47847cfb65d834ac11af477bedf8 SHA256 36f457545e77902a195e111fbec2bff272f21d53113d9be34d826630616dc0da
 DIST bongo-0.4.0.tar.bz2 2816258 RMD160 ede8c4fb31b8c35c31a441d168f4ec7b4a553021 SHA1 7bfc4fc145ad9395605afe7fa99fecf63e2260e9 SHA256 031ed931324e9d4757fc237768a0ebc8d30729808256b729c7029a290c1ff493
 DIST bongo-0.5.2.tar.bz2 3832896 RMD160 cbff75893e5ed5e314a7a97176e10b8b8c78d3ee SHA1 403d00d25c128b2f27317c4fce273b0e111ac0ac SHA256 af806a7cd460e4f82543fcebdc6e4115174f37933489e2a9cc52cac91e526981
+DIST bongo-0.6.0.tar.bz2 2137340 RMD160 8b2608d3c55a5f5e014b394853ee3d0f9ab8a144 SHA1 28432b6f7862910d60d788cea65999128880cb47 SHA256 0056368fc2587d7359b0ce6db792edc4265741e2ef8cd3677ca94235bd282802
+DIST bongo-0.6.1.tar.bz2 2138050 RMD160 ace50053abacca518153614f056e74d077057b01 SHA1 43c317faa5a49be852f33fa0bf58a285e2c21cc4 SHA256 61f0d739fb95ec32a902c31fcb9b9baeab08f8524b1c921bea6ff70eafbe645a
 EBUILD bongo-0.4.0.ebuild 2570 RMD160 3702df4ea32aa1e44cdc52021f88398050abdff2 SHA1 37950ace979eb79942d836bdded84c33be4d1826 SHA256 de01a8c4c7c19f8145c9cede31b414d6572ae7eaf2a20a6a15c3b888de3b8dce
 EBUILD bongo-0.5.2.ebuild 2481 RMD160 745219f83c9c86eabd7af123d91ffc6ac26ecf0f SHA1 839e0da2ffb67e03e7af17481db322de76ddafaf SHA256 0f55dcfed99b24bac53c46ac033c4af051c7cf295603017a319bffe07da0aebb
+EBUILD bongo-0.6.0.ebuild 2425 RMD160 d520b01f9d06fe80f102f3d7c6b50bea7377d723 SHA1 24f4a0eed69bf5daa88cde0c44329892f5e6a831 SHA256 52b672d47b821d927c24c2f7507cdc877170396660c05d190c774298df5ecb81
+EBUILD bongo-0.6.1.ebuild 2436 RMD160 786dc7387bf992d686174e40649504180ab8070e SHA1 dfc8031e8da9096a77173eac72d36c4b0f8c0d50 SHA256 445f9391120a061fe944bffcb9e1c857bde050a62500c0d8248fc29dd19d28b7
 EBUILD bongo-9999.ebuild 2421 RMD160 2fe481b2a9f8a30abe9d2ae99882786e3670c3d7 SHA1 e6cc64e1a63f3f86fbd8919fdfac740ecd3b9e72 SHA256 5f73ee515833c405a4ae85a2a96f396edf91efa8d29336c9c84168c613492ec4
 MISC ChangeLog 958 RMD160 307b0c4864cd642dfa1b7cc0b96681f551c60d94 SHA1 f062991e06a90ba40a9a6648a7cb5455987b6fb6 SHA256 c48dee27cff3bfdcc17bb3a4258dc446cd8b12cdec2efb86e75f9381a3577b10
 MISC metadata.xml 224 RMD160 a75b1683331a8874b18170c82f559bce6877f626 SHA1 da1ebf5ff592428b014945c5ccd1316778f39092 SHA256 de22a32e0eb75abae4c9d09b297c10d3597e4162861d73140fa6db97aa61f02f