summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-07 14:30:28 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-03-07 14:30:28 +0000
commit89ede4155eedfade79103adf0625ab018d61b2ab (patch)
tree1840181845564b62d9792f4b2143b50400d41040 /media-sound/dcd
parentDrop virtual/libc dependency. Respect CC, CFLAGS, LDFLAGS. (diff)
downloadhistorical-89ede4155eedfade79103adf0625ab018d61b2ab.tar.gz
historical-89ede4155eedfade79103adf0625ab018d61b2ab.tar.bz2
historical-89ede4155eedfade79103adf0625ab018d61b2ab.zip
Drop virtual/libc dependency. Respect CC, CFLAGS, LDFLAGS. Avoid dirty sed hack.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'media-sound/dcd')
-rw-r--r--media-sound/dcd/ChangeLog9
-rw-r--r--media-sound/dcd/Manifest29
-rw-r--r--media-sound/dcd/dcd-0.90.ebuild41
-rw-r--r--media-sound/dcd/dcd-0.95.ebuild29
-rw-r--r--media-sound/dcd/files/dcd-0.95-makefile.patch13
-rw-r--r--media-sound/dcd/files/digest-dcd-0.901
6 files changed, 53 insertions, 69 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/Manifest b/media-sound/dcd/Manifest
index 4f6812248d6b..66cb55e3b2fb 100644
--- a/media-sound/dcd/Manifest
+++ b/media-sound/dcd/Manifest
@@ -1,6 +1,25 @@
-MD5 c8a2b440d02e7678dafd30d64ca68c6d dcd-0.95.ebuild 938
-MD5 3aeeee0f3e2f48dce924217bc622f538 dcd-0.90.ebuild 864
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 388e6efb44a97fd46a018fcad94f3757 ChangeLog 1489
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77d3381eaffb538e0f340790d4ecff8e ChangeLog 1698
+RMD160 61b054d94b9ecf617c9f8cef95eae597bd5165ba ChangeLog 1698
+SHA256 92df0a2b000861382d7ad6a7b330ed8ec9a7a2790b659bdf85efca7f6dc54ff2 ChangeLog 1698
+MD5 4941c191c8ee9f982605dc57355ae494 dcd-0.95.ebuild 747
+RMD160 ed4a6e205ba2117b5071e3d717a19054df0dfe5d dcd-0.95.ebuild 747
+SHA256 eda8da50c22d8b218f657c1449feb82cff0d2daa634428c55a84a0b17b782610 dcd-0.95.ebuild 747
+MD5 1298c1543306b1a8abe39cfb39368f3d files/dcd-0.95-makefile.patch 393
+RMD160 f7dd4605c342e1a9436102ac317326480c9511db files/dcd-0.95-makefile.patch 393
+SHA256 f6d89f91b04fd91d8951f077d147cea2e68ed14e1bbc862cce6da43d29d64a47 files/dcd-0.95-makefile.patch 393
MD5 37b75fcbb3400c97fbed557d65239563 files/digest-dcd-0.95 60
-MD5 9a48cf3703f5a7e7dda289f1e64f1c2c files/digest-dcd-0.90 60
+RMD160 7e9d3ab425906fb24c6a1216381041b43ded866e files/digest-dcd-0.95 60
+SHA256 666a2fbc919eaa896cc474de366618145aaad040f57f60432a17739ae017adb1 files/digest-dcd-0.95 60
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDZkQAiZjviIA2XgRAlkbAJ94cLks2OkUjaSX9xwi25Pf3hYyNgCg8pgX
+m5Dfllo+3G0HbtGHiBZbXVY=
+=G7M3
+-----END PGP SIGNATURE-----
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