Version bump (bug 543846).

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 38 insertions, 73 deletions

diff --git a/net-libs/libdom/ChangeLog b/net-libs/libdom/ChangeLog
index 6407056a733c..e8b1771a32dc 100644
--- 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/files/libdom-0.1.2-glibc2.20.patch b/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch
new file mode 100644
index 000000000000..bc843d143223
--- /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
index 6dd4b7b6394e..000000000000
--- 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
index 8de66d790b65..6defab67280d 100644
--- 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