Version bump wrt security #507254 by Agostino Sarubbo

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 307 insertions, 9 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 0b1e8955a0b1..f031e3bef368 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jbigkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.66 2014/04/11 09:30:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.67 2014/04/11 10:33:43 ssuominen Exp $
+
+*jbigkit-2.1 (11 Apr 2014)
+
+  11 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/jbigkit-2.1-build.patch, +jbigkit-2.1.ebuild:
+  Version bump wrt security #507254 by Agostino Sarubbo
 
   11 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -jbigkit-2.0-r1.ebuild:
   old
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index a136f27ef317..db76498737be 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -3,18 +3,21 @@ Hash: SHA256
 
 AUX jbigkit-2.0-r1-build.patch 9364 SHA256 1f8531adbf174a74bfcfabad0302c54b39c2ea5993a62cb46752d5f85e389b4a SHA512 646a322d1c3cea2a4245ab1e99cc7b2b9c53ac3c997c76bbc99b472aabb621da5080ef113f810e29883256023115a53ac0d65a97d8aad8156deae92b939bdea7 WHIRLPOOL 490a1376fd3e4d62ad42da25d3298fc91b37b64209faa2ded2ef87358618a055001da51940d86a1a54e580e6e7bf1a13993785b300aae1116e15f09f9b266ed6
 AUX jbigkit-2.0-static-libs.patch 507 SHA256 e542dec0e97c9a7e61b57804680cc5412f4d3e1a9800119a99c6140763f9005e SHA512 8659a4b9766f4d530ac09b733a852056ef608903535f8e1eab0206ff97fbea29eed1a0518209d8f93e0c6934adf35362cb9ead0ad241e8d08c15f378e3f93fe3 WHIRLPOOL 470ad10279dce12c96895d9a1ce627193d7b16d4149f926f4c252dca7190d70bef2fe950e58c768ed37d10eb7d80b5e8f6c928e98a1a17773379f6f18fadcc61
+AUX jbigkit-2.1-build.patch 8801 SHA256 c424a3169fc745567fba4583c5bf66a3842b64caaf9f798ee22bcfccfdde037b SHA512 eb9894a8c10182bceebf49e7e035341c96b68e248538655870b124aac66c0fc68dd9128e9edce93fc72438606afa21fa79df1d46d2f92cadf36be28aa8f243fd WHIRLPOOL 49e19f9ad22e8a20bff9963c66bb089341ccd24a696006dbcfa4b5569d9092cdf1a1dd48a1eec7447081e7c8a156e3d6e96255036b66b1a5740ed290849988d8
 DIST jbigkit-2.0.tar.gz 435027 SHA256 f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee SHA512 63df9d7bb3d18b7c275525ecf06074871a473fadcf60c95fbe28deb7cfb2cc0b152231e1866b67128251facd09996d67ee2129a2540d520ee51ffe4b22c2f18f WHIRLPOOL 1857da79557c9405c533bb02890bdf9acf41df20e40f31655e5450a4272576ff07f48f9e3456f851f751c705409a615468782de2bfc128a471a9605db122b6c8
+DIST jbigkit-2.1.tar.gz 438710 SHA256 de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932 SHA512 c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf WHIRLPOOL fa904bf84d8854a8d0ced7214ce1c3c74de7441b6c612643509bd844e599685ab9380cdef3fc8d6d77b8810194d3c1c70165e4cc69ee7e177a5345d6f0cf7fcd
 EBUILD jbigkit-2.0-r2.ebuild 1497 SHA256 f29cf08c81d00c8b97936ffbb69645f1732e4c848a720360d7a5b326080979a5 SHA512 1316f8f7de9ff0eaf0c1d5ba8c0c33d553b936f2011d0af7022957328c504f47a2727a9f5bdcec83c83bd5b1a211cbd798ce358da000c5ab5d9ffe4d97a8c51e WHIRLPOOL 6388c76ddad81b28a93037b21b029fcf438625e97252f0028c0da9a52c32ab149f3263185c0913ed9c33bcbedef54fe73f88d481b5f078660032536e0132647a
