Version bump (bug 543846).

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

6 files changed, 36 insertions, 98 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/Manifest b/dev-libs/libwapcaplet/Manifest
index c4d9c4ec5f42..3a813a0fde36 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -2,23 +2,21 @@
 Hash: SHA256
 
 AUX libwapcaplet-0.2.1-glibc20.patch 502 SHA256 6640002cec0bfec23f79dfe568b4e0d9a05acc45e86cc810556914befea68ee0 SHA512 1bfe211135d2a714cc9d4d7bd48c8da3c688499da8bc77fee173dd678e34c00e72469643ac6b0a738099d42307cacd928f0c701da9ec1a5bd8e80e9cc71bd78a WHIRLPOOL ee2fe015a35c36298b622c5e2b80c7a9a0640d49e164fe56c031ee7128812e8e4435b68d021282b25bb791ed55630e2da4a617fa0bf6126030e8b82acbcc791f
-DIST libwapcaplet-0.1.1-src.tar.gz 18799 SHA256 cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258 SHA512 d5946014ed70e2e4ae474b5748d3bc7ee0a706c97be68b3c9ad810d715673fd72444526b18aae364bbd9b7b555edc7b2eaba1b301c67034666d32f5d21392b92 WHIRLPOOL be0fa06815b13a4c273576cfbe9cb782f7ba218e80c56b45cce75c68bb6ab8cecd29312e6a24582eebbc858e33a0021873b7f87be24db03096a3394bd4e5ace1
-DIST libwapcaplet-0.2.0-src.tar.gz 8894 SHA256 5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24 SHA512 a86c540f196730c90272009688864d6124a90841d263b042848790ef6d8c359595c70ab074fb1da2e34d00026e1291cf427c551720e85da6c81d4bab2853fd4d WHIRLPOOL 74ce08d86580a93613c068f25758a67698b9d67ad61fc93ce732b5f686518b552b24f44aec9d5b3d2b9912a17dee014f70125be46367d501c526996949c32bc3
+AUX libwapcaplet-0.2.2-glibc20.patch 510 SHA256 20557b135bb7a6015fe815d2e06f5a4202cc8a6a3c2dfed9927072b2ae0a4933 SHA512 12681d257849cf7c580ba560fc8bf1ed20e5e9a3d9c26711997bad0af8dd15dc082e92fa915e77ac41dfb93fd6f0626aa1322c25dceb30ff7af57c75b5e0882a WHIRLPOOL 23ee0b8298c97614b796d155508aa09a6a212414c0ac3a64351c9afbbaf8087c9f5fd3225a7cc6dcc8c555ad2fc6765ac2a0b55f10ae59ec668df08b0d47d984
 DIST libwapcaplet-0.2.1-src.tar.gz 8897 SHA256 9e4a8df3dfe6d7e1bcc4a3ccce18c3d02230545f4726b05b09b9e504946c8ec8 SHA512 793c1b89075e4ce5d6b042455d7bdd0082412788e3202fc16aa4256e35efc449af962b7df64971512cb5728a389785866e39cfa20addc4b496c28a00af630219 WHIRLPOOL 0b0e8c43befa2abc9259c8ecabe618f4bb0e1827e36a73003ed26a2c878ce1836ddd76a1305911fd528fb5bdc9f62568ee2b384eb6c655f58d6d6bf250bee957
-DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
+DIST libwapcaplet-0.2.2-src.tar.gz 8902 SHA256 38021992e1e6b3ec50d0d3bf7add069bee4c5b179691afa6a76dd58695201485 SHA512 a3026f6ca73c981ff2fa07b45fab3a75605eaab751570ab08aedb33f38d0e62cf6a8958b3df2b9efe25909706585a25383e428eb83201d903e2ec7b3f57d7c7c WHIRLPOOL f125012da633912e00879554dacf7482f30e4b80f99335c8af0fbc91106aad7ee62d51a787c6db5cc15a5bc16027c310ff9b5f3629ba62bda65352d68c900c4f
 DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
