Version bump (bug #454704), also patch commoncpp2 to fix bugs #421383 (buffer overflow) and #467628 (automake-1.13 build failures). Update ebuild to EAPI 5 and add USE=static-libs (bug #439302). Drop old versions and their patches.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

12 files changed, 132 insertions, 240 deletions

diff --git a/dev-cpp/commoncpp2/ChangeLog b/dev-cpp/commoncpp2/ChangeLog
index 4f931a1a173f..1638e526cb77 100644
--- a/dev-cpp/commoncpp2/ChangeLog
+++ b/dev-cpp/commoncpp2/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-cpp/commoncpp2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.55 2010/10/23 22:24:23 halcy0n Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/ChangeLog,v 1.56 2013/06/17 13:12:24 dev-zero Exp $
+
+*commoncpp2-1.8.1 (17 Jun 2013)
+
+  17 Jun 2013; Tiziano Müller <dev-zero@gentoo.org> +commoncpp2-1.8.1.ebuild,
+  +files/1.8.1-autoconf-update.patch,
+  +files/1.8.1-configure_detect_netfilter.patch,
+  +files/1.8.1-fix-buffer-overflow.patch, -commoncpp2-1.6.1.ebuild,
+  -commoncpp2-1.6.2.ebuild, -commoncpp2-1.6.3.ebuild,
+  -files/1.6.1-autoconf.patch, -files/1.6.2-autoconf.patch,
+  -files/1.6.3-autoconf.patch, -files/commoncpp2-1.6.3-glibc-2.10.patch:
+  Version bump (bug #454704), also patch commoncpp2 to fix bugs #421383 (buffer
+  overflow) and #467628 (automake-1.13 build failures). Update ebuild to EAPI 5
+  and add USE=static-libs (bug #439302). Drop old versions and their patches.
 
   23 Oct 2010; Mark Loeser <halcy0n@gentoo.org> commoncpp2-1.8.0.ebuild:
   Mark stable on ppc64; bug #321931
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 6b65804e1979..4c50afddff50 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -1,17 +1,28 @@
-AUX 1.6.1-autoconf.patch 247 SHA256 dfd1953311e525e4fd9b0283397233c09e0fc7f1781acfcf76331a995993baec SHA512 9b6b6d308adde9f3d94fc0dd843ea1c1174d9b130b484120556eca94105cf2035d1192b19180abbfe1d08b23244c06e9377d89c45276fa03e346777869ef854e WHIRLPOOL 8b86041bceac3119238007be7b6a0291c5a5f219ae6ae8dbd16a56853ea279427b55562a88fcc3efcd7b364f1579972279d7bae9592c423b4f50ec6fe1c3be25
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.6.1-gcc42_atomicity.patch 2138 SHA256 45eccbd6bf9a2db5491a9b6545a47d3ed3ff35f6735cee9dc47a6f09f014a7bb SHA512 99ee9bbde43359678942b17171c00b0c80d6ebbf2dfaee23d98891ec88c9f7d40db055e231d3d5c621c52ab77df725396344a95dae663eff3208510c819ad405 WHIRLPOOL 10b85d313cc99ba0811050e31d00658dd1a89eea389884f74aade39affff14c15dbcbdf1a27f711a71800001584f0ae0ddb1ab7c04cd6b72566ec25422cba0f4
-AUX 1.6.2-autoconf.patch 247 SHA256 2ecefc39dab185473be409631517f7e71e5f5a8222b494ea1fe679b6150d85b1 SHA512 099695c71e0667d08fe5f7f690fbdb022048348f06546d0d7625c4e1994a828004a0e561b65e62cdd9e49234a39706c534abd3e733bff2b7e992b1670261d706 WHIRLPOOL 7c53d2c8cca7ff1e5747638598bfeea43172ba0e0c7d1a4ef775dfbc7b45deeac9584354c23e18456d1e602f4ffa0985371681da361b9fa2e8e871c8ddeffb28
 AUX 1.6.2-configure_detect_netfilter.patch 482 SHA256 64b372b48bd7ce91151ef932ede766a586a981509fb21b5403b3c089f5f6413c SHA512 0da7ecfd85a1069f6bea850dc34a731deb4dd55c37d4e94db4f3fb87779d1b920cc6e37575854180378d58cc3bee874cb27f145d6459ac84f56865d9e5bf3603 WHIRLPOOL 27e228332eb5b35b0d265cd4ae146d0843f7207b0a4ccf0a0e3f088304c03a5a84245997edea896ed7f97216eb0f551440151ee2e94964a60996345117448706
-AUX 1.6.3-autoconf.patch 355 SHA256 14051bf53ade588eb83c9400b9e45d0101cf97c7e4505759dd97a14e8ae30331 SHA512 f8426ce4b2baf62504dd1acf235c6535935f3dd9d6dc3db8eecf8b844680ded1c219f39b089cfa0a4770e9e26cef268f1dce18d8d309e6f1c2b427aa9575cce5 WHIRLPOOL 10ad009f421107c5736e3d8e9b4bc406ae8d4ac8a48ab7a18f7def67667bf422d237d2da6d3c8a65a812f289b667cf30fe1a51037e490eca14dbb8c6de3df698
 AUX 1.8.0-glibc212.patch 319 SHA256 7f7b778dad00ae364086aa46c47d46202d27f62d96ec3d9172a25ca7b0dddff0 SHA512 73e08f45e0ed43afa70b8336d0f791d18a28c94b9cf17ce1e9fff7aa5fca210085e8dd971e876a3c78473666b854c040113f6973226e691390cf887ed7bc3ede WHIRLPOOL 49cde69ce64a6c73cc4f92be00ad0b9189d58dd2f44c5dc1b7c928dd2c7f8b984ed804bf34a5c33bbfa4d7673c8d6214aedc52cb9286606b425e8c7c15bc4e25
-AUX commoncpp2-1.6.3-glibc-2.10.patch 728 SHA256 d038ca44c773e61e23152330265dc64859fe1bde219046f8f0e8f68b83c218db SHA512 131409a272fe3d1fdab970e52f5f4ac1f4eeff6bfe2595eeeda7cf04a7af91ade3fab6e98e4f0587486ae55e9227c288402c91076d4c1177c2f26eb48b6acf0f WHIRLPOOL 236f0bb6b53ce355455f6cb07b657697d199d09769657afc8e52f3d3dfa81d6fb13d696fb6b373ab6ea412b45e7c1963bec28df91b619cc27a88fd7788a02480
-DIST commoncpp2-1.6.1.tar.gz 864006 SHA256 54dd187608917fa7f3368b70e637c27fe2d0b2996463d6ef6373f1b9f99bbeb2 SHA512 2aa2b187106d27d408f972415da2d29bbf0b46a45f9d33cc825fbe19b6d5a7bfd0124c7653716f69e326294f151e96150fd243bba072563fbb8862fff70d3035 WHIRLPOOL b6533f4ba4b98a50ffb2da60bc30e120e354083553a5c09737c6bd841fe3417fcf4103cf01197130900baa812865881a8c0d710fe9ba1e6baec40ff988cb08f0
-DIST commoncpp2-1.6.2.tar.gz 871333 SHA256 a8870aa2becf2d66740c50646f006c7188cc8236cc7393731079d9f4fbe79f8f SHA512 11eef1dd835d610e7b1f537b5c495bfeba2f61144e5a8e32d67bdddc31f7e4fea5c3b798571d0b259b51bb64ae2779a936070c98d1a44b30ac10ebaf942934b0 WHIRLPOOL fc2e903b7244e767be612389be78546bc4beec3b3715ab935fa332cb27b14e039ed61c70005bd0b22f4ba90d2fd00eb392d3aee8d62e53e71bcfc1db36a7dd9e
-DIST commoncpp2-1.6.3.tar.gz 886825 SHA256 09367a681413500955fcd07c224427c9d752c674d80dda1134bcaa2776221d1a SHA512 1a71091b5ef8847245a096b6aa04b8fef311ef9ce317a94250691c41a9b9098f8853ae2f1e3ef05b98a74e454a810a71243db7e6f8f97a2eabf499fdfcddf497 WHIRLPOOL 02c7da75f9bdb81750a9c094e84b6e5ffeb5f1c7c2eda1e14dbcf68a5908d4cc982a60888e60e1fa64a5069271744c192765f6f98812e75796952833c51d8d3b
+AUX 1.8.1-autoconf-update.patch 1503 SHA256 6cb9454052a6ac2db9680302552886945187c92af83b77400dc683412f0809e5 SHA512 4dbdbb11d28daac71848a869024096cf1305e5d61eb454aa6f1837226c90ede3535e0698ae05d9e559d7e75ed7d61324bab1da057f9f435802d9df9e7c59f3bd WHIRLPOOL be142ac1bc87cd8af7042161b9f9c95ea8f393afd081d119e93cd2a9a2fa1f23795254d3eb6533cff6f8943679b6965adb220acfbc3becfe3b1709fda8d5a149
+AUX 1.8.1-configure_detect_netfilter.patch 641 SHA256 1662350f27aaa8d058e97186a668dbd2ad02cddf498291cf1ee51c318af81bd6 SHA512 d4c3af631ab0ef37cb5943cd17ba6481e229af3537e73769f13ed6fe45e2671a9e9ee8f14f2243e95fd8b17d4a8dbb2c7945a5de9e4ce3f29e842779c55d0ea0 WHIRLPOOL 69ffa1ba5a0a123f87b8108fc26f31ddc0fb6a0a4b1e5f7cd72b7362d92c3972d08b96429367f042a86462debc92229ffedc85e26116e0a7f998a33e2b15048a
+AUX 1.8.1-fix-buffer-overflow.patch 442 SHA256 0556a17325a199df3526be14c7e47d4cf19b14bd573ddd3ff4db791e54bed281 SHA512 4c3cece95f4a32ee2b37b37f84462aeda43c2d25c2eb5cfaf4bfbbe2bdc2d7db7c2ead2f6150bb108ea124fc29c277371d1d0f415a6b26df98f515d910cb3e8b WHIRLPOOL d518d0a2f61e56a3370f40eaedf09e67e7e22152a1468250df31f5c9d2a2ef69d37c82fc01f7d3e0f41074e09f215beeb3d7f51d8e45c518e282f81909416605
 DIST commoncpp2-1.8.0.tar.gz 895726 SHA256 ac5a32001847da103ac7cd5f3f294ae9501fbaa7e7d4a259c4450f9aeacdea28 SHA512 2c4aafd7a0298534c908f2ea339cce158b745cc32dd3379eafe9f76ba5c2a4f7bf9d9f0d9d5fec3a4a41d559c28c07fef5773780e770623f60fb651cbb4e4804 WHIRLPOOL 7b63ce38a5f910097df781d0cd2c16266218410299d5ae7b986def1ebcd0ba4513a203e87d3db7ccba0b6613edd8671e3c8ab30126d579e4d0687ab82597d6f1
-EBUILD commoncpp2-1.6.1.ebuild 2018 SHA256 f63b8ad7ab047c612e3e41aca787d298ffc34dec6e0caa1b444e9cc7368636a1 SHA512 5db60ceb4a0b1ba8a2928c84bbbf63eea96c87d148b779141a9c9293713e150c357e918491190fbbee0d413dde10bcf5f1bb8f78e39a5337e1f695a3442185fb WHIRLPOOL 5838520777c65e582f08d8b7d38aa7c9985594f950fcceb7fc7bca3e54c7d31e0087e546393b3bc83bc144bd383fa2d549323e307432c0b994ddf9133c3e7c75
-EBUILD commoncpp2-1.6.2.ebuild 2031 SHA256 6b16fc5cd969ed553086d99e8dcd5407908d195873c814fd03791e4af3df8b34 SHA512 cbff18853b5ea54b408b9b89913eb5b099d0d004bb0c04359a98248b4207acd9f43f0b9cca69316368c1d18910dfc3a122dc411f273eab7df5615930f9176ab1 WHIRLPOOL 534e0ae71de43721f563323690d73758d87db649daf42a913650c182b9815056c6b4b92d49c98411a460929954346a7de992303a3c9245267e00c037bbec26b4
-EBUILD commoncpp2-1.6.3.ebuild 2138 SHA256 501a6088f196015e9fb2fab888db4cd42997e06735b082cdec832f96a37a635e SHA512 8fe83080cebfb4dbff704e5b3769583efd0d1acb02c5f98e8e0e0f243c329c5c0cb0571c6db9388027c6efeccd8fa554e18f2cb9b1b09853b8153a227690414d WHIRLPOOL b6f85d5c8a4e75275847d6d1daee16ccfe99b4be92cc026be0fc7c15aa680ac43c56812b855ff53e52890604b462cf0509b44fc8a5c2754feb412cc7c93decd1
+DIST commoncpp2-1.8.1.tar.gz 908678 SHA256 53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe WHIRLPOOL 1844cf39ce0a087aaea1cfac1e712b52f81de594278facb70306d68cd3e3343c0d2c581886b4fe3ce7607eb52150c5cf1c9558d0fac0ee7d8730eff39b46bb64
 EBUILD commoncpp2-1.8.0.ebuild 2079 SHA256 81624516ae0f53aba9dbb250d937cbeeb124d0e60625c473838173b2a0e3be6b SHA512 f3ad2f40ddcab5461d76941f52b6b4f57d083f612c6eaa5be3357a54faeb9dac5ffef16cb334ff29d5f0b78506b4fc5eaca2048ad4d9adbf81d8763c58c58f4b WHIRLPOOL e0b98e1a8db5213508dd327093c20a84dad325c3cc9e7e5d09f34f22913f281a4faafdde0f2a9e612b19995e57de764f21cd50a867286bdfb01a7b4fa2a7ddb5
-MISC ChangeLog 9136 SHA256 fa1bfa3060dba99bd1620925090196e7e26efae927f8bd33f108bbd54d7b1e3b SHA512 719456a853727c1c4cf545184770bc0aa0b3e52244c8410c46b428395711d9a708ca8571cbdf3c22ffc1cabf75cde0bc02e43de25b8d62c404f98c91af3c4572 WHIRLPOOL aa75be472438d74ac6b054a2f0e8f5278b85cce465aecdef4dbe78a99676eb99868aa5393ee9e32a082d31a89d6d77a0674cf56234cd20749ca802e75727ac74
+EBUILD commoncpp2-1.8.1.ebuild 1793 SHA256 a03f655ba57bb2f2be1a3a399d0595d4620b76433c896ae602c3d22564bb46f5 SHA512 467ffdc5511391ab4e3ee9520ef20b98ab067b38bb37d9ad9697a8b806e52db62d41cfe3e775ff3649b5570b8ca982d83b8fd1c66a6f4cf6537e1fbc8a354af7 WHIRLPOOL ef2b0f52607ee8821738dfd51a19bf7e3d9f1fab0442b11dab19b8c65c60d3dcb7c8dd72ade66091a0f83e5d6fad6a0fcb10b1be47602fed1a56adfefe37e803
+MISC ChangeLog 9830 SHA256 502f8b048a2eca57b9f8246e0e296caf584199bbeb4b4d8c11103335c3586a03 SHA512 4eb38fd45f67bda20d8545ba6642481efd3a48137a0248c359a48c6651a6a34bbad4d1573097b6d31cd3abb01008ee8a8c728a9924de6209aff46669c7b41124 WHIRLPOOL c1b7668d988e622e27beb4f49a2c940db504eb2deb6a73e67e521c57ebf39d45965e9adcf8ad23f7f1e10f3e00a70d7eaeca7b3d8779284d4da63586637624a0
 MISC metadata.xml 156 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f SHA512 e91dd7187a03a5b11f6d23d0d620c7a0326c8b3631599d616c9bd4aaf5f7901fdf8405a86bae896ecbad57afcbc9f3515a067f78817d06de4a426d5a07e7cf75 WHIRLPOOL e7838d8e96cb2762d53f85ddc28d8034cd19c2ec76c5d5356d21e2508539b7dca9e8e2ed636731eb578aa9f914a6710f165e321aa3a321a4f622cf2624e38808
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQF8BAEBCABmBQJRvws4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfPKUH/11bSU+BKG0DFSCiXFjXz/qT
+2oPIJdXUrBNHUOoCFqCHoB7uyGNxTpXaDtUeIfx9/9bt+Fqb8Zwr+RSK3HEw2pJr
+Q3XtJztsMWJjV84cQeMyu4JsP1p1dXK80jOXsbhQr8QRcz4j2uuQNGrH/ZbSBPcu
+tU4PNLUSSw5NMi7r70ofbO67AbaK8uqspTALpr9mOFJguulJQAVObyPM8X7u0ErA
+wqh4VA4ULGszmICDou9j/4UQyzYwNtXE0qQaaCmzBotQHdTMEFN12b8FSQCV0zsu
+mhWarGUPO31PhzE8e2KTIjNYw9NCLxEZD4cSZx74hV57muEOgdsr/JYJWs+V7vw=
+=EsUD
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
deleted file mode 100644
index 615d2751852f..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.1.ebuild,v 1.8 2009/03/07 14:57:13 armin76 Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/commoncpp/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples ipv6 gnutls"
-
-RDEPEND="gnutls? ( dev-libs/libgcrypt
-		net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl )
-	sys-libs/zlib"
-DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-gcc42_atomicity.patch"
-	epatch "${FILESDIR}/${PV}-autoconf.patch"
-	epatch "${FILESDIR}/1.6.2-configure_detect_netfilter.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	use doc || \
-		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
-
-	local myconf
-	use gnutls || myconf="--with-openssl"
-
-	econf \
-		$(use_enable debug) \
-		$(use_with ipv6 ) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS NEWS ChangeLog README THANKS TODO COPYING.addendum
-
-	# Only install html docs
-	# man and latex available, but seems a little wasteful
-	use doc && dohtml doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		cd demo
-		doins *.cpp *.h *.xml README
-	fi
-}
-
-pkg_postinst() {
-	ewarn "There's a change in the ABI between version 1.5.x and 1.6.x, please"
-	ewarn "run the following command to find broken packages and rebuild them:"
-	ewarn "    revdep-rebuild --library=libccext2-1.5.so"
-}
-
-# Some of the tests hang forever
-#src_test() {
-#	cd "${S}/tests"
-#	emake || die "emake tests failed"
-#	./test.sh || die "tests failed"
-#}
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
deleted file mode 100644
index 0c467b3d230e..000000000000
--- a/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.2.ebuild,v 1.6 2009/03/22 17:45:22 maekke Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/commoncpp/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc examples ipv6 gnutls"
-
-RDEPEND="gnutls? ( dev-libs/libgcrypt
-		net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl )
-	sys-libs/zlib"
-DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/1.6.1-gcc42_atomicity.patch"
-	epatch "${FILESDIR}/${PV}-autoconf.patch"
-	epatch "${FILESDIR}/${PV}-configure_detect_netfilter.patch" # bug 236177
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	use doc || \
-		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
-
-	local myconf
-	use gnutls || myconf="--with-openssl"
-
-	econf \
-		$(use_enable debug) \
-		$(use_with ipv6 ) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS NEWS ChangeLog README THANKS TODO COPYING.addendum
-
-	# Only install html docs
-	# man and latex available, but seems a little wasteful
-	use doc && dohtml doc/html/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		cd demo
-		doins *.cpp *.h *.xml README
-	fi
-}
-
-pkg_postinst() {
-	ewarn "There's a change in the ABI between version 1.5.x and 1.6.x, please"
-	ewarn "run the following command to find broken packages and rebuild them:"
-	ewarn "    revdep-rebuild --library=libccext2-1.5.so"
-}
-
-# Some of the tests hang forever
-#src_test() {
-#	cd "${S}/tests"
-#	emake || die "emake tests failed"
-#	./test.sh || die "tests failed"
-#}
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.6.3.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1.ebuild
index bc224b0d2b18..673cd55966fd 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.6.3.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.6.3.ebuild,v 1.4 2009/07/30 07:58:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/commoncpp2-1.8.1.ebuild,v 1.1 2013/06/17 13:12:24 dev-zero Exp $
+
+EAPI="5"
 
 inherit eutils autotools
 
