QA: Fixed compilation with --as-needed, bug 246903

(Portage version: 2.2_rc22/cvs/Linux 2.6.29-rc2 x86_64)

3 files changed, 116 insertions, 6 deletions

diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog
index fe2b1c82656b..0c65ccde30db 100644
--- a/app-misc/endeavour/ChangeLog
+++ b/app-misc/endeavour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/endeavour
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.29 2008/01/14 19:22:45 angelos Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.30 2009/01/18 22:42:04 angelos Exp $
+
+  18 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/endeavour-2.7.3-asneeded.patch, endeavour-2.7.3.ebuild:
+  QA: Fixed compilation with --as-needed, bug 246903
 
   14 Jan 2008; Christoph Mende <angelos@gentoo.org> endeavour-2.7.3.ebuild:
   Stable on amd64 wrt bug #204355
diff --git a/app-misc/endeavour/endeavour-2.7.3.ebuild b/app-misc/endeavour/endeavour-2.7.3.ebuild
index 6f413cb11c39..0cad9e07a69b 100644
--- a/app-misc/endeavour/endeavour-2.7.3.ebuild
+++ b/app-misc/endeavour/endeavour-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.5 2008/01/14 19:22:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.6 2009/01/18 22:42:04 angelos Exp $
 
 inherit eutils
 
@@ -26,7 +26,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch"
+	epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch" \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
@@ -35,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS HACKING INSTALL README TODO
+	dodoc AUTHORS HACKING README TODO
 
 	cd endeavour2
 	dobin endeavour2 || die
diff --git a/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch b/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch
new file mode 100644
index 000000000000..f35bf239d8da
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch
@@ -0,0 +1,105 @@
+--- endeavour-2.7.3/endeavour2/utils/Makefile.orig	2006-11-06 09:00:00.000000000 +0100
++++ endeavour-2.7.3/endeavour2/utils/Makefile	2009-01-18 23:09:11.792880952 +0100
+@@ -73,80 +73,79 @@
+ 	@echo "Compiling confirmation-dialog"
+ 	@$(CC) -c $(CFLAGS) `gtk-config --cflags`		\
+         confirmation-dialog.c
+-	@$(CPP) `gtk-config --libs`				\
++	@$(CPP)	-o confirmation-dialog				\
+         confirmation-dialog.o					\
+ 	../guiutils.o ../cdialog.o ../string.o			\
+-        -o confirmation-dialog
++        `gtk-config --libs`
+ 
+ file-selector:
+ 	@echo "Compiling file-selector"
+ 	@$(CC) -c $(CFLAGS) `gtk-config --cflags`		\
+         file-selector.c
+-	@$(CPP) $(CFLAGS) `gtk-config --libs`			\
++	@$(CPP) $(CFLAGS) -o file-selector			\
+ 	file-selector.o ../fb.o					\
+ 	../cdialog.o ../guiutils.o ../fprompt.o ../pulist.o	\
+-        ../string.o ../disk.o ../fio.o				\
+-        -o file-selector
++        ../string.o ../disk.o ../fio.o `gtk-config --libs`
+ 
+ lsmimetypes:
+ 	@echo "Compiling lsmimetypes"
+ 	@$(CC) -Wall -O2 -g					\
+-        $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	lsmimetypes.c -o lsmimetypes
++	lsmimetypes.c -o lsmimetypes				\
++        $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ notify:
+ 	@echo "Compiling notify"
+ 	@$(CC) -Wall -O2 -g					\
+-        $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	notify.c -o notify
++	notify.c -o notify					\
++        $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ open:
+ 	@echo "Compiling open"
+ 	@$(CC) -Wall -O2 -g 					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	open.c -o open
++	open.c -o open						\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ properties:
+ 	@echo "Compiling properties"
+ 	@$(CC) -Wall -O2 -g 					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	properties.c -o properties
++	properties.c -o properties				\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ purge:
+ 	@echo "Compiling purge"
+ 	@$(CC) -Wall -O2 -g					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	purge.c -o purge
++	purge.c -o purge					\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ recover:
+ 	@echo "Compiling recover"
+ 	@$(CC) -Wall -O2 -g 					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	recover.c -o recover
++	recover.c -o recover					\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ recycle:
+ 	@echo "Compiling recycle"
+ 	@$(CC) -Wall -O2 -g					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	recycle.c -o recycle
++	recycle.c -o recycle					\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ rls:
+ 	@echo "Compiling rls"
+ 	@$(CC) -Wall -O2 -g					\
+-	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)			\
+-	rls.c -o rls
++	rls.c -o rls						\
++	$(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS)
+ 
+ 
+ style-editor:
+ 	@echo "Compiling style-editor"
+ 	@$(CC) -c $(CFLAGS) `gtk-config --cflags`		\
+         style-editor.c
+-	@$(CPP) `gtk-config --libs`				\
++	@$(CPP) -o style-editor					\
+         style-editor.o						\
+         ../guiutils.o ../cdialog.o ../fprompt.o ../pulist.o	\
+         ../fb.o ../csd.o ../fsd.o ../style_edit.o		\
+         ../string.o ../fio.o ../disk.o				\
+-        -o style-editor
++        `gtk-config --libs`
+ 
+ 
+ # Install