Version bump (bug 543846).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

diff --git a/net-libs/libdom/ChangeLog b/net-libs/libdom/ChangeLog
index 6407056a733cbcea50cdcd2b546daa155c750aa2..e8b1771a32dcb5a204d85888334d6026fbd44d2a 100644 (file)
--- a/net-libs/libdom/ChangeLog
+++ b/net-libs/libdom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libdom
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdom/ChangeLog,v 1.9 2014/11/15 13:01:55 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libdom/ChangeLog,v 1.10 2015/03/21 23:55:21 xmw Exp $
+
+*libdom-0.1.2 (21 Mar 2015)
+
+  21 Mar 2015; Michael Weber <xmw@gentoo.org>
+  +files/libdom-0.1.2-glibc2.20.patch, +libdom-0.1.2.ebuild,
+  -libdom-0.0.1.ebuild, -libdom-0.0.1_pre20120705.ebuild:
+  Version bump (bug 543846).
 
 *libdom-0.1.1 (15 Nov 2014)
 

diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index bcdc83d4a56553d18e598d8f7409f2419927072e..5dd6bc89d459a103bc8579e42d7af7aaaa5e054b 100644 (file)
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -2,23 +2,21 @@
 Hash: SHA256
 
 AUX libdom-0.1.1-glibc2.20.patch 733 SHA256 dd3f522adbc23edad6c885c720843d1a1f24c7c8ee4c3154fe05a940c87ba2e8 SHA512 e7cd2ef429807567f7504a0a2f91f38b985ad1c2fa8e592981ef430fb98a78e8644e68d014654e4c9b9b2424721a99368743db3d16fb6ebb13da0c68f7790d3e WHIRLPOOL b876cbf48a04fa25db2cf6d09427405fb08e17dd8083b868ec52aab191779b8b4481bb63556586236d18930b13a6bad0415c7e3f9f2c9e4997d51c24921033dd
-DIST libdom-0.0.1-src.tar.gz 804517 SHA256 2aa75861c8a8291b6b3d1a3856c65ca615677afeec64ccfdf35a113a292c36b1 SHA512 f0382e8c1272529068ca8a5565119232344b5f2bf89a204ba3c9342150de1f7f693acbbb080c192f6ac9c14bf75d1c85f5a1d72e7dff1504eb451b7cff47164a WHIRLPOOL 783d4cbae3411135c80ce68320de72f5d9a79c07ccc7fc9eaad02a0004a5fc36baf4b3b7a424a5a4edadde36833b93ce063ca71c858442df154cb8e3fb4be6b8
-DIST libdom-0.0.1_pre20120705.tar.gz 908267 SHA256 069de590661c4d3a55954c9acd5a40b5bf3ca172db9a2c540489e2b8913f82ae SHA512 08e57af9e51d72a02172bec53deee969a37616f4758f0c8757472d9a912be3e3584881a6fc08ee12a18278e292a02898d6c2fdada60e5578e7829279f1fa2070 WHIRLPOOL 11c19c629e4e07c4601569df903fba4db7cde2770b0c69a43332a699bffc5d485dc27103d38165a2b065fbf576095294e9d6842408c74f63f5378b9790f0108d
+AUX libdom-0.1.2-glibc2.20.patch 762 SHA256 93844d5430e406337de58c86ac3bd3a872d11455d6d5823328361177496653ab SHA512 aa67625c18d6eb62aa73cf2931d3ebb4dec2dd717c835fc9d7ef3cbaf7f94c33b5b72c8d2378686d76eede89910a259091f6476f0b5cae986e3b9b5c93a1e707 WHIRLPOOL 5804a94dc77d2be06068f7189b2ade2c7a0d01d3af8c3150669a48ecfaac7323325094263835193712689c674887fe635acc7e97c3607c302d473dd929dda7a7
 DIST libdom-0.1.1-src.tar.gz 837694 SHA256 e86c11e313cdfbbe9674ad14125093240e23a2fa9e6f05b996d6b655e40c2dd4 SHA512 60406f3d6804e5a9630219bcd245476a926135b94ff58b1399377d6a2514a156505cbe802067e87ee883aa3f996b004731e00cb5f78bbef16fba1bc55b440c63 WHIRLPOOL cf623463be4968ba5385854bf01dedc4314d3d2e4f3b0e46d763d9c50849bf0b9fb2299794dd48af770c15721aa2a643fffed03948395e49393c3451da68a378
