Sync with portage [Tue Aug 11 17:57:56 MSK 2015].

9 years ago · 729243d917
parent a5fea700eb
commit 729243d917
147 changed files with 1602 additions and 4459 deletions
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"

--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@ -1,8 +1,3 @@
-DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
-DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
-DIST llpp-17_p20140112.tar.gz 118951 SHA256 7d1ae89762054d9cb4fc06af11f766ab1c638ed230213dbcf36837b9379cc612 SHA512 38249f67a7151622833cba7e19de218f43110724ca9a304f4b80ac95661c71d01a1024fac30cf66c5013669545fb08bf320225d9463d2c31844446dc3c99de0c WHIRLPOOL c67b3e60bce82dc142624d3183144230d5a42921a203f19337f0a14942aec6fb395c57edf123b1d8127ce92c90df142b3caa11b4c14ec986aa2ad6d2fae6a383
-DIST llpp-18.tar.gz 119085 SHA256 fd87f99198c26071e898e65f9d7ee2b698a8a39768a44d740733ba935fb9fe4f SHA512 994d48fe690514078a708b9a52d94f96506693863ec0c277014fc2ab5b3aa831254a3b6e227524eb46d094bb06cfe3c51ec0f2dfe50cf83d6e97198e43e9cd1c WHIRLPOOL 51862737ca0144d09db19a46a456b808a9db9d2a78a637118dc4277170f43a287e1396d0634b9d90565de120bdf86a6b625c41e27b78f7fd534ca8504e380011
-DIST llpp-19.tar.gz 122875 SHA256 a050d78ac9e3ea7b3ae285e5c860a2e52b35c3533b3c705787350ad80992c64c SHA512 997f067fc8836869657db709255e7973b4b0510a1bf7e5daef4ede524d9f60921bbc3d19cf650b7554c88781da29898d2e014b3f0c4ed4f50a97277c2d828956 WHIRLPOOL 683df1615b31a416725f38763659c0dba7755bd64aab459842bfc48fe98130b834e0e219565e0ae699595100e0e577b94204721b7e33960c99fe6c4a6e1db672
 DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
 DIST llpp-21.tar.gz 130945 SHA256 bb846ce57269848e830d2665400df107bc23146f4004a755e16fb70d90c3a971 SHA512 8194b9806fecf3f1387aa15f6bbff65ae72df545e8e79fa9244a0c6ea58bf0b96632db11a3abec8afe315acd88c41bd11f17c3b12cf76384b398fd4401f7a909 WHIRLPOOL c24c28df50669f5d684b58d0c90b497430e644b6ef61a9642a1da80324511657fbc01356b36a10754f658ead676105e4e46f94207bd422a462d7a56cc5eb37ef
 DIST llpp-21_p20150427.tar.gz 132728 SHA256 c8f1eb8eb0f8fb2e92140be7c177be9418b7cf9641f2649e7aee82101e0f0997 SHA512 8eb3c5d21cc1ae5a1d7b6d1d28cd3f8147fba62c98456d25039c90814665afdf417bb2d3ef5eb738c2561a62454f9ce8c663444d889510609cab93deaea77e81 WHIRLPOOL 1ffe07c520393fb36801f9047aa53db8ff1c48c48885e4f1972f485470781d17673b96217ef16d4e08967f5edabe15fb20ffc1e47678ddd17ed31e53251a33eb
--- a/app-text/llpp/files/llpp-11-WM_CLASS.patch
+++ b/app-text/llpp/files/llpp-11-WM_CLASS.patch
@ -1,42 +0,0 @@
--- llpp/link.c
-+++ llpp/link.c
-@@ -2792,6 +2792,32 @@
-     CAMLreturn (Val_unit);
- }
- 
-+#if !defined (_WIN32) && !defined (__APPLE__)
-+#undef pixel
-+#include <X11/X.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <GL/glx.h>
-+
-+static void set_wm_class (void)
-+{
-+    Display *dpy;
-+    Window win;
-+    int screen;
-+    XClassHint hint;
-+
-+    dpy = XOpenDisplay (getenv ("DISPLAY"));
-+    screen = DefaultScreen (dpy);
-+    hint.res_name = "llpp";
-+    hint.res_class = "llpp";
-+    win = glXGetCurrentDrawable ();
-+    XSetClassHint (dpy, win, &hint);
-+    XCloseDisplay (dpy);
-+}
-+#else
-+#define set_wm_class()
-+#endif
-+
- CAMLprim value ml_init (value pipe_v, value params_v)
- {
-     CAMLparam2 (pipe_v, params_v);
-@@ -2852,5 +2878,6 @@
-         errx (1, "pthread_create: %s", strerror (ret));
-     }
- 
-+    set_wm_class ();
-     CAMLreturn (Val_unit);
- }
--- a/app-text/llpp/llpp-13_p20121123.ebuild
+++ b/app-text/llpp/llpp-13_p20121123.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype
-	media-libs/jbig2dec
-	media-libs/openjpeg:0
-	virtual/jpeg
-	x11-libs/libX11
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	=app-text/mupdf-1.1_p20121127
-	dev-lang/ocaml[ocamlopt]
-	dev-ml/lablgl[glut]"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	ocaml str.cma keystoml.ml < KEYS > help.ml || die
-	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
-
-	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
-	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
-	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
-	ocamlopt.opt -c -o help.cmx help.ml || die
-	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
-	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
-	ocamlopt.opt -c -o parser.cmx parser.ml || die
-	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
-	ocamlopt.opt -o llpp -I +lablGL \
-		str.cmxa unix.cmxa lablgl.cmxa link.o \
-	    -cclib "${mycclib}" help.cmx parser.cmx wsi.cmx main.cmx || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
--- a/app-text/llpp/llpp-15.ebuild
+++ b/app-text/llpp/llpp-15.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
-	media-libs/openjpeg:0[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	dev-lang/ocaml[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
-	local cmo=$(usex ocamlopt cmx cmo)
-	local cma=$(usex ocamlopt cmxa cma)
-	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
-	if use static ; then
-		local cclib=""
-		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
-		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
-			case ${slib} in
-				-lm|-ldl|-lpthread)
-					einfo "${slib}: shared"
-					cclib+="${slib} " ;;
-				*)
-					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
-					einfo "${slib}: use ${ccnew}"
-					cclib+="${ccnew} " ;;
-			esac
-		done
-	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
-	fi
-
-	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
-	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
-	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
-	verbose ${ocaml} -c -o help.${cmo} help.ml
-	verbose ${ocaml} -c -o utils.${cmo} utils.ml
-	verbose ${ocaml} -c -o wsi.cmi wsi.mli
-	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
-	verbose ${ocaml} -c -o parser.${cmo} parser.ml
-	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
-	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
-		str.${cma} unix.${cma} lablgl.${cma} link.o \
-	    -cclib "${cclib}" \
-		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
--- a/app-text/llpp/llpp-17_p20140112.ebuild
+++ b/app-text/llpp/llpp-17_p20140112.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/db515851a5cf04ecb4c06311c79ce9685324bc81.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND="~app-text/mupdf-1.3_p20140118:=[static-libs]
-	media-libs/openjpeg:2[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	dev-lang/ocaml[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
-	local cmo=$(usex ocamlopt cmx cmo)
-	local cma=$(usex ocamlopt cmxa cma)
-	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
-	if use static ; then
-		local cclib=""
-		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
-		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
-			case ${slib} in
-				-lm|-ldl|-lpthread)
-					einfo "${slib}: shared"
-					cclib+="${slib} " ;;
-				*)
-					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
-					einfo "${slib}: use ${ccnew}"
-					cclib+="${ccnew} " ;;
-			esac
-		done
-	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
-	fi
-
-	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
-	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
-	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
-	verbose ${ocaml} -c -o help.${cmo} help.ml
-	verbose ${ocaml} -c -o utils.${cmo} utils.ml
-	verbose ${ocaml} -c -o wsi.cmi wsi.mli
-	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
-	verbose ${ocaml} -c -o parser.${cmo} parser.ml
-	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
-	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
-		str.${cma} unix.${cma} lablgl.${cma} link.o \
-	    -cclib "${cclib}" \
-		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
--- a/app-text/llpp/llpp-18.ebuild
+++ b/app-text/llpp/llpp-18.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/23585c732e608b486dffd2c210dc2cab43b1d4cb.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">app-text/mupdf-1.3_p20140118:0=[static-libs]
-	media-libs/openjpeg:2[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	dev-lang/ocaml[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
-	local cmo=$(usex ocamlopt cmx cmo)
-	local cma=$(usex ocamlopt cmxa cma)
-	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
-	if use static ; then
-		local cclib=""
-		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
-		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
-			case ${slib} in
-				-lm|-ldl|-lpthread)
-					einfo "${slib}: shared"
-					cclib+="${slib} " ;;
-				*)
-					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
-					einfo "${slib}: use ${ccnew}"
-					cclib+="${ccnew} " ;;
-			esac
-		done
-	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
-	fi
-
-	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
-	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
-	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
-	verbose ${ocaml} -c -o help.${cmo} help.ml
-	verbose ${ocaml} -c -o utils.${cmo} utils.ml
-	verbose ${ocaml} -c -o wsi.cmi wsi.mli
-	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
-	verbose ${ocaml} -c -o parser.${cmo} parser.ml
-	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
-	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
-		str.${cma} unix.${cma} lablgl.${cma} link.o \
-	    -cclib "${cclib}" \
-		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
--- a/app-text/llpp/llpp-19.ebuild
+++ b/app-text/llpp/llpp-19.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/7311f1b13aaf010525c477934fe1ea49ae733625.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
-	media-libs/openjpeg:2[static-libs]
-	media-libs/fontconfig:1.0[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	dev-lang/ocaml[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
-	local cmo=$(usex ocamlopt cmx cmo)
-	local cma=$(usex ocamlopt cmxa cma)
-	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG"
-	if use static ; then
-		local cclib=""
-		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
-		ewarn ${spath}
-		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 fontconfig) -ljpeg -ljbig2dec ; do
-			case ${slib} in
-				-lm|-ldl|-lpthread)
-					einfo "${slib}: shared"
-					cclib+="${slib} " ;;
-				*)
-					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
-					einfo "${slib}: use ${ccnew}"
-					cclib+="${ccnew} " ;;
-			esac
-		done
-	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig) -lpthread"
-	fi
-
-	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
-	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
-	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
-	verbose ${ocaml} -c -o help.${cmo} help.ml
-	verbose ${ocaml} -c -o utils.${cmo} utils.ml
-	verbose ${ocaml} -c -o wsi.cmi wsi.mli
-	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
-	verbose ${ocaml} -c -o parser.${cmo} parser.ml
-	verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
-	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
-	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
-		str.${cma} unix.${cma} lablgl.${cma} link.o \
-	    -cclib "${cclib}" \
-		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 #IUSE="egl +ocamlopt static"

