5 files changed, 76 insertions, 11 deletions
diff --git a/net-libs/hubbub/ChangeLog b/net-libs/hubbub/ChangeLog
index 7d16d6927566..4718221fc1f5 100644
--- a/net-libs/hubbub/ChangeLog
+++ b/net-libs/hubbub/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/hubbub
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/ChangeLog,v 1.4 2013/02/28 07:28:03 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/ChangeLog,v 1.5 2014/11/06 18:31:20 xmw Exp $
+
+*hubbub-0.1.2-r1 (06 Nov 2014)
+
+  06 Nov 2014; Michael Weber <xmw@gentoo.org>
+  +files/hubbub-0.1.2-glibc-2.20.patch, +hubbub-0.1.2-r1.ebuild,
+  hubbub-0.1.2.ebuild:
+  fix for glibc-2.20 (bug 527360)
 
   28 Feb 2013; Michael Weber <xmw@gentoo.org> hubbub-0.1.2.ebuild,
   +files/hubbub-0.1.2-error.patch:
diff --git a/net-libs/hubbub/Manifest b/net-libs/hubbub/Manifest
index 9b532adb6d37..52700e41f0e5 100644
--- a/net-libs/hubbub/Manifest
+++ b/net-libs/hubbub/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA256
 
 AUX hubbub-0.1.2-error.patch 9303 SHA256 0def8713c77431aad2da032f89dfcdad438ec4296e3ac312c9660ae3a52e3dae SHA512 548dbecdf4b2824c818e428f3ef0fbbbbaeead112a68a11763e3479266946b0ba8fbb74ae7d60083e57340f1227ddac86f2125cd7d11d8f24feb077943d8a462 WHIRLPOOL fdfc4243696238c6ba23fd715885ed8d5df65b7787a0344745804074098ad314db64a7445ea6e98a94e9eb8fa11a953b43b708872e363e72685aee83aaa73f1d
+AUX hubbub-0.1.2-glibc-2.20.patch 621 SHA256 90ae4b16b1c450ea47ddbf4ab47c8d8d7b1c91d7d4086284ddd32a8287dc1b5c SHA512 08f3565243d7b7755c3d61f34fb08605a86322b3f82dfe7487d6314ff621650c538cefb45fe345aa785418075368591c3219ae47e4b7a65fd02484745b8b573b WHIRLPOOL bb4a3a9c8c3701aed0bcb59a64db922d82599006ba0aa1850dcb371e0d4a06b8e24d3be28ce73d05d4d948012bc6cda01cb8c1efa5a4d39d3185e33f3d0fd303
 DIST hubbub-0.1.2-src.tar.gz 812684 SHA256 95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52 SHA512 c6fee003376a75fcca18ee630308320ae155df0149ceee48ad16bb69420c6a8a053bcfee17d6b315b137408284755028f37782d017873b16304ed041ea7934eb WHIRLPOOL 74c5038eabcf60b641a594300a551c139b4882439b08a70caaf4c22de868f7253dff4abab9eb3e517da86accc73882099ec8f854dcf37d1a7232731ba9d607bc