-MISC ChangeLog 7786 SHA256 e09fd47049d5ceb6ee2b8eb0c7a2b0367c12ef04e437cb604562f38f675094e9 SHA512 6e8a723b5a57bd164e95e539ebd3ba9fa28ac34f7d7552f3bc5db5d485de7e059af030a54fc8dae1aaa502a38cbbf926663eef61828ef868de68a2cad407629d WHIRLPOOL 6401264b4e640230acad5fafe156089dc58c90945b19614e5dbe47bf59172faf0afad5fb29f8b80da83e4a0949f624a85e42f3d1641ba95ed8e9b5983132d77f
+EBUILD jbigkit-2.1.ebuild 1543 SHA256 5b784bdf07d20ff9cd46f632dff93745428f0a7c7fe3d6750e486d78d630fda7 SHA512 0d79a9662cab2118cad2247144352b2f6db01578cd2874a2ac6b1d088b53af542f901d49ffea6fa1d29189f25c413c4a4b33d65460e8435d724d08df34919b1b WHIRLPOOL 51d179a66acf46fda69c325a33dd1d8c2fad0f06efbd2a8b7436cbbe03b2ca43ddc8e4612db35595cadea601affff4653088e96242bc850d1c9eba22541528c9
+MISC ChangeLog 7980 SHA256 219ba219d7af3bb465b076872cdbb6917251a031c63cb0123a739c08600a48a2 SHA512 7a8f9b430bff1299e4ae19b7e81adf952de65994d1f3fb394551b2a15bbc302480a58e063fea825937164b005a531b8a9f06fe4a61d6e05a06a480e6993e2605 WHIRLPOOL 0bc7cdbc5c7d8108daced2d63be731185f02b0dea5071d436d6947cb2d8b37c66cb2c2303092705d7021c6aa956a2a8ca58d09c94d3b2fc8e6ab12185162b87f
 MISC metadata.xml 369 SHA256 3f3399c037e30dc50fdba9d473d094fb64b5013a3a3ae8bebdaa2a71949cf037 SHA512 692ae5fdfbb25139ac5dda28d28855c07e105b49f5ff44c821bb242ca2349db1c2390fc2b21557ba86bcff27d513a50aef022e1ea78d5c94ce62b6757b1150f7 WHIRLPOOL c862da460053fde291b412090af9a09d9ab93d05a4ba4b3f3840c3e420a43b93b59663eefff64571fbfaffb99d89321b5502741262a419c1550bffd11bf46b22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTR7Y+AAoJEEdUh39IaPFNfIAH/1dAMr7JT6Rrm3YlF/fjqg+5