--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -1,7 +1,3 @@
-DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
-DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
-DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
-DIST mupdf-1.4.tar.gz 7470075 SHA256 ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e WHIRLPOOL a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
 DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
 DIST mupdf-1.6.tar.gz 8188199 SHA256 ac6f64d5c287b6549d3c26af8fa298c91697f10ebe52b122ba2c1f43e5ccfa52 SHA512 cda47ef4442bb7de15fc54b87e0e819f80c56c144318b9e953bc36c3da0bb331a10f44016bc89986c317828b7043e737a89556fc51158114b1da58cd8f7977c7 WHIRLPOOL ea14db6f43a70df144f3f70c3421ac7d2096d835fa222f0d5b9c6d64214f5c9156884b6660dda7e1fd2bee83fa9ce66ca25b2f6290ba1588fc55035ad6228413
 DIST mupdf-1.7.tar.gz 7342238 SHA256 9c79ef0ad3343f8feed8aabfaaad6ba7cbdb3e3398aa380ed505ed71086d0fbc SHA512 f4c438019285731e5c8bb6f1f9c46ae20b9fd5f720034ab40d4e31ed4b2dd9cd704c45f1b25f68d46c1ed0a9c76d16b01fb26b83aa372497f924a763f9676044 WHIRLPOOL 3674a0144fa44c618380f06cba5093016fa6f0aa37ef6cc32e582e4f0a94cedb2e320db0f42007d6096650d42cbc2cc28716adf3371f214728c01332d4120462
