diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2008-05-15 20:39:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-05-15 20:39:51 +0000 |
| commit | 77924b094775e9b88821bf0ede38de607c4dc095 (patch) | |
| tree | 399cf7647fc456969baab947f41652bac7ea8c3f /media-libs | |
| parent | Fix imagemagick dep, bug 218415 (diff) | |
| download | historical-77924b094775e9b88821bf0ede38de607c4dc095.tar.gz historical-77924b094775e9b88821bf0ede38de607c4dc095.tar.bz2 historical-77924b094775e9b88821bf0ede38de607c4dc095.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.
Package-Manager: portage-2.1.5_rc10
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/flac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/flac/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/flac/flac-1.2.1-r2.ebuild | 20 |
3 files changed, 17 insertions, 14 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/Manifest b/media-libs/flac/Manifest index b123df5f8bb2..8469a5031f98 100644 --- a/media-libs/flac/Manifest +++ b/media-libs/flac/Manifest @@ -2,9 +2,8 @@ AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SH AUX flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d SHA1 a87abf76cbc9db5cf65d6282cdfcf3b5cfcd329c SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63 AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1 SHA1 5698376e901679398b6dac850d8015b1386f1983 SHA256 cc9397825c966839edcd4a30406ff3590a21c825d4e1cb043bd35145a608bc21 AUX flac-1.2.1-gcc-4.3-includes.patch 423 RMD160 d7502f5185e8b9bcefbadfa30014b91cc0446267 SHA1 7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560 SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4 -DIST flac-1.2.1-eautoreconf-gettext-0.17-m4.tar.bz2 32381 RMD160 3662e0d74c802fa7399c64d19488126f40253188 SHA1 fea97a01d4cc9885fbd52d2549be8a950837cc7e SHA256 250c2bc2d3877671a97664c1cd47e39f48c14024522b553ee89a016988f68388 DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf EBUILD flac-1.2.1-r1.ebuild 1438 RMD160 a2c6cc0c462990ebc66c208abd23dfe5c6918d2a SHA1 5d23ca787fc69d0b790de0133ff4f2ccd97e1313 SHA256 b928002d6e7e51e675a029f713d991f10af32e6c91081ebd44238c231e47da95 -EBUILD flac-1.2.1-r2.ebuild 1653 RMD160 19ef516d3fa483c4cf9f95214195bd88cbe146c1 SHA1 5ba91a63afb1ddee8969e843ce2b5a0abf380ca7 SHA256 6b15a480e87e08b0b002bd7fd012efdecb288bfca36f3cb82ec018d500bb5599 -MISC ChangeLog 19429 RMD160 8deb252e85815914ceef236c7c36c41529ea7127 SHA1 9015d4ad703de947b87970b8676d606e37c2e836 SHA256 044309af555af1185f38c28bd6179d32e65d4bbf57cc186283c2387094db8253 +EBUILD flac-1.2.1-r2.ebuild 1543 RMD160 8fb0440a7f71cb599571aaa671ae1325c3de678b SHA1 99eea839011e1b36cf3e80684bce5f9bdf7a81ff SHA256 a1497678fbf7e7bb50d3a330986fc708511f691e8aa592c5b799efce2109eef5 +MISC ChangeLog 19648 RMD160 677a5f588c311ff3efb93c6125a9fb9d2a823ad6 SHA1 cda9745efcc54fe7118fee2ec3562cd1629f6ab4 SHA256 3d9c9bdf40a64544739a2835fbe84efa9bbbb4116784d46c804573e75058df28 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b 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() { |