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

(Portage version: 2.0.51.22-r2)

3 files changed, 39 insertions, 27 deletions

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 54d6f86d642f..ed7232f15783 100644
--- 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/files/jpeg-6b-gentoo.patch b/media-libs/jpeg/files/jpeg-6b-gentoo.patch
index d70e4653b693..11f604b53178 100644
--- 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 7fc7d3865cb0..27d95765e941 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.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() {