-DIST netsurf-buildsystem-0_p20120717.tar.gz 12371 SHA256 ef2c931fcb14c7b4759c0868fd4e8f4fa730558d1b5b769ad46d557f3b66e7fe SHA512 349ce6995993aedb64a45539aab734248779fc581741ea4463a06b9f36bab49edf02af4281f8a25ce796ce08c8477635ad8e88505a57ea66d03d9b734a33bc77 WHIRLPOOL bdd7a68482671eb18e48cf549710ab095ecdd90bd7880400c56e0a71a534b043f49a0b597043e4b5bb93235154586bcf7a4d92e261fe159b6d53c05bd5d6f713
-DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+DIST libdom-0.1.2-src.tar.gz 838332 SHA256 9cd3cf4487735c3cc5d63c5fdee05384eee65318476105646767b34d6e07e9e8 SHA512 f4b7ba24e470cb02c89314dadaefc44c86710e47963b3a845bd9ef284d52480ee758e67391fa2b24758228f67d15887dec9b12b1a2f72e567e7f9a83a12daf99 WHIRLPOOL b55c7677b86cdb84340bb22dcd18b1e11b1ddbefaf768b9eca742b1028fe62f8939bce3c000a6e11b75764bf153adf0ebef8fa2717f5b5f6f3da8b8426f00f03
 DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
-EBUILD libdom-0.0.1.ebuild 1123 SHA256 0810f76afd33e7a2b35ad089440f5caf4d7fbf8403d696ad41261502f2f0f7ac SHA512 0c99218d6d58c0eac27bd356fbed00931d4eb8974f4231f73deac86355cbc5399360ee3af7f7e07a1ee2b72e84b2afd228d310be2db432159b1cf940742a2a0c WHIRLPOOL 224a60c74d3ff4d8278a1f5a6fbbb639763466a6049707eb8c1b8647fc0ffa597021337ec27e26f37ca1b4b6ec4d1306c6f97be6a601791b1a38f9a635e328a2
-EBUILD libdom-0.0.1_pre20120705.ebuild 1639 SHA256 47825be67c6c332971bd39a53bc00b3970066a0bb97ae289b74a6207ce445672 SHA512 e10c629deff7b60f938aeab7b96a348f3b622b5c194d44eacdf0f080dabef8df1ba4b25befb220e5a62c883a90963bc3f49b09fcf977f7f8c4b400470e3b0ad1 WHIRLPOOL c8f14d36ffb6461a85c692f12c90de58825797c9f4f5a5df015625e8f4caa28c07cd678c0505396bedbec11266aa6f96201bbaf2062d2916e5020f428d4cad55
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
 EBUILD libdom-0.1.1.ebuild 1213 SHA256 1becbf496cc65cce3accaf906a7f16b5dabf7da637c80ec646f64de72efd04d8 SHA512 b8ca1d0e8a8b96df5addfb3d5e864c469d41eabdabd3754549f277c22f5680cb9122a79af94abac780bd4ebf8b947ac62fd604b80d92b55dc3b821669cd45aad WHIRLPOOL 4454366621da9fa0e32f948cb3239cae536cdda9648973b500dd031d9a58c9c35542dcda9399f454b69d41816d3a1e6e16675096d9dec0d0e826d5f57b4a72b1
