13 files changed, 355 insertions, 0 deletions
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
new file mode 100644
index 000000000000..9506a36f962e
--- /dev/null
+++ b/x11-misc/fireflies/Manifest
@@ -0,0 +1 @@
+DIST fireflies-2.07.tar.gz 199917 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 SHA512 d8d478c3ff7705eb2e2f04f490d37ea8d7edcac2fcdc99e06f9bad09c0f1b678d62f09b3d965734f230b2aa3d804c81ad3d15429ede7cb8e951213716f61666a WHIRLPOOL c7714c4f1d694a9b832594ee0627324dc6a3606d62d1a5e83ba05fb1ccfdc3a1cc7e86c8c3634cd008f70e6e443e668c3c41e795941d59af3370f1c5b0562509
diff --git a/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch b/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch
new file mode 100644
index 000000000000..e7cb5ec5a7c2
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch
@@ -0,0 +1,15 @@
+--- a/Make.include.in	2003-04-17 06:02:52.000000000 +0100
++++ b/Make.include.in	2003-11-18 18:36:36.000000000 +0000
+@@ -5,8 +5,9 @@
+ GL_LIBS = @GL_LIBS@
+ OPT_LIBS = @OPT_LIBS@
+ 
+-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
+-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
++override CFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
++override CXXFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
++override LIBS += ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS)
+ 
+ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
+ PROGRAM = @PROGRAM@
+
diff --git a/x11-misc/fireflies/files/fireflies-2.06-configure.patch b/x11-misc/fireflies/files/fireflies-2.06-configure.patch
new file mode 100644
index 000000000000..096b4018c3ab
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.06-configure.patch
@@ -0,0 +1,14 @@
+--- a/configure	2003-06-21 17:04:21.000000000 +0100
++++ b/configure	2003-11-18 09:43:21.000000000 +0000
+@@ -2889,8 +2889,8 @@
+ #define HAVE_SDL 1
+ _ACEOF
+ 
+-    SDL_LIBS="\`sdl-config --libs\`"
+-    SDL_CFLAGS="\`sdl-config --cflags\`"
++    SDL_LIBS="`sdl-config --libs`"
++    SDL_CFLAGS="`sdl-config --cflags`"
+     OPT_OBJS="$OPT_OBJS canvas_sdl.o"
+ fi
+ 
+
diff --git a/x11-misc/fireflies/files/fireflies-2.07-build_system.patch b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
new file mode 100644
index 000000000000..2097b881b743
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
@@ -0,0 +1,85 @@
+Multiple QA issues:
+* Respect CXXFLAGS,LDFLAGS
+* fix parallel build
+* configure recursively
+* don't strip binaries
+* don't unpack libgfx during make
+
+http://bugs.gentoo.org/show_bug.cgi?id=336814
+
+--- configure.ac
++++ configure.ac
+@@ -2,6 +2,7 @@
+ AC_INIT(fireflies, 2.07, guy@somewhere.fscked.org)
+ AC_CONFIG_SRCDIR([src/arrow.cc])
+ AC_CONFIG_HEADER([config.h])
++AC_CONFIG_SUBDIRS([libgfx])
+ 
+ sys=`uname`
+ 
+--- Makefile
++++ Makefile
+@@ -21,18 +21,17 @@
+ win32/
+ 
+ all:	libgfx/src/libgfx.a
+-	cd src && make
++	$(MAKE) -C src
+ 
+ libgfx/src/libgfx.a:
+-	gunzip -c libgfx-1.0.1.tar.gz | tar x
+-	cd libgfx && ./configure && cd src && make
++	$(MAKE) -C libgfx/src
+ 
+ install: all
+ 	sh ./installit $(DESTDIR)
+ 
+ clean:
+-	make -C src clean
+-	make -C win32 clean
++	$(MAKE) -C src clean
++	$(MAKE) -C win32 clean
+ 
+ dist:
+ 	rm -rf fireflies-$(VERSION)
+@@ -42,7 +41,7 @@
+ 
+ 	# need Make.include temporarily to run make
+ 	cp Make.include fireflies-$(VERSION)
+-	make -C fireflies-$(VERSION) clean
++	$(MAKE) -C fireflies-$(VERSION) clean
+ 	rm -f fireflies-$(VERSION)/Make.include
+ 
+ 	# don't want to include debian's buildroot
+--- src/Makefile
++++ src/Makefile
+@@ -8,8 +8,7 @@
+ all:	$(PROGRAM)
+ 
+ $(PROGRAM):	$(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS)
+-	strip $(PROGRAM)
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS)
+ 
+ $(OBJECTS): $(HEADERS)
+ 
+@@ -17,7 +16,7 @@
+ .SUFFIXES: .cc .rc .o
+ 
+ .cc.o:
+-	$(CXX) -c $(CFLAGS) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) -o $@ $<
+ 
+ #$(HEADERS_GCH): %.h.gch: %.h
+ #	$(CXX) -c -x c++-header $(CFLAGS) -o $@ $<
+--- Make.include.in
++++ Make.include.in
+@@ -5,7 +5,7 @@
+ GL_LIBS = @GL_LIBS@
+ OPT_LIBS = @OPT_LIBS@
+ 
+-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
++CXXFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CXXFLAGS@
+ LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
+ 
+ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
new file mode 100644
index 000000000000..d6bad4d9dda4
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
@@ -0,0 +1,11 @@
+--- fireflies-2.07/libgfx/src/raster.cxx.old	2008-07-29 17:53:35.000000000 -0500
++++ fireflies-2.07/libgfx/src/raster.cxx	2008-07-29 17:53:51.000000000 -0500
+@@ -9,7 +9,7 @@
+ #include <gfx/gfx.h>
+ #include <gfx/raster.h>
+ 
+-#include <string>
++#include <cstring>
+ #include <cctype>
+ 
+ ByteRaster::ByteRaster(const ByteRaster &img)
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch b/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
new file mode 100644
index 000000000000..612a25ec280f
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur fireflies-2.07.orig/src/vroot.h fireflies-2.07/src/vroot.h
+--- fireflies-2.07.orig/src/vroot.h	2005-12-09 05:07:30.000000000 +0200
++++ fireflies-2.07/src/vroot.h	2009-08-09 21:18:40.000000000 +0300
+@@ -78,6 +78,8 @@
+  "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #";
+ #endif
+ 
++#include <stdio.h>
++
+ #include <X11/X.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
diff --git a/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
new file mode 100644
index 000000000000..f4c8bf5bb8f3
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
@@ -0,0 +1,52 @@
+From 41db6d93ab4d91f74761f8a34800b9026b0482c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:25:39 +0200
+Subject: [PATCH] Fix underquoting in configure.ac
+
+.. resulting in
+
+  checking for glXSwapBuffers in -lGL... ./configure: line 3095: ac_fn_c_try_link: command not found
+  no
+
+at runtime.
+---
+ configure.ac | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7bb7e72..cd7fa54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,18 +54,18 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-    AC_CHECK_LIB(GL, glXSwapBuffers,\
+-	AC_DEFINE(HAVE_GLX)
+-	OPT_OBJS="$OPT_OBJS canvas_glx.o",\
+-	AC_CHECK_LIB(MesaGL, glXSwapBuffers,\
+-	    AC_DEFINE(HAVE_GLX)
+-	    OPT_OBJS="$OPT_OBJS canvas_glx.o"))
+-
+-    AC_CHECK_LIB(GL, glBegin, \
+-	GL_LIBS="-lGL -lGLU", \
+-	AC_CHECK_LIB(MesaGL, glBegin, \
++    AC_CHECK_LIB([GL], [glXSwapBuffers],\
++	[AC_DEFINE(HAVE_GLX)
++	OPT_OBJS="$OPT_OBJS canvas_glx.o"],\
++	[AC_CHECK_LIB([MesaGL], [glXSwapBuffers],\
++	    [AC_DEFINE(HAVE_GLX)
++	    OPT_OBJS="$OPT_OBJS canvas_glx.o"])])
++
++    AC_CHECK_LIB([GL], [glBegin], \
++	[GL_LIBS="-lGL -lGLU"], \
++	[AC_CHECK_LIB([MesaGL], [glBegin], \
+ 	    [GL_LIBS="-lMesaGL -lMesaGLU"], \
+-	    AC_MSG_ERROR([cannot find GL libraries])))
++	    [AC_MSG_ERROR([cannot find GL libraries])])])
+ 
+     ;;
+ esac
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
new file mode 100644
index 000000000000..23d471b8fd13
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
@@ -0,0 +1,20 @@
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -39,7 +39,7 @@
+    // Because we didn't set up any error handlers, we need to be
+    // prepared to handle longjmps out of the library on error
+    // conditions.
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       fclose(fp);
+@@ -129,7 +129,7 @@
+       return false;
+    }
+ 
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       fclose(fp);
+       png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
new file mode 100644
index 000000000000..b599cac4f80f
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
@@ -0,0 +1,15 @@
+raster-png.cxx: In function ‘ByteRaster* read_png_image(const char*)’:
+raster-png.cxx:104:47: error: ‘memcpy’ was not declared in this scope
+       memcpy(pixel, row_pointers[row], nbytes);
+                                              ^
+
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -16,6 +16,7 @@
+ #ifdef HAVE_LIBPNG
+ 
+ #include <png.h>
++#include <string.h> /* memcpy() */
+ 
+ ByteRaster *read_png_image(const char *file_name)
+ {
diff --git a/x11-misc/fireflies/files/fireflies-2.07-linking.patch b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
new file mode 100644
index 000000000000..cc7e16994878
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
@@ -0,0 +1,28 @@
+From da7c37ae638ac9e2989a3d65f529997c6d2111e1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:38:27 +0200
+Subject: [PATCH] Fix linking of src/canvas_glx.o
+
+Otherwise:
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../x86_64-pc-linux-gnu/bin/ld: canvas_glx.o: undefined reference to symbol 'XPending'
+/usr/lib64/libX11.so.6: error adding symbols: DSO missing from command line
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cd7fa54..1fa000b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,7 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+ 	    test -f $try && RCFILE=$try
+     done
+ 
+-    OPT_LIBS=""
++    OPT_LIBS="-lX11"
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
new file mode 100644
index 000000000000..a7a1e994a31e
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
+SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2 HPND" # HPND is for libgfx, see src_unpack()
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog debian/README.Debian README )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar -xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
diff --git a/x11-misc/fireflies/fireflies-2.07-r2.ebuild b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
new file mode 100644
index 000000000000..9f0420715f7b
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
+SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2 HPND" # HPND is for libgfx, see src_unpack()
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog debian/README.Debian README TODO )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar -xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-glx-detection.patch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_install() {
+	exeinto /usr/lib  # FHS: internal binaries
+	newexe {,${PN}-}add-xscreensaver
+
+	default
+}
diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/fireflies/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>