summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLina Pezzella <j4rg0n@gentoo.org>2005-01-30 21:06:16 +0000
committerLina Pezzella <j4rg0n@gentoo.org>2005-01-30 21:06:16 +0000
commit97ad525404827537c693c66e30a164f4dfcb8d54 (patch)
treec748b7cfef948d8c546534fb404fea73ace7b0ef /media-libs/jpeg
parentadded ~amd64 to KEYWORDS. fixes #7972 (diff)
downloadhistorical-97ad525404827537c693c66e30a164f4dfcb8d54.tar.gz
historical-97ad525404827537c693c66e30a164f4dfcb8d54.tar.bz2
historical-97ad525404827537c693c66e30a164f4dfcb8d54.zip
Bug 80032 temporary fix pending baselayout bug #58106
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'media-libs/jpeg')
-rw-r--r--media-libs/jpeg/ChangeLog7
-rw-r--r--media-libs/jpeg/Manifest16
-rw-r--r--media-libs/jpeg/jpeg-6b-r4.ebuild6
3 files changed, 13 insertions, 16 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 7aedb6857ae7..d56ecaa1259b 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/jpeg
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.30 2005/01/04 18:03:21 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.31 2005/01/30 21:06:16 j4rg0n Exp $
+
+ 30 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> jpeg-6b-r4.ebuild:
+ Bug #80032 fix.
04 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+files/jpeg-6b-gentoo.patch, -files/jpeg-6b-pic.patch, jpeg-6b-r4.ebuild:
@@ -14,7 +17,7 @@
10 Nov 2004; Mike Frysinger <vapier@gentoo.org> -jpeg-6b-r3.ebuild,
+jpeg-6b-r4.ebuild:
- Install jpegint.h #64254 by Jos� Romildo Malaquias.
+ Install jpegint.h #64254 by José Romildo Malaquias.
11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> jpeg-6b-r3.ebuild:
Added darwintoolize for ppc-macos.
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index a5fcdddebf9d..2ac1db67e739 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c2bf4eb7f85551bc14b7f7b105393d2a jpeg-6b-r4.ebuild 1576
-MD5 be17cf1d57530996e2ceb92d9ca3d004 ChangeLog 4083
+MD5 baf350cb4cfd9f8defce95bd85720bf0 ChangeLog 4168
MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
-MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
+MD5 45b07fe6c62f632ebc02a2f8eb673325 jpeg-6b-r4.ebuild 1683
MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB2trzZ/iYVBmujdURAkZJAKDoPDRQb4Z6h+NjCQYrTb0DiXxoUACgsukJ
-9FaAC/LSadC4OIljshZ8s2A=
-=36oX
------END PGP SIGNATURE-----
+MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
diff --git a/media-libs/jpeg/jpeg-6b-r4.ebuild b/media-libs/jpeg/jpeg-6b-r4.ebuild
index 8f49ca80bdb7..fcdb8f879111 100644
--- a/media-libs/jpeg/jpeg-6b-r4.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r4.ebuild,v 1.4 2005/01/04 18:03:21 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r4.ebuild,v 1.5 2005/01/30 21:06:16 j4rg0n Exp $
inherit flag-o-matic libtool eutils toolchain-funcs
@@ -32,6 +32,10 @@ src_unpack() {
src_compile() {
replace-cpu-flags k6 k6-2 k6-3 i586
econf --enable-shared --enable-static || die "econf failed"
+ if use ppc-macos; then
+ cd ${S}
+ sed -i -e 's:LIBTOOL = libtool:LIBTOOL = /usr/bin/glibtool:' Makefile
+ fi
emake \
CC="$(tc-getCC)" \
AR="$(tc-getAR) rc" \