-MISC ChangeLog 1564 SHA256 4c4435d878373552f7ec4c5e000cbc810dedfdb453a3aced0369c8be8bdfee26 SHA512 fe8f679089a3f35cc9c215ee65a8e5054c48035524afefbebe2285a0a0559ad826682751609c593519f829db8f27a1e9f439fff891a2467a79300660e6496a7e WHIRLPOOL 6c9cc4ebb70679c984a6b13affffc0caeb352102cf8653b4797a4502a93c13eb347cafa1bb3ed26fad65bf7996bdc67e9029d8fdff6998986af579baf5a6c7fa
+EBUILD libdom-0.1.2.ebuild 1204 SHA256 e73cee8d2f48496becc48f562713592270300bda1cd322922eb615a7c0d6a924 SHA512 3e28a5208d86a08f399b6e76533198cf2e5022de74c26ca72a4c4ee855e732aa97effacc9f506b0dec10692f0a66adf6378ab5c1d1301160f980f73780794d15 WHIRLPOOL 961e03767c7dd0076210a2aeb8a58f906438f5c6debdd3ad9e6e6850cf566532a22d4ddd5d0dbc78ec60c2d74f8ecd7ca7b03da4214c1e6410e8275a0f96d721
+MISC ChangeLog 1789 SHA256 d3f283ada94b5768eab5a32b85a04dcdea8ba7efc5fa7ffac74ab8fe09800fb3 SHA512 78b495f91288a472c34cc24bc64376aa85920a1a5a357efe51acddc58b9fd0b45bbaf653ecdeb6a32e1d0fb2d2a19cacc41cf57c835cae760bc879e51bf9b5a6 WHIRLPOOL d869fa5ea499b1f691552f84f5c6dc325c3a8b881d3109ecb4f0da03e837bb87cbcb41d5b5f854d87a07a869090e264a0690bac73e8e7261a795d2ab4602428c
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlRnTslfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlUOBO1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAiVQEAgWdhOjOQPVIpTk9Zooj5eLhi
-bT/oCEiMIPNQFdzmORMA/01yzr/ShYNFdl+LjclDragaelT/2Yi0gJM+5/K7/kNW
-=daua
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBf/gEAl4Dw9cAAv/yvJPagwgdxDcr9
+zNSlYVAh7Hp4fMBEQ9gA/ixGezi/l0EilChA/bi22IUmDHkEGB35nyLLdQIH18oz
+=n9Q0
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch b/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch
new file mode 100644 (file)
index 0000000..bc843d1
--- /dev/null
+++ b/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch
@@ -0,0 +1,19 @@
+--- libdom-0.1.2/Makefile
++++ libdom-0.1.2/Makefile
+@@ -15,15 +15,11 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+       -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+       -Wmissing-declarations -Wnested-externs
+-# BeOS/Haiku standard library headers generate warnings
+-ifneq ($(HOST),i586-pc-haiku)
+-  WARNFLAGS := $(WARNFLAGS) -Werror
+-endif
+ # AmigaOS needs this to avoid warnings
+ ifeq ($(findstring amigaos,$(HOST)),amigaos)
+   CFLAGS := -U__STRICT_ANSI__ $(CFLAGS)
+ endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+       -I$(CURDIR)/src -I$(CURDIR)/binding $(WARNFLAGS) $(CFLAGS)
+ # Some gcc2 versions choke on -std=c99, and it doesn't know about it anyway
+ ifneq ($(GCCVER),2)

