Version bump (bug 543846).

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

4 files changed, 32 insertions, 67 deletions

diff --git a/media-libs/libnsgif/ChangeLog b/media-libs/libnsgif/ChangeLog
index 5d32f06d6c2d..51778de5f0b8 100644
--- a/media-libs/libnsgif/ChangeLog
+++ b/media-libs/libnsgif/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libnsgif
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/ChangeLog,v 1.7 2014/11/15 12:12:26 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/ChangeLog,v 1.8 2015/03/22 00:21:03 xmw Exp $
+
+*libnsgif-0.1.2 (22 Mar 2015)
+
+  22 Mar 2015; Michael Weber <xmw@gentoo.org>
+  +files/libnsgif-0.1.2-glibc2.20.patch, +libnsgif-0.1.2.ebuild,
+  -libnsgif-0.0.3.ebuild, -libnsgif-0.1.0.ebuild:
+  Version bump (bug 543846).
 
 *libnsgif-0.1.1 (15 Nov 2014)
 
diff --git a/media-libs/libnsgif/files/libnsgif-0.1.2-glibc2.20.patch b/media-libs/libnsgif/files/libnsgif-0.1.2-glibc2.20.patch
new file mode 100644
index 000000000000..47e56528d439
--- /dev/null
+++ b/media-libs/libnsgif/files/libnsgif-0.1.2-glibc2.20.patch
@@ -0,0 +1,15 @@
+--- libnsgif-0.1.2/Makefile
++++ libnsgif-0.1.2/Makefile
+@@ -13,11 +13,7 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ 	-Wmissing-declarations -Wnested-externs -pedantic
+-# BeOS/Haiku standard library headers create 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/media-libs/libnsgif/libnsgif-0.0.3.ebuild b/media-libs/libnsgif/libnsgif-0.0.3.ebuild
deleted file mode 100644
index 001465908e4b..000000000000
--- a/media-libs/libnsgif/libnsgif-0.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/libnsgif-0.0.3.ebuild,v 1.3 2013/02/28 07:46:00 xmw Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="debug static-libs"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-pkg_setup(){
-	netsurf_src_prepare() {
-		sed -e "/^CCOPT :=/s:=.*:=:" \
-			-e "/^CCNOOPT :=/s:=.*:=:" \
-			-e "/^CCDBG :=/s:=.*:=:" \
-			-i build/makefiles/Makefile.{gcc,clang}
-		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-			-i Makefile || die
-		sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-			-i ${NETSURF_PKGCONFIG:-${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
-}
diff --git a/media-libs/libnsgif/libnsgif-0.1.0.ebuild b/media-libs/libnsgif/libnsgif-0.1.2.ebuild
index e9d01029b296..31365581f438 100644
--- a/media-libs/libnsgif/libnsgif-0.1.0.ebuild
+++ b/media-libs/libnsgif/libnsgif-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/media-libs/libnsgif/libnsgif-0.1.0.ebuild,v 1.3 2014/01/05 19:07:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/libnsgif-0.1.2.ebuild,v 1.1 2015/03/22 00:21:03 xmw Exp $
 
 EAPI=5
 
+NETSURF_BUILDSYSTEM=buildsystem-1.3
 inherit netsurf
 
 DESCRIPTION="decoding library for the GIF image file format, written in C"
@@ -13,3 +14,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~m68k-mint"
 IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )