diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-04-22 10:29:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-22 10:29:41 +0000 |
| commit | 1e5290096b536aa13c99b656367f56c71a4e8816 (patch) | |
| tree | ae055f2c92c916f7e50b9d204d590b71277fe60b /media-libs | |
| parent | Stable for amd64, wrt bug #413007 (diff) | |
| download | gentoo-2-1e5290096b536aa13c99b656367f56c71a4e8816.tar.gz gentoo-2-1e5290096b536aa13c99b656367f56c71a4e8816.tar.bz2 gentoo-2-1e5290096b536aa13c99b656367f56c71a4e8816.zip | |
Remove very old net-zope/zodb block.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/FusionSound/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild | 29 |
2 files changed, 19 insertions, 16 deletions
diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog index 7b5c6248937c..3ec349c55bed 100644 --- a/media-libs/FusionSound/ChangeLog +++ b/media-libs/FusionSound/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/FusionSound # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.18 2012/04/17 13:19:58 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.19 2012/04/22 10:29:41 ssuominen Exp $ + + 22 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> + FusionSound-1.1.1-r1.ebuild: + Remove very old net-zope/zodb block. 17 Apr 2012; Davide Pesavento <pesa@gentoo.org> +files/FusionSound-1.1.1-libav-0.8.1.patch, FusionSound-1.1.1-r1.ebuild: diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild index 307893dcefd2..0a4703427ad8 100644 --- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild +++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.11 2012/04/17 13:19:58 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.12 2012/04/22 10:29:41 ssuominen Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils DESCRIPTION="Audio sub system for multiple applications" @@ -16,40 +16,40 @@ IUSE="alsa cddb ffmpeg mad oss timidity vorbis" RDEPEND=">=dev-libs/DirectFB-${PV} alsa? ( media-libs/alsa-lib ) - timidity? ( media-libs/libtimidity - media-sound/timidity++ ) + timidity? ( + media-libs/libtimidity + media-sound/timidity++ + ) vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) - ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) - !net-zope/zodb" + ffmpeg? ( >=virtual/ffmpeg-0.6.90 )" DEPEND="${RDEPEND} dev-util/pkgconfig sys-apps/sed" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch \ + epatch \ + "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-ffmpeg.patch \ "${FILESDIR}"/${P}-ffmpeg-0.6.90.patch \ "${FILESDIR}"/${P}-ffmpeg-0.10.patch \ "${FILESDIR}"/${P}-libavformat54.patch \ "${FILESDIR}"/${P}-libav-0.8.1.patch - sed -i -e 's:-O3 -ffast-math -pipe::' configure.in \ - || die "sed failed" + sed -i -e 's:-O3 -ffast-math -pipe::' configure.in || die + AT_M4DIR="m4" eautoreconf } src_configure() { local myaudio="wave" - - use alsa && myaudio="${myaudio} alsa" - use oss && myaudio="${myaudio} oss" + use alsa && myaudio+=" alsa" + use oss && myaudio+=" oss" # Lite is used only for tests or examples. # Tremor isn't there with latest libvorbis. econf \ - --disable-dependency-tracking \ --without-lite \ --with-drivers="${myaudio}" \ --without-examples \ @@ -64,7 +64,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \ - install || die "emake install failed" + emake DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html install dodoc AUTHORS ChangeLog NEWS README TODO } |