Respect CXXFLAGS, LDFLAGS wrt bug 336814. Thanks to Diego for the report. Fix parallel build, configure recursively.

Package-Manager: portage-2.1.9/cvs/Linux x86_64

4 files changed, 153 insertions, 3 deletions

diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index 47eee35dbf9f..e8ed9ee2ea81 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/fireflies
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.22 2009/08/09 18:18:30 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.23 2010/09/11 14:55:15 xarthisius Exp $
+
+*fireflies-2.07-r1 (11 Sep 2010)
+
+  11 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +fireflies-2.07-r1.ebuild, +files/fireflies-2.07-build_system.patch:
+  Respect CXXFLAGS, LDFLAGS wrt bug 336814. Thanks to Diego for the report.
+  Fix parallel build, configure recursively.
 
   09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> fireflies-2.07.ebuild,
   +files/fireflies-2.07-gcc44.patch:
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 879dbe31881b..d7da53d937bf 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fireflies-2.06-Make.include.in.patch 613 RMD160 940c177b4916cc8696f45439a441bd122bf00e31 SHA1 b80009c2a7d2f79606575218ab6384d8563a96c5 SHA256 cf6aa603e431892fb460f8ba967f221b4195b45de48d1ce8592b289336436e40
 AUX fireflies-2.06-configure.patch 358 RMD160 956afb64007bf27aa6d3ea6f26476100322ad40c SHA1 e8ce9b8db4cba171a6b3da5c591d25a2f33b8f9e SHA256 9431612c107be0cbd73a3604d01f42a90632efccb604aff7a102b5635611ec4c
+AUX fireflies-2.07-build_system.patch 1920 RMD160 1811c6d089bc1d12d54a52feaea5421e84ce2e0a SHA1 8309de5873740ca236380d4d5d3bb6a1e497ffa5 SHA256 096cfd6ce9c2183799930ea8bdb64e733ccb1592281cb7921b551000eb42ac46
 AUX fireflies-2.07-gcc43.patch 330 RMD160 b5e1a3094e9848d6d5f0635e912d020cbe16c69a SHA1 2c9fc09c82424838affe1f48e7bbec269fb6535c SHA256 8a17ccace374dbc5c1683051080ea39bac49443061977bde726731e4dcaf749c
 AUX fireflies-2.07-gcc44.patch 390 RMD160 b05e7844f3ce4efd1a74efc055f8fc8ab6a00525 SHA1 a9d01390c29f3da9cb55c0c32002fd952c3f75e0 SHA256 3d9cca98813125a881614d0c027d8251db211ea7c0c6e2fc35e53a4fbeff72b6
 DIST fireflies-2.07.tar.gz 199917 RMD160 fb835d27da9679cd5545ae8fdbfe53f604987853 SHA1 83e773fef820e4a39119efd0d6b4000cb3d00147 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648
+EBUILD fireflies-2.07-r1.ebuild 1029 RMD160 6af72b86c797a99b35b1c4e7e9721e80c460c295 SHA1 e3d659b5edbeeb90f3f077d79d6d8933dd15bdee SHA256 43e7ecbf6b30d059f3c1741e27c426bc7fb3a20290b2d50c72ee2446230471ce
 EBUILD fireflies-2.07.ebuild 1155 RMD160 56ae0307f7ff689a0bf6b260cd6c511adab31891 SHA1 c2f0ffebb197f5bb82df5fe4951d87eae4102945 SHA256 6e33b714f0c7c41f711ec03fba26c4f3b15f1972f8557b1ac983951164c061e8
-MISC ChangeLog 2894 RMD160 868d558dc4449123ff398f133e846ca2e52ef39b SHA1 cc77601c2c4df56fe745f1a9a37c9ea3ab226693 SHA256 0889b8fed69f0deb3b7f2d8347b1cb8bae2afae2aef70123cac81a7d9ae99158
+MISC ChangeLog 3176 RMD160 2591176e953c6feb34e342e745b5cdca0b2557ce SHA1 65f344b018ead82e1cf82ced1d9e72f573280cfd SHA256 578fe517c8df68b85053e3b02858dbf246d5e39df15c95bd9872f77d59eb41bb
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkyLmF0ACgkQIiMqcbOVdxTNQwP/YBY45zYv/IYsdnSsFQba7tCP
+HvM77FDH278CZs1OTF8A99/41Feu46DaABT+vrgVR/WBiF2oIUZcM46RRQUqWXQj
+mixiOIttqWKGWPMbI4RmPIkKOONJqdYGWSTDjBgXcEDTcwhWPnPe3MgEfvd0j0xL
+GAaOXiI+Z9JNiQ8jzjc=
+=ouIY
+-----END PGP SIGNATURE-----
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/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
new file mode 100644
index 000000000000..14248feb1143
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.1 2010/09/11 14:55:15 xarthisius Exp $
+
+EAPI=2
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	media-libs/libsdl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir=/usr/$(get_libdir)/misc/xscreensaver
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README TODO || die
+}