Revbump for EAPI=3 and fixed build patch such that the Darwin bits are actually active and correct. Transferred Prefix keywords.

Package-Manager: portage-2.2.00.15819-prefix/cvs/Darwin powerpc

4 files changed, 308 insertions, 2 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index e43fc33d61ca..b60d8f4945b4 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/jbigkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.39 2010/02/28 11:53:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.40 2010/03/15 19:55:42 grobian Exp $
+
+*jbigkit-2.0-r1 (15 Mar 2010)
+
+  15 Mar 2010; Fabian Groffen <grobian@gentoo.org> +jbigkit-2.0-r1.ebuild,
+  +files/jbigkit-2.0-r1-build.patch:
+  Revbump for EAPI=3 and fixed build patch such that the Darwin bits are
+  actually active and correct.  Transferred Prefix keywords.
 
   28 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> jbigkit-2.0.ebuild:
   Install API documentation for both jbig and jbig85.
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 6100beeaed01..102cf1128df0 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -2,9 +2,11 @@ AUX jbigkit-1.6-build.patch 852 RMD160 f8df305b083d2bde5446849e1090b31452df4ed5
 AUX jbigkit-1.6-respect-make.patch 3637 RMD160 8bff31e36ee7d84223df85f8dae063b82ca41889 SHA1 44ba623d1f0b9232cd4e27b9eaeedde294b43c92 SHA256 46f6b949a8f230691e9e1192d54d9c6777e444e315176c6920626139d6e9b2cf
 AUX jbigkit-1.6-shared-lib.patch 925 RMD160 4da212d826083def5bfa3654865a3daf948e1582 SHA1 7e588de6813bd2df1fc24b4cd1a0adda4138c1fa SHA256 e9b7b5b3fa0372a1737ede38007441e182f07e5860f7d68496424b419339e178
 AUX jbigkit-2.0-build.patch 9317 RMD160 e348468ff5ef177a4aa801d12ab4853c0b3c10a1 SHA1 80d27e9f69d2c6e7398342bcbb0d14a0aca0b7e3 SHA256 23efd425f86af4f78db1febdb078d3aa4ad9720ca9918ec531884d1d2e0512c4
+AUX jbigkit-2.0-r1-build.patch 9364 RMD160 c05157a4dd861c54f1d703338f0818456df8cfb4 SHA1 d17976f853f655768ce6f4f6805534c11864ae52 SHA256 1f8531adbf174a74bfcfabad0302c54b39c2ea5993a62cb46752d5f85e389b4a
 DIST jbigkit-1.6.tar.gz 405712 RMD160 c412bf5a665ee98026eaa4162a9d623dcf0d1b98 SHA1 f401df793d91a1cc123bbf1387d39d4f0e73b272 SHA256 d841b6d0723c1082450967f3ea500be01810a34ec4a97ad10985ae7071a6150b
 DIST jbigkit-2.0.tar.gz 435027 RMD160 4b1b8358203c2bd86e034703d666c1453c60e572 SHA1 cfb7d3121f02a74bfb229217858a0d149b6589ef SHA256 f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
 EBUILD jbigkit-1.6-r1.ebuild 1261 RMD160 742e49d3e30a563341013392963ca0e16b7ce005 SHA1 7ab71be5d9722e3cef141d0252d3c8f78511b0dd SHA256 b84166a23700573f9f3c145ca44daec4faba2ccc9505299d665bc0f57ed21058
+EBUILD jbigkit-2.0-r1.ebuild 1208 RMD160 7b184626e07cf6acc80be2408224ea2283516d3c SHA1 2ee15f60dea103de65e731d2ece7dd6e34ed3ccf SHA256 3aa682443804ecbf4f79dd148cc656404f40ee2b676962a1c56d01273b993b94
 EBUILD jbigkit-2.0.ebuild 1076 RMD160 de6fa951f9f99584999a5addc88778f0aa4ed8da SHA1 8ea725c293467e4f801fd9151d38f5ce4fb1b08a SHA256 4d71c3e76931a4a6283bab647e8dffc17101a2f05669e16d64dbeb14c8ced937
