New revision with patch for Gentoo/FreeBSD (bump to avoid adding it in stable).

(Portage version: 2.0.51.22-r1)

5 files changed, 95 insertions, 3 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 82b4dfb22758..74d7be2680d7 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2005/05/24 20:29:36 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.34 2005/06/10 18:22:10 flameeyes Exp $
+
+*jpeg-6b-r5 (10 Jun 2005)
+
+  10 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/jpeg-6b-freebsd.patch, +jpeg-6b-r5.ebuild:
+  New revision with patch for Gentoo/FreeBSD (bump to avoid adding it in stable).
 
   24 May 2005; Herbie Hopkins <herbs@gentoo.org> jpeg-6b-r4.ebuild:
   Fix libdir path in libtool file.
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index fb598025b9a6..cad42ca566ab 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,5 +1,8 @@
-MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
 MD5 e4880187b3362cf232cb38f4b38efc41 ChangeLog 4416
 MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
-MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
+MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
+MD5 d7e385396cfd327fe4b1ed6b699632bc jpeg-6b-r5.ebuild 1878
 MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
+MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
+MD5 9a51d910e2d420741b9261e0ab1b8f47 files/jpeg-6b-freebsd.patch 410
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
diff --git a/media-libs/jpeg/files/digest-jpeg-6b-r5 b/media-libs/jpeg/files/digest-jpeg-6b-r5
new file mode 100644
index 000000000000..654429e47399
--- /dev/null
+++ b/media-libs/jpeg/files/digest-jpeg-6b-r5
@@ -0,0 +1 @@
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
diff --git a/media-libs/jpeg/files/jpeg-6b-freebsd.patch b/media-libs/jpeg/files/jpeg-6b-freebsd.patch
new file mode 100644
index 000000000000..8608fa1ccc40
--- /dev/null
+++ b/media-libs/jpeg/files/jpeg-6b-freebsd.patch
@@ -0,0 +1,12 @@
+--- configure.orig	Sat Mar 21 14:08:57 1998
++++ configure	Mon Aug  4 21:49:44 2003
+@@ -1559,7 +1559,8 @@
+   if test "x$LTSTATIC" = xno; then
+     disable_static="--disable-static"
+   fi
+-  $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
++  pic_flag="-fPIC"
++  $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh
+ fi
+ 
+ # Select memory manager depending on user input.
diff --git a/media-libs/jpeg/jpeg-6b-r5.ebuild b/media-libs/jpeg/jpeg-6b-r5.ebuild
new file mode 100644
index 000000000000..562e117e3a3e
--- /dev/null
+++ b/media-libs/jpeg/jpeg-6b-r5.ebuild
@@ -0,0 +1,70 @@
+# 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-r5.ebuild,v 1.1 2005/06/10 18:22:10 flameeyes Exp $
+
+inherit flag-o-matic libtool eutils toolchain-funcs
+
+MY_P=${PN}src.v${PV}
+DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
+HOMEPAGE="http://www.ijg.org/"
+SRC_URI="ftp://ftp.uu.net/graphics/jpeg/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-1.5.10-r4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# make shared libraries work on G/FBSD. Need to be before the sed
+	epatch "${FILESDIR}/${P}-freebsd.patch"
+
+	# allow /etc/make.conf's HOST setting to apply
+	sed -i 's/ltconfig.*/& $CHOST/' configure
+	uclibctoolize
+	use ppc-macos && darwintoolize
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+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
+
+	# The configure script seems to ignore the --libdir option..
+	# set this here to fix libdir path in libtool file
+	sed -i -e "s:^libdir.*:libdir = \$(exec_prefix)/$(get_libdir):" \
+		${S}/Makefile || die
+
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR) rc" \
+		AR2="$(tc-getRANLIB)" \
+		|| die "make failed"
+}
+
+src_install() {
+	dodir /usr/{include,$(get_libdir),bin,share/man/man1}
+	make \
+		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
+		mandir=${D}/usr/share/man/man1 \
+		install || die
+	insinto /usr/include
+	doins jpegint.h
+
+	dodoc README install.doc usage.doc wizard.doc change.log \
+		libjpeg.doc example.c structure.doc filelist.doc \
+		coderules.doc
+}