diff --git a/net-libs/libdom/libdom-0.0.1_pre20120705.ebuild b/net-libs/libdom/libdom-0.0.1_pre20120705.ebuild
deleted file mode 100644 (file)
index 6dd4b7b..0000000
--- a/net-libs/libdom/libdom-0.0.1_pre20120705.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdom/libdom-0.0.1_pre20120705.ebuild,v 1.4 2014/07/26 11:46:40 dilfridge Exp $
-
-EAPI=4
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-SRC_URI="mirror://gentoo/netsurf-buildsystem-0_p20120717.tar.gz
-       mirror://gentoo/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/libparserutils
-       dev-libs/libwapcaplet
-       dev-libs/libxml2
-       net-libs/hubbub"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       test? ( dev-perl/XML-XPath
-               dev-perl/libxml-perl
-               dev-perl/Switch )"
-
-src_unpack() {
-       default
-       mv build "${S}" || die
-}
-
-src_prepare() {
-       sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-               -e "s:-Werror::g" \
-               -e "1iNSSHARED=${S}/build" \
-               -e "1iNSBUILD=${S}/build/makefiles" \
-               -i Makefile || die
-       sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-               -i ${PN}.pc.in || die
-       echo "Q := " >> Makefile.config.override
-       echo "CC := $(tc-getCC)" >> Makefile.config.override
-       echo "AR := $(tc-getAR)" >> Makefile.config.override
-}
-
-src_compile() {
-       emake COMPONENT_TYPE=lib-shared
-       use static-libs && \
-               emake COMPONENT_TYPE=lib-static
-}
-
-src_test() {
-       emake COMPONENT_TYPE=lib-shared test
-       use static-libs && \
-               emake COMPONENT_TYPE=lib-static test
-}
-
-src_install() {
-       emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install
-       use static-libs && \
-               emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install
-       dodoc README docs/*
-}

diff --git a/net-libs/libdom/libdom-0.0.1.ebuild b/net-libs/libdom/libdom-0.1.2.ebuild
similarity index 61%
rename from net-libs/libdom/libdom-0.0.1.ebuild
rename to net-libs/libdom/libdom-0.1.2.ebuild
index 8de66d790b65c9c0d762d5391ef1e2f736ed1ca2..6defab67280dc649d60c8d801a0a4aa2cd4afedb 100644 (file)
--- a/net-libs/libdom/libdom-0.0.1.ebuild
+++ b/net-libs/libdom/libdom-0.1.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libdom/libdom-0.0.1.ebuild,v 1.6 2014/07/26 11:46:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libdom/libdom-0.1.2.ebuild,v 1.1 2015/03/21 23:55:21 xmw Exp $
 
 EAPI=5
 
+NETSURF_BUILDSYSTEM=buildsystem-1.3
 inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
@@ -14,21 +15,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~m68k-mint"
 IUSE="expat test xml"
 
-RDEPEND=">=dev-libs/libparserutils-0.1.2[static-libs?,${MULTILIB_USEDEP}]
-       >=dev-libs/libwapcaplet-0.2.0[static-libs?,${MULTILIB_USEDEP}]
-       >=net-libs/libhubbub-0.2.0[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/libparserutils-0.2.1[static-libs?,${MULTILIB_USEDEP}]
+       >=dev-libs/libwapcaplet-0.2.2[static-libs?,${MULTILIB_USEDEP}]
+       >=net-libs/libhubbub-0.3.1[static-libs?,${MULTILIB_USEDEP}]
        xml? (
                expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
                !expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
        )"
 DEPEND="${RDEPEND}
-       test? ( dev-lang/perl
-               dev-perl/XML-XPath
+       virtual/pkgconfig
+       test? ( dev-perl/XML-XPath
                dev-perl/libxml-perl
                dev-perl/Switch )"
 
 REQUIRED_USE="test? ( xml )"
 
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
+
 src_configure() {
        netsurf_src_configure
 

diff --git a/net-libs/libhubbub/ChangeLog b/net-libs/libhubbub/ChangeLog
index a554692ca18d4d0d6da57cdd6dd9f947c1306270..332fa54626973445354bfd38bd8206f028767c51 100644 (file)
--- a/net-libs/libhubbub/ChangeLog
+++ b/net-libs/libhubbub/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libhubbub
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/ChangeLog,v 1.9 2014/11/15 12:47:57 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/ChangeLog,v 1.10 2015/03/21 23:51:10 xmw Exp $
+
+*libhubbub-0.3.1 (21 Mar 2015)
+
+  21 Mar 2015; Michael Weber <xmw@gentoo.org>
+  +files/libhubbub-0.3.1-glibc2.20.patch, +libhubbub-0.3.1.ebuild,
+  -files/libhubbub-0.2.0-error.patch, -libhubbub-0.2.0.ebuild,
+  -libhubbub-0.3.0.ebuild:
+  Version bump (bug 543846).
 
   15 Nov 2014; Michael Weber <xmw@gentoo.org> libhubbub-0.3.0-r1.ebuild:
   tighten dependencies

diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 4ab0676f03ba6358068a10ec4605bafe7e2494cc..e765086a1aac02d4f9d112899a83f9a355dc1824 100644 (file)
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libhubbub-0.2.0-error.patch 3543 SHA256 36bfac73273396b08eb282c16fc368fe88daf2755daa7cf135e871d12bea6e8a SHA512 dba570ae89d87b1ba410119c651f48989c1c09425a803736c423aec031303506a45a0a554a39667779451738045102aa81100a63d060db69680e628319a7a7d2 WHIRLPOOL 939891ae4b91fa44d67dd42bbc1478ea06b600a14752fad283d6245b54a4292ef8e07b9fc229aaa3f7093d77c9848391e619a1c305bb63eed8d2491bc44df710
 AUX libhubbub-0.3.0-glibc2.20.patch 624 SHA256 33ef1ccdfc1258812783ce079dcd75306d4a214992648e3fcf3f87be9f44a08d SHA512 64141f44808080e09d5f16e67c5dd604f2a7a7ad530a6678ec2a64ac0977d38bc99441731c357595d7d927d63d5a8befec1a0b9dc1097ad5a42075ceadf47fa4 WHIRLPOOL 8c74cef534b406d436c8b8a23bd90bb6ba1e1a06a357cd6e35df7aee7dd10d8b735ad02bff0cf4c94d66f91899aa0b1271c7c1d69f28f027460c36d9469139c1
-DIST libhubbub-0.2.0-src.tar.gz 792718 SHA256 91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf SHA512 4309490fd9c4d7f368a85a16b74ce0b2274f85d4a557c1dbcd69f2836be8f54c6e592b31582c3c17ab1227fc13a6cdf012f3494cc13ae9b6b4242886dade3c8b WHIRLPOOL 7b60ede859856eb5a0fa57bdb7ac8d3dd93326460300a8f259d6b3eae72fbc17706c1380691939beec564260cf42c3f0d35005a3d79dfeae86b4f3ae3b2181be
+AUX libhubbub-0.3.1-glibc2.20.patch 655 SHA256 152c455008c408e1d5df69c5c1e4505e809a79ffe222e0f5a62d16a99c4bb4e4 SHA512 6c51521e809e46e5ed1bfa924b4f6adfddf3dfb1b4dd7b94ab124c493230c5e1fef0c03dcfa2adbdf8bdb4a4515c45735e2f9bb8cde6985bace89bb7cac1c8de WHIRLPOOL dbee503bd6715a5bb2e1402359a59086a07332547d1442316ad63bc617ed01eb25bc5b678616335f0911111c1c6416a2b6d6fa27d20928949853dc9cdf579791
 DIST libhubbub-0.3.0-src.tar.gz 792069 SHA256 dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7 SHA512 e34e74baca01039ba0435785ec5a33718d438d5bdedab37fa42f73be79f8e928642667811e40a97d7f9ffad7b6a0f3eb3a70982838611f83f085b1d9503e7894 WHIRLPOOL b6f8d86cafb8196d53f577072c4b2710bb2ff64d9c0e7bb0162da384992fc6f4b36dc3f639d2c6775488ed0a99db9a662d157c04c8184ad23db68005a6e5e16c
-DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+DIST libhubbub-0.3.1-src.tar.gz 791945 SHA256 1f8b31e86d0d32735f247c071a7ade1a475606b7a3583d2132e567a310b62053 SHA512 79a40602cda351f16e81788903c8b77a6f4975fc6e6389b9b197bde8b20478e528acbd7b10bbb556c9ea78accf8088a7c461c239e457903615b159e8c5a881c8 WHIRLPOOL dfc0e20059c7f11d78d3006b1350328588a5651024a17672fb3cfe9717390654223a2366ab9fa64dc227634fc27ffb638d84fc50f286606aa4548c62d0dca4ea
 DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
-EBUILD libhubbub-0.2.0.ebuild 756 SHA256 6ad9f223fce0e025bdcbcbae5501d083788130c01d4c2210d5b42ef57b58524c SHA512 2475a45766e00f773d559d864f8a1e6de226f7db2c2b1a1c6acfe4fbba50c8064ebd7624cec7351a61692626ad6221788c7c0800a97124a9faebf2b24faa8036 WHIRLPOOL d5facd6e0e95212ade88f24f297780acf481f415c473dcfac3ea00e9fb7bba774cf1798b9d4912858e793a81c41dccc9f774b448541fd77952d7b3eb423445dc
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
 EBUILD libhubbub-0.3.0-r1.ebuild 819 SHA256 f0607e73d78817fa1c0a8d5c37bbe86180b88f6818f75f05ec16c84683ac2f50 SHA512 a541e0a6b9e01e5e61091b0e7a150a5829d9b4c1c8e560ca94c64be0e48b13fcd3a7db4b681fe17aac0f1cff99757847d69dfb9dd0531fab274fb533e4bde421 WHIRLPOOL 69fb8c240d7af90cf585458f34e47b2495d486cb1bc3c46cce1578b5ed34f52c4cd1074816cbc3ec58423f7d358385ea11a5d5ee097f7d382d314bed05892203
-EBUILD libhubbub-0.3.0.ebuild 958 SHA256 020f33580987b574d8daea96f994e3899987ed42c9ce0025b77f82a772c5ea74 SHA512 113544f2351f035c2d3b8de23c007c58f19195ab9e3e7fe2ff7cc248a3e52e33c664ddab26499764eaf5c65c37164eae524debf868925006f5eaeaaf23fccb6f WHIRLPOOL a3bf6e58aaeabba556f42c24eff5701d9b3f48a48a7b3b1a9559a498291196485c7e2f284f612291464472025bf63c9daffa2bf68feb73d67b0cf095b2b12cd3
-MISC ChangeLog 1552 SHA256 301d6faa95ca35fae677406e6f8d32e343257af9d6f7da449b5543329dcfedbc SHA512 c3ab57b5e496fdf131ce4561da5c63ceea0c77ed9c815e243d6e325476959f9781bb8df07091df7d21043b13f2defc80cd8abcf5e90452318d691037813e23b9 WHIRLPOOL e442080896f03e7889bd6bc80440829989d532b02c698c8e1eac00ade0723c7a0285006734fdd44d88d7ef79f149e9bd3c05513e5ba305017e268bf293db8eef
+EBUILD libhubbub-0.3.1.ebuild 813 SHA256 a48c245f3896e1cb9be84794c4af56307037bf3f44f77daa8081886093a9be2b SHA512 a0d80219817aafcb730ad45fc2cf871d8e4a044774a26ecf643ca08e98bff150972b9b70fb378a6ed0daa3a349af3217f425883dae56dad674b3f09eeb1898f5 WHIRLPOOL 278501699049f20fc0eb6297e3158679cc6214fd5a077e7dabf32e61df13b97314b6fc515738fa41a87f9b3a887b4f9cfcd3df8d96da1e98d40c78cbcd8d35ed
+MISC ChangeLog 1818 SHA256 eed30b14b62ce48cebb878423b047abd0240105b7c92278ddb149207244dd0f6 SHA512 c0f2c73407595f4b3996c8d030f66a5136443eac3f741dff63ab4b3eeb244164af0a53cbf841b3a8531ebb02d7d6d169a034d3a054cb1b45aaed041f5e57afd0 WHIRLPOOL 0b0bb2afa771624cb560d2fa1ba5dcadf2d2470a3de8fd3d617ff3238d714f04dba01f10e52ae6bfd8cdbb248aba70b717f7a558c4f44d7076236fbab0bce999
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlRnS4JfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlUOA/JfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCyjQEAhJ34jB/Vlwk6m7VccvhhHnOq
-1NJzIYJYur1PA60ltpcA/3ma4lu1NK9h1FA2Zs6fk6tsXXE0Zav/3sdBPZCWDFLy
-=yuBB
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAgQAD+MjLIM/PrzUTmN+O+wn+Mfwu7
+wzb9U7LsMxhclnn2LcIA/igmDP9bng5kBeN5Yt99cWhjogLsXA7UHfdzzVZBOf8r
+=zOM3
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch b/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch
deleted file mode 100644 (file)
index f0e7110..0000000
--- a/net-libs/libhubbub/files/libhubbub-0.2.0-error.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- hubbub-0.1.2/test/csdetect.c
-+++ hubbub-0.1.2/test/csdetect.c
-@@ -108,7 +108,7 @@
-       static int testnum;
- 
-       assert(hubbub_charset_extract(data, len,
--                      &mibenum, &source) == HUBBUB_OK);
-+                      &mibenum, &source) == (parserutils_error)HUBBUB_OK);
- 
-       assert(mibenum != 0);
- 
---- hubbub-0.1.2/test/parser.c
-+++ hubbub-0.1.2/test/parser.c
-@@ -24,7 +24,7 @@
-       hubbub_parser *parser;
-       hubbub_parser_optparams params;
-       FILE *fp;
--      size_t len, origlen;
-+      size_t len;
-       uint8_t *buf = alloca(CHUNK_SIZE);
-       const char *charset;
-       hubbub_charset_source cssource;
-@@ -46,7 +46,7 @@
-       }
- 
-       fseek(fp, 0, SEEK_END);
--      origlen = len = ftell(fp);
-+      len = ftell(fp);
-       fseek(fp, 0, SEEK_SET);
- 
-       while (len > 0) {
---- hubbub-0.1.2/test/tokeniser.c
-+++ hubbub-0.1.2/test/tokeniser.c
-@@ -26,7 +26,7 @@
-       hubbub_tokeniser *tok;
-       hubbub_tokeniser_optparams params;
-       FILE *fp;
--      size_t len, origlen;
-+      size_t len;
- #define CHUNK_SIZE (4096)
-       uint8_t buf[CHUNK_SIZE];
- 
-@@ -44,7 +44,7 @@
-       params.token_handler.handler = token_handler;
-       params.token_handler.pw = NULL;
-       assert(hubbub_tokeniser_setopt(tok, HUBBUB_TOKENISER_TOKEN_HANDLER,
--                      &params) == HUBBUB_OK);
-+                      &params) == (hubbub_error)HUBBUB_OK);
- 
-       fp = fopen(argv[1], "rb");
-       if (fp == NULL) {
-@@ -53,7 +53,7 @@
-       }
- 
-       fseek(fp, 0, SEEK_END);
--      origlen = len = ftell(fp);
-+      len = ftell(fp);
-       fseek(fp, 0, SEEK_SET);
- 
-       while (len > 0) {
-@@ -63,7 +63,7 @@
-                         break;
-                 
-               assert(parserutils_inputstream_append(stream,
--                              buf, bytes_read) == HUBBUB_OK);
-+                              buf, bytes_read) == (parserutils_error)HUBBUB_OK);
-
- 
-               len -= bytes_read;
- 
---- hubbub-0.1.2/test/tokeniser2.c
-+++ hubbub-0.1.2/test/tokeniser2.c
-@@ -151,7 +149,7 @@
-                                       ctx->last_start_tag);
- 
-                       assert(parserutils_inputstream_append(stream,
--                              buf, len - 1) == HUBBUB_OK);
-+                              buf, len - 1) == (parserutils_error)HUBBUB_OK);
- 
-                       assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
-               }
-@@ -196,10 +194,10 @@
-                               &params) == HUBBUB_OK);
- 
-               assert(parserutils_inputstream_append(stream,
--                              ctx->input, ctx->input_len) == HUBBUB_OK);
-+                              ctx->input, ctx->input_len) == (parserutils_error)HUBBUB_OK);
- 
-               assert(parserutils_inputstream_append(stream, NULL, 0) ==
--                              HUBBUB_OK);
-+                              (parserutils_error)HUBBUB_OK);
- 
-               printf("Input: '%.*s' (%d)\n", (int) ctx->input_len,
-                               (const char *) ctx->input, 
---- hubbub-0.1.2/test/tokeniser3.c
-+++ hubbub-0.1.2/test/tokeniser3.c
-@@ -148,7 +146,7 @@
-                                       ctx->last_start_tag);
- 
-                       assert(parserutils_inputstream_append(stream,
--                              buf, len - 1) == HUBBUB_OK);
-+                              buf, len - 1) == (parserutils_error)HUBBUB_OK);
- 
-                       assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
-               }
-@@ -197,13 +197,13 @@
-               for (j = 0; j < ctx->input_len; j++) {
-                       assert(parserutils_inputstream_append(stream,
-                                       ctx->input + j, 1) ==
--                                                      HUBBUB_OK);
-+                                              (parserutils_error)HUBBUB_OK);
- 
-                       assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
-               }
- 
-               assert(parserutils_inputstream_append(stream, NULL, 0) ==
--                              HUBBUB_OK);
-+                              (parserutils_error)HUBBUB_OK);
- 
-               assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
- 
---- hubbub-0.1.2/test/tree.c
-+++ hubbub-0.1.2/test/tree.c
-@@ -88,7 +88,7 @@
-       hubbub_parser *parser;
-       hubbub_parser_optparams params;
-       FILE *fp;
--      size_t len, origlen;
-+      size_t len;
-       uint8_t *buf = alloca(CHUNK_SIZE);
-       const char *charset;
-       hubbub_charset_source cssource;
-@@ -123,7 +123,7 @@
-       }
- 
-       fseek(fp, 0, SEEK_END);
--      origlen = len = ftell(fp);
-+      len = ftell(fp);
-       fseek(fp, 0, SEEK_SET);
- 
-       while (len > 0) {

diff --git a/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch b/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch
new file mode 100644 (file)
index 0000000..45ce36b
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch
@@ -0,0 +1,17 @@
+--- libhubbub-0.3.1/Makefile
++++ libhubbub-0.3.1/Makefile
+@@ -15,13 +15,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 ($(BUILD),i586-pc-haiku)
+-  ifneq ($(findstring amigaos,$(BUILD)),amigaos)
+-    WARNFLAGS := $(WARNFLAGS) -Werror
+-  endif
+-endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+       -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ ifneq ($(GCCVER),2)
+   CFLAGS := $(CFLAGS) -std=c99

diff --git a/net-libs/libhubbub/libhubbub-0.3.0.ebuild b/net-libs/libhubbub/libhubbub-0.3.0.ebuild
deleted file mode 100644 (file)
index 4bb3b79..0000000
--- a/net-libs/libhubbub/libhubbub-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/libhubbub-0.3.0.ebuild,v 1.2 2014/11/12 23:01:37 slyfox Exp $
-
-EAPI=5
-
-inherit netsurf
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k-mint"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.0[static-libs?,${MULTILIB_USEDEP}]
-       !net-libs/hubbub"
-DEPEND="${RDEPEND}
-       test? ( dev-lang/perl
-               >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
-
-#PATCHES=( "${FILESDIR}"/${P}-error.patch )
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-
-RESTRICT=test
-
-src_prepare() {
-       # glibc-2.20 introduced a warning:
-       #    _BSD_SOURCE and _SVID_SOURCE are deprecated
-       sed -e 's/WARNFLAGS := $(WARNFLAGS) -Werror/# &/' \
-               -i Makefile || die
-
-       netsurf_src_prepare
-}

diff --git a/net-libs/libhubbub/libhubbub-0.2.0.ebuild b/net-libs/libhubbub/libhubbub-0.3.1.ebuild
similarity index 66%
rename from net-libs/libhubbub/libhubbub-0.2.0.ebuild
rename to net-libs/libhubbub/libhubbub-0.3.1.ebuild
index 7131b8b8e0092690d2c44c50d5ad2776bb189fee..381996a50a840d0dfb6875265d504cf70dfa18b8 100644 (file)
--- a/net-libs/libhubbub/libhubbub-0.2.0.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/libhubbub-0.2.0.ebuild,v 1.5 2014/06/18 20:36:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhubbub/libhubbub-0.3.1.ebuild,v 1.1 2015/03/21 23:51:10 xmw Exp $
 
 EAPI=5
 
+NETSURF_BUILDSYSTEM=buildsystem-1.3
 inherit netsurf
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
@@ -14,13 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~m68k-mint"
 IUSE="doc test"
 
-RDEPEND=">=dev-libs/libparserutils-0.1.2[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/libparserutils-0.2.1[static-libs?,${MULTILIB_USEDEP}]
        !net-libs/hubbub"
 DEPEND="${RDEPEND}
+       virtual/pkgconfig
        test? ( dev-lang/perl
                >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/${P}-error.patch )
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
 
-RESTRICT=test
+#RESTRICT=test