Cleanup build system and dont filter k6 CFLAGS anymore #104953.

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 54d6f86d642f6540b74a21530ade8b9b7df3c3e4..ed7232f15783851efdb59abbc1ea26c3ef5f4cb8 100644 (file)
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2005/09/03 20:52:47 corsair Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.38 2005/09/06 06:09:02 vapier Exp $
+
+  06 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/jpeg-6b-gentoo.patch, jpeg-6b-r5.ebuild:
+  Cleanup build system and dont filter k6 CFLAGS anymore #104953.
 
   03 Sep 2005; Markus Rothe <corsair@gentoo.org> jpeg-6b-r5.ebuild:
   Stable on ppc64

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 520bec0101984494a5ca59ffa6d9e0fa2a12057e..8a6e13279396648034e4ad5ef81d65368cbe94aa 100644 (file)
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,8 +1,18 @@
-MD5 fe5fd60998c15bb78e26bcdcfeeadbe7 ChangeLog 4903
-MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
-MD5 d14b26840c34c78709e460cb9920716b jpeg-6b-r5.ebuild 1914
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 3637cbaea842b04f1aa4693a1f68e286 metadata.xml 224
-MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
+MD5 1199e263b7d91d0dcb0eefaae57acd4a jpeg-6b-r4.ebuild 1920
+MD5 8bb0265d9fcb807f80504b2615efc1a5 jpeg-6b-r5.ebuild 1595
+MD5 dc857a4d929f3de8e91a64f3e5c9cc51 ChangeLog 5068
+MD5 5db275bc0a1f7084ba8855a3210e32b2 files/jpeg-6b-gentoo.patch 1132
 MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r5 63
+MD5 232dd13c6edffa89c6ccd5f911bbac64 files/digest-jpeg-6b-r4 63
 MD5 9a51d910e2d420741b9261e0ab1b8f47 files/jpeg-6b-freebsd.patch 410
-MD5 7ad51434927f9e17f295349d9465530f files/jpeg-6b-gentoo.patch 916
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHTKzgIKl8Uu19MoRAtJRAJ4qLOb20UGYSNfVTlA0cqg7vpPINACggAyx
+uTn8MDbdjV3PcRaQuh/RNvU=
+=shdG
+-----END PGP SIGNATURE-----

diff --git a/media-libs/jpeg/files/jpeg-6b-gentoo.patch b/media-libs/jpeg/files/jpeg-6b-gentoo.patch
index d70e4653b693f0378f25c3ace9a3c32cd1591abd..11f604b53178942cb55eb2b4d9f5b1777ced9715 100644 (file)
--- a/media-libs/jpeg/files/jpeg-6b-gentoo.patch
+++ b/media-libs/jpeg/files/jpeg-6b-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur jpeg-6b.orig/configure jpeg-6b/configure
---- jpeg-6b.orig/configure     2005-01-04 15:34:08.000000000 +0100
-+++ jpeg-6b/configure  2005-01-04 15:39:10.620128760 +0100
+--- jpeg-6b/configure
++++ jpeg-6b/configure
 @@ -1529,7 +1529,7 @@
  
  if test "x$LTSHARED" != xno  -o  "x$LTSTATIC" != xno; then
@@ -10,9 +9,8 @@ diff -Naur jpeg-6b.orig/configure jpeg-6b/configure
    O="lo"
    A="la"
    LN='$(LIBTOOL) --mode=link $(CC)'
-diff -Naur jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
---- jpeg-6b.orig/ltconfig      2005-01-04 15:41:06.025584464 +0100
-+++ jpeg-6b/ltconfig   2005-01-04 15:34:08.315086112 +0100
+--- jpeg-6b/ltconfig
++++ jpeg-6b/ltconfig
 @@ -553,7 +553,7 @@
      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
      # create non-PIC objects.  So, if there were any warnings, we assume that
@@ -22,3 +20,23 @@ diff -Naur jpeg-6b.orig/ltconfig jpeg-6b/ltconfig
        echo "$ac_t"no 1>&6
        can_build_shared=no
        pic_flag=
+--- jpeg-6b/makefile.cfg
++++ jpeg-6b/makefile.cfg
+@@ -11,13 +11,13 @@
+ # Where to install the programs and man pages.
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = $(exec_prefix)/bin
+-libdir = $(exec_prefix)/lib
+-includedir = $(prefix)/include
++bindir = @bindir@
++libdir = @libdir@
++includedir = @includedir@
+ binprefix =
+ manprefix =
+ manext = 1
+-mandir = $(prefix)/man/man$(manext)
++mandir = @mandir@/man$(manext)
+ 
+ # The name of your C compiler:
+ CC= @CC@

diff --git a/media-libs/jpeg/jpeg-6b-r5.ebuild b/media-libs/jpeg/jpeg-6b-r5.ebuild
index 7fc7d3865cb06907346dd58c7d028fc12a12dd03..27d95765e9411d2b9a91ae30ec090bf2a2718567 100644 (file)
--- 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.5 2005/09/03 20:52:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r5.ebuild,v 1.6 2005/09/06 06:09:02 vapier Exp $
 
 inherit flag-o-matic libtool eutils toolchain-funcs
 
@@ -20,38 +20,28 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        unpack ${A}
-
        cd "${S}"
 
        # make shared libraries work on G/FBSD. Need to be before the sed
-       epatch "${FILESDIR}/${P}-freebsd.patch"
+       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
+       elibtoolize
        epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
-       replace-cpu-flags k6 k6-2 k6-3 i586
+       tc-export CC RANLIB
        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
+       if use ppc-macos ; then
+               sed -i \
+                       -e '/^LIBTOOL =/s:=.*:=/usr/bin/glibtool:' \
+                       Makefile || die
        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"
+       emake AR="$(tc-getAR) rc" || die "make failed"
 }
 
 src_install() {