diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-02-03 10:47:33 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-02-03 10:47:33 +0000 |
| commit | 625962cfd55f1a4d99f2e59766a93efc88dc45af (patch) | |
| tree | 7c77a29c529f6c28199d3a68cb8772ec906d9212 | |
| parent | Version bump closes bug #80476. (diff) | |
| download | historical-625962cfd55f1a4d99f2e59766a93efc88dc45af.tar.gz historical-625962cfd55f1a4d99f2e59766a93efc88dc45af.tar.bz2 historical-625962cfd55f1a4d99f2e59766a93efc88dc45af.zip | |
Fix bug #50447 properly. It's not hard dammit.
Package-Manager: portage-2.0.51-r15
| -rw-r--r-- | media-sound/mcdp/ChangeLog | 10 | ||||
| -rw-r--r-- | media-sound/mcdp/files/mcdp-0.3j-dietlibc-fix.patch | 14 | ||||
| -rw-r--r-- | media-sound/mcdp/mcdp-0.3j.ebuild | 22 |
3 files changed, 33 insertions, 13 deletions
diff --git a/media-sound/mcdp/ChangeLog b/media-sound/mcdp/ChangeLog index 4457072f4259..7222ba412b2a 100644 --- a/media-sound/mcdp/ChangeLog +++ b/media-sound/mcdp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/mcdp -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/ChangeLog,v 1.9 2004/10/30 10:54:22 eradicator Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/ChangeLog,v 1.10 2005/02/03 10:47:33 robbat2 Exp $ + + 03 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mcdp-0.3j.ebuild, + +files/mcdp-0.3j-dietlibc-fix.patch: + Fix bug #50447 properly. It's not hard dammit. 30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> mcdp-0.3j.ebuild: toolchain love for bug #69011. @@ -25,5 +29,5 @@ 11 Jul 2003; jje <jje@gentoo.org> mcdp-0.3j.ebuild: Initial revision. - Submitted by: Freyr Gunnar Ólafsson <gnarlin@utopia.is> + Submitted by: Freyr Gunnar Ãlafsson <gnarlin@utopia.is> diff --git a/media-sound/mcdp/files/mcdp-0.3j-dietlibc-fix.patch b/media-sound/mcdp/files/mcdp-0.3j-dietlibc-fix.patch new file mode 100644 index 000000000000..9f9f10e5d0aa --- /dev/null +++ b/media-sound/mcdp/files/mcdp-0.3j-dietlibc-fix.patch @@ -0,0 +1,14 @@ +--- mcdp-0.3j/mcdp.h 2002-07-12 06:24:30.000000000 -0700 ++++ mcdp-0.3j.new/mcdp.h 2005-02-03 02:37:26.000000000 -0800 +@@ -27,6 +27,11 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + ++// hack to avoid re-definition of some stuff ++#ifdef __dietlibc__ ++#define _LINUX_BYTEORDER_GENERIC_H ++#endif //__dietlibc__ ++ + #include <linux/cdrom.h> + + #include "params.h" diff --git a/media-sound/mcdp/mcdp-0.3j.ebuild b/media-sound/mcdp/mcdp-0.3j.ebuild index 17fa4abcf63c..ad9b92af91c6 100644 --- a/media-sound/mcdp/mcdp-0.3j.ebuild +++ b/media-sound/mcdp/mcdp-0.3j.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/mcdp-0.3j.ebuild,v 1.10 2004/10/30 10:54:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mcdp/mcdp-0.3j.ebuild,v 1.11 2005/02/03 10:47:33 robbat2 Exp $ -IUSE="diet" - -inherit toolchain-funcs +inherit eutils toolchain-funcs DESCRIPTION="A very small console cd player" HOMEPAGE="http://www.mcmilk.de/projects/mcdp/" -SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.gz" - +SRC_URI="${HOMEPAGE}/dl/${P}.tar.gz" +IUSE="diet" SLOT="0" KEYWORDS="x86 amd64 sparc" LICENSE="GPL-2" +DEPEND="diet? ( dev-libs/dietlibc )" +RDEPEND="!diet? ( virtual/libc )" -DEPEND="diet? ( dev-libs/dietlibc ) - !diet? ( virtual/libc )" +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-dietlibc-fix.patch +} src_compile() { if use diet; then @@ -29,6 +31,6 @@ src_install() { dobin mcdp || die doman mcdp.1 || die - cd doc + cd ${S}/doc dodoc CHANGES INSTALL README THANKS profile.sh } |