summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-07 13:58:19 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-07 13:58:19 +0000
commitb0ccfee219f2c55c412133790df0d8726056f6ca (patch)
tree7c3a444579834b1bb44e930fc92b64917db76d57 /media-sound/cdtool
parentBug 124981, dep for media-tv/kalva (diff)
downloadgentoo-2-b0ccfee219f2c55c412133790df0d8726056f6ca.tar.gz
gentoo-2-b0ccfee219f2c55c412133790df0d8726056f6ca.tar.bz2
gentoo-2-b0ccfee219f2c55c412133790df0d8726056f6ca.zip
Respect CC and LDFLAGS, add debug useflag.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'media-sound/cdtool')
-rw-r--r--media-sound/cdtool/ChangeLog8
-rw-r--r--media-sound/cdtool/cdtool-2.1.5-r1.ebuild19
-rw-r--r--media-sound/cdtool/files/cdtool-2.1.5-ldflags.patch30
3 files changed, 50 insertions, 7 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/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 < $< > $@