--- a/app-text/mupdf/files/mupdf-1.0-zoom.patch
+++ b/app-text/mupdf/files/mupdf-1.0-zoom.patch
@ -1,18 +0,0 @@
--- mupdf-9999/apps/pdfapp.c
-+++ mupdf-9999/apps/pdfapp.c
-@@ -858,6 +858,7 @@
- 		break;
- 
- 	case 'b':
-+	case '\b': //backspace
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno -= atoi(app->number);
-@@ -866,6 +867,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'F':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
--- a/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
@ -1,24 +0,0 @@
--- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
-CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
-@@ -21,9 +21,9 @@
- endif
- 
- ifeq "$(OS)" "Linux"
-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
-SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg`
-X11_LIBS := -lX11 -lXext
-+SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-+SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
-+X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
- 
- ifeq "$(OS)" "FreeBSD"
--- a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
@ -1,20 +0,0 @@
--- mupdf-1.1/debian/mupdf.desktop
-+++ mupdf-1.1/debian/mupdf.desktop
-@@ -1,8 +1,6 @@
- [Desktop Entry]
-Encoding=UTF-8
- Name=MuPDF
- GenericName=PDF file viewer
-Comment=PDF file viewer
- Exec=mupdf %f
- TryExec=mupdf
- Icon=mupdf
-@@ -10,6 +8,8 @@
- Type=Application
- MimeType=application/pdf;application/x-pdf;
- Categories=Viewer;Graphics;
-+Actions=View;
- 
- [Desktop Action View]
-+Name=View with mupdf
- Exec=mupdf %f
--- a/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-buildsystem.patch
@ -1,22 +0,0 @@
--- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
-CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
-@@ -21,8 +21,8 @@
- endif
- 
- ifeq "$(OS)" "Linux"
-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
-X11_LIBS := -lX11 -lXext
-+SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-+X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
- 
- ifeq "$(OS)" "FreeBSD"
--- a/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
+++ b/app-text/mupdf/files/mupdf-1.1_rc1-zoom-2.patch
@ -1,10 +0,0 @@
--- mupdf-9999/apps/pdfapp.c
-+++ mupdf-9999/apps/pdfapp.c
-@@ -866,6 +867,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'F':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
--- a/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
+++ b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
@ -1,13 +0,0 @@
-should be upstream, but not included here http://bugs.ghostscript.com/show_bug.cgi?id=693595#c1
-
--- mupdf-1.2-source/Makefile
-+++ mupdf-1.2-source/Makefile
-@@ -212,7 +212,7 @@
- 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
- 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
- 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
-	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
-+	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
- 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
- 
- # --- Clean and Default ---
--- a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
@ -1,17 +0,0 @@
-no pkgconfig data for jbig2dec and jpeg
-http://bugs.ghostscript.com/show_bug.cgi?id=694301
-
--- mupdf-1.2-source/debian/mupdf.pc
-+++ mupdf-1.2-source/debian/mupdf.pc
-@@ -4,9 +4,8 @@
- includedir=${prefix}/include
- 
- Name: mupdf
- Description: Library for rendering PDF documents
-Requires.private: freetype2
-+Requires: freetype2 libopenjpeg1
- Version: 0.5.0
-Libs: -L${libdir} -lmupdf
-+Libs: -L${libdir} -lfitz -ljpeg -ljbig2dec
-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
- Cflags: -I${includedir}
--- a/app-text/mupdf/files/mupdf-1.3-forward_back.patch
+++ b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
@ -1,25 +0,0 @@
-Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
-on http://bugs.ghostscript.com/show_bug.cgi?id=693494
-
--- mupdf-1.3/platform/x11/x11_main.c
-+++ mupdf-1.3/platform/x11/x11_main.c
-@@ -5,6 +5,7 @@
- #include <X11/Xatom.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
-+#include <X11/XF86keysym.h>
- 
- #include <sys/select.h>
- #include <sys/time.h>
-@@ -836,9 +837,11 @@
- 						break;
- 
- 					case XK_Page_Up:
-+					case XF86XK_Back:
- 						len = 1; buf[0] = ',';
- 						break;
- 					case XK_Page_Down:
-+					case XF86XK_Forward:
- 						len = 1; buf[0] = '.';
- 						break;
- 					}
--- a/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
+++ b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
@ -1,15 +0,0 @@
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
--- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -52,8 +52,8 @@
- 
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
--- a/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
+++ b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
@ -1,11 +0,0 @@
--- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -63,6 +63,8 @@
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
- 
- endif
- 
--- a/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch
+++ b/app-text/mupdf/files/mupdf-1.4-old-debian-files.patch
@ -1,533 +0,0 @@
--- /dev/null
-+++ platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf-select-file %f
-+TryExec=mupdf-select-file
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-+Categories=Viewer;Graphics;
-+Actions=View
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
--- /dev/null
-+++ platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires.private: freetype2
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Cflags: -I${includedir}
--- /dev/null
-+++ platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+"   c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+".  c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X  c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o  c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O  c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+"  oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT  ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#.  g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O  iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+"  Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou  "
-+};
--- a/app-text/mupdf/mupdf-1.1_p20121127.ebuild
+++ b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	>=media-libs/openjpeg-1.5:0
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		 "${FILESDIR}"/${P}-buildsystem.patch \
-		"${FILESDIR}"/${P}-desktop-integration.patch
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
-	fi
-}
-
-src_compile() {
-	use X || my_nox11="NOX11=yes MUPDF= "
-
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
-		build=debug verbose=true ${my_nox11}
-}
-
-src_install() {
-	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
-		build=debug verbose=true ${my_nox11} install
-
-	insinto /usr/include
-	doins pdf/mupdf{,-internal}.h
-	doins fitz/fitz{,-internal}.h
-	doins xps/muxps{,-internal}.h
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
-
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-	fi
-	dodoc README doc/{example.c,overview.txt}
-}
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
-
-LICENSE="AGPL-3"
-SLOT="0/1.2"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	>=media-libs/openjpeg-1.5:0[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-S=${WORKDIR}/${P}-source
-
-src_prepare() {
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch \
-		"${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch \
-		"${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch \
-		"${FILESDIR}"/${PN}-1.2-pkg-config.patch
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i debian/mupdf.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
-
-	sed -e "\$aOS = Linux" \
-		-e "\$aCC = $(tc-getCC)" \
-		-e "\$aLD = $(tc-getCC)" \
-		-e "\$aAR = $(tc-getAR)" \
-		-e "\$averbose = true" \
-		-e "\$abuild = debug" \
-		-e "\$aprefix = ${ED}usr" \
-		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
-		-i Makerules || die
-
-	if ! use X ; then
-		sed -e "\$aNOX11 = yes" \
-			-i Makerules || die
-	fi
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
-			-i "${S}"-static/Makerules || die
-		sed -e '/^LIBS +=/s:\(-lfreetype\):\1 -lbz2:' \
-			-i "${S}"-static/Makefile || die
-	fi
-
-	my_soname=libfitz.so.1.2
-	sed -e "\$a\$(FITZ_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/^FITZ_LIB :=/s:=.*:= build/debug/${my_soname}:" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/libfitz.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-	else
-		rm apps/man/mupdf.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/libfitz.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/mupdf
-	fi
-
-	insinto /usr/include
-	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
-
-	dodoc CHANGES README doc/{example.c,overview.txt}
-}
--- a/app-text/mupdf/mupdf-1.3_p20140118.ebuild
+++ b/app-text/mupdf/mupdf-1.3_p20140118.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffaa2556ced74868572dac7f5;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/1.3"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	<media-libs/openjpeg-2.1:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-src_prepare() {
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
-		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
-		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
-		"${FILESDIR}"/${PN}-1.3-forward_back.patch
-
-	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
-		-i platform/debian/${PN}.desktop || die
-
-	sed -e "\$aOS = Linux" \
-		-e "\$aCC = $(tc-getCC)" \
-		-e "\$aLD = $(tc-getCC)" \
-		-e "\$aAR = $(tc-getAR)" \
-		-e "\$averbose = true" \
-		-e "\$abuild = debug" \
-		-e "\$aprefix = ${ED}usr" \
-		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
-		-i Makerules || die
-
-	if ! use X ; then
-		sed -e "\$aNOX11 = yes" \
-			-i Makerules || die
-	fi
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.1.3
-	my_soname_js_none=libmupdf-js-none.so.1.3
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-		dobin platform/debian/${PN}-select-file
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	use X && dosym ${PN}-x11 /usr/bin/${PN}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
--- a/app-text/mupdf/mupdf-1.4-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.4-r1.ebuild
@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/1.4"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	<media-libs/openjpeg-2.1:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-src_prepare() {
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
-		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
-		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
-		"${FILESDIR}"/${PN}-1.3-forward_back.patch
-
-	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
-		-i platform/debian/${PN}.desktop || die
-
-	sed -e "\$aOS = Linux" \
-		-e "\$aCC = $(tc-getCC)" \
-		-e "\$aLD = $(tc-getCC)" \
-		-e "\$aAR = $(tc-getAR)" \
-		-e "\$averbose = yes" \
-		-e "\$abuild = debug" \
-		-e "\$aprefix = ${ED}usr" \
-		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
-		-i Makerules || die
-
-	sed -e "\$aHAVE_X11 = $(usex X yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.1.4
-	my_soname_js_none=libmupdf-js-none.so.1.4
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-		dobin platform/debian/${PN}-select-file
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	use X && dosym ${PN}-x11 /usr/bin/${PN}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.5-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbb
 LICENSE="AGPL-3"
 MY_SOVER=1.5
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla +curl +openssl static static-libs"

 LIB_DEPEND="dev-libs/openssl[static-libs?]
--- a/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
@ -21,7 +21,7 @@ REQUIRED_USE="^^ ( qt4 qt5 )

 RDEPEND="cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
-	fitz? ( app-text/mupdf:0/1.4 )
+	fitz? ( <app-text/mupdf-1.7:= )
 	postscript? ( app-text/libspectre )
 	qt4? ( dev-qt/qtcore:4[iconv]
 		dev-qt/qtgui:4
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@ -1 +1,2 @@
+DIST LMDB_0.9.15.tar.gz 130113 SHA256 a72b13db91e7c445e47194178915556b4ebcd6f9f64d48f60b1f830b0cfbd75a SHA512 c6c73661aea42679c83738afbecf9542a04ceed229f72c008b4ef406e7d9284defc652c5b070897155917c5bb2c96a4c35bde3e6423ab0f1802fb711ef1cf16a WHIRLPOOL c00fbb166467a2e7157b4ffbf10525ea8fd2987d172083b07ba52990ab7c39005be3436fe948a29f2c722bf8e4cf76009be55ff5148b0d139126c9a4703c0b28
 DIST lmdb-0.9.14.tar.gz 128170 SHA256 3b14dfe2134521cfebd98168b925f7327b9bd07c715640b79f3526e54f0ccb1f SHA512 d5bde616fb22631fe1689e2c77babfbf5098833cf313bce59a5daab1e450d2998a65f087929879e73e0a897b934ff40b8e340c79ec7b2b1c1fe7e1eea7da6267 WHIRLPOOL 0ebda52fd50d9d73bc079e6a613b2e2cdaa1032665d91e499dea9dcf1698095bfe84b03a931118baae8048c616e9bae7153972446502d368e7dc9ee33105e777
--- a/dev-db/lmdb/lmdb-0.9.15.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.15.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="http://symas.com/mdb/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+# =net-nds/openldap-2.4.40 installs lmdb files.
+RDEPEND="!=net-nds/openldap-2.4.40"
+
+S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+
+src_prepare() {
+	sed -i -e "s/^CC.*/CC = $(tc-getCC)/" \
+		-e "s/^CFLAGS.*/CFLAGS = ${CFLAGS}/" \
+		-e "s/ar rs/$(tc-getAR) rs/" \
+		-e "s:^prefix.*:prefix = /usr:" \
+		-e "s:/man/:/share/man/:" \
+		-e "/for f/s:lib:$(get_libdir):" \
+		-e "s:shared:shared -Wl,-soname,liblmdb.so.0:" \
+		"${S}/Makefile" || die
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake LDLIBS+=" -pthread"
+}
+
+src_install() {
+	mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+	default
+
+	mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
+	dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+}
--- a/dev-java/cofoja/Manifest
+++ b/dev-java/cofoja/Manifest
@ -1 +1,2 @@
 DIST cofoja-1.1_p150.tar.bz2 152190 SHA256 934a858aba9af1830b557c3ac8ad692658df1500c88a89d183b37bb5eb61ec09 SHA512 095741da4c59d4fd397f0211dd51bf84ba7080eed658d2ec0a2390b599f1bd4a0426488ea858338822c92b757b155881a26d79f596b3df7517e9f39e290b76fa WHIRLPOOL a9ef9b061c2a152143e66041e49bd0f286b0e4598113b1f41fd9dd8c9ddae050e45341a10242fa3011ea06437062e6a50e750490b4ffb75970726d0f67c27ee9
+DIST v1.2.zip 229127 SHA256 57732add36b60b6cc194b80bb878fd7616ed5cf2a3c9f1aab814f687b3564f33 SHA512 d6d73d32adaceaeb4c34600c0761f272d4917d276eb654a3e43ad368bc77eae26e9d5b90cb93f7ae073b6dad81eece129337e3c2d52daf7bb3dbc0577dcc2e7e WHIRLPOOL a3781e7e07e22b56c78ebc54754f9beae85cc0fa4d6e3396e48b716ca457c36cf7f2f51347dd661cf14cfb10880dd9aced248413e4d2b90d1e8822e985d6dbe7
--- a/dev-java/cofoja/cofoja-1.2.ebuild
+++ b/dev-java/cofoja/cofoja-1.2.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Contracts for Java"
+HOMEPAGE="https://code.google.com/p/cofoja/"
+SRC_URI="https://github.com/nhatminhle/${PN}/archive/v${PV}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="dev-java/asm:4"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="asm-4"
+JAVA_SRC_DIR="src/com/google/java/contract"
+
+# Relies on a bunch of classes in jsr308,
+# spec we don't have packaged in Gentoo.. yet.
+JAVA_RM_FILES=(
+	src/com/google/java/contract/core/apt/JavacUtils.java
+)
--- a/dev-java/cofoja/metadata.xml
+++ b/dev-java/cofoja/metadata.xml
@ -5,5 +5,8 @@
 	<upstream>
 		<remote-id type="google-code">cofoja</remote-id>
 	</upstream>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
 </pkgmetadata>
-
--- a/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
+++ b/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
@ -0,0 +1,15 @@
+--- source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java.orig	2015-08-11 10:52:11.031000000 +0000
+++ source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java	2015-08-11 10:52:39.070000000 +0000
+@@ -183,9 +183,9 @@
+                     if (status == CertificateStatus.GOOD) {
+                         return basicResponse.getEncoded();
+                     }
+-                    else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {
+-                        throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));
+-                    }
+                    //else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {
+                    //    throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));
+                    //}
+                     else {
+                         throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.unknown"));
+                     }
--- a/dev-java/itext/itext-5.5.4-r1.ebuild
+++ b/dev-java/itext/itext-5.5.4-r1.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+HOMEPAGE="http://itextpdf.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="AGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/bcmail:0
+	dev-java/bcpkix:0
+	dev-java/bcprov:1.52
+	dev-java/xml-security:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+	bcmail
+	bcpkix
+	bcprov-1.52
+	xml-security"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
+)
+
+java_prepare() {
+	mkdir source || die
+
+	for x in *-sources.jar; do
+		unzip -n ${x} -d source || die
+	done
+
+	rm -v *.jar || die
+
+	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
+	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
+	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
+	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
+
+	epatch "${PATCHES[@]}"
+}
--- a/dev-java/jflex/jflex-1.4.3-r3.ebuild
+++ b/dev-java/jflex/jflex-1.4.3-r3.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to avoid it would be to use a supplied pre-compiled .scanner file.
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.jflex.de/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/junit:0
+	dev-java/javacup:0
+	dev-java/ant-core:0"
+
+#RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? (
+		|| (
+			app-editors/vim app-editors/gvim
+		)
+	)
+	${CDEPEND}"
+
+#DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+IUSE="doc source vim-syntax"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src" || die
+
+	mkdir "${S}/tools" || die
+
+	cp "${S}/lib/JFlex.jar" "${S}/tools/JFlex.jar" || die
+	rm -rf java_cup "${S}/lib/JFlex.jar" || die
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	ANT_TASKS="javacup"
+	local jflex_cp="$(java-pkg_getjars --build-only junit):$(java-pkg_getjars ant-core,javacup)"
+	cd "${S}/src" || die
+	eant realclean || die
+	eant -Dgentoo.classpath="${jflex_cp}" jar || die
+
+	rm "${S}/tools/JFlex.jar" || die
+	cp "${S}/lib/JFlex.jar" "${S}/tools/" || die
+	rm "${S}/lib/JFlex.jar" || die
+
+	eant realclean || die
+	einfo "Recompiling using the newly generated JFlex library" || die
+	eant -Dgentoo.classpath="${jflex_cp}" jar || die
+}
+
+src_install() {
+	java-pkg_dojar lib/JFlex.jar
+	java-pkg_dolauncher "${PN}" --main JFlex.Main
+	java-pkg_register-ant-task
+
+	dodoc doc/manual.pdf doc/manual.ps.gz src/changelog
+	dohtml -r doc/*
+
+	use source && java-pkg_dosrc src/JFlex
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/jflex.vim"
+	fi
+}
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@ -1,2 +1 @@
-DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
--- a/dev-java/netty-common/files/netty-common-4.0.19-build.xml
+++ b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/15/14 7:11 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="netty-common-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="netty-common-4.0.19.Final"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="true" 
-           debug="true" 
-           optimize="true" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="1024m"
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="true" 
-           debug="true" 
-           optimize="true" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="1024m"
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*Test*.java"/>
-          <include name="**/*Benchmark*.java"/>
-          <exclude name="**/Abstract*"/>
-          <exclude name="**/TestUtil*"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/Abstract*"/>
-          <exclude name="**/TestUtil*"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="false" 
-             use="true" 
-             author="false" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="true"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
--- a/dev-java/netty-common/files/netty-common-4.0.21-build.xml
+++ b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/15/14 7:11 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="netty-common-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="netty-common-4.0.21.Final"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-  </path>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="true" 
-           debug="true" 
-           optimize="true" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="1024m"
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="true" 
-           debug="true" 
-           optimize="true" 
-           deprecation="true" 
-           target="1.6" 
-           verbose="false" 
-           fork="true" 
-           memoryInitialSize="1024m"
-           source="1.6">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/*Test*.java"/>
-          <include name="**/*Benchmark*.java"/>
-          <exclude name="**/Abstract*"/>
-          <exclude name="**/TestUtil*"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/Abstract*"/>
-          <exclude name="**/TestUtil*"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="false" 
-             use="true" 
-             author="false" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="true"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-</project>
--- a/dev-java/netty-common/netty-common-4.0.19.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.19.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/javassist:3
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
-		${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
-
-# Tests fail as they might need logging to be properly set up and/or compatible.
-#
-# junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
-# at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
-RESTRICT="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@ -6,7 +6,7 @@ EAPI="5"

 JAVA_PKG_IUSE="doc source"

-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple

 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
@ -21,32 +21,26 @@ KEYWORDS="amd64 x86"
 CDEPEND="dev-java/commons-logging:0
 	dev-java/javassist:3
 	dev-java/log4j:0
+	dev-java/slf4j-nop:0
 	dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.7
+RDEPEND=">=virtual/jre-1.6
 		${CDEPEND}"
-DEPEND=">=virtual/jdk-1.7
+DEPEND=">=virtual/jdk-1.6
 		${CDEPEND}"

 S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"

-EANT_BUILD_TARGET="package"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
+JAVA_GENTOO_CLASSPATH="
+	log4j
+	slf4j-api
+	slf4j-nop
+	javassist-3
+	commons-logging"
+
+JAVA_SRC_DIR="src/main/java"

 # Tests fail as they might need logging to be properly set up and/or compatible.
 #
 # junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
 # at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
 RESTRICT="test"
-
-java_prepare() {
-	#EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@ -1,5 +1 @@
-DIST slf4j-1.6.6.tar.gz 2703160 SHA256 d169a50fd535417bde88e342a21c1674fef0a560cbe249ff05e56b8178589b55 SHA512 bb22e3c38d451893b79f382d790eb1058465208a1ab462999894c12375ed6b38daced6389d2a8e6015cc718479bfbc50b2b58a354e99a2aadec7c9decd59423f WHIRLPOOL 1903a6513c1b7e133240c19bcf3e6c506ba3c080be66d000c7d3f382c750a8a4ad47faffe9352937bbf77e814152c58e1163b76b012d7d65ad4c3cc9bd9e290d
-DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
-DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
 DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
-DIST slf4j-api-1.5.11-sources.jar 42350 SHA256 1ab1f0772dd8b232b38fc47a2b3fb9c94c069e5f38ce943ee78601840c452b09 SHA512 ad6d8fc92b3ca6377ca8d93c2222022636644d0eab03ad72af98c7a8169f73874ab768eb80cfc07ec1ad3bcbc60fed68eee03a9e54e383b46ef530d66a46f8c0 WHIRLPOOL 579fbf56ce4d54be392b3a9929c73ac56b1828b8b0c9d309b40fe01abe46b69bb52beda54bfab4aed5578fa654b1eee055fd65139d30999280cc61a10b009e30
--- a/dev-java/slf4j-api/files/1.7.5-build.xml
+++ b/dev-java/slf4j-api/files/1.7.5-build.xml
@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-api-from-maven" default="package" basedir=".">
-
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="slf4j-api" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath" />
-	<path id="build.test.classpath"/>
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<delete dir="${maven.build.outputDir}/org/slf4j/impl" />
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-	</target>
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-					<exclude name="**/NoBindingTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-	<target name="test-junit-present">
-		<available classname="junit.framework.Test" property="junit.present" />
-	</target>
-
-	<target name="test-junit-status" depends="test-junit-present">
-		<condition property="junit.missing">
-			<and>
-				<isfalse value="${junit.present}" />
-				<isfalse value="${maven.test.skip}" />
-			</and>
-		</condition>
-		<condition property="junit.skipped">
-			<or>
-				<isfalse value="${junit.present}" />
-				<istrue value="${maven.test.skip}" />
-			</or>
-		</condition>
-	</target>
-
-	<target name="junit-missing" depends="test-junit-status" if="junit.missing">
-		<echo>=================================== WARNING ===================================</echo>
-		<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-		<echo>===============================================================================</echo>
-	</target>
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${basedir}/apidocs/" access="protected" old="false" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false" />
-	</target>
-
-	<target name="package" depends="compile,test" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" manifest="${basedir}/target/classes/META-INF/MANIFEST.MF" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-
-	<target name="jar" depends="package" description="Builds the jar for the application" />
-
-	<target name="test-offline">
-		<condition property="maven.mode.offline">
-			<equals arg1="${maven.settings.offline}" arg2="true" />
-		</condition>
-	</target>
-</project>
--- a/dev-java/slf4j-api/files/1.7.7-build.xml
+++ b/dev-java/slf4j-api/files/1.7.7-build.xml
@ -52,10 +52,10 @@
           debug="true"
           optimize="false"
           deprecation="true"
-           target="1.5"
+           target="1.6"
           verbose="false"
           fork="false"
-           source="1.5">
+           source="1.6">
      <src>
        <pathelement location="${maven.build.srcDir.0}"/>
      </src>
@ -81,10 +81,10 @@
           debug="true"
           optimize="false"
           deprecation="true"
-           target="1.5"
+           target="1.6"
           verbose="false"
           fork="false"
-           source="1.5">
+           source="1.6">
      <src>
        <pathelement location="${maven.build.testDir.0}"/>
      </src>
--- a/dev-java/slf4j-api/files/build.xml
+++ b/dev-java/slf4j-api/files/build.xml
@ -1,19 +0,0 @@
-<project name="slf4j-api" default="jar">
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}">
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="slf4j-api.jar" basedir="build">
-			<exclude name="org/slf4j/impl/**"/>
-		</jar>
-	</target>
-
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="." destdir="docs" classpath="${gentoo.classpath}"/>
-	</target>
-
-</project>
--- a/dev-java/slf4j-api/slf4j-api-1.5.11.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.5.11.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-# Extract from http://www.slf4j.org/dist/${P/-api/}.tar.gz
-SRC_URI="mirror://gentoo/${P}-sources.jar"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-}
--- a/dev-java/slf4j-api/slf4j-api-1.6.6.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.6.6.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-# Extract from http://www.slf4j.org/dist/${P/-api/}.tar.gz
-#SRC_URI="mirror://gentoo/${P}-sources.jar"
-SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}/${P/-api/}/${PN}"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
--- a/dev-java/slf4j-api/slf4j-api-1.7.5-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.5-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit4:0
-	)"
-
-S="${WORKDIR}/${P/-api/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
--- a/dev-java/slf4j-api/slf4j-api-1.7.6.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.6.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-api/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit4:0
-	)"
-
-S="${WORKDIR}/${P/-api/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"

-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip
 	test? (
 		dev-java/junit:4
@ -32,7 +32,7 @@ EANT_TEST_ANT_TASKS="ant-junit"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"

 java_prepare() {
-	cp "${FILESDIR}"/1.7.6-build.xml build.xml || die
+	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
 	find "${WORKDIR}" -iname '*.jar' -delete || die
 }

--- a/dev-java/slf4j-log4j12/Manifest
+++ b/dev-java/slf4j-log4j12/Manifest
@ -1,3 +1 @@
-DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
-DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
 DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
--- a/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
+++ b/dev-java/slf4j-log4j12/files/slf4j-log4j12-1.7.7-maven-build.xml
@ -10,12 +10,12 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/22/12 3:36 PM                       -->
+<!-- Generated by Maven Ant Plugin on 3/12/14 1:54 AM                       -->
 <!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
 <!--                                                                        -->
 <!-- ====================================================================== -->

-<project name="slf4j-api-from-maven" default="package" basedir=".">
+<project name="slf4j-log4j12-from-maven" default="package" basedir=".">

  <!-- ====================================================================== -->
  <!-- Build environment properties                                           -->
@ -24,7 +24,7 @@
  <property file="${user.home}/.m2/maven.properties"/>
  <property file="maven-build.properties"/>

-  <property name="maven.build.finalName" value="slf4j-api-1.6.6"/>
+  <property name="maven.build.finalName" value="slf4j-log4j12-1.7.7"/>
  <property name="maven.build.dir" value="target"/>
  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
  <property name="maven.build.srcDir.0" value="src/main/java"/>
@ -43,9 +43,15 @@
  <!-- Defining classpaths                                                    -->
  <!-- ====================================================================== -->

-  <path id="build.classpath"/>
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+  </path>
  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/>
+    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
  </path>

  <!-- ====================================================================== -->
@ -60,23 +66,22 @@
  <!-- Compilation target                                                     -->
  <!-- ====================================================================== -->

-  <target name="compile" depends="get-deps" description="Compile the code">
+  <target name="compile" description="Compile the code">
    <mkdir dir="${maven.build.outputDir}"/>
    <javac destdir="${maven.build.outputDir}" 
           nowarn="false" 
           debug="true" 
           optimize="false" 
           deprecation="true" 
-           target="1.3" 
+           target="1.6" 
           verbose="false" 
           fork="false" 
-           source="1.3">
+           source="1.6">
      <src>
        <pathelement location="${maven.build.srcDir.0}"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
-	<delete dir="${maven.build.outputDir}/org/slf4j/impl" />
    <copy todir="${maven.build.outputDir}">
      <fileset dir="${maven.build.resourceDir.0}"/>
    </copy>
@ -96,10 +101,10 @@
           debug="true" 
           optimize="false" 
           deprecation="true" 
-           target="1.3" 
+           target="1.6" 
           verbose="false" 
           fork="false" 
-           source="1.3">
+           source="1.6">
      <src>
        <pathelement location="${maven.build.testDir.0}"/>
      </src>
@ -108,6 +113,9 @@
        <pathelement location="${maven.build.outputDir}"/>
      </classpath>
    </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
  </target>

  <!-- ====================================================================== -->
@ -210,7 +218,7 @@
    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
         compress="true" 
         index="false" 
-         manifest="target/classes/META-INF/MANIFEST.MF" 
+         manifest="${maven.build.resourceDir.0}/META-INF/MANIFEST.MF" 
         basedir="${maven.build.outputDir}" 
         excludes="**/package.html"/>
  </target>
@ -230,17 +238,4 @@
      <equals arg1="${maven.settings.offline}" arg2="true"/>
    </condition>
  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
 </project>
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.5.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.5.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-java/log4j:0
-	~dev-java/slf4j-api-${PV}:0"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/hamcrest-core:0
-		dev-java/junit:4
-		dev-java/ant-junit4:0
-	)"
-
-S=${WORKDIR}/${P/-log4j12/}/${PN}
-
-EANT_GENTOO_CLASSPATH="log4j,slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.6.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.6.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java (SLF4J) log4j bindings"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/hamcrest-core:0
-		dev-java/junit:4
-		dev-java/ant-junit4:0
-	)"
-
-S=${WORKDIR}/${P/-log4j12/}/${PN}
-
-EANT_GENTOO_CLASSPATH="log4j,slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
-	find "${WORKDIR}" -iname '*.jar' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
@ -13,16 +13,17 @@ SRC_URI="http://www.slf4j.org/dist/${P/-log4j12/}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"

 COMMON_DEPEND="
 	dev-java/log4j:0
 	dev-java/slf4j-api:0"
+
 RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.6"
 DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.6
 	test? (
 		dev-java/hamcrest-core:0
 		dev-java/junit:4
@ -37,7 +38,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"

 java_prepare() {
-	cp "${FILESDIR}"/${PN}-1.7.6-maven-build.xml build.xml || die
+	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
 	find "${WORKDIR}" -iname '*.jar' -delete || die
 }

--- a/dev-lang/fsharp/Manifest
+++ b/dev-lang/fsharp/Manifest
@ -1 +1,2 @@
 DIST fsharp-3.1.1.31.tar.gz 31369171 SHA256 9b39c3f4625475c2553668ddbca337ec52fa3a637a05ae14a61a41abe39568b0 SHA512 fcbdad5780a5dd6ab55c380d70b8d0a38f25088e2bb49078468a2cd723b604a14bee6ba2d1005094b1f777a894208654b3f8d3876c5f72126ddc24f96e1eb049 WHIRLPOOL e9060e1e8ccfd3b0efcfeb1148cb5182390e738e8b462746e87d52acaacf5561b53cde50c920a1e4f6929ddf9f3ad0ca6a7d1e9eb8fd3b10af37a375675df019
+DIST fsharp-4.0.0.3.tar.gz 39812344 SHA256 d8a0f2e4504900d973532e1aa28c6758e8f2648898f85ef345437632b5ed1ed2 SHA512 18fae6c20290dec5a0961173875d3b57b9ca6e26d8a4147cf38631752c6feb8202d7726c2f83c30886947388bcc98bae4961f38ae0a169098a004db75e64cd26 WHIRLPOOL e267e156a80edc7d760c3266cb6fe0d5e175e843ebd9cebfa614ecb2fa3bb10f5fe6ee191e3c7bc9e082fb21ac5ce70f8791226b32d2d02313fb8b35009ba5e9
--- a/dev-lang/fsharp/fsharp-3.1.1.31.ebuild
+++ b/dev-lang/fsharp/fsharp-3.1.1.31.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $

-EAPI="5"
+EAPI=5

 AUTOTOOLS_AUTORECONF=1

--- a/dev-lang/fsharp/fsharp-4.0.0.3.ebuild
+++ b/dev-lang/fsharp/fsharp-4.0.0.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils mono-env
+
+DESCRIPTION="The F# Compiler"
+HOMEPAGE="https://github.com/fsharp/fsharp"
+SRC_URI="https://github.com/fsharp/fsharp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+MAKEOPTS+=" -j1" #nowarn
+DEPEND="dev-lang/mono"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_install() {
+	autotools-utils_src_install
+}
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@ -1,6 +1,3 @@
 DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
-DIST ntl-6.0.0.tar.gz 714741 SHA256 9342fa7d83a0ee6748ebae683368250eff06b19d7df5dfb85bcba8a896c0a29b SHA512 fa1f1745e75c7588ca5af437648ab0844281f5c6e6a22a3bcaf0409792f3d4c70f0b8050823d90d19673ebcecae18ce6d39e6c9b1fec9f2d79f87b788b58d261 WHIRLPOOL ba8d7355639d54c6b95b66f648330876a892223c2232ddd5dd7097c53b783f01a26c5da01e72c6ad4527c3829b3c9e7123b58e63ecb8d22b4940f71a9b8a422d
 DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
-DIST ntl-8.1.2.tar.gz 865458 SHA256 35c71d63786a7d7aa60e70c838e662da771ff14c98d643213baeda09bcbbfab5 SHA512 40a3e9f49c8b0f654668ac2bbd4dc18824ede22841ab6c809886a4abbf2d0ce9e7e544be62cc705c31c452cac0e29be9f93345fcf4bb6554badcf17134c32f69 WHIRLPOOL 88d675cfc7153abce8bf409236eea86dcc9e649bf0028b5265f033316db399339a01196274379eb16793bbe538f4fb4a80af2f4ce50b18416eb52058fb75e543
-DIST ntl-9.0.2.tar.gz 872258 SHA256 9b961b5fef294784bd4ece994a8a623c90ae9f01231b269c390d44bb4be5e346 SHA512 c720b8e8d36e078e8d4f6f053bccc352758bac71ef868579482f4c847084cb4498b62e40a43de1bd7bcc2357a58f728fa092caef6019ec98f24853046549ba00 WHIRLPOOL b7cd955b7cd52252f1978aa85600105a21b3ecdc133b6af87ed171271f0a9c3144efa33325c2f1706efe059f0de4b198d713b69807314547e5c7f043bfa87294
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99
--- a/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch
+++ b/dev-libs/ntl/files/ntl-8.1.2-sanitize-makefile.patch
@ -1,158 +0,0 @@
-diff -U 3 -dHrN ntl-8.1.2/src/DoConfig ntl-8.1.2-shared/src/DoConfig
--- ntl-8.1.2/src/DoConfig	2015-01-31 14:07:38.000000000 +0100
-+++ ntl-8.1.2-shared/src/DoConfig	2015-03-26 10:23:41.117816775 +0100
-@@ -21,14 +21,16 @@
- 
- 'LDFLAGS'     => '',
- 'LDLIBS'      => '-lm',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
-'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-diff -U 3 -dHrN ntl-8.1.2/src/mfile ntl-8.1.2-shared/src/mfile
--- ntl-8.1.2/src/mfile	2015-01-31 14:07:38.000000000 +0100
-+++ ntl-8.1.2-shared/src/mfile	2015-03-26 10:56:50.277826975 +0100
-@@ -109,6 +109,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -141,6 +151,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -313,6 +325,8 @@
- 
- LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
- 
-+.SUFFIXES: .lo
-+
- 
- 
- # 'make all' does a complete make, including all setup.
-@@ -321,11 +335,11 @@
- # again.
- 
- all:
-	make setup1
-	make setup2
-	make setup3
-	make setup4
-	make ntl.a
-+	${MAKE} setup1
-+	${MAKE} setup2
-+	${MAKE} setup3
-+	${MAKE} setup4
-+	${MAKE} ntl.a
- 	touch all
- 
- 
-@@ -369,21 +383,34 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h 
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
- 
-GetTime.o: GetTime.c 
-+GetTime.o: GetTime.c
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
-+
- GetPID.o: GetPID.c 
- 	$(LCOMP) $(COMPILE) GetPID.c
- 
-
-+GetPID.lo: GetPID.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
- @{LSHAR}	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
-@@ -397,7 +424,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
-	make QuickTest
-+	${MAKE} QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -454,19 +481,18 @@
- #
- #################################################################
- 
-clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c GetPID.c
- 	rm -f ../include/NTL/gmp_aux.h
-	sh RemoveProg $(PROGS) MakeDesc TestGetTime TestGetPID gen_gmp_aux
-	rm -f *.o
-	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime TestGetPID gen_gmp_aux
-	rm -f *.o 
-+	rm -f *.o *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -551,4 +577,11 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	  $(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	  ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	     $(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	     ln -s lib`cat DIRNAME`.dylib libntl.dylib
- 
--- a/dev-libs/ntl/ntl-6.0.0.ebuild
+++ b/dev-libs/ntl/ntl-6.0.0.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/gf2x:0="
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	# implement a call back framework (submitted upstream)
-	# sanitize the makefile and allow the building of shared library
-	epatch \
-		"${FILESDIR}"/${PN}-6.0.0-singular.patch \
-		"${FILESDIR}"/${PN}-6.0.0-sage-tools.patch \
-		"${FILESDIR}"/${PN}-5.5.2-shared.patch
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2
-	emake setup3
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg}
-}
-
-src_install() {
-	dolib.so lib*$(get_libname)
-	use static-libs && newlib.a ntl.a libntl.a
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt
-		dohtml doc/*
-	fi
-}
--- a/dev-libs/ntl/ntl-8.1.2.ebuild
+++ b/dev-libs/ntl/ntl-8.1.2.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-8.1.2-sanitize-makefile.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
--- a/dev-libs/ntl/ntl-9.0.2.ebuild
+++ b/dev-libs/ntl/ntl-9.0.2.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-8.1.2-sanitize-makefile.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@ -1,2 +1,3 @@
 DIST pyaml-14.05.7.tar.gz 7401 SHA256 8c1edf635edc0658d9f6cd222f175e35aecaaef1cad432b188206b71a9cdbd30 SHA512 4a977de705a85341ff817b51e29facea6029c0082cdc0d9b212748d6992a1be3c461d59a5a41f131a14c0cfc0b6db3aad9091e0ff86c05da70974fd3651eaea9 WHIRLPOOL ed5fe07b7dd686a8d460841bfcbbb326d833124f0078a7aa70a80ddd3c85fcc245d9808a2aa19676636fea3d299be986fefead3022d96f846e6a9571ae67024f
 DIST pyaml-15.5.7.tar.gz 14374 SHA256 85c44970d9bca68742faef77cb10a16d4a81be81281541c8d39c10f504042bc6 SHA512 c92250bba3bfded1a4d047940098b532989f9fe020d1e7ccdd45779260e1114c8720d9ef4d98de0abfa699807d9377e29e9ad9c979dd086456eade0fecf6f0ae WHIRLPOOL e7cb76e586f32eebb8cb56af949925030dabc81e5f2f7b1a575980b49ab020968c393739deb6b69afb98f2c4b3ef21601a43166b7ce092c1e88aa3e2e95758cf
+DIST pyaml-15.6.3.tar.gz 14459 SHA256 2df761472d0974205b779dab469903cc9ddf257dcd126acc4a97b9d4c970e662 SHA512 9d0789342f59adfc415bef54cdc52b75cbcf1fa71940e1b9534ea0c141c5737449104e45fb0feea968e58d0886a74d9a5bbec0ba05b7d72cf5d93d3a674b5868 WHIRLPOOL 7c2e06dedf40c7c13474824090bf1f5a0453d2d955d446053479be93388c55b30480dc41eaec32a31a2303ae1971de5902922776a48c6d54cdb107a2356a1786
--- a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN//retty-}"
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unidecode[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" pyaml/tests/dump.py || die "tests failed under ${EPYTHON}"
+}
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@ -1,6 +1,4 @@
 DIST psutil-1.2.1.tar.gz 167397 SHA256 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 SHA512 9faec6c4139f677252b30f4a8793484658d888535428dfb4e316821bb5f246e1832baedd8704279a7e0da7096d539f1a8dcd49f2d61d943f9299e9204ff47d81 WHIRLPOOL e6b13df0c6f70e5d92a88bd540ad2e2f4d670463e1ec815a3eb3b6b009715dd7c0a96b73a03c5819fb3eb3b30f63a1299d6668ffef992a408d8d1b78d33dea43
 DIST psutil-2.1.3.tar.gz 224008 SHA256 b434c75f01715777391f10f456002e33d0ca14633f96fdbd9ff9139b42d9452c SHA512 12a566c2c53897d858bd75455da8f52d9d9279e28dc0df40594275626f75da716d82c8f67d1fc37df4bd3bc05fef401391cb6c52380c819d1e82fb4edd11f843 WHIRLPOOL 75c8475fc55c5a04858ba8acba0e57f9daa06aed6badf68b484d5ff0dc9c6e52066472bb78350113c1ebe755baf4ab205e347cbb5b2bac3eb4857a2fe0dd8f3f
-DIST psutil-2.2.0.tar.gz 223676 SHA256 b15cc9e7cad0991bd1cb806fa90ea85ba3a95d0f1226625ecef993294ad61521 SHA512 5ea2f0eb2c952314b5683f92582deb2fd7da01a285f984870c64b78dba5c33b6b2f97d5c0e3a05d16fbeb921e22a1e2d165145767205ef4fa76fc424a382c50d WHIRLPOOL e938eec8e2863a52e85eebf2574ea16d984fa06fce31add930c5708c4e2c7d50e9a0f3cb2b2e36201a10a76aa1c10ae2851e2423c69efa668003d171769514cd
-DIST psutil-2.2.1.tar.gz 223688 SHA256 a0e9b96f1946975064724e242ac159f3260db24ffa591c3da0a355361a3a337f SHA512 aa49dfdab8497ce3064465a35d8a99115e269f8b01af61379c35b68fbc31cca31f2a639c44f6cdf5dcf12f161355285e0e6ce2663ef46d43852dc6b3fda389aa WHIRLPOOL fa8f27af83661f22121fc6cfa9306e31d2dd2c32c800393d7f0b3d70342f6d741a3a38d6d904bf817437fd9ba80107940ea0cc193612980177c0c3bc7c1bb068
 DIST psutil-3.0.1.tar.gz 241539 SHA256 3f213b9ceed3c3068a973e04d7a8b2a29d1076abcb5ef45382517bfc6b808801 SHA512 38ea65bd91ab2cb6caa88362840d84ad5042fff037ad7b2ff1505e6a014135bd219caea9b48cdb9b5d952eeccc145ee84029f446fbc709c39dc3cc6bd8974846 WHIRLPOOL a536f08c173b606f1e78c27dd8786d469d4dae1ca5e43f997b2c1e74fa129b391d2d2e345f43da0f1a80f1bbd474eb515b62adc60aa78eea9e1b69bfe2ec2edf
 DIST psutil-3.1.1.tar.gz 247284 SHA256 d3290bd4a027fa0b3a2e2ee87728056fe49d4112640e2b8c2ea4dd94ba0cf057 SHA512 13393ae083f6881a3e9ac84c0778c622d9a484aeab39705200f9a36386adc2f5a4236db72e1de68aadd90204982ef43ee00c0f3ac61d23fc532d92ab6914d830 WHIRLPOOL f035e7d7de5712e39349806e758afa9d45b7c683b4e3bd9390279900749e3da452df02118ff9a6a047a7c16333d68c6d081dafae0782092b329bc832dd646c97
--- a/dev-python/psutil/psutil-2.2.0.ebuild
+++ b/dev-python/psutil/psutil-2.2.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/psutil/psutil-2.2.1.ebuild
+++ b/dev-python/psutil/psutil-2.2.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
--- a/games-engines/renpy/files/renpy-6.99.5-multiple-abi.patch
+++ b/games-engines/renpy/files/renpy-6.99.5-multiple-abi.patch
@ -0,0 +1,302 @@
+From 9f318ab1a173bc3527c72f2ce9073d4b711559f4 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sat, 4 Apr 2015 13:13:18 +0200
+Subject: [PATCH] fix multiple abi support
+
+---
+ renpy.py        | 124 ++------------------------------------------------------
+ renpy/common.py | 106 ++++++++++++++++++++++++++++++++++++++++++++++++
+ renpy/main.py   |   6 +--
+ 3 files changed, 113 insertions(+), 123 deletions(-)
+ create mode 100644 renpy/common.py
+
+diff --git a/renpy.py b/renpy.py
+index b7bc67d..82ea492 100644
+--- a/renpy.py
+++ b/renpy.py
+@@ -29,114 +29,9 @@ import os
+ import sys
+ import warnings
+ 
+-# Functions to be customized by distributors. ################################
+-
+-# Given the Ren'Py base directory (usually the directory containing
+-# this file), this is expected to return the path to the common directory.
+-def path_to_common(renpy_base):
+-    return renpy_base + "/renpy/common"
+-
+-# Given a directory holding a Ren'Py game, this is expected to return
+-# the path to a directory that will hold save files.
+-def path_to_saves(gamedir):
+-    import renpy #@UnresolvedImport
+-
+-    # Makes sure the permissions are right on the save directory.
+-    def test_writable(d):
+-        try:
+-            fn = os.path.join(d, "test.txt")
+-            open(fn, "w").close()
+-            open(fn, "r").close()
+-            os.unlink(fn)
+-            return True
+-        except:
+-            return False
+-
+-
+-    # Android.
+-    if renpy.android:
+-        paths = [
+-            os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
+-            os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
+-            os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
+-            ]
+-
+-        for rv in paths:
+-            if os.path.isdir(rv) and test_writable(rv):
+-                break
+-
+-        print "Saving to", rv
+-
+-        # We return the last path as the default.
+-
+-        return rv
+-
+-    if renpy.ios:
+-        from pyobjus import autoclass
+-        from pyobjus.objc_py_types import enum
+-
+-        NSSearchPathDirectory = enum("NSSearchPathDirectory", NSDocumentDirectory=9)
+-        NSSearchPathDomainMask = enum("NSSearchPathDomainMask", NSUserDomainMask=1)
+-
+-        NSFileManager = autoclass('NSFileManager')
+-        manager = NSFileManager.defaultManager()
+-        url = manager.URLsForDirectory_inDomains_(
+-            NSSearchPathDirectory.NSDocumentDirectory,
+-            NSSearchPathDomainMask.NSUserDomainMask,
+-            ).lastObject()
+-
+-        # url.path seems to change type based on iOS version, for some reason.
+-        try:
+-            rv = url.path().UTF8String().decode("utf-8")
+-        except:
+-            rv = url.path.UTF8String().decode("utf-8")
+-
+-        print "Saving to", rv
+-        return rv
+-
+-    # No save directory given.
+-    if not renpy.config.save_directory:
+-        return gamedir + "/saves"
+-
+-    # Search the path above Ren'Py for a directory named "Ren'Py Data".
+-    # If it exists, then use that for our save directory.
+-    path = renpy.config.renpy_base
+-
+-    while True:
+-        if os.path.isdir(path + "/Ren'Py Data"):
+-            return path + "/Ren'Py Data/" + renpy.config.save_directory
+-
+-        newpath = os.path.dirname(path)
+-        if path == newpath:
+-            break
+-        path = newpath
+-
+-    # Otherwise, put the saves in a platform-specific location.
+-    if renpy.macintosh:
+-        rv = "~/Library/RenPy/" + renpy.config.save_directory
+-        return os.path.expanduser(rv)
+-
+-    elif renpy.windows:
+-        if 'APPDATA' in os.environ:
+-            return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
+-        else:
+-            rv = "~/RenPy/" + renpy.config.save_directory
+-            return os.path.expanduser(rv)
+-
+-    else:
+-        rv = "~/.renpy/" + renpy.config.save_directory
+-        return os.path.expanduser(rv)
+-
+-
+-# Returns the path to the Ren'Py base directory (containing common and
+-# the launcher, usually.)
+-def path_to_renpy_base():
+-    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
+-    renpy_base = os.path.abspath(renpy_base)
+-
+-    return renpy_base
+-
+-##############################################################################
+from distutils.sysconfig import get_python_lib
+sys.path.append(get_python_lib() + "/renpy@SLOT@")
+import renpy.common as common
+ 
+ # The version of the Mac Launcher and py4renpy that we require.
+ macos_version = (6, 14, 0)
+@@ -151,20 +46,9 @@ except:
+     print "Ren'Py requires at least python 2.6."
+     sys.exit(0)
+ 
+-android = ("ANDROID_PRIVATE" in os.environ)
+-
+-# Android requires us to add code to the main module, and to command some
+-# renderers.
+-if android:
+-    __main__ = sys.modules["__main__"]
+-    __main__.path_to_renpy_base = path_to_renpy_base
+-    __main__.path_to_common = path_to_common
+-    __main__.path_to_saves = path_to_saves
+-    os.environ["RENPY_RENDERER"] = "gl"
+-
+ def main():
+ 
+-    renpy_base = path_to_renpy_base()
+    renpy_base = common.path_to_renpy_base()
+ 
+     # Add paths.
+     if os.path.exists(renpy_base + "/module"):
+diff --git a/renpy/common.py b/renpy/common.py
+new file mode 100644
+index 0000000..598b16c
+--- /dev/null
+++ b/renpy/common.py
+@@ -0,0 +1,106 @@
+# This file is part of Ren'Py. The license below applies to Ren'Py only.
+# Games and other projects that use Ren'Py may use a different license.
+
+# Copyright 2004-2015 Tom Rothamel <pytom@bishoujo.us>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import os
+import sys
+import warnings
+from distutils.sysconfig import get_python_lib
+
+# Functions to be customized by distributors. ################################
+
+# Given the Ren'Py base directory (usually the directory containing
+# this file), this is expected to return the path to the common directory.
+def path_to_common(renpy_base):
+    return renpy_base + "/renpy/common"
+
+# Given a directory holding a Ren'Py game, this is expected to return
+# the path to a directory that will hold save files.
+def path_to_saves(gamedir):
+    import renpy #@UnresolvedImport
+
+    # Makes sure the permissions are right on the save directory.
+    def test_writable(d):
+        try:
+            fn = os.path.join(d, "test.txt")
+            open(fn, "w").close()
+            open(fn, "r").close()
+            os.unlink(fn)
+            return True
+        except:
+            return False
+
+
+    # Makes sure the permissions are right on the save directory.
+    def test_writable(d):
+        try:
+            fn = os.path.join(d, "test.txt")
+            open(fn, "w").close()
+            open(fn, "r").close()
+            os.unlink(fn)
+            return True
+        except:
+            return False
+
+    # No save directory given.
+    if not renpy.config.save_directory:
+        return gamedir + "/saves"
+
+    # Search the path above Ren'Py for a directory named "Ren'Py Data".
+    # If it exists, then use that for our save directory.
+    path = renpy.config.renpy_base
+
+    while True:
+        if os.path.isdir(path + "/Ren'Py Data"):
+            return path + "/Ren'Py Data/" + renpy.config.save_directory
+
+        newpath = os.path.dirname(path)
+        if path == newpath:
+            break
+        path = newpath
+
+    # Otherwise, put the saves in a platform-specific location.
+    if renpy.macintosh:
+        rv = "~/Library/RenPy/" + renpy.config.save_directory
+        return os.path.expanduser(rv)
+
+    elif renpy.windows:
+        if 'APPDATA' in os.environ:
+            return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory
+        else:
+            rv = "~/RenPy/" + renpy.config.save_directory
+            return os.path.expanduser(rv)
+
+    else:
+        rv = "~/.renpy/" + renpy.config.save_directory
+        return os.path.expanduser(rv)
+
+
+# Returns the path to the Ren'Py base directory (containing common and
+# the launcher, usually.)
+def path_to_renpy_base():
+    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
+    renpy_base = get_python_lib() + "/renpy@SLOT@"
+    renpy_base = os.path.abspath(renpy_base)
+
+    return renpy_base
+diff --git a/renpy/main.py b/renpy/main.py
+index 70372d1..937dd21 100644
+--- a/renpy/main.py
+++ b/renpy/main.py
+@@ -27,7 +27,7 @@ import os
+ import sys
+ import time
+ import zipfile
+-import __main__
+import renpy.common as common
+ 
+ 
+ def run(restart):
+@@ -204,7 +204,7 @@ def main():
+     renpy.config.searchpath = [ renpy.config.gamedir ]
+ 
+     # Find the common directory.
+-    commondir = __main__.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
+    commondir = common.path_to_common(renpy.config.renpy_base) # E1101 @UndefinedVariable
+ 
+     if os.path.isdir(commondir):
+         renpy.config.searchpath.append(commondir)
+@@ -272,7 +272,7 @@ def main():
+ 
+     # Find the save directory.
+     if renpy.config.savedir is None:
+-        renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
+        renpy.config.savedir = common.path_to_saves(renpy.config.gamedir) # E1101 @UndefinedVariable
+ 
+     if renpy.game.args.savedir: #@UndefinedVariable
+         renpy.config.savedir = renpy.game.args.savedir #@UndefinedVariable
+-- 
+2.3.1
+
--- a/media-gfx/freecad/files/freecad.sharedmimeinfo
+++ b/media-gfx/freecad/files/freecad.sharedmimeinfo
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+	<mime-type type="application/x-extension-fcstd">
+		<!-- <sub-class-of type="application/zip"/> -->
+		<comment>FreeCAD document files</comment>
+		<glob pattern="*.fcstd"/>
+	</mime-type>
+</mime-info>
--- a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
@ -19,7 +19,7 @@ IUSE=""

 RDEPEND="dev-cpp/eigen:3
 	dev-games/ode
-	dev-libs/boost
+	<dev-libs/boost-1.57
 	dev-libs/libf2c
 	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
@ -33,8 +33,7 @@ RDEPEND="dev-cpp/eigen:3
 	dev-qt/qtxmlpatterns:4
 	media-libs/SoQt
 	media-libs/coin[doc]
-	sci-libs/gts
-	|| ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+	sci-libs/opencascade:6.7.1
 	sys-libs/zlib
 	virtual/glu"
 DEPEND="${RDEPEND}
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@ -19,7 +19,7 @@ IUSE=""

 COMMON_DEPEND="dev-cpp/eigen:3
 	dev-games/ode
-	dev-libs/boost
+	<dev-libs/boost-1.57
 	dev-libs/libf2c
 	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
@ -32,8 +32,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	dev-qt/qtxmlpatterns:4
 	media-libs/SoQt
 	media-libs/coin[doc]
-	sci-libs/gts
-	|| ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+	sci-libs/opencascade:6.7.1
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@ -6,7 +6,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit cmake-utils eutils fortran-2 multilib python-single-r1
+inherit cmake-utils eutils fortran-2 multilib python-single-r1 fdo-mime

 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
@ -34,8 +34,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	media-libs/SoQt
 	media-libs/coin[doc]
 	net-libs/ptlib
-	sci-libs/gts
-	|| ( sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+	sci-libs/opencascade:6.7.1
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
@ -123,14 +122,34 @@ src_install() {
 		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
 		"" "${EROOT}"usr/$(get_libdir)/${P}/lib

-	newicon src/Main/icon.ico ${PN}.ico
-	make_desktop_entry FreeCAD
+	make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"

 	dodoc README.Linux ChangeLog.txt

+	# install mimetype for FreeCAD files
+	insinto /usr/share/mime/packages
+	newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
+
+	# install icons to correct place rather than /usr/share/freecad
+	pushd "${ED}/usr/share/${P}"
+	for size in 16 32 48 64; do
+		newicon -s ${size} freecad-icon-${size}.png freecad.png
+	done
+	doicon -s scalable freecad.svg
+	newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png
+	popd
+
 	# disable compression of QT assistant help files
 	>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
 	>> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip

 	python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
--- a/media-gfx/freecad/freecad-0.15.4671.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@ -6,7 +6,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit cmake-utils eutils fortran-2 multilib python-single-r1
+inherit cmake-utils eutils fortran-2 multilib python-single-r1 fdo-mime

 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
@ -29,7 +29,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
 	media-libs/coin
-	|| ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+	|| ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
@ -111,14 +111,34 @@ src_install() {
 		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
 		"" "${EROOT}"usr/$(get_libdir)/${P}/lib

-	newicon src/Main/icon.ico ${PN}.ico
-	make_desktop_entry FreeCAD
+	make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"

 	dodoc README.Linux ChangeLog.txt

+	# install mimetype for FreeCAD files
+	insinto /usr/share/mime/packages
+	newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
+
+	# install icons to correct place rather than /usr/share/freecad
+	pushd "${ED}/usr/share/${P}"
+	for size in 16 32 48 64; do
+		newicon -s ${size} freecad-icon-${size}.png freecad.png
+	done
+	doicon -s scalable freecad.svg
+	newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png
+	popd
+
 	# disable compression of QT assistant help files
 	>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
 	>> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip

 	python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@ -6,7 +6,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit cmake-utils eutils git-r3 fortran-2 multilib python-single-r1
+inherit cmake-utils eutils git-r3 fortran-2 multilib python-single-r1 fdo-mime

 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""

-# sci-libs/opencascade ok: failed: 6.9.0
 COMMON_DEPEND="dev-cpp/eigen:3
 	dev-libs/boost
 	dev-libs/xerces-c[icu]
@ -30,7 +29,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
 	media-libs/coin
-	|| ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 )
+	|| ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 )
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
@ -112,14 +111,34 @@ src_install() {
 		"${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \
 		"" "${EROOT}"usr/$(get_libdir)/${P}/lib

-	newicon src/Main/icon.ico ${PN}.ico
-	make_desktop_entry FreeCAD
+	make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;"

 	dodoc README.md ChangeLog.txt

+	# install mimetype for FreeCAD files
+	insinto /usr/share/mime/packages
+	newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml"
+
+	# install icons to correct place rather than /usr/share/freecad
+	pushd "${ED}/usr/share/${P}"
+	for size in 16 32 48 64; do
+		newicon -s ${size} freecad-icon-${size}.png freecad.png
+	done
+	doicon -s scalable freecad.svg
+	newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png
+	popd
+
 	# disable compression of QT assistant help files
 	>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
 	>> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip

 	python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
 }
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}
--- a/media-sound/pnmixer/pnmixer-0.6_rc2.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.6_rc2.ebuild
@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libX11
 	libnotify? ( x11-libs/libnotify )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/intltool
 	virtual/pkgconfig"

 S=${WORKDIR}/${P/_rc/-rc}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 11 Aug 2015 07:11:02 +0000
+Tue, 11 Aug 2015 14:11:11 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 11 Aug 2015 07:11:02 +0000
+Tue, 11 Aug 2015 14:11:11 +0000
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.31
+++ b/metadata/md5-cache/app-admin/apache-tools-2.2.31
@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=4
 HOMEPAGE=http://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) !<www-servers/apache-2.2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.2.31.tar.bz2
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=60270997e69df5d01745d5c0006cf321
+_md5_=bb98ed83660e99dad90fa302939f17c3
--- a/metadata/md5-cache/app-text/llpp-13_p20121123
+++ b/metadata/md5-cache/app-text/llpp-13_p20121123
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg:0 virtual/jpeg x11-libs/libX11 x11-misc/xsel =app-text/mupdf-1.1_p20121127 dev-lang/ocaml[ocamlopt] dev-ml/lablgl[glut]
-DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=4
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg:0 virtual/jpeg x11-libs/libX11 x11-misc/xsel
-SLOT=0
-SRC_URI=mirror://gentoo/llpp-13_p20121123.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=386ab419148d2f20b135fbf2faf1e75e
--- a/metadata/md5-cache/app-text/llpp-15
+++ b/metadata/md5-cache/app-text/llpp-15
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-misc/xsel !static? ( ~app-text/mupdf-1.2:= media-libs/openjpeg:0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( ~app-text/mupdf-1.2:=[static-libs] media-libs/openjpeg:0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=5
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( ~app-text/mupdf-1.2:= media-libs/openjpeg:0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=mirror://gentoo/llpp-15.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=7530d01516dbbe13e2999a861824f70b
--- a/metadata/md5-cache/app-text/llpp-17_p20140112
+++ b/metadata/md5-cache/app-text/llpp-17_p20140112
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-misc/xsel !static? ( ~app-text/mupdf-1.3_p20140118:= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( ~app-text/mupdf-1.3_p20140118:=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=5
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( ~app-text/mupdf-1.3_p20140118:= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~xmw/llpp-17_p20140112.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=6caadf21e4ed3f11727dc219c65d832a
--- a/metadata/md5-cache/app-text/llpp-18
+++ b/metadata/md5-cache/app-text/llpp-18
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-misc/xsel !static? ( >app-text/mupdf-1.3_p20140118:0= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( >app-text/mupdf-1.3_p20140118:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=5
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( >app-text/mupdf-1.3_p20140118:0= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~xmw/llpp-18.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=5390b6eeabb7c443e4b24175255b763b
--- a/metadata/md5-cache/app-text/llpp-19
+++ b/metadata/md5-cache/app-text/llpp-19
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.5:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( >=app-text/mupdf-1.5:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=5
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.5:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=http://repo.or.cz/w/llpp.git/snapshot/7311f1b13aaf010525c477934fe1ea49ae733625.tar.gz -> llpp-19.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=aea422c595196bcc540a1827a7fa0ae7
--- a/metadata/md5-cache/app-text/llpp-20_p20140818
+++ b/metadata/md5-cache/app-text/llpp-20_p20140818
@ -4,11 +4,11 @@ DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
 EAPI=5
 HOMEPAGE=http://repo.or.cz/w/llpp.git
 IUSE=+ocamlopt static
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.5:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> llpp-20_p20140818.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=29f681fdabc49f37508f7be2f0bb4568
+_md5_=86cc27babd21e401a71d71344d17f170
--- a/metadata/md5-cache/app-text/mupdf-1.1_p20121127
+++ b/metadata/md5-cache/app-text/mupdf-1.1_p20121127
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5:0 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext ) virtual/pkgconfig
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=4
-HOMEPAGE=http://mupdf.com/
-IUSE=X vanilla
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5:0 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
-SLOT=0
-SRC_URI=mirror://gentoo/mupdf-1.1_p20121127.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=7be44189593ea3044d12f69b6a36d7ab
--- a/metadata/md5-cache/app-text/mupdf-1.2
+++ b/metadata/md5-cache/app-text/mupdf-1.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] >=media-libs/openjpeg-1.5:0[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig static-libs? ( media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] >=media-libs/openjpeg-1.5:0[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] )
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=5
-HOMEPAGE=http://mupdf.com/
-IUSE=X vanilla static static-libs
-KEYWORDS=amd64 arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] >=media-libs/openjpeg-1.5:0[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
-SLOT=0/1.2
-SRC_URI=http://mupdf.googlecode.com/files/mupdf-1.2-source.zip
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=c713375ba7e1e3145e5b2ba2229c0f19
--- a/metadata/md5-cache/app-text/mupdf-1.3_p20140118
+++ b/metadata/md5-cache/app-text/mupdf-1.3_p20140118
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig static-libs? ( dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] )
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=5
-HOMEPAGE=http://mupdf.com/
-IUSE=X vanilla static static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
-SLOT=0/1.3
-SRC_URI=http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=01f0a0db15faf4bffaa2556ced74868572dac7f5;sf=tgz -> mupdf-1.3_p20140118.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=4cc7acdb4a25a926d42363a30153ce22
--- a/metadata/md5-cache/app-text/mupdf-1.4-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.4-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig static-libs? ( dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] )
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=5
-HOMEPAGE=http://mupdf.com/
-IUSE=X vanilla static static-libs
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] <media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
-SLOT=0/1.4
-SRC_URI=http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> mupdf-1.4.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	flag-o-matic	02090c5a622458303e6bf68837ac6b96	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=b339ce1343a059c9cd9b3230fe8e42d1
--- a/metadata/md5-cache/app-text/mupdf-1.5-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.5-r1
@ -4,10 +4,10 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=5
 HOMEPAGE=http://mupdf.com/
 IUSE=X vanilla +curl +openssl static static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/openjpeg:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
 SLOT=0/1.5
 SRC_URI=http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> mupdf-1.5.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=5a418cb8e13af744f5760125e0991cab
+_md5_=cc052c6954d071c3e8bbbc6cda0bf8e1
--- a/metadata/md5-cache/app-text/qpdfview-0.4.13-r1
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.13-r1
@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( app-text/mupdf:0/1.4 ) postscript? ( app-text/libspectre ) qt4? ( dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) pdf? ( app-text/poppler[qt4] ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.26.4[qt5] ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) ) !svg? ( virtual/freedesktop-icon-theme ) virtual/pkgconfig
+DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( <app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) qt4? ( dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) pdf? ( app-text/poppler[qt4] ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.26.4[qt5] ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) ) !svg? ( virtual/freedesktop-icon-theme ) virtual/pkgconfig
 DESCRIPTION=A tabbed document viewer
 EAPI=5
 HOMEPAGE=http://launchpad.net/qpdfview
 IUSE=cups dbus djvu fitz +pdf postscript +qt4 qt5 sqlite +svg synctex linguas_ast linguas_az linguas_bg linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_he linguas_hr linguas_id linguas_it linguas_kk linguas_ko linguas_ky linguas_lt linguas_ms linguas_my linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_vi linguas_zh_CN
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( app-text/mupdf:0/1.4 ) postscript? ( app-text/libspectre ) qt4? ( dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) pdf? ( app-text/poppler[qt4] ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.26.4[qt5] ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) ) !svg? ( virtual/freedesktop-icon-theme )
+RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( <app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) qt4? ( dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) pdf? ( app-text/poppler[qt4] ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.26.4[qt5] ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) ) !svg? ( virtual/freedesktop-icon-theme )
 REQUIRED_USE=^^ ( qt4 qt5 ) ?? ( fitz pdf )
 SLOT=0
 SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.13/+download/qpdfview-0.4.13.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	l10n	714aaf78929eade946da5eaff7d2001a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=44e54fe762cef553a61cd6b0d00deb00
+_md5_=5d23eb7f50ea3d4dfaeb9ccb6f6c0e51
--- a/metadata/md5-cache/dev-java/netty-common-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.19
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
-EAPI=5
-HOMEPAGE=http://netty.io/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e32d3bd94ef251123c8e72ba26f5aa78
--- a/metadata/md5-cache/dev-java/netty-common-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.21
@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-nop:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
 EAPI=5
 HOMEPAGE=http://netty.io/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-nop:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8d099b4aeaf9d334e2a8c91bed92e47
+_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-pkg-simple	d87e645de7dff9e1bc0aac42b43ca4f4	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=34ba9da5af89bfec74a673ce68eb12c7
--- a/metadata/md5-cache/dev-java/slf4j-api-1.5.11
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.5.11
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=2
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/slf4j-api-1.5.11-sources.jar
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6ec8825009a142a76cfffe0287d01aba
--- a/metadata/md5-cache/dev-java/slf4j-api-1.6.6
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.6.6
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=4
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.6.6.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=953551858fd3e2cc01f2630d96f51cb3
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f7ebce53203406478493dd7b141ffd30
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.6
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.6
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.6.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=547b8c9dce2295c6d16f7558f53a4f49
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Simple Logging Facade for Java
 EAPI=5
 HOMEPAGE=http://www.slf4j.org/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b6c66547bba8aa5f53bd9f2f5b3f4397
+_md5_=7c9bfe5ac0b9308acab6cf16155372f7
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 ~dev-java/slf4j-api-1.7.5:0 >=virtual/jdk-1.5 test? ( dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java (SLF4J) log4j bindings
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-java/log4j:0 ~dev-java/slf4j-api-1.7.5:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d8400706025ad312ebc30161c770f6c
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jdk-1.5 test? ( dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple Logging Facade for Java (SLF4J) log4j bindings
-EAPI=5
-HOMEPAGE=http://www.slf4j.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.6.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=90faf3994939d0be8dade4efd093772b
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jdk-1.5 test? ( dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jdk-1.6 test? ( dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/ant-junit4:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Simple Logging Facade for Java (SLF4J) log4j bindings
 EAPI=5
 HOMEPAGE=http://www.slf4j.org/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	java-ant-2	a91064e45b54985a9d6a8779e1cde5f4	java-pkg-2	bb9b8157d2a348d9ec42ce34a107fe0d	java-utils-2	7c8af272d218f7b7df22fd16bb0bfb63	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=67ac58af14d45c29419cb579248d543c
+_md5_=e0284b80167957f1f490ac9c617fa141
--- a/Show More
+++ b/Show More