summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-26 18:02:55 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-26 18:02:55 +0000
commitd58862407a3879fccdb66ac3d7abccc53b842c2c (patch)
tree2001ba5c6a292c141ecd576e63949647db908623 /media-sound/musepack-tools
parentMigrated to generation 2 and added the source use flag. (diff)
downloadgentoo-2-d58862407a3879fccdb66ac3d7abccc53b842c2c.tar.gz
gentoo-2-d58862407a3879fccdb66ac3d7abccc53b842c2c.tar.bz2
gentoo-2-d58862407a3879fccdb66ac3d7abccc53b842c2c.zip
Remove old versions (and old patches); fix quoting of patches names; block media-sound/mppenc (the software replacing musepack-tools upstream, coming soon).
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'media-sound/musepack-tools')
-rw-r--r--media-sound/musepack-tools/ChangeLog15
-rw-r--r--media-sound/musepack-tools/musepack-tools-1.15v.ebuild13
2 files changed, 21 insertions, 7 deletions
diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 2f7e20afd539..76f1da138a9d 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,19 @@
# ChangeLog for media-sound/musepack-tools
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.30 2006/06/09 02:36:36 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.31 2006/12/26 18:02:55 flameeyes Exp $
+
+ 26 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+ -files/musepack-tools-1.15r-r1-Makefile.patch,
+ -files/musepack-tools-1.15s-Makefile.patch,
+ -files/musepack-tools-1.15t-Makefile.patch,
+ -files/musepack-tools-1.15t-gcc4.patch,
+ -files/musepack-tools-1.15u-Makefile.patch,
+ -files/musepack-tools-1.15u-gcc4.patch, -musepack-tools-1.15s-r2.ebuild,
+ -musepack-tools-1.15t.ebuild, -musepack-tools-1.15u.ebuild,
+ musepack-tools-1.15v.ebuild:
+ Remove old versions (and old patches); fix quoting of patches names; block
+ media-sound/mppenc (the software replacing musepack-tools upstream, coming
+ soon).
09 Jun 2006; Luis Medinas <metalgod@gentoo.org>
musepack-tools-1.15v.ebuild:
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index 812ad5921ab2..e3e517ecaca0 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.9 2006/06/09 02:36:36 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.10 2006/12/26 18:02:55 flameeyes Exp $
IUSE="static 16bit esd"
@@ -17,7 +17,8 @@ LICENSE="LGPL-2.1"
KEYWORDS="amd64 x86 ~x86-fbsd"
RDEPEND="esd? ( media-sound/esound )
- media-libs/id3lib"
+ media-libs/id3lib
+ !media-sound/mppenc"
DEPEND="${RDEPEND}
x86? ( dev-lang/nasm )
@@ -28,15 +29,15 @@ src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${P}-Makefile.patch
- epatch ${FILESDIR}/${P}-gcc4.patch
+ epatch "${FILESDIR}/${P}-Makefile.patch"
+ epatch "${FILESDIR}/${P}-gcc4.patch"
sed -i 's/#define USE_IRIX_AUDIO/#undef USE_IRIX_AUDIO/' mpp.h
if ! use esd ; then
sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h
else
- sed -i -e 's/^LDADD = -lm$/LDADD = $(shell esd-config --libs)/' \
+ sed -i -e 's/^LDADD = -lm$/LDADD = $(shell esd-config --libs)/' \
Makefile
fi
@@ -58,7 +59,7 @@ src_compile() {
filter-flags "-mfpmath=sse" "-mfpmath=sse,387"
use static && export BLD_STATIC=1
- append-flags -I${S}
+ append-flags "-I${S}"
ARCH= emake CC="$(tc-getCC)" mppenc mppdec replaygain || die
}