diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2008-05-15 20:39:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2008-05-15 20:39:51 +0000 |
| commit | a5a2588442372f023c625edb8914018438c9eb11 (patch) | |
| tree | 4084aabc24ed492f0bca2744171dbf1574db21e7 /media-libs/flac | |
| parent | Fix imagemagick dep, bug 218415 (diff) | |
| download | gentoo-2-a5a2588442372f023c625edb8914018438c9eb11.tar.gz gentoo-2-a5a2588442372f023c625edb8914018438c9eb11.tar.bz2 gentoo-2-a5a2588442372f023c625edb8914018438c9eb11.zip | |
Revert commit for bug 173464, it doesn't solve the entire problem. Stop wasting time with this too long, and known to fail testsuite wrt #197122.
(Portage version: 2.1.5_rc10)
Diffstat (limited to 'media-libs/flac')
| -rw-r--r-- | media-libs/flac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/flac/flac-1.2.1-r2.ebuild | 20 |
2 files changed, 15 insertions, 11 deletions
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog index 7a6941c2e488..1bbe78c17da2 100644 --- a/media-libs/flac/ChangeLog +++ b/media-libs/flac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/flac # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.138 2008/05/12 15:23:35 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.139 2008/05/15 20:39:51 drac Exp $ + + 15 May 2008; Samuli Suominen <drac@gentoo.org> flac-1.2.1-r2.ebuild: + Revert commit for bug 173464, it doesn't solve the entire problem. Stop + wasting time with this too long, and known to fail testsuite wrt #197122. 12 May 2008; Markus Rothe <corsair@gentoo.org> flac-1.2.1-r2.ebuild: Stable on ppc64 diff --git a/media-libs/flac/flac-1.2.1-r2.ebuild b/media-libs/flac/flac-1.2.1-r2.ebuild index 1036dc9bdc0a..00479796314a 100644 --- a/media-libs/flac/flac-1.2.1-r2.ebuild +++ b/media-libs/flac/flac-1.2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.5 2008/05/12 15:23:35 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.6 2008/05/15 20:39:51 drac Exp $ EAPI=1 @@ -8,8 +8,7 @@ inherit autotools eutils DESCRIPTION="free lossless audio encoder and decoder" HOMEPAGE="http://flac.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - http://dev.gentoo.org/~drac/${P}-eautoreconf-gettext-0.17-m4.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0" @@ -22,21 +21,22 @@ DEPEND="${RDEPEND} !elibc_uclibc? ( sys-devel/gettext ) dev-util/pkgconfig" +RESTRICT="test" + src_unpack() { unpack ${A} cd "${S}" - # Stop using upstream CFLAGS. Fix building with - # ldflag asneeded on non glibc systems. Fix - # broken asm causing text relocations. - epatch "${FILESDIR}"/${P}-asneeded.patch - epatch "${FILESDIR}"/${P}-cflags.patch - epatch "${FILESDIR}"/${P}-asm.patch + # Fix building with asneeded on non-glibc systems. + # Fix text relocations. Fix {C,XX}FLAGS. + epatch "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-cflags.patch \ + "${FILESDIR}"/${P}-asm.patch # Fix build with gcc 4.3, bug #199579 epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch" - AT_M4DIR="../m4 m4" eautoreconf + AT_M4DIR="m4" eautoreconf } src_compile() { |