clean up uname garbage the OS X team thought was a good idea

Package-Manager: portage-2.0.51.22-r2

4 files changed, 13 insertions, 27 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 88f1abe71279..9464c0ce430a 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,11 +1,6 @@
 # ChangeLog for media-libs/jbigkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.20 2005/10/01 14:48:07 grobian Exp $
-
-  01 Oct 2005; Fabian Groffen <grobian@gentoo.org>
-  files/jbigkit-1.6-shared-lib.patch, jbigkit-1.6-r1.ebuild:
-  Enhancing spanky's shared lib patch to get it compiling again on OSX using
-  dylibs.
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.21 2005/10/04 00:51:44 vapier Exp $
 
 *jbigkit-1.6-r1 (30 Sep 2005)
 
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 3a5948d76f6c..b3186b433941 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad83592db497981e95509d1b20682b82 jbigkit-1.6-r1.ebuild 1209
+MD5 58f928723be08c9121089af83ca4547b jbigkit-1.6-r1.ebuild 1173
 MD5 4e84e1e79ca429311ce5af75fb72c3c5 jbigkit-1.6.ebuild 1016
 MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
-MD5 ac50fc297e6708502984fa5a3627877a ChangeLog 2104
+MD5 faa967aa43d4525e435c13f1392ab092 ChangeLog 1903
 MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6 63
 MD5 d1b93d8aefb118f3259cc9ac2a55239e files/digest-jbigkit-1.6-r1 63
 MD5 b5fa036877461225b796e1bab1fb2179 files/jbigkit-1.6-build.patch 284
 MD5 3b69012688770808e2d9ebaf7d43533e files/digest-jbigkit-1.4 63
-MD5 2ff843b8334471263691dcd0f6e7cff4 files/jbigkit-1.6-shared-lib.patch 1218
+MD5 390efb595be40382210383e92f50b8e9 files/jbigkit-1.6-shared-lib.patch 925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQc8DgIKl8Uu19MoRAmvnAJ0YwmGRtqJIk0KAGE4CsUUz/psOKACeMHim
-6AaDDqZcD9mLdVjYiKdIB14=
-=tg0j
+iD8DBQFDQdJ0gIKl8Uu19MoRArwrAJ9mjT1t5HI06+fRuVWvcXzLOS+zTwCeI/TW
+PQ04cJphupoaDfC6hxh4PK0=
+=ZCT1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
index 3e94ef8c26ef..6aa2707ddcc7 100644
--- a/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
+++ b/media-libs/jbigkit/files/jbigkit-1.6-shared-lib.patch
@@ -1,14 +1,6 @@
---- libjbig/Makefile.orig	2005-10-01 16:18:37.000000000 +0200
-+++ libjbig/Makefile	2005-10-01 16:36:16.000000000 +0200
-@@ -1,13 +1,24 @@
- # Unix makefile for the JBIG-KIT library
- # $Id: jbigkit-1.6-shared-lib.patch,v 1.2 2005/10/01 14:48:07 grobian Exp $
- 
-+include ../uname.mk
-+
- # Select an ANSI/ISO C compiler here, GNU gcc is recommended
- CC = gcc
- 
+--- libjbig/Makefile
++++ libjbig/Makefile
+@@ -1,7 +1,16 @@
  # Options for the compiler: A high optimization level is suggested
  CFLAGS = -O -Wall -ansi -pedantic
  
@@ -16,7 +8,7 @@
 +AR = ar
 +RANLIB = ranlib
 +
-+ifeq ($(UNAME),Darwin)
++ifeq ($(USERLAND),Darwin)
 +	SONAME = dylib
 +else
 +	SONAME = so
diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
index 249302718ce1..4c96dd67968f 100644
--- a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.6-r1.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/jbigkit/jbigkit-1.6-r1.ebuild,v 1.3 2005/10/04 00:37:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.4 2005/10/04 00:51:44 vapier Exp $
 
 inherit eutils multilib
 
@@ -23,11 +23,10 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-shared-lib.patch
-	echo "UNAME = `uname -s`" > uname.mk
 }
 
 src_test() {
-	LD_LIBRARY_PATH=${S}/libjbig make test || die "make test failed"
+	LD_LIBRARY_PATH="${S}"/libjbig make test || die "make test failed"
 }
 
 src_install() {