-EBUILD hubbub-0.1.2.ebuild 1839 SHA256 11c634310429522541be10a5af033b2a69b6e37f50e2d0c8ee87132566a9803a SHA512 9103648c3b540b9274d4022fed07cec74e5fdd7345cbf75d21ac840e9f369237e63385f044df63b4714aed8fc53596096c61521afab5075433f1bf81ceebd9fc WHIRLPOOL 6777d2402c6c0a9f4faa17ce2ed3722ab82a75d4cae8f1d36b5dcd737480e7ead87aec0cb26cb2a0f63bee28a1a7b03be1025cc5ad2381dd07fe32861f5e266e
-MISC ChangeLog 688 SHA256 9e11ab3108d1e92685ad7cab23e8efc8cf8395a44713bb80861755af2a797784 SHA512 86b9a8888f2bf1d15af3dac33a8716c27a1f6d5165c1afac999189f159b4a39ae6a36b41e5dab65f143b93bfef574204ac4688c91edffb59e9f217f1a33d08e6 WHIRLPOOL 0ed535667df55a799dcd10451ebdcb21618bd5f69c76382b0cdd0b50b80b8b6781dc42aa12a09f29446152b18e53937d1f44ff4a14a20af8b5dd118b6c39d4ca
+EBUILD hubbub-0.1.2-r1.ebuild 914 SHA256 7f306923a01969795fe3ca043757804a774b56a874171d049e9bbc1c1761a977 SHA512 3ee2d63bf0119e0ea890b4193a18a080188bf5f2159a814fba0c0d6c32b81ac9b25bd2d578bc539bb2ec6037cff9d52c1df6dd021d758e77fe4fda7b212c5d8d WHIRLPOOL 48fd04f8d8757b2dfc16c1a0b3c37ecf6bef72341232cdb56fe8de74280cb34d7383a0bc54aeda77a512995bb6a67e747124dd24222c4ac611ef7cce70d1eee5
+EBUILD hubbub-0.1.2.ebuild 1865 SHA256 9bfaac6a5420068190cdfe7c3a53852f271e7ba37cce9c72ce39c527df54f3cf SHA512 fec31eb299585797661605b4225dffe269dd42aa1a0a2afc46ada482a2eebc03f93c83da78865ea5132ee56c0830148aff29889f07de2028c39e8ca4dd5e7112 WHIRLPOOL bd4889d0300b915b4d2d0031319e444e4f3a93fb46bbe59a192818966ce93960d4031cf362e30780a541e61bf599ac7fde1da9794df6c47a222e0dd77cf92e62
+MISC ChangeLog 889 SHA256 622d1ca2d2145a6fe8ec2bda5bedcf0ef9ee88b1712e239b76dbb6b0d10962e7 SHA512 d46b3079ae18e0b61518cb891836f05b3e93e7b06b8b5f0f735ecdefe499e00b6c37dba189d27d3df6c41261200da394d1b660516cf3c153a693c55b29374b84 WHIRLPOOL db06659fad583c52b9d549617f488371dce353c3cf4b3d924a55cb0828b394ee8cccd407bc576e39ac761cd111e4fb9900c49d3076f4afeea0c72a4106cfc09f
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlEvBwUACgkQknrdDGLu8JD2egD/VgqVzXv3iEdhTtRIG3z7oaz4
-FB9H12+A9NDuopsPDLQA/1bYKKcDwOjw2CIs+PD3SyRFZ8V43J8USM9P12miKeNU
-=UWLo
+iL4EAREIAGYFAlRbvn5fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBCXQD/dlAVhX+XRWKoG9DkAz4GkQVd
+b3BZDUo4uuTj5qI8v1sA/RAHeVINQxF5ZyBO90kGh1ZNE+zmfE7i7mACw97F9IfC
+=pxPy
 -----END PGP SIGNATURE-----
diff --git a/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch b/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch
new file mode 100644
index 000000000000..55c38ffddff6
--- /dev/null
+++ b/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch
@@ -0,0 +1,17 @@
+--- work/hubbub-0.1.2/Makefile
++++ work/hubbub-0.1.2/Makefile
+@@ -13,13 +13,7 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ 	-Wmissing-declarations -Wnested-externs -pedantic
+-# BeOS/Haiku/AmigaOS have standard library errors that issue warnings.
+-ifneq ($(TARGET),beos)
+-  ifneq ($(TARGET),amiga)
+-    WARNFLAGS := $(WARNFLAGS) -Werror
+-  endif
+-endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT -I$(CURDIR)/include/ \
+ 	-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ ifneq ($(GCCVER),2)
+   CFLAGS := $(CFLAGS) -std=c99
diff --git a/net-libs/hubbub/hubbub-0.1.2-r1.ebuild b/net-libs/hubbub/hubbub-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..c12b6d2dafb8
--- /dev/null
+++ b/net-libs/hubbub/hubbub-0.1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2-r1.ebuild,v 1.1 2014/11/06 18:31:20 xmw Exp $
+
+EAPI=5
+
+inherit netsurf
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="debug doc static-libs test"
+
+RDEPEND="<dev-libs/libparserutils-0.2
+	!net-libs/libhubbub"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/libiconv
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl
+		dev-libs/json-c )"
+
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-glibc-2.20.patch )
+
+src_install() {
+	netsurf_src_install
+
+	dodoc README docs/{Architecture,Macros,Todo,Treebuilder,Updated}
+	use doc && dohtml build/docs/html/*
+}
diff --git a/net-libs/hubbub/hubbub-0.1.2.ebuild b/net-libs/hubbub/hubbub-0.1.2.ebuild
index a36f6e48cdc0..8e13f537889b 100644
--- a/net-libs/hubbub/hubbub-0.1.2.ebuild
+++ b/net-libs/hubbub/hubbub-0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild,v 1.4 2013/02/28 07:28:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild,v 1.5 2014/11/06 18:31:20 xmw Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm"
 IUSE="debug doc static-libs test"
 
-RDEPEND="dev-libs/libparserutils"
+RDEPEND="<dev-libs/libparserutils-0.2
+	!net-libs/libhubbub"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	virtual/libiconv