Version bump (bug 543846).

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

5 files changed, 27 insertions, 87 deletions

diff --git a/dev-libs/libwapcaplet/ChangeLog b/dev-libs/libwapcaplet/ChangeLog
index cf0127fbecd4..d746be93a073 100644
--- a/dev-libs/libwapcaplet/ChangeLog
+++ b/dev-libs/libwapcaplet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libwapcaplet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/ChangeLog,v 1.15 2014/11/15 11:22:25 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/ChangeLog,v 1.16 2015/03/21 23:37:29 xmw Exp $
+
+*libwapcaplet-0.2.2 (21 Mar 2015)
+
+  21 Mar 2015; Michael Weber <xmw@gentoo.org>
+  +files/libwapcaplet-0.2.2-glibc20.patch, +libwapcaplet-0.2.2.ebuild,
+  -libwapcaplet-0.1.1.ebuild, -libwapcaplet-0.2.0.ebuild,
+  -libwapcaplet-0.2.1.ebuild:
+  Version bump (bug 543846).
 
 *libwapcaplet-0.2.1-r1 (15 Nov 2014)
 
diff --git a/dev-libs/libwapcaplet/files/libwapcaplet-0.2.2-glibc20.patch b/dev-libs/libwapcaplet/files/libwapcaplet-0.2.2-glibc20.patch
new file mode 100644
index 000000000000..546a5bfeafff
--- /dev/null
+++ b/dev-libs/libwapcaplet/files/libwapcaplet-0.2.2-glibc20.patch
@@ -0,0 +1,14 @@
+--- libwapcaplet-0.2.2/Makefile
++++ libwapcaplet-0.2.2/Makefile
+@@ -17,10 +17,7 @@
+ 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ 	-Wmissing-declarations -Wnested-externs
+ # BeOS/Haiku standard library headers issue warnings
+-ifneq ($(BUILD),i586-pc-haiku)
+-  WARNFLAGS := $(WARNFLAGS) -Werror
+-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/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild
deleted file mode 100644
index a6ddc6befd14..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild,v 1.8 2013/02/27 08:48:08 xmw Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="debug static-libs test"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-pkg_setup(){
-	netsurf_src_prepare() {
-		sed -e "/^CCOPT :=/s:=.*:=:" \
-			-e "/^CCNOOPT :=/s:=.*:=:" \
-			-e "/^CCDBG :=/s:=.*:=:" \
-			-i build/makefiles/Makefile.{gcc,clang} || die
-		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-			-i Makefile || die
-		sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-			-i ${PN}.pc.in || die
-	}
-	netsurf_src_configure() {
-		echo "Q := " >> Makefile.config
-		echo "CC := $(tc-getCC)" >> Makefile.config
-		echo "AR := $(tc-getAR)" >> Makefile.config
-	}
-
-	netsurf_make() {
-		emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
-		use static-libs && \
-			emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
-	}
-}
-
-src_prepare() {
-	netsurf_src_prepare
-}
-
-src_configure() {
-	netsurf_src_configure
-}
-
-src_compile() {
-	netsurf_make
-}
-
-src_test() {
-	netsurf_make test
-}
-
-src_install() {
-	netsurf_make DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc README
-}
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.2.0.ebuild
deleted file mode 100644
index fb168671d7c7..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/libwapcaplet-0.2.0.ebuild,v 1.5 2014/06/18 19:14:41 mgorny Exp $
-
-EAPI=5
-
-inherit netsurf
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k-mint"
-IUSE="test"
-
-DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.2.2.ebuild
index a7a3eef0c70e..4c7708b8abbf 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.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/dev-libs/libwapcaplet/libwapcaplet-0.2.1.ebuild,v 1.1 2014/11/06 17:40:05 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/libwapcaplet-0.2.2.ebuild,v 1.1 2015/03/21 23:37:29 xmw Exp $
 
 EAPI=5
 
+NETSURF_BUILDSYSTEM=buildsystem-1.3
 inherit netsurf
 
 DESCRIPTION="string internment library, written in C"