-DESCRIPTION="GNU Common C++ is a C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
+DESCRIPTION="C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
 SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc examples ipv6 gnutls"
+IUSE="debug doc examples ipv6 gnutls static-libs"
 
 RDEPEND="gnutls? ( dev-libs/libgcrypt
 		net-libs/gnutls )
@@ -19,19 +21,16 @@ RDEPEND="gnutls? ( dev-libs/libgcrypt
 DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
 	${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/1.6.1-gcc42_atomicity.patch"
-	epatch "${FILESDIR}/${PV}-autoconf.patch"
-	epatch "${FILESDIR}/1.6.2-configure_detect_netfilter.patch" # bug 236177
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
-
-	AT_M4DIR="m4" eautoreconf
+src_prepare() {
+	epatch \
+		"${FILESDIR}/1.8.1-configure_detect_netfilter.patch" \
+		"${FILESDIR}/1.8.0-glibc212.patch" \
+		"${FILESDIR}/1.8.1-autoconf-update.patch" \
+		"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	use doc || \
 		sed -i "s/^DOXYGEN=.*/DOXYGEN=no/" configure || die "sed failed"
 
@@ -44,15 +43,16 @@ src_compile() {
 
 	econf \
 		$(use_enable debug) \
-		$(use_with ipv6 ) \
+		$(use_with ipv6) \
+		$(use_enable static-libs static) \
 		${myconf}
-	emake -j1 || die "emake failed"
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
+	prune_libtool_files
 
-	dodoc AUTHORS NEWS ChangeLog README THANKS TODO COPYING.addendum
+	dodoc COPYING.addendum
 
 	# Only install html docs
 	# man and latex available, but seems a little wasteful
@@ -65,12 +65,6 @@ src_install () {
 	fi
 }
 
-pkg_postinst() {
-	ewarn "There's a change in the ABI between version 1.5.x and 1.6.x, please"
-	ewarn "run the following command to find broken packages and rebuild them:"
-	ewarn "    revdep-rebuild --library=libccext2-1.5.so"
-}
-
 # Some of the tests hang forever
 #src_test() {
 #	cd "${S}/tests"
diff --git a/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch
deleted file mode 100644
index b2befd567582..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-05-06 10:41:53.000000000 +0200
-+++ configure.ac	2008-05-06 10:42:19.000000000 +0200
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.1"
- LT_RELEASE="1.6"
- LT_VERSION="0:1"
diff --git a/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
deleted file mode 100644
index fcba56dccb4b..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-05-06 10:41:53.000000000 +0200
-+++ configure.ac	2008-05-06 10:42:19.000000000 +0200
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.2"
- LT_RELEASE="1.6"
- LT_VERSION="0:2"
diff --git a/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch
deleted file mode 100644
index a94ac91d8b03..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur commoncpp2-1.6.3.orig/configure.ac commoncpp2-1.6.3/configure.ac
---- commoncpp2-1.6.3.orig/configure.ac	2009-03-07 16:03:44.000000000 +0100
-+++ commoncpp2-1.6.3/configure.ac	2009-03-07 16:04:25.000000000 +0100
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.3"
- LT_RELEASE="1.6"
- LT_VERSION="0:2"
diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
new file mode 100644
index 000000000000..d50a3405ee6c
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
@@ -0,0 +1,49 @@
+diff --git a/configure.ac b/configure.ac
+index 80518db..64221e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,8 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-AC_INIT(src/thread.cpp)
++AC_INIT
++AC_CONFIG_SRCDIR([src/thread.cpp])
+ AC_CONFIG_MACRO_DIR([m4])
+ m4_pattern_allow(LT_VERSION)
+ 
+@@ -81,17 +82,17 @@ fi
+ AC_SUBST(ccincludedir)
+ 
+ AC_CONFIG_AUX_DIR(autoconf)
+-AC_CANONICAL_SYSTEM
++AC_CANONICAL_TARGET
+ AC_PROG_CPP
+ AC_PROG_CC
+ AC_PROG_CXXCPP
+ AC_PROG_CXX
+ OST_PROG_CC_POSIX
+ NP_PROG_MSC
+-AC_LIBTOOL_WIN32_DLL
+-AM_PROG_LIBTOOL
++
++LT_INIT([win32-dll,disable-static])
+ AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_C_RESTRICT
+ AC_C_VOLATILE
+@@ -408,10 +409,11 @@ LIB_MAJOR=`echo $LT_VERSION | sed -e 's/[:].*$//'`
+ AC_SUBST(LIB_VERSION)
+ AC_SUBST(LIB_MAJOR)
+ 
+-AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
++AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
+ src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
+ doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
+ commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
++AC_OUTPUT
+ 
+ # if test ! -f inc/cc++/thread.h ; then
+ #   cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi
diff --git a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
new file mode 100644
index 000000000000..b6ebf0e0f4a4
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
@@ -0,0 +1,14 @@
+diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
+index bd9db7c..122c938 100644
+--- a/m4/ost_socket.m4
++++ b/m4/ost_socket.m4
+@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
+                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
+                     [#ifdef HAVE_LIMITS_H
+                     #include <limits.h>
++                    #endif
++                    #ifdef HAVE_NETINET_IN_H
++                    #include <netinet/in.h>
+                     #endif])
+                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
+                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..e68b00576cdb
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/src/inaddr.cpp b/src/inaddr.cpp
+index 5a4b9c4..50127f3 100644
+--- a/src/inaddr.cpp
++++ b/src/inaddr.cpp
+@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
+             if(ipaddr)
+                 delete[] ipaddr;
+             ipaddr = new struct in_addr[1];
+-            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
++            memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
+             return;
+         }
+ 
diff --git a/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch b/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch
deleted file mode 100644
index 1f7d445d8ae9..000000000000
--- a/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp commoncpp2-1.6.3-orig/src/cidr.cpp commoncpp2-1.6.3/src/cidr.cpp
---- commoncpp2-1.6.3-orig/src/cidr.cpp	2008-06-23 07:02:09.000000000 -0600
-+++ commoncpp2-1.6.3/src/cidr.cpp	2009-07-30 01:17:49.276744991 -0600
-@@ -198,7 +198,7 @@ void IPV4Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+	ep = (char *)strchr(cp, '/');
- 	if(ep)
- 		*ep = 0;
- 
-@@ -326,7 +326,7 @@ void IPV6Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+	ep = (char *)strchr(cp, '/');
- 	if(ep)
- 		*ep = 0;
-