Added patch to respect the $(MAKE) variable. Use the right compiler for current arch...

Package-Manager: portage-2.0.53_rc5

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 9464c0ce430a9289935364dde2b2653bbff0430f..d29848e6cc13ca82f989619384e5b02562edcfc1 100644 (file)
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2005/10/04 00:51:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.22 2005/10/10 12:24:35 flameeyes Exp $
+
+  10 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/jbigkit-1.6-respect-make.patch, jbigkit-1.6-r1.ebuild:
+  Added patch to respect the $(MAKE) variable. Use the right compiler for
+  current arch to build with newer compiler-config.
 
 *jbigkit-1.6-r1 (30 Sep 2005)
 

diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index b3186b4339413065b929c577bb4aefb00003c267..7958c67372f16efc7fa173a7bb4036894ec1b3fb 100644 (file)
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 58f928723be08c9121089af83ca4547b jbigkit-1.6-r1.ebuild 1173
-MD5 4e84e1e79ca429311ce5af75fb72c3c5 jbigkit-1.6.ebuild 1016
-MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
-MD5 faa967aa43d4525e435c13f1392ab092 ChangeLog 1903
+MD5 d9d01da2c6b20a989348d027e365d177 ChangeLog 2150
+MD5 3b69012688770808e2d9ebaf7d43533e files/digest-jbigkit-1.4 63
 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 70021e4d1632a1277102944be46039d7 files/jbigkit-1.6-respect-make.patch 916
 MD5 390efb595be40382210383e92f50b8e9 files/jbigkit-1.6-shared-lib.patch 925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQdJ0gIKl8Uu19MoRArwrAJ9mjT1t5HI06+fRuVWvcXzLOS+zTwCeI/TW
-PQ04cJphupoaDfC6hxh4PK0=
-=ZCT1
------END PGP SIGNATURE-----
+MD5 f38ae5389c51dc49e9046dc00c043403 jbigkit-1.4.ebuild 1111
+MD5 4c80f760102cb381be776b6bfe4297ad jbigkit-1.6-r1.ebuild 1301
+MD5 4e84e1e79ca429311ce5af75fb72c3c5 jbigkit-1.6.ebuild 1016

diff --git a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch
new file mode 100644 (file)
index 0000000..46d4107
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch
@@ -0,0 +1,30 @@
+Index: jbigkit/Makefile
+===================================================================
+--- jbigkit.orig/Makefile
++++ jbigkit/Makefile
+@@ -16,19 +16,19 @@ all: lib pbm
+       @echo "Enter 'make test' in order to start some automatic tests."
+ 
+ lib:
+-      (cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
++      (cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
+ 
+ pbm: lib
+-      (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
++      (cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
+ 
+ test: lib pbm
+-      (cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+-      (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
++      (cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
++      (cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+ 
+ clean:
+       rm -f *~ core
+-      (cd libjbig; make clean)
+-      (cd pbmtools; make clean)
++      (cd libjbig; $(MAKE) clean)
++      (cd pbmtools; $(MAKE) clean)
+ 
+ distribution: clean
+       rm -f libjbig/libjbig.a

diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
index 4c96dd67968f5f9b33b3ed6f35994c801e77828a..8ade6e92c695f062826ec12a82238cd0e3789b9b 100644 (file)
--- a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2005/10/04 00:51:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.5 2005/10/10 12:24:35 flameeyes Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="highly effective data compression algorithm for bi-level high-resolution images such as fax pages or scanned documents"
 HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
@@ -23,6 +23,11 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/${P}-build.patch
        epatch "${FILESDIR}"/${P}-shared-lib.patch
+       epatch "${FILESDIR}"/${P}-respect-make.patch
+}
+
+src_compile() {
+       emake CC=$(tc-getCC) || die "emake failed"
 }
 
 src_test() {