summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-03-03 22:05:21 +0000
committerJonathan Callen <abcd@gentoo.org>2011-03-03 22:05:21 +0000
commitc9b3f944414c830b489ae707399957c867a1dbd7 (patch)
tree2f823c2c103390f91b22ebe4200c1cdd4773abca /media-libs/libjpeg-turbo
parentRevbump to remove xauth_switch_to_sun-des-1 script (does not work on Gentoo) ... (diff)
downloadgentoo-2-c9b3f944414c830b489ae707399957c867a1dbd7.tar.gz
gentoo-2-c9b3f944414c830b489ae707399957c867a1dbd7.tar.bz2
gentoo-2-c9b3f944414c830b489ae707399957c867a1dbd7.zip
Add ~amd64-linux/~x86-linux keywords, fix build on prefix
(Portage version: 2.2.0_alpha23_p5/cvs/Linux i686)
Diffstat (limited to 'media-libs/libjpeg-turbo')
-rw-r--r--media-libs/libjpeg-turbo/ChangeLog5
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild10
2 files changed, 10 insertions, 5 deletions
diff --git a/media-libs/libjpeg-turbo/ChangeLog b/media-libs/libjpeg-turbo/ChangeLog
index 32e8473c1b9d..7e55af3d8616 100644
--- a/media-libs/libjpeg-turbo/ChangeLog
+++ b/media-libs/libjpeg-turbo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libjpeg-turbo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.9 2011/03/01 17:33:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.10 2011/03/03 22:05:21 abcd Exp $
+
+ 03 Mar 2011; Jonathan Callen <abcd@gentoo.org> libjpeg-turbo-1.1.0.ebuild:
+ Add ~amd64-linux/~x86-linux keywords, fix build on prefix
01 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
libjpeg-turbo-1.1.0.ebuild:
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild
index 4186354f199a..1c107114d33d 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.2 2011/03/01 17:33:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.0.ebuild,v 1.3 2011/03/03 22:05:21 abcd Exp $
-EAPI=2
+EAPI=3
inherit libtool toolchain-funcs
DESCRIPTION="MMX, SSE, and SSE2 SIMD accellerated JPEG library"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="as-is LGPL-2.1 wxWinLL-3.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="!media-libs/jpeg:0"
@@ -47,5 +47,7 @@ src_install() {
find "${D}" -name '*.la' -exec rm -f {} +
cd ../debian/extra || die
- emake DESTDIR="${D}" prefix=/usr install || die
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+ install || die
}