Move patches to a patchset. Add fixes from Debian, support for lossless cropping #71122, and support for exif data #38503.

(Portage version: 2.0.51.22-r2)

4 files changed, 58 insertions, 15 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 0ee90f6d2dcc..5bc10df8c294 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.39 2005/09/06 16:20:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.40 2005/09/06 22:38:51 vapier Exp $
+
+*jpeg-6b-r6 (06 Sep 2005)
+
+  06 Sep 2005; Mike Frysinger <vapier@gentoo.org> +jpeg-6b-r6.ebuild:
+  Move patches to a patchset. Add fixes from Debian, support for lossless
+  cropping #71122, and support for exif data #38503.
 
   06 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   -files/jpeg-6b-freebsd.patch, jpeg-6b-r5.ebuild:
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 26d10d7c9562..9301797307ba 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b571faff5e2b4ac29cf574de274c9ab5 ChangeLog 5237
-MD5 ba5272e072532ba855f7b375c97f2c3e jpeg-6b-r5.ebuild 1489
 MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
 MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
-MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
-MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
+MD5 c48d569e43cc279af544b1d981f3a508 jpeg-6b-r6.ebuild 1252
+MD5 ba5272e072532ba855f7b375c97f2c3e jpeg-6b-r5.ebuild 1489
+MD5 b571faff5e2b4ac29cf574de274c9ab5 ChangeLog 5237
 MD5 5db275bc0a1f7084ba8855a3210e32b2 files/jpeg-6b-gentoo.patch 1132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHcISj5H05b2HAEkRAtumAJ4j6j4ABXwmGp8Xq9NGKUVLmUqDzgCfe2CP
-aau1jC/GQPbOSASbnbcKWe0=
-=cf2Y
------END PGP SIGNATURE-----
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
+MD5 ad877b696ca2483d5eeb26e6b13e8f16 files/digest-jpeg-6b-r6 134
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
diff --git a/media-libs/jpeg/files/digest-jpeg-6b-r6 b/media-libs/jpeg/files/digest-jpeg-6b-r6
new file mode 100644
index 000000000000..36bc6e7772e8
--- /dev/null
+++ b/media-libs/jpeg/files/digest-jpeg-6b-r6
@@ -0,0 +1,2 @@
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+MD5 a13e35f335056e33f573283f4392aab3 jpeg-6b-patches-1.0.tar.bz2 21280
diff --git a/media-libs/jpeg/jpeg-6b-r6.ebuild b/media-libs/jpeg/jpeg-6b-r6.ebuild
new file mode 100644
index 000000000000..444806769c18
--- /dev/null
+++ b/media-libs/jpeg/jpeg-6b-r6.ebuild
@@ -0,0 +1,43 @@
+# 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-r6.ebuild,v 1.1 2005/09/06 22:38:51 vapier Exp $
+
+inherit libtool eutils toolchain-funcs
+
+PATCH_VER=1.0
+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/${PN}src.v${PV}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-1.5.10-r4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	elibtoolize
+}
+
+src_compile() {
+	tc-export CC RANLIB AR
+	econf --enable-shared --enable-static || die "econf failed"
+	emake || die "make failed"
+	emake -C "${WORKDIR}"/extra || die "make extra failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install"
+	make -C "${WORKDIR}"/extra install DESTDIR="${D}" || die "install extra"
+
+	dodoc README install.doc usage.doc wizard.doc change.log \
+		libjpeg.doc example.c structure.doc filelist.doc \
+		coderules.doc
+}