summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/freepv/freepv-0.3.0-r4.ebuild16
-rw-r--r--media-gfx/freepv/freepv-0.3.0-r5.ebuild4
2 files changed, 12 insertions, 8 deletions
diff --git a/media-gfx/freepv/freepv-0.3.0-r4.ebuild b/media-gfx/freepv/freepv-0.3.0-r4.ebuild
index e3ce5204516..464bdb32ea3 100644
--- a/media-gfx/freepv/freepv-0.3.0-r4.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -23,12 +23,16 @@ DEPEND="dev-libs/libxml2
x11-libs/libXxf86vm"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc44.patch
+ "${FILESDIR}"/${P}-gcc46.patch
+ "${FILESDIR}"/${P}-noplugin.patch
+ "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-stringh.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc44.patch \
- "${FILESDIR}"/${P}-gcc46.patch \
- "${FILESDIR}"/${P}-noplugin.patch \
- "${FILESDIR}"/${P}-libpng14.patch \
- "${FILESDIR}"/${P}-stringh.patch
+ cmake-utils_src_prepare
sed -i \
-e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index 412a59122a0..fb4eeffb23c 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -33,11 +33,11 @@ PATCHES=(
)
src_prepare() {
+ cmake-utils_src_prepare
+
sed -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
-i src/libfreepv/JpegReader.cpp || die
sed -e 's:^INSTALL(.*)::' \
-i src/libfreepv/CMakeLists.txt || die
-
- default
}