-MISC ChangeLog 4220 RMD160 93d82f4e1edbf48d94e61a17d564488a8322c07d SHA1 8739eb49ef576cab351f92672cca272e2b6f7919 SHA256 ff5e57d5600c4d15ab9ec24e41a7bb8e9ec893d8d21d6d2eaac42266a3312889
+MISC ChangeLog 4496 RMD160 e1cb9ab78ba499746bd69f4c55cf67129df4a35c SHA1 ddc9bd4025663c4c2348299257e3b60bcbc767f6 SHA256 7bd5e34641b45c6c97840c44cd2f15f626450bd95a24c1393496c1c76a48d9fa
 MISC metadata.xml 510 RMD160 2bd864aa5e2d103a298c203a323b31ae72499f5f SHA1 c61a031d4668d85cd238987f2f72b8baaba8c541 SHA256 af4ade5ef82f07702d0f0c56e1aa17f5dbcea99b055bef6558c363bc032817e1
diff --git a/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch b/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch
new file mode 100644
index 000000000000..44ad4c319825
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch
@@ -0,0 +1,255 @@
+diff -ur jbigkit.orig/libjbig/Makefile jbigkit/libjbig/Makefile
+--- jbigkit.orig/libjbig/Makefile	2008-08-30 20:20:52.000000000 +0300
++++ jbigkit/libjbig/Makefile	2010-02-28 13:12:41.000000000 +0200
+@@ -1,29 +1,55 @@
+ # Unix makefile for the JBIG-KIT library
+ # $Id: jbigkit-2.0-r1-build.patch,v 1.1 2010/03/15 19:55:43 grobian Exp $
+ 
+-# Select an ANSI/ISO C compiler here, GNU gcc is recommended
+-CC = gcc
++AR ?= ar
++CC ?= gcc
++RANLIB ?= ranlib
++
++CFLAGS += -Wall -ansi -pedantic
++
++ifeq ($(shell uname),Darwin)
++	SONAME = dylib
++	LIBDIR ?= /usr/lib
++else
++	SONAME = so
++endif
+ 
+-# Options for the compiler: A high optimization level is suggested
+-CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
+-
+-all: libjbig.a tstcodec tstcodec85
++all: libjbig.a libjbig.$(SONAME) libjbig85.a libjbig85.$(SONAME) tstcodec tstcodec85
+ 
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+-	$(CC) $(CFLAGS) -o tstcodec $+
++	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec $+
+ 
+ tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
+-	$(CC) $(CFLAGS) -o tstcodec85 $+
++	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec85 $+
+ 
+ libjbig.a: jbig.o jbig_ar.o
+ 	rm -f libjbig.a
+-	ar rc libjbig.a jbig.o jbig_ar.o
+-	-ranlib libjbig.a
++	$(AR) rc libjbig.a jbig.o jbig_ar.o
++	-$(RANLIB) libjbig.a
++
++SOBJS = jbig.lo jbig_ar.lo
++
++libjbig.so: $(SOBJS)
++	$(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS)
++
++libjbig.dylib: $(SOBJS)
++	$(CC) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $(LIBDIR)/$@ $(SOBJS)
++
++SOBJS85 = jbig85.lo jbig_ar.lo
++
++libjbig85.so: $(SOBJS85)
++	$(CC) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS85)
++
++libjbig85.dylib: $(SOBJS85)
++	$(CC) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $(LIBDIR)/$@ $(SOBJS85)
++
++%.lo: %.c jbig.h jbig85.h jbig_ar.h
++	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+ 
+ libjbig85.a: jbig85.o jbig_ar.o
+ 	rm -f libjbig85.a
+-	ar rc libjbig85.a jbig85.o jbig_ar.o
+-	-ranlib libjbig85.a
++	$(AR) rc libjbig85.a jbig85.o jbig_ar.o
++	-$(RANLIB) libjbig85.a
+ 
+ jbig.o: jbig.c jbig.h jbig_ar.h
+ jbig85.o: jbig85.c jbig85.h jbig_ar.h
+diff -ur jbigkit.orig/Makefile jbigkit/Makefile
+--- jbigkit.orig/Makefile	2008-08-30 23:40:22.000000000 +0300
++++ jbigkit/Makefile	2010-02-28 12:59:07.000000000 +0200
+@@ -1,34 +1,25 @@
+ # Unix makefile for JBIG-KIT
+ # $Id: jbigkit-2.0-r1-build.patch,v 1.1 2010/03/15 19:55:43 grobian Exp $
+ 
+-# Select an ANSI/ISO C compiler here, GNU gcc is recommended
+-CC = gcc
+-
+-# Options for the compiler: A high optimization level is suggested
+-CCFLAGS = -O2 -W
+-#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
+-
+-CFLAGS = $(CCFLAGS) -I../libjbig
+-
+ VERSION=2.0
+ 
+ all: lib pbm
+-	@echo "Enter 'make test' in order to start some automatic tests."
++	@echo "Enter '$(MAKE) test' in order to start some automatic tests."
+ 
+ lib:
+-	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
++	(cd libjbig;  $(MAKE))
+ 
+ pbm: lib
+-	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
++	(cd pbmtools; $(MAKE))
+ 
+ test: lib pbm
+-	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+-	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
++	(cd libjbig;  $(MAKE) test)
++	(cd pbmtools; $(MAKE) 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 -ur jbigkit.orig/pbmtools/Makefile jbigkit/pbmtools/Makefile
+--- jbigkit.orig/pbmtools/Makefile	2008-08-26 01:26:39.000000000 +0300
++++ jbigkit/pbmtools/Makefile	2010-02-28 13:01:19.000000000 +0200
+@@ -2,10 +2,10 @@
+ # $Id: jbigkit-2.0-r1-build.patch,v 1.1 2010/03/15 19:55:43 grobian Exp $
+ 
+ # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
+-CC = gcc
++CC ?= gcc
+ 
+ # Options for the compiler
+-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
++CFLAGS += -Wall -ansi -pedantic -I../libjbig
+ 
+ .SUFFIXES: .1 .5 .txt $(SUFFIXES)
+ 
+@@ -13,16 +13,16 @@
+ 	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+ 
+ pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
+-	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
++	$(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
+ 
+ jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
+-	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
++	$(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
+ 
+ pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
+-	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
++	$(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
+ 
+ jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
+-	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
++	$(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
+ 
+ jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
+ pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
+@@ -31,31 +31,31 @@
+ 
+ ../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig.a
++	$(MAKE) -C ../libjbig libjbig.a
+ 
+ ../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig85.a
++	$(MAKE) -C ../libjbig libjbig85.a
+ 
+ test: test82 test85
+ 
+ test82: pbmtojbg jbgtopbm
+-	make IMG=ccitt1     OPTIONSP=                      dotest1
+-	make IMG=ccitt2     OPTIONSP=                      dotest1
+-	make IMG=ccitt3     OPTIONSP=                      dotest1
+-	make IMG=xvlogo    "OPTIONSP=-d 3"                 dotest1
+-	make IMG=sandra     OPTIONSP=      OPTIONSJ=       dotest2g
+-	make IMG=sandra     OPTIONSP=-b    OPTIONSJ=-b     dotest2g
+-	make IMG=sandra     OPTIONSP=-q    OPTIONSJ=       dotest2g
+-	make IMG=sandra    "OPTIONSP=-o 0" OPTIONSJ=       dotest2g
+-	make IMG=sandra    "OPTIONSP=-o 2" OPTIONSJ=       dotest2g
+-	make IMG=multi      OPTIONSP=      OPTIONSJ=       dotest2g
+-	make IMG=multi      OPTIONSP=-b    OPTIONSJ=-b     dotest2g
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest1
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest2b
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b
+-	make IMG=mx        "OPTIONSP=-q -Y -1"             dotest2b
+-	make IMG=mx        "OPTIONSP=-Y -1"                dotest2b
++	$(MAKE) IMG=ccitt1     OPTIONSP=                      dotest1
++	$(MAKE) IMG=ccitt2     OPTIONSP=                      dotest1
++	$(MAKE) IMG=ccitt3     OPTIONSP=                      dotest1
++	$(MAKE) IMG=xvlogo    "OPTIONSP=-d 3"                 dotest1
++	$(MAKE) IMG=sandra     OPTIONSP=      OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra     OPTIONSP=-b    OPTIONSJ=-b     dotest2g
++	$(MAKE) IMG=sandra     OPTIONSP=-q    OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra    "OPTIONSP=-o 0" OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra    "OPTIONSP=-o 2" OPTIONSJ=       dotest2g
++	$(MAKE) IMG=multi      OPTIONSP=      OPTIONSJ=       dotest2g
++	$(MAKE) IMG=multi      OPTIONSP=-b    OPTIONSJ=-b     dotest2g
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest1
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-q -Y -1"             dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-Y -1"                dotest2b
+ 	rm -f test-*.jbg test-*.pbm test-*.pgm
+ 	./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg
+ 	cmp ../examples/ccitt1.jbg test-ccitt1.jbg
+@@ -91,24 +91,24 @@
+ 	cmp test-$(IMG).pgm ../examples/$(IMG).pgm
+ 
+ test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t82.pbm
+-	make IMG=t82 "OPTIONSP=-p 0"      dotest85
+-	make IMG=t82 "OPTIONSP=-p 8"      dotest85
+-	make IMG=t82 "OPTIONSP=-p 8 -r"   dotest85b
+-	make IMG=t82 "OPTIONSP=-p 64"     dotest85
+-	make IMG=t82 "OPTIONSP=-p 72"     dotest85
+-	make IMG=t82 "OPTIONSP=-s 2 -C c" dotest85
+-	make IMG=t82 "OPTIONSP=-s 99999"  dotest85
+-	make IMG=t82 "OPTIONSP=-Y 9999 0" dotest85
+-	make IMG=t82 "OPTIONSP=-Y 1951 0" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 127" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 128" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 1919" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 1920" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 1949" dotest85
+-	make IMG=t82 "OPTIONSP=-Y -1 1950" dotest85
+-	make IMG=ccitt1 dotest85
+-	make IMG=ccitt2 dotest85
+-	make IMG=ccitt3 dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-p 0"      dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-p 8"      dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-p 8 -r"   dotest85b
++	$(MAKE) IMG=t82 "OPTIONSP=-p 64"     dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-p 72"     dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-s 2 -C c" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-s 99999"  dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y 9999 0" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y 1951 0" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 127" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 128" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 1919" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 1920" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 1949" dotest85
++	$(MAKE) IMG=t82 "OPTIONSP=-Y -1 1950" dotest85
++	$(MAKE) IMG=ccitt1 dotest85
++	$(MAKE) IMG=ccitt2 dotest85
++	$(MAKE) IMG=ccitt3 dotest85
+ 	rm -f test-*.jbg test-*.jbg85 test-*.pbm
+ 	@echo
+ 	@echo "The T.85 pbmtools have PASSED the functional tests. Good!"
+@@ -142,7 +142,7 @@
+ 	./jbgtopbm $< $@
+ 
+ test-t82.pbm:
+-	make -C ../libjbig tstcodec
++	$(MAKE) -C ../libjbig tstcodec
+ 	../libjbig/tstcodec $@
+ 
+ .1.txt .5.txt:
diff --git a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
new file mode 100644
index 000000000000..470992505c55
--- /dev/null
+++ b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.1 2010/03/15 19:55:42 grobian Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="data compression algorithm for bi-level high-resolution images"
+HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
+SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r1-build.patch
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	emake LIBDIR="${EPREFIX}/usr/$(get_libdir)" || die
+}
+
+src_test() {
+	LD_LIBRARY_PATH=${S}/libjbig make test || die
+}
+
+src_install() {
+	dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85} || die
+	doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
+
+	insinto /usr/include
+	doins libjbig/*.h || die
+	dolib libjbig/libjbig{,85}{.a,$(get_libname)} || die
+
+	dodoc ANNOUNCE CHANGES TODO libjbig/*.txt
+}