summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-08-18 10:25:10 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-08-18 10:25:50 +0200
commit4f25636537c05b244257cc26da7aabd80c2b3e30 (patch)
tree29e66a015ac593a87766ae2639fefbecc9420cc8 /media-libs
parentmedia-video/flvstreamer: EAPI-7 bump (diff)
downloadgentoo-4f25636537c05b244257cc26da7aabd80c2b3e30.tar.gz
gentoo-4f25636537c05b244257cc26da7aabd80c2b3e30.tar.bz2
gentoo-4f25636537c05b244257cc26da7aabd80c2b3e30.zip
media-libs/libfishsound: EAPI-7 bump, sort deps, fix description
Thanks-to: Michael Mair-Keimberger (iamnr3) <bu9zilla@gmail.com> Closes: https://bugs.gentoo.org/663800 Closes: https://github.com/gentoo/gentoo/pull/9032
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch4
-rw-r--r--media-libs/libfishsound/libfishsound-1.0.0.ebuild20
2 files changed, 13 insertions, 11 deletions
diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
index fa417bb98ef8..fae476bf8e26 100644
--- a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
+++ b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
@@ -1,8 +1,8 @@
This will avoid including -I/usr/include/FLAC in `pkg-config --cflags fishsound` since
FLAC/assert.h will collide with system assert.h.
---- fishsound.pc.in
-+++ fishsound.pc.in
+--- a/fishsound.pc.in
++++ b/fishsound.pc.in
@@ -5,7 +5,6 @@
Name: fishsound
diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index e67184a6f17c..d5fe387728b8 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=2
-inherit eutils
+EAPI=7
-DESCRIPTION="Simple programming interface for decoding and encoding audio data using vorbis or speex"
-HOMEPAGE="http://www.xiph.org/fishsound/"
-SRC_URI="http://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
+DESCRIPTION="Simple programming interface to decode and encode audio with vorbis or speex"
+HOMEPAGE="https://www.xiph.org/fishsound/"
+SRC_URI="https://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="flac speex"
-RDEPEND="media-libs/libvorbis
+RDEPEND="
media-libs/libogg
+ media-libs/libvorbis
flac? ( media-libs/flac )
speex? ( media-libs/speex )"
DEPEND="${RDEPEND}
@@ -23,8 +23,10 @@ DEPEND="${RDEPEND}
# bug #395153
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${P}-pc.patch )
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-pc.patch
+ default
sed -i \
-e 's:doxygen:doxygen-dummy:' \
configure || die
@@ -42,6 +44,6 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" \
- docdir="${D}/usr/share/doc/${PF}" install || die
+ docdir="${D}/usr/share/doc/${PF}" install
dodoc AUTHORS ChangeLog README
}