Fix linking with --as-needed, bug #247775

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 i686

4 files changed, 28 insertions, 14 deletions

diff --git a/media-libs/sdl-flic/ChangeLog b/media-libs/sdl-flic/ChangeLog
index c9067f9c309e..97804456a182 100644
--- a/media-libs/sdl-flic/ChangeLog
+++ b/media-libs/sdl-flic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-flic
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/ChangeLog,v 1.5 2007/02/09 03:43:09 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/ChangeLog,v 1.6 2008/12/06 16:50:21 nyhm Exp $
+
+  06 Dec 2008; Tristan Heaven <nyhm@gentoo.org> files/Makefile,
+  sdl-flic-1.2.ebuild:
+  Fix linking with --as-needed, bug #247775
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/media-libs/sdl-flic/Manifest b/media-libs/sdl-flic/Manifest
index 20e2e52b7cbe..7b7a2a9c931a 100644
--- a/media-libs/sdl-flic/Manifest
+++ b/media-libs/sdl-flic/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2-win32.patch 310 RMD160 307587051dc82560fb2139bad78581b681ea15da SHA1 887bdabe2ba1d81909969e9127189944774ccb06 SHA256 916682863efd90e95bcc750a186ea0efc7d0ea95499821c94bd6c132afeaf468
-AUX Makefile 1172 RMD160 5da69bb07992c0ce6f86a4e7946d218ee175ca47 SHA1 6de44dfca1220b141b76451f69c4efa448a9569b SHA256 36a78544ce608992e1fabf7ca12d37725899397eb162615d56f7e6047672bbcd
+AUX Makefile 1217 RMD160 1f218b69cea2a09c07a781606b22090ae4d3e39e SHA1 af325da89de16f5978a4dd1dbc1d8b3b462f12a7 SHA256 cffbb54cb5539283a08227005ed27878b7a2b98f277c7ad6c3778899a9e6442d
 DIST SDL_flic-12.tgz 52901 RMD160 34d34769a0e8880329b74e9a99a20d0602dd6aaf SHA1 135e19a2be30999001d66d497a0a501cfc6600bd SHA256 e2b6141a7ec4fa7959957f93cdd189bab800595e1323492c610d630c3763dd05
-EBUILD sdl-flic-1.2.ebuild 823 RMD160 7046ba99db20f39a919abf90f3d28fd52e372f93 SHA1 ed4730dbde12a742105f798705a9e6577bd2367b SHA256 cf652e10e96436b4a5e8d3059fa3cc0acf81aed5400898817c8dc74117cc03a1
-MISC ChangeLog 744 RMD160 e813b6b520a454d5ae0a17e92a2c7fed049898f5 SHA1 a1221af8657bc67ddeb392d97f999a264c92e697 SHA256 5681dece8ef943eeb2d0900b760490405203bafdb241dc83044b3a0294e99b6e
+EBUILD sdl-flic-1.2.ebuild 799 RMD160 efd84895180f489e03154d009c4db0455d2a2097 SHA1 646a64e47cb04ba5854ce690f5779e35d2452caf SHA256 fe51ff530e01e8ab6ac14ea5f97b619c887e309083831f2635e33cdfb365e053
+MISC ChangeLog 871 RMD160 861c79e43516939715393505fa88701ad32eca42 SHA1 c5b432d5cb87237aef3a5dda5552df5f16f56842 SHA256 abd9ce33e8ae5c26bff239fe43493189cb706d1bc691cef9daaa952446ced196
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk6rVQACgkQdz7hIScOURHTJQCfcKP6WmYHvz2JpYK/4TvkTLZQ
+bC4AoJf6E4h6u0i0bFaa5h/DZHx4ryYs
+=YQLK
+-----END PGP SIGNATURE-----
diff --git a/media-libs/sdl-flic/files/Makefile b/media-libs/sdl-flic/files/Makefile
index cfba1c19835a..b4f9110ffc2b 100644
--- a/media-libs/sdl-flic/files/Makefile
+++ b/media-libs/sdl-flic/files/Makefile
@@ -1,5 +1,6 @@
 CFLAGS		+= $(shell sdl-config --cflags) -I. -DINLINE=
-LDFLAGS		+= $(shell sdl-config --libs) -L.
+LDFLAGS		+= -L.
+LIBS		+= $(shell sdl-config --libs)
 
 LIB_NAME	= libSDL_flic
 LIB_SHARED	= $(LIB_NAME).so
@@ -16,7 +17,7 @@ all: $(TARGETS)
 SDL_flic.lo: SDL_flic.c
 	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
 $(LIB_SHARED): SDL_flic.lo
-	$(CC) $(LDFLAGS) SDL_flic.lo -shared -Wl,-soname,$@ -o $@.1.0.0
+	$(CC) $(CFLAGS) $(LDFLAGS) SDL_flic.lo -shared -Wl,-soname,$@ -o $@.1.0.0 $(LIBS)
 	ln -s $@.1.0.0 $@.1
 	ln -s $@.1 $@
 
@@ -24,7 +25,7 @@ $(LIB_STATIC): SDL_flic.o
 	$(AR) rcs $@ $<
 
 $(BIN): $(LIB_SHARED) playflic.o
-	$(CC) $(LDFLAGS) -lSDL_flic -o $@ playflic.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ playflic.o -lSDL_flic $(LIBS)
 
 install: $(TARGETS)
 	install -d -m 755 $(DESTDIR)/$(LIBDIR)
diff --git a/media-libs/sdl-flic/sdl-flic-1.2.ebuild b/media-libs/sdl-flic/sdl-flic-1.2.ebuild
index b8c2e38b798c..8267aac14cec 100644
--- a/media-libs/sdl-flic/sdl-flic-1.2.ebuild
+++ b/media-libs/sdl-flic/sdl-flic-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/sdl-flic-1.2.ebuild,v 1.4 2005/12/10 20:48:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-flic/sdl-flic-1.2.ebuild,v 1.5 2008/12/06 16:50:21 nyhm Exp $
 
 inherit eutils
 
@@ -13,10 +13,9 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib
-	>=media-libs/libsdl-1.2.4"
+DEPEND="media-libs/libsdl"
 
-S="${WORKDIR}"/SDL_flic-${PV}
+S=${WORKDIR}/SDL_flic-${PV}
 
 src_unpack() {
 	unpack ${A}
@@ -27,6 +26,6 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README.txt
 }