-pXMAHc12frPbIwkz6uU1KwwdB8ykgDwsNPaqueH/7UF7Mpv7BfBygzox8q770Fbq
-1qVWQyjmvbpBDQPERJoL3co2Gr+alnOrU9SVTTzWkDirTKMgQgL03r+NWSu+IsZb
-r0HdIQEH+fQOeBxZt+XQSxrNS/Ntu9OdedZ/6Junws4U5yQlxGZQ/2zl3RNzXmUZ
-b1clK2yZRXHmMW4aw3CkiwYP1w9nBrtj5XxwLw5KBDvBcdUQdzeofIQvQFJeUB5X
-5qQa70xqIyOwhCAhRlkH6z62Lg/TkV6BnI6k/My/GqlIXjPo/jx2PfxjKMuN2G8=
-=zAAi
+iQEcBAEBCAAGBQJTR8UHAAoJEEdUh39IaPFNdNgH/jghnLcHR8A8GRq5wxqsj3HG
+Sr7cNuBaaIJTDeJ1JtcL0A1v8qgn1Q96pDNCaBjUHhAhMqMnzXE1CIT6nkmMi7c8
+LwnVQA+Pos/IufCeIfEjwKJCDc/xhHt4PaJ6Wv0Xw11eaCLf+IhXOdF48pVR3BFZ
+FiewChujVLUvFfGzLhNXVqe3wIUB0c3piOawtUU3NAFQO9n6m7fMh2RPpLceMxJB
+0IntHXJH2ZR2foqrRQbkbVKFq8YaN76rvtStl4NUZdX4u70Hp2pV4QxJ+p4itBfw
+SwsMxyA87UcAmPihwteEPqiwMV7nky6+8fzeK4vlY8K+++tD91WCnPyioIpe+9Q=
+=7Dvf
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jbigkit/files/jbigkit-2.1-build.patch b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
new file mode 100644
index 000000000000..4f65b175a2fe
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
@@ -0,0 +1,239 @@
+This patch has been mailed to upstream. No reply at this time. Status unknown.
+
+--- libjbig/Makefile
++++ libjbig/Makefile
+@@ -1,28 +1,58 @@
+ # Unix makefile for the JBIG-KIT library
+ 
+ # Select an ANSI/ISO C compiler here, GNU gcc is recommended
+-CC = gcc
++AR ?= ar
++CC ?= gcc
++RANLIB ?= ranlib
+ 
+ # Options for the compiler: A high optimization level is suggested
+-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
++CFLAGS += -W -Wall -ansi -pedantic # --coverage
+ 
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
++ifeq ($(shell uname),Darwin)
++	SONAME = dylib
++	LIBDIR ?= /usr/lib
++else
++	SONAME = so
++endif
++
++all: libjbig.$(SONAME) libjbig85.$(SONAME) tstcodec tstcodec85
++
++static: libjbig.a libjbig85.a
+ 
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+-	$(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
+ 
+ tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
+-	$(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
+ 
+ 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) $(CFLAGS) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS)
++
++libjbig.dylib: $(SOBJS)
++	$(CC) $(CFLAGS) -dynamic $(LDFLAGS) -o $@ -dynamiclib -install_name $(LIBDIR)/$@ $(SOBJS)
++
++SOBJS85 = jbig85.lo jbig_ar.lo
++
++libjbig85.so: $(SOBJS85)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ -Wl,-soname -Wl,$@ $(SOBJS85)
++
++libjbig85.dylib: $(SOBJS85)
++	$(CC) $(CFLAGS) -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
+--- Makefile
++++ Makefile
+@@ -1,10 +1,10 @@
+ # Unix makefile for JBIG-KIT
+ 
+ # Select an ANSI/ISO C compiler here, GNU gcc is recommended
+-CC = gcc
++CC ?= gcc
+ 
+ # Options for the compiler: A high optimization level is suggested
+-CFLAGS = -O2 -W -Wno-unused-result
++CFLAGS += -W -Wno-unused-result
+ # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
+ 
+ export CC CFLAGS
+@@ -36,7 +36,7 @@
+ distribution:
+ 	rm -rf jbigkit-$(VERSION)
+ 	git archive v$(VERSION) --prefix jbigkit-$(VERSION)/ | tar xvf -
+-	make -C jbigkit-$(VERSION)/pbmtools txt
++	$(MAKE) -C jbigkit-$(VERSION)/pbmtools txt
+ 	tar cvaf jbigkit-$(VERSION).tar.gz jbigkit-$(VERSION)
+ 
+ release:
+--- pbmtools/Makefile
++++ pbmtools/Makefile
+@@ -1,11 +1,11 @@
+ # Unix makefile for the JBIG-KIT PBM tools
+ 
+ # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
+-CC = gcc
++CC ?= gcc
+ 
+ # Options for the compiler
+-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
+-CPPFLAGS = -I../libjbig 
++CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
++CPPFLAGS += -I../libjbig 
+ 
+ .SUFFIXES: .1 .5 .txt $(SUFFIXES)
+ .PHONY: txt test test82 test85 clean
+@@ -15,16 +15,16 @@
+ txt: 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
+@@ -33,11 +33,11 @@
+ 
+ ../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
+ 
+ analyze:
+ 	clang $(CPPFLAGS) --analyze *.c
+@@ -45,22 +45,22 @@
+ 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
+@@ -96,24 +96,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!"
+@@ -147,7 +147,7 @@
+ 	./jbgtopbm $< $@
+ 
+ test-t82.pbm:
+-	make -C ../libjbig tstcodec
++	$(MAKE) -C ../libjbig tstcodec
+ 	../libjbig/tstcodec $@
+ 
+ FOPT=-c 1000 -p 300000 -m 3
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
new file mode 100644
index 000000000000..e28d27175d1e
--- /dev/null
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.1.ebuild,v 1.1 2014/04/11 10:33:43 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+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/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC RANLIB
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		$(multilib_build_binaries || echo lib)
+
+	if use static-libs; then
+		cd libjbig && emake static
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH=${BUILD_DIR}/libjbig emake -j1 test
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85}
+		doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
+	fi
+
+	insinto /usr/include
+	doins libjbig/*.h
+	dolib libjbig/libjbig{,85}$(get_libname)
+	use static-libs && dolib libjbig/libjbig{,85}.a
+}