Respect LDFLAGS wrt #333729 by Diego E. Pettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 43 insertions, 27 deletions

diff --git a/media-sound/aylet/ChangeLog b/media-sound/aylet/ChangeLog
index f0554f2f17a0..d1e53c0b36c9 100644
--- a/media-sound/aylet/ChangeLog
+++ b/media-sound/aylet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aylet
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.14 2007/08/20 17:25:43 jokey Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.15 2010/08/21 02:19:36 ssuominen Exp $
+
+  21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> aylet-0.5.ebuild,
+  files/aylet-0.5-gtk.patch:
+  Respect LDFLAGS wrt #333729 by Diego E. Pettenò.
 
   20 Aug 2007; Markus Ullmann <jokey@gentoo.org> aylet-0.5.ebuild:
   Stable on x86 wrt bug #188881
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
index 39ecfeafbe2e..b9d5d4aca6d4 100644
--- a/media-sound/aylet/aylet-0.5.ebuild
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/aylet-0.5.ebuild,v 1.6 2007/08/20 17:25:43 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/aylet-0.5.ebuild,v 1.7 2010/08/21 02:19:36 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Aylet plays music files in the .ay format."
@@ -14,29 +15,28 @@ KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="gtk"
 
 RDEPEND="sys-libs/ncurses
-	gtk? ( >=x11-libs/gtk+-2 )"
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gtk.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DDRIVER_OSS" \
-		${PN} || die "emake failed."
-	if use gtk; then
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DDRIVER_OSS" gtk2 || die "emake failed."
-	fi
+	tc-export CC
+
+	emake ${PN} || die
+	use gtk && { emake gtk2 || die; }
 }
 
 src_install() {
-	dobin ${PN}
-	use gtk && dobin x${PN}
+	dobin ${PN} || die
+	use gtk && { dobin x${PN} || die; }
+
 	local mansuffix=$(ecompress --suffix)
 	doman ${PN}.1
 	use gtk && dosym aylet.1${mansuffix} /usr/share/man/man1/xaylet.1${mansuffix}
+
 	dodoc ChangeLog NEWS README TODO
 }
diff --git a/media-sound/aylet/files/aylet-0.5-gtk.patch b/media-sound/aylet/files/aylet-0.5-gtk.patch
index 72972ec1b9ff..7c1ad74a693d 100644
--- a/media-sound/aylet/files/aylet-0.5-gtk.patch
+++ b/media-sound/aylet/files/aylet-0.5-gtk.patch
@@ -1,6 +1,20 @@
-diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile
---- aylet-0.5.orig/Makefile	2005-12-18 05:05:08.000000000 +0200
-+++ aylet-0.5/Makefile	2007-07-25 17:14:19.000000000 +0300
+--- Makefile
++++ Makefile
+@@ -2,12 +2,12 @@
+ 
+ # You need an ANSI C compiler. gcc is probably best.
+ #
+-CC=gcc
++CC?=gcc
+ 
+ # Compiler options (and sound driver) to use. This one is for Linux,
+ # and other OSS-using systems.
+ #
+-CFLAGS=-O -Wall -DDRIVER_OSS
++CFLAGS+=-Wall -DDRIVER_OSS
+ 
+ # for OpenBSD, uncomment this:
+ #CFLAGS=-O -Wall -DDRIVER_OPENBSD
 @@ -39,14 +39,29 @@
  
  all: aylet xaylet
@@ -21,11 +35,12 @@ diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile
 +gtk2: all
 +
  aylet: $(OBJS)
- 	$(CC) -o aylet $(OBJS) $(CURSES_LIB)
+-	$(CC) -o aylet $(OBJS) $(CURSES_LIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o aylet $(OBJS) $(CURSES_LIB)
  
  xaylet: $(XOBJS)
 -	$(CC) -o xaylet $(XOBJS) `gtk-config --libs`
-+	$(CC) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs`
++	$(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs`
  
  uigtk.o: uigtk.c
 -	$(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o
@@ -33,9 +48,8 @@ diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile
  
  installdirs:
  	/bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR)
-diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c
---- aylet-0.5.orig/ui.c	2003-11-27 21:42:47.000000000 +0200
-+++ aylet-0.5/ui.c	2007-07-25 17:14:53.000000000 +0300
+--- ui.c
++++ ui.c
 @@ -5,7 +5,9 @@
   */
  
@@ -57,10 +71,8 @@ diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c
    }
  
  /* update time display */
-Only in aylet-0.5: ui.c.orig
-diff -ur aylet-0.5.orig/uigtk.c aylet-0.5/uigtk.c
---- aylet-0.5.orig/uigtk.c	2002-09-14 18:45:45.000000000 +0300
-+++ aylet-0.5/uigtk.c	2007-07-25 17:14:22.000000000 +0300
+--- uigtk.c
++++ uigtk.c
 @@ -14,11 +14,13 @@
  #include "ui.h"