summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-09-06 16:39:36 +0000
committerChristoph Junghans <ottxor@gentoo.org>2014-09-06 16:39:36 +0000
commit80be5e9d809710cac097eeecfe7aa5c53f10c931 (patch)
tree086f2a0f6a6c45572cf178ae7cd46366638a17dd /media-gfx
parentEAPI bump, minor qa (diff)
downloadgentoo-2-80be5e9d809710cac097eeecfe7aa5c53f10c931.tar.gz
gentoo-2-80be5e9d809710cac097eeecfe7aa5c53f10c931.tar.bz2
gentoo-2-80be5e9d809710cac097eeecfe7aa5c53f10c931.zip
add prefix support (bug #518974)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/exiv2/ChangeLog5
-rw-r--r--media-gfx/exiv2/exiv2-0.24.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index cf9dfb5ca3d1..ed40e2a86d59 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/exiv2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.123 2014/06/18 19:24:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.124 2014/09/06 16:39:36 ottxor Exp $
+
+ 06 Sep 2014; Christoph Junghans <ottxor@gentoo.org> exiv2-0.24.ebuild:
+ add prefix support (bug #518974)
18 Jun 2014; Michał Górny <mgorny@gentoo.org> exiv2-0.23-r2.ebuild,
exiv2-0.24.ebuild:
diff --git a/media-gfx/exiv2/exiv2-0.24.ebuild b/media-gfx/exiv2/exiv2-0.24.ebuild
index cd291ca62ff9..1ff6f6351711 100644
--- a/media-gfx/exiv2/exiv2-0.24.ebuild
+++ b/media-gfx/exiv2/exiv2-0.24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.3 2014/06/18 19:24:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.4 2014/09/06 16:39:36 ottxor Exp $
EAPI=5
AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -14,7 +14,7 @@ SRC_URI="http://www.exiv2.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE_LINGUAS="de es fi fr pl ru sk"
IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
@@ -59,7 +59,7 @@ src_prepare() {
if use contrib; then
# create build environment for contrib
ln -snf ../../src contrib/organize/exiv2
- sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
+ sed -i -e 's:/usr/local/include/.*:'"${EPREFIX}"'/usr/include:g' \
-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
contrib/organize/boost.mk || die
fi
@@ -91,6 +91,8 @@ multilib_src_configure() {
}
multilib_src_compile() {
+ # Needed for Solaris because /bin/sh is not a bash, bug #245647
+ sed -i -e "s:/bin/sh:${EPREFIX}/bin/sh:" src/Makefile || die "sed failed"
emake
if multilib_is_native_abi; then