Stable amd64, sparc, and x86.

(Portage version: 2.0.51.20-r4)

4 files changed, 7 insertions, 71 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 0ba22ae1fdc8..65a4dc1b904c 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.52 2005/04/15 18:01:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.53 2005/04/25 17:27:44 eradicator Exp $
+
+  25 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> -flac-1.1.1.ebuild,
+  flac-1.1.2.ebuild:
+  Stable amd64, sparc, and x86.
 
   15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> flac-1.1.2.ebuild:
   introduced more useflag to get more control over the resulting binaries.
diff --git a/media-libs/flac/files/digest-flac-1.1.1 b/media-libs/flac/files/digest-flac-1.1.1
deleted file mode 100644
index 7d6444dd7c34..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6ccddccf8ad344065698047c2fc7280 flac-1.1.1.tar.gz 1467204
diff --git a/media-libs/flac/flac-1.1.1.ebuild b/media-libs/flac/flac-1.1.1.ebuild
deleted file mode 100644
index c4880eebd9e6..000000000000
--- a/media-libs/flac/flac-1.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.1.ebuild,v 1.11 2005/04/08 18:55:33 corsair Exp $
-
-inherit libtool eutils flag-o-matic gcc
-
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="sse xmms"
-
-RDEPEND=">=media-libs/libogg-1.0_rc2
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if ! use xmms
-	then
-		sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die
-	fi
-
-	epatch ${FILESDIR}/${P}-m4.patch
-	epatch ${FILESDIR}/${P}-libtool.patch
-	epatch ${FILESDIR}/${P}-altivec.patch.gz
-
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	use hppa && [ "`gcc-fullversion`" == "3.4.0" ] && replace-cpu-flags 2.0 1.0
-
-	econf \
-		--with-pic \
-		`use_enable sse` \
-		|| die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# emake seems to mess up the building of the xmms input plugin
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-
-	# Keep around old lib
-	preserve_old_lib /usr/$(get_libdir)/libFLAC.so.4
-	preserve_old_lib /usr/$(get_libdir)/libFLAC++.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC.so.4
-	preserve_old_lib_notify /usr/$(get_libdir)/libFLAC++.so.2
-}
-
-# see #59482
-src_test() { :; }
diff --git a/media-libs/flac/flac-1.1.2.ebuild b/media-libs/flac/flac-1.1.2.ebuild
index c9ef8b38dd2f..309cb62e23ca 100644
--- a/media-libs/flac/flac-1.1.2.ebuild
+++ b/media-libs/flac/flac-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.7 2005/04/15 18:01:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.8 2005/04/25 17:27:44 eradicator Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos sparc x86"
 IUSE="3dnow debug doc ogg sse xmms"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )