summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/jpeg/ChangeLog5
-rw-r--r--media-libs/jpeg/Manifest10
-rw-r--r--media-libs/jpeg/jpeg-6b-r7.ebuild45
3 files changed, 8 insertions, 52 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index e403cfdfaba8..4c882eba606a 100644
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/jpeg
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.69 2008/07/06 22:28:16 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.70 2008/08/16 15:49:20 maekke Exp $
+
+ 16 Aug 2008; Markus Meier <maekke@gentoo.org> -jpeg-6b-r7.ebuild:
+ old
06 Jul 2008; <solar@gentoo.org> jpeg-6b-r8.ebuild:
- cross compile build fix
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 09269bff8417..5f0e8117ed47 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,17 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-DIST jpeg-6b-patches-1.4.tar.bz2 22476 RMD160 b8c5cc7383b07028c7b973305437c89d5bf66aea SHA1 535b1ca416d83efcb33084161cdedf388452599b SHA256 6f0d17a38bf582728f9e35cdeb48ce76a8c2ef8983fa4cea646afb4f4770d70a
DIST jpeg-6b-patches-1.6.tar.bz2 22573 RMD160 21290e71c116d8e543737ffd5e26b96f34e30f93 SHA1 b66629ad0380a318442be5b5b4ba945bf98035ff SHA256 23a07581f336a1e8c33f0efdb4b3ef728fe278459811b3b89258f8525dbbbcca
DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
-EBUILD jpeg-6b-r7.ebuild 1264 RMD160 51ab8814a623440313a1391f42f155f12c4dc08b SHA1 57f47269b5a0fd541c6331b44979b9531dc4eb1a SHA256 4d09fdd43ec7fd5d177744032f9a9fd86ccccc94d001fbd2195add138d572705
EBUILD jpeg-6b-r8.ebuild 1403 RMD160 4afdc4d2075bbc36b9c49e85618306cf0137e771 SHA1 c261e925d768138cd2b38cf75edae27476ab089a SHA256 f3da0a22522d50207fcc751f0560bae1a75a570fdb99818dc5a9b6642af10277
-MISC ChangeLog 8633 RMD160 136cf29c19c9a584fbf77b4343b3557cb8608e00 SHA1 80ee719836edf41d4e87a297d76e29d144accef3 SHA256 a18b31261134db6d700e9ca150ad754c85591ae198269132e5aca73c85d0caf8
+MISC ChangeLog 8709 RMD160 b1e218ce8cd27e6690d47cafa19f565af65b724f SHA1 4d52191b5851dc3176b11ec741be2f0273ad3584 SHA256 9db1bb63ad4beaac8b3b943b9dce24f1a449e3b4c3340c6b5be19aa5575df53a
MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkim6FUACgkQ67wieSYcaxc8lgCg5PKMEDKwRacZt6Mqnvw3RKzp
-6MEAnRp4LPOrmKem86Husl/xmy2nOB/s
-=rsVx
+iEYEARECAAYFAkim91IACgkQkKaRLQcq0GL1ZwCff1q2Cez5lfAyihmfbftFRf9e
+mdIAn18UG/5y4fN56kXo2xISKjmBcXtT
+=SWMB
-----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-6b-r7.ebuild b/media-libs/jpeg/jpeg-6b-r7.ebuild
deleted file mode 100644
index 426ebb962ecb..000000000000
--- a/media-libs/jpeg/jpeg-6b-r7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r7.ebuild,v 1.17 2008/05/23 16:45:26 maekke Exp $
-
-inherit libtool eutils toolchain-funcs
-
-PATCH_VER=1.4
-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 ppc64 s390 sh sparc x86 ~x86-fbsd"
-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 \
- --enable-maxmem=64 || 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
-}