Drop virtual/libc dependency. Respect CC, CFLAGS, LDFLAGS. Avoid dirty sed hack.

(Portage version: 2.1_pre5-r4)

5 files changed, 29 insertions, 64 deletions

diff --git a/media-sound/dcd/ChangeLog b/media-sound/dcd/ChangeLog
index a220294fd7af..f9927c8418e4 100644
--- a/media-sound/dcd/ChangeLog
+++ b/media-sound/dcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/dcd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/ChangeLog,v 1.11 2005/09/14 07:15:06 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/ChangeLog,v 1.12 2006/03/07 14:30:28 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/dcd-0.95-makefile.patch, -dcd-0.90.ebuild, dcd-0.95.ebuild:
+  Drop virtual/libc dependency. Respect CC, CFLAGS, LDFLAGS. Avoid dirty sed
+  hack.
 
   14 Sep 2005; Aron Griffis <agriffis@gentoo.org> dcd-0.95.ebuild:
   Mark 0.95 stable on alpha
diff --git a/media-sound/dcd/dcd-0.90.ebuild b/media-sound/dcd/dcd-0.90.ebuild
deleted file mode 100644
index 8165ee262530..000000000000
--- a/media-sound/dcd/dcd-0.90.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/dcd-0.90.ebuild,v 1.16 2004/07/01 07:50:33 eradicator Exp $
-
-IUSE=""
-
-S=${WORKDIR}/dcd-0.90
-DESCRIPTION="A simple command-line based CD Player"
-HOMEPAGE="http://www.technopagan.org/dcd"
-SRC_URI="http://www.technopagan.org/dcd/dcd-0.90.tar.bz2"
-
-DEPEND="virtual/libc"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" \
-		-e "s:/man/:/share/man/:" \
-		-e "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
-		Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-	make EXTRA_CFLAGS="$CFLAGS" || die
-
-}
-
-src_install() {
-
-	make PREFIX=${D}/usr install || die
-	dodoc README BUGS ChangeLog
-
-}
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
index ef5d567ae570..2d080ab3173c 100644
--- a/media-sound/dcd/dcd-0.95.ebuild
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -1,42 +1,31 @@
-# 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/dcd/dcd-0.95.ebuild,v 1.14 2005/09/14 07:15:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dcd/dcd-0.95.ebuild,v 1.15 2006/03/07 14:30:28 flameeyes Exp $
+
+inherit eutils toolchain-funcs
 
 IUSE=""
 
-S=${WORKDIR}/dcd-0.95
 DESCRIPTION="A simple command-line based CD Player"
 HOMEPAGE="http://www.technopagan.org/dcd"
-SRC_URI="http://www.technopagan.org/dcd/dcd-0.95.tar.bz2"
-
-DEPEND="virtual/libc"
+SRC_URI="http://www.technopagan.org/dcd/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:PREFIX = .*$:PREFIX = \"${D}/usr\":" \
-		-e "s:/man/:/share/man/:" \
-		-e "s:# CDROM = /dev/cdroms/cdrom0:CDROM = \"/dev/cdroms/cdrom0\":"\
-		-e "/install -m 755 -d \${HOME}\/\${CDI}/d"\
-		Makefile.orig > Makefile
-
+	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_compile() {
-
-	make EXTRA_CFLAGS="$CFLAGS" || die
-
+	emake CC="$(tc-getCC)" CDROM="/dev/cdrom" EXTRA_CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-
-	make PREFIX=${D}/usr install || die
+	dobin dcd
+	doman dcd.1
 	dodoc README BUGS ChangeLog
-
 }
diff --git a/media-sound/dcd/files/dcd-0.95-makefile.patch b/media-sound/dcd/files/dcd-0.95-makefile.patch
new file mode 100644
index 000000000000..b59fedb6180c
--- /dev/null
+++ b/media-sound/dcd/files/dcd-0.95-makefile.patch
@@ -0,0 +1,13 @@
+Index: dcd-0.95/Makefile
+===================================================================
+--- dcd-0.95.orig/Makefile
++++ dcd-0.95/Makefile
+@@ -114,7 +114,7 @@ all: ${PROGS}
+ 	$(CC) -c $(CFLAGS) ${EXTRA_CFLAGS} $< -o $@
+  
+ ${PROGS}: ${OBJECTS}
+-	${CC} ${CFLAGS} ${EXTRA_CFLAGS} ${OBJECTS} -o $@
++	${CC} ${CFLAGS} ${LDFLAGS} ${EXTRA_CFLAGS} ${OBJECTS} -o $@
+ 
+ clean:;
+ 	-${RM} *.o ${PROGS}
diff --git a/media-sound/dcd/files/digest-dcd-0.90 b/media-sound/dcd/files/digest-dcd-0.90
deleted file mode 100644
index 6bae53482d5c..000000000000
--- a/media-sound/dcd/files/digest-dcd-0.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ec47c09b2b414cb54e421746074ae0 dcd-0.90.tar.bz2 32225