summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2003-06-02 20:16:54 +0000
committerDaniel Robbins <drobbins@gentoo.org>2003-06-02 20:16:54 +0000
commit71b6b445f54dbdf3b89ea909ad5b24d425c259e9 (patch)
tree082ab5b9dcc7d6b7d4295ecdada222f27686387f /media-libs/flac
parentImprove my java-config again. (diff)
downloadgentoo-2-71b6b445f54dbdf3b89ea909ad5b24d425c259e9.tar.gz
gentoo-2-71b6b445f54dbdf3b89ea909ad5b24d425c259e9.tar.bz2
gentoo-2-71b6b445f54dbdf3b89ea909ad5b24d425c259e9.zip
alpha support, USE X fix
Diffstat (limited to 'media-libs/flac')
-rw-r--r--media-libs/flac/ChangeLog15
-rw-r--r--media-libs/flac/Manifest4
-rw-r--r--media-libs/flac/flac-1.1.0.ebuild30
3 files changed, 31 insertions, 18 deletions
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 62be411085f0..ef042ed8a25a 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,12 +1,17 @@
# ChangeLog for media-libs/flac
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.14 2003/03/14 07:10:02 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.15 2003/06/02 20:16:36 drobbins Exp $
- 14 Mar 2003; Daniel Robbins <drobbins@gentoo.org> flac-1.1.0.ebuild:
- added dependency on id3lib to (R)DEPEND.
+ 02 Jun 2003; Daniel Robbins <drobbins@gentoo.org> flac-1.1.0.ebuild: xmms USE
+ won't be considered if X USE isn't set (to help people who like to do -X and
+ be safe;) moved libtool eclass inherit line to later in the ebuild so it's
+ after the DEPEND/RDEPEND defs. Also unmasking on Alpha.
- 10 Feb 2003; Aron Griffis <agriffis@gentoo.org> flac-1.1.0.ebuild :
- Add ~alpha to KEYWORDS
+ 14 Mar 2003; Daniel Robbins <drobbins@gentoo.org> flac-1.1.0.ebuild: added
+ dependency on id3lib to (R)DEPEND.
+
+ 10 Feb 2003; Aron Griffis <agriffis@gentoo.org> flac-1.1.0.ebuild : Add
+ ~alpha to KEYWORDS
*flac-1.1.0 (29 Jan 2003)
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 65d499889c53..f87cc19b9812 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,7 +1,7 @@
-MD5 0475a65768e26fd9f2c268f0b1f5cfb0 ChangeLog 1993
MD5 afc8e0d147a6025617d4673a301a471f flac-1.0.3.ebuild 1091
+MD5 823a72c431bd5adc8bb3ab1537ccb751 flac-1.1.0.ebuild 1388
+MD5 c2cf107ee89c52f4acfb63abf281bdc0 ChangeLog 2289
MD5 8573a2a89956a99cd83ddb915ddaadd0 flac-1.0.4.ebuild 1260
-MD5 c2cbdabf6a0cc7dc860caaccc8422b8f flac-1.1.0.ebuild 1178
MD5 ea7cf9841d61ef32148c08cebc7d86c7 files/digest-flac-1.0.3 62
MD5 60392f14261ba187ca43cbdc770bcecf files/digest-flac-1.0.4 63
MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
diff --git a/media-libs/flac/flac-1.1.0.ebuild b/media-libs/flac/flac-1.1.0.ebuild
index 3699665a5b8a..1bc1c99410ee 100644
--- a/media-libs/flac/flac-1.1.0.ebuild
+++ b/media-libs/flac/flac-1.1.0.ebuild
@@ -1,8 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.7 2003/04/25 13:45:33 vapier Exp $
-
-inherit libtool
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.8 2003/06/02 20:16:36 drobbins Exp $
DESCRIPTION="=free lossless audio encoder which includes an XMMS plugin"
SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
@@ -10,24 +8,34 @@ HOMEPAGE="http://flac.sourceforge.net/"
SLOT="0"
LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-IUSE="sse xmms"
+KEYWORDS="x86 ppc ~sparc alpha"
+IUSE="sse xmms X"
RDEPEND="virtual/glibc
media-libs/id3lib
>=media-libs/libogg-1.0_rc2
- xmms? ( media-sound/xmms )"
+ X? ( xmms? ( media-sound/xmms ) )"
+
DEPEND="${RDEPEND}
x86? ( dev-lang/nasm )
sys-apps/gawk"
-src_compile() {
- use xmms || {
+inherit libtool
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ #if X not in use, then don't build in xmms support
+ #if xmms not in use, then don't do it either.
+ #if both X and xmms in use, then do it.
+ if ! use xmms || ! use X
+ then
cp src/Makefile.in src/Makefile.in.orig
- sed -e '/^@FLaC__HAS_XMMS_TRUE/d' \
- src/Makefile.in.orig > src/Makefile.in
- }
+ sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
+ fi
+}
+src_compile() {
elibtoolize --reverse-deps
local myconf