Respect CC and LDFLAGS, add debug useflag.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 68 insertions, 14 deletions

diff --git a/media-sound/cdtool/ChangeLog b/media-sound/cdtool/ChangeLog
index 1d7a3be82a68..0f47c1c9880f 100644
--- a/media-sound/cdtool/ChangeLog
+++ b/media-sound/cdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cdtool
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/ChangeLog,v 1.9 2005/04/20 19:01:26 luckyduck Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/ChangeLog,v 1.10 2006/03/07 13:58:19 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cdtool-2.1.5-ldflags.patch, cdtool-2.1.5-r1.ebuild:
+  Respect CC and LDFLAGS, add debug useflag.
 
 *cdtool-2.1.5-r1 (20 Apr 2005)
 
diff --git a/media-sound/cdtool/Manifest b/media-sound/cdtool/Manifest
index 094464455cc3..4ecfd9f1cc0c 100644
--- a/media-sound/cdtool/Manifest
+++ b/media-sound/cdtool/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bcac26b390343ebbdaf6c49f959ed01a cdtool-2.1.5-r1.ebuild 961
-MD5 2a9af6849625470a91329548034e096c ChangeLog 935
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4c35eae66b37fc6f70858343f6e22b32 ChangeLog 1096
+RMD160 9fc60be4b12e39e91fc48adc21d2907e9da4f5c2 ChangeLog 1096
+SHA256 a552ec3396e720800f514085c9f5b985db887ddd7c956c0f039d27fdaeab1a2b ChangeLog 1096
+MD5 fee7438d9cb9580ae2fc00c849fe235a cdtool-2.1.5-r1.ebuild 1156
+RMD160 d508ba20db0e6eb00af50a811f7f2d1f8a744217 cdtool-2.1.5-r1.ebuild 1156
+SHA256 ba8e2770580633d77fc3b13fb9e05cb90fc25ad4f5879a3e4ad427150818a0c6 cdtool-2.1.5-r1.ebuild 1156
+MD5 c9634364512cf7e6f5fae3d6dc16d9fc files/cdtool-2.1.5-ldflags.patch 793
+RMD160 76aecf056494c1e38657892d8593439086b541f2 files/cdtool-2.1.5-ldflags.patch 793
+SHA256 4f34965659f18b1ac0fd08071c94888a9cdb838c4a6c6835e0a96eb0ec89b2cf files/cdtool-2.1.5-ldflags.patch 793
 MD5 d29e321ea1fc813d76ee1f28bf711a47 files/digest-cdtool-2.1.5-r1 63
+RMD160 b78dd17d860311f2733d58cf7296fd15b636b533 files/digest-cdtool-2.1.5-r1 63
+SHA256 70a05db700001a2c5de40021abed5e58bce95d99e87d7baf09b24360554643b2 files/digest-cdtool-2.1.5-r1 63
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFCZqcb06ebR+OMO78RArrDAJ4/pHHPTkuFm4fxdg7jOHEUK4gipwCgj6Gh
-/w6/+OvzNsAR3iE9tfxg3uc=
-=Sxyq
+iD8DBQFEDZGIAiZjviIA2XgRAiAEAJsF6XnZDyaFnOcWgzcp5VMDUr98bACdH+M4
+x5RqfnJg9WNM/2fwlPVclJ8=
+=5/FO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cdtool/cdtool-2.1.5-r1.ebuild b/media-sound/cdtool/cdtool-2.1.5-r1.ebuild
index 8d9c2720f4d4..55b7a51f73e9 100644
--- a/media-sound/cdtool/cdtool-2.1.5-r1.ebuild
+++ b/media-sound/cdtool/cdtool-2.1.5-r1.ebuild
@@ -1,18 +1,27 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/cdtool-2.1.5-r1.ebuild,v 1.1 2005/04/20 19:01:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdtool/cdtool-2.1.5-r1.ebuild,v 1.2 2006/03/07 13:58:19 flameeyes Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A package of command-line utilities to play and catalog cdroms."
-HOMEPAGE=""
+HOMEPAGE="none"
 SRC_URI="http://www.ibiblio.org/pub/linux/apps/sound/cdrom/cli/cdtool-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc amd64 ppc"
-IUSE=""
+IUSE="debug"
 DEPEND="!media-sound/cdplay"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
 src_compile() {
-	emake || die "make failed"
+	use debug && append-flags -DDEBUG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "make failed"
 }
 
 src_install() {
diff --git a/media-sound/cdtool/files/cdtool-2.1.5-ldflags.patch b/media-sound/cdtool/files/cdtool-2.1.5-ldflags.patch
new file mode 100644
index 000000000000..a0d6dec67de9
--- /dev/null
+++ b/media-sound/cdtool/files/cdtool-2.1.5-ldflags.patch
@@ -0,0 +1,30 @@
+Index: cdtool-2.1.5/Makefile
+===================================================================
+--- cdtool-2.1.5.orig/Makefile
++++ cdtool-2.1.5/Makefile
+@@ -68,7 +68,7 @@ all::
+ 	make noobjs
+ 	make cdown
+ 	make cdadd
+-	make cdctrl DEBUG_FLAGS="-O -s -DCDCTRL"
++	make cdctrl DEBUG_FLAGS="-O -s" CC="$(CC) -DCDCTRL"
+ 	make noobjs
+ 	make cdtool DEBUG_FLAGS="-O -s"
+ 	make links
+@@ -113,13 +113,13 @@ rpm: $(SRCS) $(OTHERS)
+ 	rpm -ba $(THISVER)-$(THISREL).spec
+ 
+ cdown:  cdown.c
+-	$(CC) -o cdown $(DEBUG_FLAGS) cdown.c
++	$(CC) $(LDFLAGS) -o cdown $(DEBUG_FLAGS) cdown.c
+ 
+ cdtool: $(OBJS)
+-	$(CC) -o cdtool $(OBJS)
++	$(CC) $(LDFLAGS) -o cdtool $(OBJS)
+ 
+ cdctrl: $(OBJS1)
+-	$(CC) -o cdctrl $(OBJS1)
++	$(CC) $(LDFLAGS) -o cdctrl $(OBJS1)
+ 
+ cdadd: cdadd.sh
+ 	sed s,@BINDIR@,$(BINDIR),g < $< > $@