old

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

5 files changed, 14 insertions, 342 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 35e5838c68ea..4b0edb95a882 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.78 2014/05/14 16:10:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.79 2014/05/14 17:23:34 ssuominen Exp $
+
+  14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/jbigkit-2.0-r1-build.patch, -files/jbigkit-2.0-static-libs.patch,
+  -jbigkit-2.0-r2.ebuild:
+  old
 
   14 May 2014; Agostino Sarubbo <ago@gentoo.org> jbigkit-2.1.ebuild:
   Stable for sparc, wrt bug #507254
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index 02672248a48c..345f94cc266a 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 EBUILD jbigkit-2.1.ebuild 1527 SHA256 269be0405f959c816243e2a154f8515c75f54a0b0489905dded6696bb7ddfbb3 SHA512 d6a0dd8cb9709cc72d8690492da8bf213546a3c68148af76f9aa35e4e7db03c29496f951bf6ec42800ce3b41d56cee98a39e41ab42cf9c4966d617094bbd1034 WHIRLPOOL 272d46e833afd16460b7d90846c491109a9af7213db66f22eff0af996b2f420eebe9303285da60d20bbc9b92a266d761c6a2f267853d1974eb7e5b16bdb2a5d7
-MISC ChangeLog 9271 SHA256 2f93e45565dd61c6de4e2a6e14b733a36852d3e4812fa7aecf14ed1f3da59b98 SHA512 37904d054400350566a72bd024639cfac0d00d3f3e1beacd1f5f7d031539a44a1830cbcd09314c84beb1fda400ccbb3bb69ab1fdf2a33bf5bb72d196f9d53877 WHIRLPOOL b78c8b68c008773d7d5d63862cc3cbe73e26d50ccefda4bed3b0f05720cb6d37f02ab17d2461adaf52476d79fe86c1f65491d98a6a3f206c6e5a484b7d01bf93
+MISC ChangeLog 9439 SHA256 a939e2d896e55d699f97bad5b6e8c58803f176d9fb30265ef6c51414184ff5d1 SHA512 9cf629f1ab001f5f5fd0afe2664d88dd8324adc6515cc8fc9939283e43f0b6134adf082fcf0eb4e99fa27b660ff1d90e15382f9c20f91bac39cb958c419df1ea WHIRLPOOL 33c1a5f5a85812347709aee44f0ba00368e001408d906090d2844325aa6cf218e7f538afe2a94431145300a524418e01bff00e92efd3e3af548f90806d56df1a
 MISC metadata.xml 369 SHA256 3f3399c037e30dc50fdba9d473d094fb64b5013a3a3ae8bebdaa2a71949cf037 SHA512 692ae5fdfbb25139ac5dda28d28855c07e105b49f5ff44c821bb242ca2349db1c2390fc2b21557ba86bcff27d513a50aef022e1ea78d5c94ce62b6757b1150f7 WHIRLPOOL c862da460053fde291b412090af9a09d9ab93d05a4ba4b3f3840c3e420a43b93b59663eefff64571fbfaffb99d89321b5502741262a419c1550bffd11bf46b22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTc5VwAAoJELp701BxlEWfLuQP+gIdf6d6isatjEBn/5mbSHzr
-qpMnDa8lniRwR07SGOomzoLxPfnnzXh9VnBvK00J3JcwFaqhzbGBAfyt/LKF4RHS
-nMdbSyWG+fbzvB45pQtM3cIjqknLu5Imj6OwlwO2WexB4wXYSJxFbNPgu+R9k0OH
-SbBlMa1yKpEE6zqeN3ggAUndP5VTJGHzrF8A2hCcynwCJrjxE16f9xJW39m4fnVc
-tMkrRP5FbdnJOTKgrrR5lbFXehMSJOmcN2ZESeqyEDl6ZjFxCl6biChplaUJ1T6T
-WVBPn9xem7kbxzr1sXwD10bF1eAzFpJW9IH2skeKVT6Xx6Jjse6FvkIvltqrbdJI
-iS8M3ID3XO8QSCypbh1o5BA8driH2IAV9chj4rFkDfMyFRds9lwcWUyNsD1iZljl
-worgna9so+/1o0spMHrP8tPm8wcG4SaDUmoKeWfRYLhSDDKxTpZF4OOmorRSSW+l
-zKUXdpua214W7HC7EWiuUEnd9nbAXG5c9bq8YZHa6twsbYwuHSxLRH8VxZP7grCB
-M/FlIhn6y6qf0EXfGLVLxnSh3fkO0/7yIai+xlQwrl0b4S/xEyMR1B7ecyqx3k+V
-z13HrDtKBn+f98vUQfMSppp59QalPVcHA0+53Kq3RXYgjW5tmpwH0dLt31SW9+f0
-8H15nEaOEHkPSX6RidJX
-=3Pyt
+iQEcBAEBCAAGBQJTc6ZYAAoJEEdUh39IaPFNh2QH/0SYPM6dOTEOAk4RMCDPEfbH
+r9IQ8CjirIbiOZtdnT4NV9JwyJo0qtPseTOgIxS3iI/HIP+XhSprge1kAkzDO4Ol
+8X6zX9NaiLsmiJtt5ER9DWytPq6f5oNiizB0rVOhIclf4f6X/zUUfMdZiJmSi9mH
+4AaZQj73Pqiyu2t1QJdD4ZRiBh+2ixqrKky5twLxkkBiwU3JfVbk6kAqcLNFzqf5
+5k6anHp9zgLIJjNORJpM2pUv56GFuJIPDOheE3XcQs1LyCzl9IxU/dUBnU2uMt2o
+zSOY+FZFY9DHmXt8OkOEp4yM5sMPyVLbJ3/h1W0hC8ENxuqru5HRxbnLjnVP3J0=
+=zOKJ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch b/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch
deleted file mode 100644
index 44ad4c319825..000000000000
--- a/media-libs/jbigkit/files/jbigkit-2.0-r1-build.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-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/files/jbigkit-2.0-static-libs.patch b/media-libs/jbigkit/files/jbigkit-2.0-static-libs.patch
deleted file mode 100644
index 1387fbe144b0..000000000000
--- a/media-libs/jbigkit/files/jbigkit-2.0-static-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN jbigkit.old/libjbig/Makefile jbigkit/libjbig/Makefile
---- jbigkit.old/libjbig/Makefile	2012-03-12 20:42:50.774142386 +0100
-+++ jbigkit/libjbig/Makefile	2012-03-12 20:43:20.147140210 +0100
-@@ -14,7 +14,9 @@
- 	SONAME = so
- endif
- 
--all: libjbig.a libjbig.$(SONAME) libjbig85.a libjbig85.$(SONAME) tstcodec tstcodec85
-+all: libjbig.$(SONAME) libjbig85.$(SONAME) tstcodec tstcodec85
-+
-+static: libjbig.a libjbig85.a
- 
- tstcodec: tstcodec.o jbig.o jbig_ar.o
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec $+
diff --git a/media-libs/jbigkit/jbigkit-2.0-r2.ebuild b/media-libs/jbigkit/jbigkit-2.0-r2.ebuild
deleted file mode 100644
index b6e8573cd026..000000000000
--- a/media-libs/jbigkit/jbigkit-2.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.0-r2.ebuild,v 1.10 2014/03/19 13:55:36 ago 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"
-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"
-
-S=${WORKDIR}/${PN}
-
-DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-r1-build.patch \
-		"${FILESDIR}"/${P}-static-libs.patch
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC RANLIB
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		$(multilib_is_native_abi || 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
-}