push to stable to force users to re-emerge after jpeg-mmx header file clobbering

Package-Manager: portage-2.0.51.22-r2

2 files changed, 20 insertions, 20 deletions

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 000816ee1d1a..5e68f06b88a6 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1b6053f35791c76b3fa189755515bdbb ChangeLog 4635
 MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
 MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
-MD5 421b27c477d31be0c5a225b1abcc2ab4 jpeg-6b-r5.ebuild 1882
-MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
+MD5 b9b9844d010acd910e2f68916355b9ea jpeg-6b-r5.ebuild 1916
+MD5 1b6053f35791c76b3fa189755515bdbb ChangeLog 4635
 MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
-MD5 9a51d910e2d420741b9261e0ab1b8f47 files/jpeg-6b-freebsd.patch 410
 MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
+MD5 9a51d910e2d420741b9261e0ab1b8f47 files/jpeg-6b-freebsd.patch 410
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCqdlHj5H05b2HAEkRAhUMAKCeqHEs3fL3eqTAtmf5LWFKmJMIGACgjPai
-rjiEgG2gEyY+F1XAjrmtmgA=
-=Tsgr
+iD8DBQFDCk9YgIKl8Uu19MoRAtbtAJ4/xfBe+TklgBtwsMgb3XndUYla+QCfUOAT
+B4MSYfNhClD4YDTau5GlnkU=
+=drCc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jpeg/jpeg-6b-r5.ebuild b/media-libs/jpeg/jpeg-6b-r5.ebuild
index 562e117e3a3e..d0f83c1fb81f 100644
--- a/media-libs/jpeg/jpeg-6b-r5.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r5.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-r5.ebuild,v 1.1 2005/06/10 18:22:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r5.ebuild,v 1.2 2005/08/22 22:18:18 vapier Exp $
 
 inherit flag-o-matic libtool eutils toolchain-funcs
 
@@ -11,17 +11,17 @@ 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"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc-macos ~ppc64 s390 sh ~sparc x86"
 IUSE=""
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5.10-r4"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# make shared libraries work on G/FBSD. Need to be before the sed
 	epatch "${FILESDIR}/${P}-freebsd.patch"
@@ -30,7 +30,7 @@ src_unpack() {
 	sed -i 's/ltconfig.*/& $CHOST/' configure
 	uclibctoolize
 	use ppc-macos && darwintoolize
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
@@ -38,14 +38,14 @@ src_compile() {
 	econf --enable-shared --enable-static || die "econf failed"
 
 	if use ppc-macos; then
-		cd ${S}
+		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
+		"${S}"/Makefile || die
 
 	emake \
 		CC="$(tc-getCC)" \
@@ -57,12 +57,12 @@ src_compile() {
 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
+		prefix="${D}"/usr \
+		libdir="${D}"/usr/$(get_libdir) \
+		mandir="${D}"/usr/share/man/man1 \
+		install || die "make install"
 	insinto /usr/include
-	doins jpegint.h
+	doins jpegint.h || die "jpeg headers"
 
 	dodoc README install.doc usage.doc wizard.doc change.log \
 		libjpeg.doc example.c structure.doc filelist.doc \