Version bump wrt #307131, thanks to Michael C. Ferguson for reporting.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 303 insertions, 2 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index f4ca1f8198e3..51de5e3b08d7 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jbigkit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.37 2008/01/17 00:11:11 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.38 2010/02/28 11:21:40 ssuominen Exp $
+
+*jbigkit-2.0 (28 Feb 2010)
+
+  28 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +jbigkit-2.0.ebuild,
+  +files/jbigkit-2.0-build.patch:
+  Version bump wrt #307131, thanks to Michael C. Ferguson for reporting.
 
   17 Jan 2008; Markus Meier <maekke@gentoo.org> -jbigkit-1.4.ebuild,
   -jbigkit-1.6.ebuild:
diff --git a/media-libs/jbigkit/files/jbigkit-2.0-build.patch b/media-libs/jbigkit/files/jbigkit-2.0-build.patch
new file mode 100644
index 000000000000..fafb775774ae
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-2.0-build.patch
@@ -0,0 +1,254 @@
+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,54 @@
+ # Unix makefile for the JBIG-KIT library
+ # $Id: jbigkit-2.0-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen 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 ($(USERLAND),Darwin)
++	SONAME = dylib
++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 $@ $(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 $@ $(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-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen 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-build.patch,v 1.1 2010/02/28 11:21:39 ssuominen 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.ebuild b/media-libs/jbigkit/jbigkit-2.0.ebuild
new file mode 100644
index 000000000000..7762e390fc11
--- /dev/null
+++ b/media-libs/jbigkit/jbigkit-2.0.ebuild
@@ -0,0 +1,41 @@
+# 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.ebuild,v 1.1 2010/02/28 11:21:40 ssuominen Exp $
+
+EAPI=2
+inherit eutils 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/"
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	emake || 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
+}