-EBUILD libwapcaplet-0.1.1.ebuild 1526 SHA256 36f5ef207cffd42a57c7b62d2670717cbb1c965a1e4058f93fe12f064498426d SHA512 5e5babf213e8268a4bc216c0340820387c293340d5bb042aada01270ca481b5f5f2cbe99601d13945eb9a61863363fbafbc782cc4afd97543708738303bc9e7f WHIRLPOOL 68218c84ab31f82a4f7707850da63187e49ffd301a8c8a4ad0a3e50f793b8c8c3763bea9808c1ac8634b3570ac8960a9d116b709a0082884db5b67dff26e6e9d
-EBUILD libwapcaplet-0.2.0.ebuild 508 SHA256 e046c4236adb0cc86855dc60beaec6503852cb6b0f9204305063a036f41d3244 SHA512 d7d8b9cda2667402de3320639fe7a902125fa1e775042ed0e50945eddd27d7b55c2b139092fcefbd9f471ac16de9a084a81b0b4aa1311b5a1c521f84ef926d8c WHIRLPOOL 0505ef333f1952c47cb1fdbc4234b456bca74f70ab05811e1e1341e33981940e8b68a77d973bb9d5312ba7beb3d9766201d6465fa4385eff51f2524f90abe382
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
 EBUILD libwapcaplet-0.2.1-r1.ebuild 590 SHA256 6cea107ecbebd9b61a16fdd456926fe1c7d03dc8eb86e293a3c85dd37624d3ab SHA512 9e665405f3a1c0cae8177af5e020e0079a62db3b45957e82a83533ec2faa0db8acdecd1d63d143ccccb58c2700f4edaa471057074e8e65061ec3861a9e1a35c4 WHIRLPOOL 348b197b6cef450a3872a69ffd26cc9885463d8ab999237927a0e1ead9323e46b7ea84d8ce59c80b4fe37927d7327fed5c601f2bb91a15267c46a19ba2a73155
-EBUILD libwapcaplet-0.2.1.ebuild 551 SHA256 c022a09ec085d3b1b248238ef93c1cf1b5c3f0790d2a0f89cee05411d54ed151 SHA512 78d6132252c87c8214efde4a0c7a378dc5ff21a64487d810b2c0fdd73fff2b04f284040b403f4bfc5f58ae5ae4daa3c40b8510dc89f4967f3efdfa06dfe30e16 WHIRLPOOL 2c6546c9deb9fd4de262b749eb9dea2bd7b3bdd0e918ee23490eec66d39d903982200eadb25551893a65c1bf1fc2df201479367fa52919b6676a25005904f413
-MISC ChangeLog 2202 SHA256 9b347b4994441b4e3eddeb51c9d133b634b7dfe549a050ddac0cd144c9346bdf SHA512 324aae9d23048c3766dc22ea9e5baae6ebdb53fae60c9b3bb8ccd3668c1de4a4ed28c24513221a1868842f0d384ebbb79be3e1778ec9ec0dec0ba969c32f33ea WHIRLPOOL 046ffc09e19594a597b4fde8f20e7bf63a76074f7d84825f51ba76436a360e7ac25886b24030ff8c2ddfc9479283c93c48b4dabb6c78423e374b48d563ffb5c1
+EBUILD libwapcaplet-0.2.2.ebuild 587 SHA256 aada9989f674e81faccff55389a152494d582ab418aeb3ccb517afe38b1d86d9 SHA512 d1ba2ab956396e5aad28c4842eb55396fa64ee83e4cd2393047c6d19d0a58bdd8c3d1c826c5fb25826af114139dc24e89b6ed2524af1fa853fb63ed2829a4abc WHIRLPOOL 92e1b19d75ee1a5eb7b75325b58235bf4d885d6ef7988890a8dcef53f5ec3e3a000656fc3c97f1240f27934c6a47cd573c052cef0f431412a20b878ae3a32471
+MISC ChangeLog 2472 SHA256 016c0761b1027cfd31ac1b354e3143af35b5fa9dea7e16838f08ec37c9e63d0e SHA512 87e4ac3cb90fa1328fecd37b967726e2f7d2d0a0e425111297cf486b3f87ccc5ef82e68c0b8c348a70a555470178b64b2462d2429825093e675a873cbaf86250 WHIRLPOOL 6914196668611cfc0108ec3769020d97f9ae14c2444f6ddc0645f934c87a82832201b562785e30a75d58a1280791a20c03614ea36dbad6becc0fe361d01864f0
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iL4EAREIAGYFAlRnN3hfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+iL4EAREIAGYFAlUOAL5fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
 bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDMXwD8DhjS2/x5S9SQWydCrMPWe0Q7
-i8VeZ5vtfu7lmWNbd6UA/RJvt8AYW3VVePzYkr3FONDiOkl9y1RsXg2ExiWxk/Gx
-=iEhM
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JC2sAD/UH0rdCpnCdlFgNZvQ2sMuDhH
+K0+/S4GKxLk8iYmvTwgBAJA9jFOi3DNLXpH1u4FxOaYDzYDx6sgNEvuXPSlOonXM
+=zpjc
 -----END PGP SIGNATURE-----
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"