- make beep respect LDFLAGS via basic Makefile cleanups

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

4 files changed, 40 insertions, 24 deletions

diff --git a/app-misc/beep/ChangeLog b/app-misc/beep/ChangeLog
index 0800fb4b5944..f4c581b43c70 100644
--- a/app-misc/beep/ChangeLog
+++ b/app-misc/beep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/beep
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.25 2008/05/10 23:18:43 solar Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/ChangeLog,v 1.26 2009/03/28 05:39:33 solar Exp $
+
+  28 Mar 2009; <solar@gentoo.org> +files/beep-1.2.2-Makefile.patch,
+  beep-1.2.2-r1.ebuild:
+  - make beep respect LDFLAGS via basic Makefile cleanups
 
   10 May 2008; <solar@gentoo.org> beep-1.2.2-r1.ebuild:
   - cross compile fix and keyworded for ~arm
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 510fa340cad6..5b06749ebafc 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX beep-1.2.2-Makefile.patch 573 RMD160 04a9c85502db7d7d25ed219456dec406878810e0 SHA1 f782d731fb4f7cab5a03fed13eaed893d1e9670f SHA256 a3d6d7d13c98e82b012131fa741c0409c278e52193fa4b94438aeeb181557b3e
 AUX beep-1.2.2-nosuid.patch 1528 RMD160 872096b7ae3fd7d7825ba84e23600ca14287adec SHA1 53807cd5f44977d105f21fea33acc63e78066af7 SHA256 e9f9eaed4a4b7cd9a7adced8b32a7d779a11fc9f599eadcb7153a35bb878c7af
 DIST beep-1.2.2.tar.gz 18460 RMD160 39c3bc2dc35fe983877371bfda20409d0b0067b7 SHA1 f4eeb8f074449a37326b79c6b560d7e1ab1ee579 SHA256 5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1
-EBUILD beep-1.2.2-r1.ebuild 842 RMD160 a99da6dc64878b11ee8e801bde0520fbf504da1d SHA1 c89665545841acdf1c6c49d01f23b5b8d5b53f26 SHA256 34b52ecd58b1c169f68dd82e1bdf2073b4cba0bc413194103bfef9d9788c352f
-MISC ChangeLog 2568 RMD160 bd0a1e2a79ffa26054bf7849466f38cd50a5ef85 SHA1 6d7cb911ec7d59c1a6499d85a152a323ed398b85 SHA256 1e54837d8d2d446d2e7f29cffc6c3d312a816d15fd6ceb863250dffec3a77410
+EBUILD beep-1.2.2-r1.ebuild 690 RMD160 5316f962c354977f2c70922589c79e23817ce851 SHA1 287f66f9fbdfb7b20eded1a6560182d3df61b162 SHA256 60f3ecf4619b19b300502f3c88238c5be52fa8032bfd376eb40b3481e21d86ee
+MISC ChangeLog 2719 RMD160 fbda9b0e684730fbaa2427cc4c163d921e2c396e SHA1 d17fc074b0dd5d6fcc364b8d70a7d601635540a4 SHA256 f427aa2fbd4d3b40f86ae5fe668de89a415cf1a8decc334390e82b88378560cd
 MISC metadata.xml 166 RMD160 122e578c52fe3661ff8b8f1f574d8651916e3bf5 SHA1 5eb96c1efa4708676adcd6cad061b22caf9bdfe5 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkFVhwACgkQ67wieSYcaxfuVwCg4+y2AxwB0ip6Mk2+MFBQMszZ
-BTQAnR1CXlyMes97/aF17Ey99PSQn9QK
-=tAVB
------END PGP SIGNATURE-----
diff --git a/app-misc/beep/beep-1.2.2-r1.ebuild b/app-misc/beep/beep-1.2.2-r1.ebuild
index e83f22287276..ab1a07215997 100644
--- a/app-misc/beep/beep-1.2.2-r1.ebuild
+++ b/app-misc/beep/beep-1.2.2-r1.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/beep/beep-1.2.2-r1.ebuild,v 1.11 2008/10/27 05:48:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2-r1.ebuild,v 1.12 2009/03/28 05:39:33 solar Exp $
 
 inherit eutils base toolchain-funcs
 
@@ -13,15 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
 IUSE=""
 
-PATCHES="${FILESDIR}/${P}-nosuid.patch"
+PATCHES=( ${FILESDIR}/${P}-{Makefile,nosuid}.patch )
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's/CC=gcc/CC?=gcc/' Makefile || ewarn "Have I been fixed?"
-}
-src_compile() {
-	emake CC=$(tc-getCC) FLAGS="${CFLAGS}" || die "compile problem"
+pkg_setup() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-misc/beep/files/beep-1.2.2-Makefile.patch b/app-misc/beep/files/beep-1.2.2-Makefile.patch
new file mode 100644
index 000000000000..6497323b9235
--- /dev/null
+++ b/app-misc/beep/files/beep-1.2.2-Makefile.patch
@@ -0,0 +1,26 @@
+--- /var/tmp/portage/app-misc/beep-1.2.2-r1/work/beep-1.2.2/Makefile	2002-03-29 09:37:22.000000000 -0800
++++ /tmp/Makefile	2009-03-27 22:19:18.000000000 -0700
+@@ -1,17 +1,18 @@
+-CC=gcc
+-FLAGS=-Wall
++CC ?= gcc
++LDFLAGS ?=
++CFLAGS ?= -Wall
+ EXEC_NAME=beep
+ INSTALL_DIR=/usr/bin
+ MAN_FILE=beep.1.gz
+-MAN_DIR=/usr/man/man1
++MAN_DIR=/usr/share/man/man1
+ 
+ default : beep
+ 
+ clean : 
+-	rm ${EXEC_NAME}
++	rm -f ${EXEC_NAME}
+ 
+ beep : beep.c
+-	${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c
+ 
+ install : 
+ 	cp ${EXEC_NAME} ${INSTALL_DIR}