diff --git a/app-office/texmaker/texmaker-4.4.1.ebuild b/app-office/texmaker/texmaker-4.4.1.ebuild
index 3cad4c17487c..c0a7ab25f9d5 100644
--- a/app-office/texmaker/texmaker-4.4.1.ebuild
+++ b/app-office/texmaker/texmaker-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.2 2015/01/28 12:36:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.3 2015/02/02 08:41:08 jlec Exp $
 
 EAPI=5
 
@@ -92,5 +92,5 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
diff --git a/dev-java/jcifs/files/1.3.17-build.xml.patch b/dev-java/jcifs/files/1.3.17-build.xml.patch
index a2a4c1303122..e90c6ef0ace0 100644
--- a/dev-java/jcifs/files/1.3.17-build.xml.patch
+++ b/dev-java/jcifs/files/1.3.17-build.xml.patch
@@ -1,5 +1,3 @@
-diff --git a/build.xml b/build.xml
-index ad5b2b6..7820dd0 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -52,8 +52,6 @@ dependencies: Checks that all class dependencies are met.
@@ -11,6 +9,4 @@ index ad5b2b6..7820dd0 100644
              debug="on">
  <!--
              <compilerarg line="-Xlint:deprecation -Xlint:unchecked"/>
-diff --git a/jcifs-1.3.17.jar b/jcifs-1.3.17.jar
 index ae4c8d8..2b09fa2 100644
-Binary files a/jcifs-1.3.17.jar and b/jcifs-1.3.17.jar differ
diff --git a/dev-java/scala-bin/scala-bin-2.11.4.ebuild b/dev-java/scala-bin/scala-bin-2.11.4.ebuild
index 53bb57ca582b..60a377806801 100644
--- a/dev-java/scala-bin/scala-bin-2.11.4.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.2 2015/01/18 21:39:44 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.3 2015/02/02 10:22:05 monsieurp Exp $
 EAPI=5
 
 inherit java-utils-2
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="doc"
 DEPEND=""
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/dev-libs/libf2c/files/libf2c-20110801-format-security.patch b/dev-libs/libf2c/files/libf2c-20110801-format-security.patch
new file mode 100644
index 000000000000..669da2d694b4
--- /dev/null
+++ b/dev-libs/libf2c/files/libf2c-20110801-format-security.patch
@@ -0,0 +1,11 @@
+--- arithchk.c
++++ arithchk.c
+@@ -122,7 +122,7 @@
+ 	long Cray1;
+ 
+ 	/* Cray1 = 4617762693716115456 -- without overflow on non-Crays */
+-	Cray1 = printf(emptyfmt) < 0 ? 0 : 4617762;
++	Cray1 = fputs(emptyfmt, stdout) < 0 ? 0 : 4617762;
+ 	if (printf(emptyfmt, Cray1) >= 0)
+ 		Cray1 = 1000000*Cray1 + 693716;
+ 	if (printf(emptyfmt, Cray1) >= 0)
diff --git a/dev-libs/libf2c/libf2c-20110801-r4.ebuild b/dev-libs/libf2c/libf2c-20110801-r4.ebuild
new file mode 100644
index 000000000000..cf96c434bdcf
--- /dev/null
+++ b/dev-libs/libf2c/libf2c-20110801-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r4.ebuild,v 1.1 2015/02/02 08:28:51 jlec Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Library that converts FORTRAN to C source"
+HOMEPAGE="http://www.netlib.org/f2c/"
+SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
+		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
+		"${FILESDIR}"/${P}-main.patch\
+		"${FILESDIR}"/${P}-64bit-long.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
+}
+
+src_compile() {
+	emake \
+		-f makefile.u \
+		libf2c.so \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CC="$(tc-getCC)"
+
+	# Clean up files so we can recompile without PIC for the static lib
+	if use static-libs; then
+		rm *.o || die "clean failed"
+		emake \
+			-f makefile.u \
+			all \
+			CFLAGS="${CFLAGS}" \
+			CC="$(tc-getCC)"
+	fi
+}
+
+src_install () {
+	dolib libf2c.so.2
+	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
+	use static-libs && dolib.a libf2c.a
+	doheader f2c.h
+	dodoc README Notice
+}
diff --git a/dev-libs/papi/Manifest b/dev-libs/papi/Manifest
index 656c35fe08e9..6bae30620498 100644
--- a/dev-libs/papi/Manifest
+++ b/dev-libs/papi/Manifest
@@ -1 +1,2 @@
 DIST papi-5.3.0.tar.gz 3928589 SHA256 99f2f36398b370e75d100b4a189d5bc0ac4f5dd66df44d441f88fd32e1421524 SHA512 a88d28d895a1b44b0d05ac90c39406b7e9806a1d865b39df405e55b27d7f6bb191330ed7df52d4f3f04f46ff94ce867e6c1bdd9b38c314652cff1ee9d838b226 WHIRLPOOL cf1074f259831283292b57b636b6b0083a11ec6084bce2361eabe3ca706fd3d2420d3ab4074c8024296b06d11223a1dcc9782040ab08502481498b84bb2517e6
+DIST papi-5.4.0.tar.gz 4075657 SHA256 537bc209ad05050399d5f268ba8f40e499f457cab9b3503f57600f9893819195 SHA512 be4a929208a83765f99f2f34e98d6770bf46d4f336e492506cc86d6a34fbf84754b05cfd22db0949b382bb8f24ad0ed7f5e7c90941baad2593b82827ee27eb4a WHIRLPOOL 291d087c23b30a5f9f696771b62204ebe030ab731c35b9613a7821d110b920fcef777b0cfbbd136fe3838acf14631527055e0cf0c99624dfbbcd7c40cc4f4d99
diff --git a/dev-libs/papi/papi-5.4.0.ebuild b/dev-libs/papi/papi-5.4.0.ebuild
new file mode 100644
index 000000000000..2428db044194
--- /dev/null
+++ b/dev-libs/papi/papi-5.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/papi/papi-5.4.0.ebuild,v 1.1 2015/02/02 07:04:32 slis Exp $
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils fortran-2 versionator
+
+DESCRIPTION="Performance Application Programming Interface"
+HOMEPAGE="http://icl.cs.utk.edu/papi/"
+SRC_URI="http://icl.cs.utk.edu/projects/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-libs/libpfm[static-libs]
+	virtual/mpi
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)/src"
+
+src_configure() {
+	local myeconfargs=(
+		--with-shlib
+		--with-perf-events
+		--with-pfm-prefix="${EPREFIX}/usr"
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	dodoc ../RE*
+}
diff --git a/dev-ml/obrowser/Manifest b/dev-ml/obrowser/Manifest
deleted file mode 100644
index 7e3073983fb1..000000000000
--- a/dev-ml/obrowser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST obrowser-1.1.1.tar.gz 1374221 SHA256 9372518f675b71084c440aa98a8ff94aacae67458873dcf82682e235a90b0dce SHA512 1e3097e9ec210585f51c7da8f458e057edc0a32d38caab15188ba1c01170cf515b5cb9b626242ce752c9c5e08c2516f1a945a0c2b2fcfbdaa0b46d12868b286b WHIRLPOOL 3e4e991c486fac5bbd6781738c44ac349ae5cc520cde71c3c935d836b11731de4a9914ed19a582de942d43feefc0470f93b8ac3a57c525905eb657156d1ae690
diff --git a/dev-ml/obrowser/files/obrowser-1.1.1-ocaml4.patch b/dev-ml/obrowser/files/obrowser-1.1.1-ocaml4.patch
deleted file mode 100644
index 634255247a57..000000000000
--- a/dev-ml/obrowser/files/obrowser-1.1.1-ocaml4.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: obrowser-1.1.1/rt/caml/pervasives.ml
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/pervasives.ml
-+++ obrowser-1.1.1/rt/caml/pervasives.ml
-@@ -91,6 +90,8 @@ external acos : float -> float = "caml_a
- external asin : float -> float = "caml_asin_float" "asin" "float"
- external atan : float -> float = "caml_atan_float" "atan" "float"
- external atan2 : float -> float -> float = "caml_atan2_float" "atan2" "float"
-+external hypot : float -> float -> float
-+               = "caml_hypot_float" "caml_hypot" "float"
- external cos : float -> float = "caml_cos_float" "cos" "float"
- external cosh : float -> float = "caml_cosh_float" "cosh" "float"
- external log : float -> float = "caml_log_float" "log" "float"
-@@ -104,6 +105,8 @@ external tanh : float -> float = "caml_t
- external ceil : float -> float = "caml_ceil_float" "ceil" "float"
- external floor : float -> float = "caml_floor_float" "floor" "float"
- external abs_float : float -> float = "%absfloat"
-+external copysign : float -> float -> float
-+                  = "caml_copysign_float" "caml_copysign" "float"
- external mod_float : float -> float -> float = "caml_fmod_float" "fmod" "float"
- external frexp : float -> float * int = "caml_frexp_float"
- external ldexp : float -> int -> float = "caml_ldexp_float"
-Index: obrowser-1.1.1/rt/caml/pervasives.mli
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/pervasives.mli
-+++ obrowser-1.1.1/rt/caml/pervasives.mli
-@@ -310,10 +310,18 @@ external atan : float -> float = "caml_a
-     Result is in radians and is between [-pi/2] and [pi/2]. *)
- 
- external atan2 : float -> float -> float = "caml_atan2_float" "atan2" "float"
--(** [atan x y] returns the arc tangent of [y /. x].  The signs of [x]
-+(** [atan2 y x] returns the arc tangent of [y /. x].  The signs of [x]
-     and [y] are used to determine the quadrant of the result.
-     Result is in radians and is between [-pi] and [pi]. *)
- 
-+external hypot : float -> float -> float
-+               = "caml_hypot_float" "caml_hypot" "float"
-+(** [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length
-+  of the hypotenuse of a right-angled triangle with sides of length
-+  [x] and [y], or, equivalently, the distance of the point [(x,y)]
-+  to origin.
-+  @since 4.00.0  *)
-+
- external cosh : float -> float = "caml_cosh_float" "cosh" "float"
- (** Hyperbolic cosine.  Argument is in radians. *)
- 
-@@ -337,6 +345,14 @@ external floor : float -> float = "caml_
- external abs_float : float -> float = "%absfloat"
- (** [abs_float f] returns the absolute value of [f]. *)
- 
-+external copysign : float -> float -> float
-+                  = "caml_copysign_float" "caml_copysign" "float"
-+(** [copysign x y] returns a float whose absolute value is that of [x]
-+  and whose sign is that of [y].  If [x] is [nan], returns [nan].
-+  If [y] is [nan], returns either [x] or [-. x], but it is not
-+  specified which.
-+  @since 4.00.0  *)
-+
- external mod_float : float -> float -> float = "caml_fmod_float" "fmod" "float"
- (** [mod_float a b] returns the remainder of [a] with respect to
-    [b].  The returned value is [a -. n *. b], where [n]
diff --git a/dev-ml/obrowser/files/obrowser-1.1.1-ocaml41.patch b/dev-ml/obrowser/files/obrowser-1.1.1-ocaml41.patch
deleted file mode 100644
index 91d60fd56bb2..000000000000
--- a/dev-ml/obrowser/files/obrowser-1.1.1-ocaml41.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Index: obrowser-1.1.1/rt/caml/pervasives.ml
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/pervasives.ml
-+++ obrowser-1.1.1/rt/caml/pervasives.ml
-@@ -24,6 +24,11 @@ let invalid_arg s = raise(Invalid_argume
- 
- exception Exit
- 
-+(* Composition operators *)
-+
-+external ( |> ) : 'a -> ('a -> 'b) -> 'b = "%revapply"
-+external ( @@ ) : ('a -> 'b) -> 'a -> 'b = "%apply"
-+
- (* Comparisons *)
- 
- external (=) : 'a -> 'a -> bool = "%equal"
-Index: obrowser-1.1.1/rt/caml/pervasives.mli
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/pervasives.mli
-+++ obrowser-1.1.1/rt/caml/pervasives.mli
-@@ -137,6 +137,19 @@ external ( || ) : bool -> bool -> bool =
- external ( or ) : bool -> bool -> bool = "%sequor"
- (** @deprecated {!Pervasives.( || )} should be used instead.*)
- 
-+(** {6 Composition operators} *)
-+
-+external ( |> ) : 'a -> ('a -> 'b) -> 'b = "%revapply"
-+(** Reverse-application operator: [x |> f |> g] is exactly equivalent
-+ to [g (f (x))].
-+   @since 4.01
-+*)
-+
-+external ( @@ ) : ('a -> 'b) -> 'a -> 'b = "%apply"
-+(** Application operator: [g @@ f @@ x] is exactly equivalent to
-+ [g (f (x))].
-+   @since 4.01
-+*)
- 
- (** {6 Integer arithmetic} *)
- 
-Index: obrowser-1.1.1/rt/caml/printexc.ml
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/printexc.ml
-+++ obrowser-1.1.1/rt/caml/printexc.ml
-@@ -78,6 +78,11 @@ let catch fct arg =
-     eprintf "Uncaught exception: %s\n" (to_string x);
-     exit 2
- 
-+type raw_backtrace
-+
-+external get_raw_backtrace:
-+  unit -> raw_backtrace = "caml_get_exception_raw_backtrace"
-+
- type loc_info =
-   | Known_location of bool   (* is_raise *)
-                     * string (* filename *)
-@@ -86,8 +91,13 @@ type loc_info =
-                     * int    (* end char *)
-   | Unknown_location of bool (*is_raise*)
- 
--external get_exception_backtrace:
--  unit -> loc_info array option = "caml_get_exception_backtrace"
-+(* to avoid warning *)
-+let _ = [Known_location (false, "", 0, 0, 0); Unknown_location false]
-+
-+type backtrace = loc_info array
-+
-+external convert_raw_backtrace:
-+  raw_backtrace -> backtrace option = "caml_convert_raw_backtrace"
- 
- let format_loc_info pos li =
-   let is_raise =
-@@ -108,8 +118,8 @@ let format_loc_info pos li =
-       sprintf "%s unknown location"
-               info
- 
--let print_backtrace outchan =
--  match get_exception_backtrace() with
-+let print_exception_backtrace outchan backtrace =
-+  match backtrace with
-   | None ->
-       fprintf outchan
-         "(Program not linked with -g, cannot print stack backtrace)\n"
-@@ -119,8 +129,15 @@ let print_backtrace outchan =
-           fprintf outchan "%s\n" (format_loc_info i a.(i))
-       done
- 
--let get_backtrace () =
--  match get_exception_backtrace() with
-+let print_raw_backtrace outchan raw_backtrace =
-+  print_exception_backtrace outchan (convert_raw_backtrace raw_backtrace)
-+
-+(* confusingly named: prints the global current backtrace *)
-+let print_backtrace outchan =
-+  print_raw_backtrace outchan (get_raw_backtrace ())
-+
-+let backtrace_to_string backtrace =
-+  match backtrace with
-   | None ->
-      "(Program not linked with -g, cannot print stack backtrace)\n"
-   | Some a ->
-@@ -131,8 +148,22 @@ let get_backtrace () =
-       done;
-       Buffer.contents b
- 
-+let raw_backtrace_to_string raw_backtrace =
-+  backtrace_to_string (convert_raw_backtrace raw_backtrace)
-+
-+(* confusingly named:
-+   returns the *string* corresponding to the global current backtrace *)
-+let get_backtrace () =
-+  (* we could use the caml_get_exception_backtrace primitive here, but
-+     we hope to deprecate it so it's better to just compose the
-+     raw stuff *)
-+  backtrace_to_string (convert_raw_backtrace (get_raw_backtrace ()))
-+
- external record_backtrace: bool -> unit = "caml_record_backtrace"
- external backtrace_status: unit -> bool = "caml_backtrace_status"
- 
- let register_printer fn =
-   printers := fn :: !printers
-+
-+
-+external get_callstack: int -> raw_backtrace = "caml_get_current_callstack"
-Index: obrowser-1.1.1/rt/caml/printexc.mli
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/printexc.mli
-+++ obrowser-1.1.1/rt/caml/printexc.mli
-@@ -79,3 +79,33 @@ val register_printer: (exn -> string opt
-     generic printer).
-     @since 3.11.2
- *)
-+
-+(** {6 Raw backtraces} *)
-+
-+type raw_backtrace
-+
-+(** The abstract type [backtrace] stores exception backtraces in
-+    a low-level format, instead of directly exposing them as string as
-+    the [get_backtrace()] function does.
-+
-+    This allows to pay the performance overhead of representation
-+    conversion and formatting only at printing time, which is useful
-+    if you want to record more backtrace than you actually print.
-+*)
-+
-+val get_raw_backtrace: unit -> raw_backtrace
-+val print_raw_backtrace: out_channel -> raw_backtrace -> unit
-+val raw_backtrace_to_string: raw_backtrace -> string
-+
-+
-+(** {6 Current call stack} *)
-+
-+val get_callstack: int -> raw_backtrace
-+
-+(** [Printexc.get_callstack n] returns a description of the top of the
-+    call stack on the current program point (for the current thread),
-+    with at most [n] entries.  (Note: this function is not related to
-+    exceptions at all, despite being part of the [Printexc] module.)
-+
-+    @since 4.01.0
-+*)
-Index: obrowser-1.1.1/rt/caml/list.ml
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/list.ml
-+++ obrowser-1.1.1/rt/caml/list.ml
-@@ -73,6 +73,18 @@ let rec fold_left f accu l =
-     [] -> accu
-   | a::l -> fold_left f (f accu a) l
- 
-+let rec mapi i f = function
-+    [] -> []
-+  | a::l -> let r = f i a in r :: mapi (i + 1) f l
-+
-+let mapi f l = mapi 0 f l
-+
-+let rec iteri i f = function
-+    [] -> ()
-+  | a::l -> f i a; iteri (i + 1) f l
-+
-+let iteri f l = iteri 0 f l
-+
- let rec fold_right f l accu =
-   match l with
-     [] -> accu
-Index: obrowser-1.1.1/rt/caml/list.mli
-===================================================================
---- obrowser-1.1.1.orig/rt/caml/list.mli
-+++ obrowser-1.1.1/rt/caml/list.mli
-@@ -75,11 +75,25 @@ val iter : ('a -> unit) -> 'a list -> un
-    [a1; ...; an]. It is equivalent to
-    [begin f a1; f a2; ...; f an; () end]. *)
- 
-+val iteri : (int -> 'a -> unit) -> 'a list -> unit
-+(** Same as {!List.iter}, but the function is applied to the index of
-+   the element as first argument (counting from 0), and the element
-+   itself as second argument.
-+   @since 4.00.0
-+*)
-+
- val map : ('a -> 'b) -> 'a list -> 'b list
- (** [List.map f [a1; ...; an]] applies function [f] to [a1, ..., an],
-    and builds the list [[f a1; ...; f an]]
-    with the results returned by [f].  Not tail-recursive. *)
- 
-+val mapi : (int -> 'a -> 'b) -> 'a list -> 'b list
-+(** Same as {!List.map}, but the function is applied to the index of
-+   the element as first argument (counting from 0), and the element
-+   itself as second argument.  Not tail-recursive.
-+   @since 4.00.0
-+*)
-+
- val rev_map : ('a -> 'b) -> 'a list -> 'b list
- (** [List.rev_map f l] gives the same result as
-    {!List.rev}[ (]{!List.map}[ f l)], but is tail-recursive and
diff --git a/dev-ml/obrowser/metadata.xml b/dev-ml/obrowser/metadata.xml
deleted file mode 100644
index 2193d772e351..000000000000
--- a/dev-ml/obrowser/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ml</herd>
-</pkgmetadata>
diff --git a/dev-ml/obrowser/obrowser-1.1.1.ebuild b/dev-ml/obrowser/obrowser-1.1.1.ebuild
deleted file mode 100644
index 87b9961376e0..000000000000
--- a/dev-ml/obrowser/obrowser-1.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/obrowser/obrowser-1.1.1.ebuild,v 1.7 2013/08/19 20:54:42 aballier Exp $
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="OCaml virtual machine written in Javascript, to run OCaml program in browsers"
-HOMEPAGE="http://ocsigen.org/obrowser/"
-SRC_URI="http://ocsigen.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-3 WTFPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ocaml-3.12.0:=
-	dev-ml/lwt:="
-DEPEND="${RDEPEND}
-	app-arch/sharutils"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4' && epatch "${FILESDIR}/${P}-ocaml4.patch"
-	has_version '>=dev-lang/ocaml-4.01_beta' && epatch "${FILESDIR}/${P}-ocaml41.patch"
-}
-
-src_compile() {
-	touch .check_version
-	emake -j1 EXAMPLES_TARGETS=""
-}
-
-src_install() {
-	findlib_src_preinst
-	OCAMLPATH=${OCAMLFIND_DESTDIR} emake DESTDIR="${D}" install
-	dodoc README.TXT
-}
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
index f7cc529d090c..cfbcb91215e4 100644
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -3,3 +3,4 @@ DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801
 DIST postgresql-ocaml-2.0.6.tar.gz 79697 SHA256 1f3ae24c323f3b1f5876d647168eeca2182994feb53dad9ef540fd54837887cb SHA512 0cde0deb38df5bdce467941ca4e9bd3a9648c430a9e406eadc6aecffbe7b5aae27fb5fe3464954de98cba8ecece77e91416cd28f94cb3d3d7d08993d2238f2dc WHIRLPOOL f5f3a100074fb0e1d1dbc6ae13b98be28db76cf7dce5f1731bee44f099dd00f40dd0e13015432f6e1e1f55d3b522986bacf1ea369f1d1a881be10266d2decd8c
 DIST postgresql-ocaml-2.1.1.tar.gz 84217 SHA256 3f26e78db8a7896470f3ef53cfd3643efa82e8153cdc52156b140bd6e2b0e9c7 SHA512 df385e2db809f7992f74c6f55b3e63e8eaf6889e6bd40f40f9ddb57842ff89c283f25f21cc72ae221a9a213d695c0a383846647237d4c0ab5c1f20ad4809e085 WHIRLPOOL 59dc6f220248eb8d7e9653554d6f29c905b66da8f02149fbd8c4cf9873418f85f31a9f87339da8b56ef8cf73732e15dbf4fa205cd6a85213f250da5abccd388a
 DIST postgresql-ocaml-2.1.2.tar.gz 84866 SHA256 6b355a089d5c945ac89c8b277e58f2112447646e3951c4f933cc1a2022b97a28 SHA512 75b14a5d6edcac035fd0de2d969932046e43ccf7d3e3c3a748991b2d7931e3f86e0f235c7a07e7f7661b4cacc4fd76aa4226b8196e5ea8707d931d965d27a1ea WHIRLPOOL 13860201fb81f1c83d9449eea69377de810801297a07ede1166b6370c849fc9df02cf45cf8c81f290b7aa29bfd81b86f010f817f3cc157b5681e83e9ed4124c1
+DIST postgresql-ocaml-3.0.0.tar.gz 85430 SHA256 7328b537f72d8d90f8b54e254789c6e400b4f0fa7a06f6c97318965bb4139aaa SHA512 514e47e2675fce60c8b85970347b04d3ca83a427f3b3500157d0f439d81602499b33e5b02ba9bda0b945ca233bd0d86c0d4363708be609b2ba0363aee84e8b55 WHIRLPOOL 631fe36899ee749f26c68f0a32cac6289912649514b5d5611abd9278018e45adf505348345c13e67ea43ffd5d4a5c1872365528b0acaf18ee8af38dab9c9468c
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-3.0.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-3.0.0.ebuild
new file mode 100644
index 000000000000..ec05e3c6eb32
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-3.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-3.0.0.ebuild,v 1.1 2015/02/02 09:39:35 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE="examples"
+
+RDEPEND="
+	dev-db/postgresql[server]
+"
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/jenkins-autojobs/Manifest b/dev-python/jenkins-autojobs/Manifest
new file mode 100644
index 000000000000..9780cfefc993
--- /dev/null
+++ b/dev-python/jenkins-autojobs/Manifest
@@ -0,0 +1,3 @@
+DIST jenkins-autojobs-0.14.3.tar.gz 151992 SHA256 ceb7fab28421c34b01015116cc64428ed3bf672381de759ae3d029500fe1b161 SHA512 1db2d02bf6f1c2d52d0197ffc21e80e5ccd48f6e2020bbe4618ab06792ea3988a42089c1fe1e6d277e30ea6ecf58078d8138da0c463862a063583c119e67e805 WHIRLPOOL 465057f18207fbb1d4d5fe48b06151dca2cc683ae4ba72c92ebc3a4e8548aa4018605189f4f1c353d048230c5a70eaf2bde41648cd0a84e1213f834db59d7f68
+DIST jenkins-autojobs-0.14.3_git_1.1.21.hpi 2108607 SHA256 bed6ad5ee68ab126139dc0a889d04d31541bbeb0063e05734d34a3586fe98124 SHA512 6fa6386f0292cfc61f44dca11860146b7c35df46adefdfec547789b75145fbff61e620195e5f756ae8902211117b4cd2cd7d616dfe51204e563ad38154a67d88 WHIRLPOOL af70f74034cbd6205f4a3518ae1273500b8f526378a02963437f4e92c6594faea8b59a5d1ff0035e9fa90bad328074f5eeb37c815997a25291105b599641478a
+DIST jenkins-autojobs-0.14.3_mercurial_1.41.hpi 107202 SHA256 944a83d115171affdbd4d7e227cb234d01aaecbff90b49bd54800c93b820eff6 SHA512 76d24c9964d7d4590f128bf1577f54a0a4b799d275a0e7874aee95aa20c3ed0313b96bb6fb4e7f9603a4433db68e4d0caeb4ca22394cdc24a436fcc3b32b8d67 WHIRLPOOL 2b32cf6aa2bc23f62e1ec173ad8a16debf7c313902ab8eaf5f41ecae870e0c81fa095756d6c78af9b0106a2042f3f5a5fa9d5b9743c53d09d586d28c4bc9925f
diff --git a/dev-python/jenkins-autojobs/files/local_jenkins.patch b/dev-python/jenkins-autojobs/files/local_jenkins.patch
new file mode 100644
index 000000000000..96bab635ffe8
--- /dev/null
+++ b/dev-python/jenkins-autojobs/files/local_jenkins.patch
@@ -0,0 +1,26 @@
+--- tests/bin/start-jenkins.sh.orig	2015-01-02 23:10:17.000000000 +0100
++++ tests/bin/start-jenkins.sh	2015-01-30 16:35:27.058035074 +0100
+@@ -19,6 +19,8 @@
+     echo 0 | nc $jenkins_addr $jenkins_cport
+ }
+ 
++cp -v /opt/jenkins/jenkins.war $jenkins_war 
++
+ if [[ ! -e $jenkins_war ]]; then
+     echo "Downloading jenkins.war ..."
+     curl -L $jenkins_war_url > $jenkins_war
+@@ -31,7 +33,6 @@
+ 
+ if [[ $(unzip -l $jenkins_war | egrep "plugins/(mercurial)|(git).hpi" | wc -l) -ne 2 ]]; then
+     echo "Adding git and hg plugins to jenkins.war ..."
+-    wget -c $hg_hpi_url $git_hpi_url -P "${here}/../tmp/WEB-INF/plugins"
+     (cd ${here}/../tmp && zip jenkins.war ./WEB-INF/plugins/*.hpi)
+ fi
+ 
+@@ -57,4 +58,4 @@
+ 
+ [[ $jenkins_running -ne 0 ]] && exit 1
+ 
+-wait $java_pid
++#wait $java_pid
+
diff --git a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
new file mode 100644
index 000000000000..65c8d1b8b448
--- /dev/null
+++ b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild,v 1.1 2015/02/02 14:06:07 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MERCURIAL_PV="1.41"
+GIT_PV="1.1.21"
+
+DESCRIPTION="Scripts for automatically creating Jenkins jobs from scm branches"
+HOMEPAGE="https://github.com/gvalkov/jenkins-autojobs"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		http://updates.jenkins-ci.org/download/plugins/mercurial/${MERCURIAL_PV}/mercurial.hpi -> ${P}_mercurial_${MERCURIAL_PV}.hpi
+		http://updates.jenkins-ci.org/download/plugins/git/${GIT_PV}/git.hpi -> ${P}_git_${GIT_PV}.hpi"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">dev-python/jenkins-webapi-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+			dev-util/jenkins-bin
+			net-analyzer/netcat
+			dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( 	>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+			>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/local_jenkins.patch" )
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use test; then
+	  mkdir -p ${P}/tests/tmp/WEB-INF/plugins/
+
+	  cp -v "${DISTDIR}"/${P}_mercurial_${MERCURIAL_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/mercurial.hpi
+	  cp -v "${DISTDIR}"/${P}_git_${GIT_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/git.hpi
+	fi
+}
+
+python_test() {
+	# Test phase works with the limitation that it need be run as root in portage
+	# starts jenkins
+	./tests/bin/start-jenkins.sh
+
+	py.test || die "Failed with ${EPYTHON}"
+
+	# kills jenkins
+	echo 0 | nc 127.0.0.1 60887
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-autojobs/metadata.xml b/dev-python/jenkins-autojobs/metadata.xml
new file mode 100644
index 000000000000..770dc1fc8494
--- /dev/null
+++ b/dev-python/jenkins-autojobs/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>idella4@gentoo.org</email>
+        </maintainer>
+        <maintainer>
+                <email>hydrapolic@gmail.com</email>
+                <name>Tomas Mozes</name>
+                <description>Proxy maintainer</description>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 31b8a5357fb3..eea04a5f2922 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,4 +1,3 @@
 DIST python-daemon-1.6.tar.gz 41564 SHA256 1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b SHA512 ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299 WHIRLPOOL 35ec95c43b7822fa9abca9bb21442fe2b9f83b7171d8e8a87cc12a7e07a2653fbd5b4aea7adbba799c76d8b4cf3c844b665ae3b90d5b77afe4b33c88dce85ba4
-DIST python-daemon-2.0.1.tar.gz 62549 SHA256 a081b495133f9089c63f50e9ec0836804704bb39a8da2def071f0471aee6c094 SHA512 abf6e4ea8102f413430e6bc85a8a980cd086b8b3b3948e9f71b5b020819caedc2cce444df944a39197bc0bfbed5fd2e893b807fd60de2250ac7c3987d4f6dddd WHIRLPOOL eb59d314f86bad3ca9f0ec0c7e9cf65e36a91f495fe21949b404892ceafb09e987d3c8a39df4d9bcc2c6334e6a5a982fbf4363994e2352518c62f5909c186d29
-DIST python-daemon-2.0.3.tar.gz 68657 SHA256 fa17fb81c32f7abefabed978f000b07fa878fed754f97a9675fa17edb325a087 SHA512 8ca7ab59c9d529ed3fddd4b8ecf94d9a1198d916472efb565f1c85e9694464e6462851f4a7f4c7b2392d6565ee486b6cf2443df95944af94fbc163fcf54f99b1 WHIRLPOOL df9a34e31b018b5d973042064acd9ba6959cd39c0a620f13cb552ba154499da1b95ce3355e53addcd21282e51ea257e2e9bd324278e24274f7fdadda0815f6ef
 DIST python-daemon-2.0.4.tar.gz 71162 SHA256 07ca8c037d85bd365ef42ad7786d9d5866e636ede8e21da695a9ab4dc8c4dc19 SHA512 923680198616ffd17bc86f92c6639afe97a13d9a8d6658fb09011ddc57dabd0bcc4009abdd0be837ab092153f22ce535796705091d0785ce6845bf1919a419b3 WHIRLPOOL 2bdf2eeef58288f7df7f96fdb667b69d8b55f702bce376acc9a260a0e07f7541970834e9db3eb5effc9d37cb3df99a05979b4ac22bfb9ff72efa869fabfeb69e
+DIST python-daemon-2.0.5.tar.gz 71298 SHA256 afde4fa433d94d007206ee31a0941d55b5eb232a5422b670aad628547b46bf68 SHA512 6bac000e304e0828dd54cfa3c7972c07dedb07684f98e5f7e05815df2cf2f25c43ddf4f121e8d282519bdfcca0990fab585f18e43b2578123bc7fbe5f5f8b73e WHIRLPOOL db39b107f7c96cf5fd1c62262ed33bb6e53e8f79836be6d12dabd6b05ec59457df4fea70cd7fa2c38548fc0b60b22d01a62895251b6f26bfa0d9fe5577cdf55f
diff --git a/dev-python/python-daemon/python-daemon-2.0.3.ebuild b/dev-python/python-daemon/python-daemon-2.0.3.ebuild
deleted file mode 100644
index 954376e3be16..000000000000
--- a/dev-python/python-daemon/python-daemon-2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-daemon/python-daemon-2.0.3.ebuild,v 1.1 2015/01/17 14:15:43 djc Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="http://pypi.python.org/pypi/python-daemon"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/unittest2-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( ChangeLog )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-daemon/python-daemon-2.0.1.ebuild b/dev-python/python-daemon/python-daemon-2.0.5.ebuild
similarity index 93%
rename from dev-python/python-daemon/python-daemon-2.0.1.ebuild
rename to dev-python/python-daemon/python-daemon-2.0.5.ebuild
index 8cab345a5325..dc1f7cb42f4d 100644
--- a/dev-python/python-daemon/python-daemon-2.0.1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-daemon/python-daemon-2.0.1.ebuild,v 1.1 2015/01/10 19:41:44 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-daemon/python-daemon-2.0.5.ebuild,v 1.1 2015/02/02 09:22:00 djc Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 8820cdd3da49..2647fd70775d 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,2 +1,3 @@
 DIST pyzor-0.5.0.tar.bz2 40654 SHA256 2bf3df9e916861063a73f7b46cb8b27bac6f661fce1362803de9e7921fc155ba SHA512 048c81e373be217808f4e4e8f6adbc1b464891b725b3004031dfa7a82abe234b080c3a87bc9ad61ee1df2bfb78ed0ee78565b49843f09243f72b6315df6877a1 WHIRLPOOL 966090015bfe93d4ef059a1186e97705807769f9341e94a2f5d9c223540effac04209a32cad850c6f405225c00aea55bdf7ac5a6a98e0927824d641ee61e5c80
 DIST pyzor-0.7.0.tar.bz2 78555 SHA256 6d9ca62bd4aa9a0210adb9d4c8ff2b38bb2cd051f1517ce29e88d7fbe4b1026d SHA512 40026fc0276b4cf60fe7dfe30e2d4d4d1f220cf860b8aaef9d983e632a7d87bc8deb3430ded7520a69269ef56550117735a6e3c8d046d4cad7066f8597ead3cd WHIRLPOOL dd8466477e38362fa0a64ec66822ae3820c22f8ae13b40002145b1e688d17c17edfb800eb44679ff961e74b667daa43ef09d8eadb92f683c9e73c9b00fad23b9
+DIST pyzor-1.0.0.tar.gz 126276 SHA256 548bc461c01e790cf8db1f26d9f66b281f3aa3cf5f5a6fd647071360ed663ef1 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a WHIRLPOOL ad92ca30c116b1c22cc49b5643ecb03880ef1911d7f2a59cf9b655ccd5fa5167e0ccdb890d92754ed1b1c0730785c186f6615c569b6bbbc36aed26e2423037b1
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index 74cf7e268ac3..bfdacbcaeaaa 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -6,5 +6,6 @@
 	<flag name='pyzord'>enable support for pyzord</flag>
 	<flag name='mysql'>Enables mysql support</flag>
 	<flag name='redis'>Enables redis support</flag>
+	<flag name='gevent'>Enable support for the gevent based handler</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-python/pyzor/pyzor-1.0.0.ebuild b/dev-python/pyzor/pyzor-1.0.0.ebuild
new file mode 100644
index 000000000000..c174e7e89680
--- /dev/null
+++ b/dev-python/pyzor/pyzor-1.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-1.0.0.ebuild,v 1.1 2015/02/02 07:55:34 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYHON_REQ_USE="gdbm"
+
+inherit distutils-r1
+
+MY_PV="1-0-0"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor/"
+SRC_URI="https://github.com/SpamExperts/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gevent mysql pyzord redis test"
+
+RDEPEND="mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.5[${PYTHON_USEDEP}]' python2_7) )
+	redis? ( ~dev-python/redis-py-2.9.1[${PYTHON_USEDEP}] )
+	gevent? ( $(python_gen_cond_dep '~dev-python/gevent-1.0.1[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://sourceforge.net/apps/trac/pyzor/attachment/ticket/196/
+DISTUTILS_IN_SOURCE_BUILD=1
+
+REQUIRED_USE="test? ( mysql redis )"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+python_test() {
+	# The suite is py2 friendly only
+	if ! python_is_python3; then
+		PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
+
+src_install () {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${D}"usr/bin/pyzord* "${ED}usr/sbin"
+	else
+		rm "${D}"usr/bin/pyzord*
+	fi
+}
+
+pkg_postinst() {
+	if use pyzord; then
+		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
+	fi
+
+	einfo "If you want to run the pyzor server you will need to emerge / re-emerge"
+	einfo "with use flag mysql and or redis. Without either flag provides only the pyzor client"
+}
diff --git a/dev-python/virtualenv/virtualenv-12.0.6.ebuild b/dev-python/virtualenv/virtualenv-12.0.6.ebuild
index 715bd963e93a..8340e4e5e403 100644
--- a/dev-python/virtualenv/virtualenv-12.0.6.ebuild
+++ b/dev-python/virtualenv/virtualenv-12.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-12.0.6.ebuild,v 1.1 2015/02/01 21:45:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-12.0.6.ebuild,v 1.2 2015/02/02 13:38:35 idella4 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv"
+HOMEPAGE="http://www.virtualenv.org/ https://github.com/pypa/virtualenv/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -30,7 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
 )
 
-# pypi releases don't include tests
+# pypi releases don't include tests, github simply missed making a tarball locally for this release
 RESTRICT="test"
 
 python_compile_all() {
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 792fea4ead2d..1451629a8c71 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,4 +1,2 @@
-DIST hg-git-0.5.0.tar.gz 28923 SHA256 bad27f98f4a3d58acbea6495b93d6b7ca27e5544e1c685c4432e5d0fe09fcbee SHA512 ee695b2340f571827ed3fcc4542d838d85525de0a2ba0dbb875dba9348d1c8d30c7ad515072db0bf354d5cce77cf64300cf57f71b75f8b0740dd0acf35a6e1b3 WHIRLPOOL 9a36ccfd7194dc5d5a419f6ee6bce085adc7abc215ac7b42e8f195881777998cc3280699f82f17bb436a028b07e713260f0bbb31bce1ab7ceb331a5a6f3136b6
-DIST hg-git-0.6.0.tar.gz 31073 SHA256 fe10a81d5daf401e1df6d04e63a300a405441a77f13dfd6f1833e76c2785ecd5 SHA512 1b2fd15edd13c2b2fb6f4c79d68d0ab675bf200090b4965886ea7b6564aa15ac04a8cd7d967a03732f1cf727b7492dd01fed13e798752d9c5fbaff287806d50b WHIRLPOOL cad193f78e63b2f769f3c51c81c285d1cb3400ed08b311505e9bae0e93da9fba3370985e46f8b4561a7dee6848d33e750fde2ceb71db8445b1cbc9fecc8c44e5
-DIST hg-git-0.6.1.tar.gz 41055 SHA256 3a8111b232c2ab479d653e0fda7fb71d54af50fcaa18f49a648d9e3338f9d38c SHA512 518b82a79eab368ab5a64062d225eb3ca16443aa05354e8499a612a24a6fd530b8b30c04ae97c409b58f533b24f0292fcee09f6906c541eda65e018d07aadd50 WHIRLPOOL f7b8c182f246ea390dd4cee43523221b39e0425d83cf32c12d79818a862bd4f35eed66698ea4c2c843fc0704f49fc228e37e5441395b21007f00186140cdf117
 DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
+DIST hg-git-0.8.0.tar.gz 46004 SHA256 91a16e34612595eca8c4e23d847c6ab697267b68008594926123c6c0064298dc SHA512 6281ef070b110d0449f5667888f9f97c3c310a840890283d14f7b0d35a397bdc995af0726acc28737aa35ff99631406b575dad141a1bd16dab88eac7fb855199 WHIRLPOOL 99dac4e75cb322b68a3b7990f0130acb0ef8245583e612432f0f4af06d8ce411d7f211291683bb1adcd1866d2125796c64b37d690738bb5f4a3efd2e114934fe
diff --git a/dev-vcs/hg-git/hg-git-0.5.0-r1.ebuild b/dev-vcs/hg-git/hg-git-0.5.0-r1.ebuild
deleted file mode 100644
index e4803b279e80..000000000000
--- a/dev-vcs/hg-git/hg-git-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.5.0-r1.ebuild,v 1.3 2014/08/09 10:31:59 nimiux Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.6.1.ebuild b/dev-vcs/hg-git/hg-git-0.6.1.ebuild
deleted file mode 100644
index 18fb3b0f8b6f..000000000000
--- a/dev-vcs/hg-git/hg-git-0.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.6.1.ebuild,v 1.1 2014/08/18 20:09:47 djc Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.6.0.ebuild b/dev-vcs/hg-git/hg-git-0.8.0.ebuild
similarity index 81%
rename from dev-vcs/hg-git/hg-git-0.6.0.ebuild
rename to dev-vcs/hg-git/hg-git-0.8.0.ebuild
index 9d1a8af5f28f..e6e665df1f46 100644
--- a/dev-vcs/hg-git/hg-git-0.6.0.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.6.0.ebuild,v 1.1 2014/05/28 06:59:45 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.8.0.ebuild,v 1.1 2015/02/02 10:10:54 djc Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 6eac58ebfaac..a3e34e9a29ea 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -2,3 +2,4 @@ DIST hgsubversion-1.4.tar.gz 133564 SHA256 e3febee217ce321d316712c4c75236dcc2f27
 DIST hgsubversion-1.6.1.tar.gz 173184 SHA256 bb2787259a5f9716fe4ff4f6a4e6170fb8109c6f74550cbd92ec314d8d4278a0 SHA512 0f8e50a7445b85ad6a4984d22b976d55ebf6e15ade85aed2ae87aaf7914bcc9fbb4bd68347b1377ca2d0d307de31cbcc5e2b3691327ab9463401a1c5eee8a6f2 WHIRLPOOL c581de56a6ae5cf98ab78c8f61e1f1f1f7df895be582ccad94e05675965770aaee7e51371a14059dd2bbbc29407697dcfe1341c564cced8377283b75e0569752
 DIST hgsubversion-1.6.3.tar.gz 177625 SHA256 915f4415208f61ae7dc551da94a3c6269805af0558945a9f2736e60b0a6190c5 SHA512 b94c5febced30a6d199307ea7ff53b737e287055a97ddc539eb982efd357e8eac97bed52404099ec537ca84ff4a29a109ba88d658dfc0df38128ee1727cf3465 WHIRLPOOL 7a7970cbd223311629cb889389ffe6c48a76d54554c736fe66c025151fdad4f0083216b6465e3734319abfe0a0eb4823812652d8236ce58c20ce90baf5fa9299
 DIST hgsubversion-1.7.tar.gz 179852 SHA256 87ac8ad36dc4252202a3138a1a126710bb8f6783c9806ea408bcb8f467daf292 SHA512 a80884df901d8233ae1e59040dd272b904e6f52bcfa5a3b804e5e2b49dad75c253f1c9efe61f2dbd587f901dac0e0704e618297a975665eed8d6fc6042cd8e49 WHIRLPOOL cab9f0ce016bc1336096aa75f696664524afd391aedfded0455b006f92ed7e5b04d79b2056d3b1892fc6d02c1954edfb21495d5042296a5fe51556a0ec923494
+DIST hgsubversion-1.8.tar.gz 179375 SHA256 f8e4d1b4fc8621b8ed782f74a6328c76dabec1385d4f732f2a15d4efd27201b1 SHA512 dd38722f771e9fa4b56e8921064c7b819bb9c0483aaef48de7414531c1cc1fa3802ef3870ef22c59526afa6aa10459c0ea9f8ef1b6e3f20b41c8457c644433f9 WHIRLPOOL f70c6061e1f6dda053b65e896a7fd8ac133f08a256d0b3b47910c5b477583f0a921e76efcb557019291c6fb810293d740f8f561b56800b41ac00c050cde9b0ef
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
new file mode 100644
index 000000000000..73026de2b845
--- /dev/null
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild,v 1.1 2015/02/02 10:16:50 djc Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home http://pypi.python.org/pypi/hgsubversion"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test"
+
+# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
+RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
+		>=dev-vcs/subversion-1.5[python] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( README )
+
+#python_test() {
+#	"${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
+#}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index af6bb9ad2b24..6abe1bc2d7a5 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,2 +1,3 @@
 DIST mercurial-3.2.3.tar.gz 4078011 SHA256 c4369320e276d78aada1b5936e96c7bbbbb8154cfba725ef4e8757dcedeaf1ef SHA512 eba8e9a1f807132614d2229a6ed38840aa55a80859a504c8fa7c500572e73a1b8a33d4a26ec0e1b9c0202f5ec592d29bf4b6bd1d95f069d2ecda342d28e31569 WHIRLPOOL 586743d7960673f97cf88232a529528ce0a6e3fd2a94256ba5b528a292669111d06a9f3ecc95f10ad590374691dbdb18538f927e7b6510c3b965973646585837
 DIST mercurial-3.2.4.tar.gz 4078698 SHA256 08d4169d02fd24819a7b3203ba85ccf5037dc646e082eb1b21b3c87ed576f6bc SHA512 20f39489ca8c3a619f86e9a4c81908fe38890d55908d8194f61ea697770cbe48425b5aedf5483fa08a5297c52a746c8efde524930fb45c4f8fd778d8278557c9 WHIRLPOOL a4472a0611b427269391cdb62902d41559910146857ba6c4a63a3574cff61823ef5f99f71096469e1151bf2804f09ac04f1cb1fb3712c302c14af41f86e9cc79
+DIST mercurial-3.3.tar.gz 4162147 SHA256 306a084b166ab3d01a0d8a2e1b80208fd7c7f71dc46d485d47a9c5c021e9dc77 SHA512 96d3ad32b51d3a32a0610e36d410b5370b06c7f0746cee3d3b119c2faf864e0cc089b0e0992c6dd4c660a727e22b9e13ce94fcc98ab9b2a57b8e521d8e4a678e WHIRLPOOL fcde79dea587923e94235bc297c13bfdf0947554af9d14e67b76ac2343c548f8a7b16a15ac2977590b5dbb5b62c7901789f1bda1ef964622daaaa2e6d1a5e1a3
diff --git a/dev-vcs/mercurial/mercurial-3.3.ebuild b/dev-vcs/mercurial/mercurial-3.3.ebuild
new file mode 100644
index 000000000000..c0c6644b5b44
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.ebuild,v 1.1 2015/02/02 10:04:06 djc Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
new file mode 100644
index 000000000000..8199b9627f47
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
@@ -0,0 +1,28 @@
+From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sat, 31 Jan 2015 23:55:48 +0000
+Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h>
+
+class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
+but these are defined in <unistd.h> according to POSIX.  With libc's
+that adhere strictly to standards, like musl, this breaks the build.
+
+We add <unistd.h> to fdbuf.h which is included by fdbuf.h.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ lib/fdbuf/fdbuf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h
+index 4b0e9cb..0054b01 100644
+--- a/lib/fdbuf/fdbuf.h
++++ b/lib/fdbuf/fdbuf.h
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
index b47a12a49f34..f0835b56c265 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild,v 1.4 2014/12/31 16:20:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild,v 1.5 2015/02/02 11:50:13 jlec Exp $
 
 EAPI=5
 
@@ -66,6 +66,8 @@ src_prepare() {
 	# DO NOT APPLY patch 0009... It breaks
 	epatch "${WORKDIR}"/patches/000{1..8}*patch
 
+	epatch "${FILESDIR}"/${P}-unistd.h.patch
+
 	sed -i.orig \
 		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
 		"${S}"/src/Makefile.am || die "Sed failed"
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index 1bf0cb019c4f..076dec37ad4b 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.31 2015/01/29 17:49:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.32 2015/02/02 14:27:33 jer Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs base flag-o-matic
@@ -36,7 +36,7 @@ DEPEND="amd64? ( dev-lang/yasm )
 
 REQUIRED_USE="
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	"
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-chost.patch"
diff --git a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild b/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
index 783bd9946b70..7cbb22e001d1 100644
--- a/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
+++ b/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild,v 1.6 2015/01/29 17:49:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.2.0_pre20130625.ebuild,v 1.7 2015/02/02 14:27:33 jer Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs multilib-minimal eutils
@@ -44,7 +44,7 @@ DEPEND="abi_x86_32? ( dev-lang/yasm )
 REQUIRED_USE="
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	"
+"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-armv7.patch"
diff --git a/media-libs/libvpx/libvpx-1.3.0.ebuild b/media-libs/libvpx/libvpx-1.3.0.ebuild
index 8eeef24ecdac..56b6fc7f617b 100644
--- a/media-libs/libvpx/libvpx-1.3.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.3.0.ebuild,v 1.15 2015/01/29 17:49:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.3.0.ebuild,v 1.16 2015/02/02 14:27:33 jer Exp $
 
 EAPI=4
 inherit eutils multilib toolchain-funcs multilib-minimal
@@ -45,7 +45,7 @@ REQUIRED_USE="
 	cpu_flags_x86_sse? ( cpu_flags_x86_sse2 )
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	"
+"
 
 src_prepare() {
 	epatch "${FILESDIR}/libvpx-1.3.0-dash.patch"
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index ea827068b293..3a5e9687fdc0 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.49 2015/01/29 17:49:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.50 2015/02/02 14:27:33 jer Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs multilib-minimal
@@ -45,7 +45,7 @@ REQUIRED_USE="
 	cpu_flags_x86_sse? ( cpu_flags_x86_sse2 )
 	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-	"
+"
 
 multilib_src_configure() {
 	unset CODECS #357487
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1a938519574c..faff6002c489 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Feb 2015 07:06:52 +0000
+Mon, 02 Feb 2015 14:37:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1a938519574c..faff6002c489 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Feb 2015 07:06:52 +0000
+Mon, 02 Feb 2015 14:37:03 +0000
diff --git a/metadata/md5-cache/app-office/texmaker-4.4.1 b/metadata/md5-cache/app-office/texmaker-4.4.1
index f3b5e2bd68a9..61119a811062 100644
--- a/metadata/md5-cache/app-office/texmaker-4.4.1
+++ b/metadata/md5-cache/app-office/texmaker-4.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( qt4 qt5 )
 SLOT=0
 SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.4.1.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f51a4c8cbe5a9bd769d736d3c037545a
+_md5_=75fa01c378153f3a105131b502bfe6da
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.4 b/metadata/md5-cache/dev-java/scala-bin-2.11.4
index 88c32a5b8271..06dede3340f8 100644
--- a/metadata/md5-cache/dev-java/scala-bin-2.11.4
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DESCRIPTION=The Scala Programming Language
 EAPI=5
 HOMEPAGE=http://scala.epfl.ch/
-IUSE=elibc_FreeBSD
+IUSE=doc elibc_FreeBSD
 KEYWORDS=~x86 ~amd64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.4/scala-2.11.4.tgz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=923eb24ac2a1c130d0f02523dc001a65
+_md5_=07859b2c2b18ea449bad7a4afc542dfb
diff --git a/metadata/md5-cache/dev-libs/libf2c-20110801-r4 b/metadata/md5-cache/dev-libs/libf2c-20110801-r4
new file mode 100644
index 000000000000..3e1bc69f1a79
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libf2c-20110801-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Library that converts FORTRAN to C source
+EAPI=5
+HOMEPAGE=http://www.netlib.org/f2c/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=HPND
+SLOT=0
+SRC_URI=http://www.netlib.org/f2c//libf2c.zip -> libf2c-20110801.zip
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=f91f5c0e6cffab55d5145e34ee63432b
diff --git a/metadata/md5-cache/dev-libs/papi-5.4.0 b/metadata/md5-cache/dev-libs/papi-5.4.0
new file mode 100644
index 000000000000..0d843080c0b4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/papi-5.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
+DESCRIPTION=Performance Application Programming Interface
+EAPI=5
+HOMEPAGE=http://icl.cs.utk.edu/papi/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpfm[static-libs] virtual/mpi virtual/fortran
+SLOT=0
+SRC_URI=http://icl.cs.utk.edu/projects/papi/downloads/papi-5.4.0.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5d119927de15b107eca654703ae44bbe
diff --git a/metadata/md5-cache/dev-ml/obrowser-1.1.1 b/metadata/md5-cache/dev-ml/obrowser-1.1.1
deleted file mode 100644
index 9fc1079fc7ec..000000000000
--- a/metadata/md5-cache/dev-ml/obrowser-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.12.0:= dev-ml/lwt:= app-arch/sharutils >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml virtual machine written in Javascript, to run OCaml program in browsers
-EAPI=5
-HOMEPAGE=http://ocsigen.org/obrowser/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 GPL-3 WTFPL-2
-RDEPEND=>=dev-lang/ocaml-3.12.0:= dev-ml/lwt:=
-SLOT=0/1.1.1
-SRC_URI=http://ocsigen.org/download/obrowser-1.1.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=662a2ab15bfd0f9bd0099efd1cbaada8
diff --git a/metadata/md5-cache/dev-ml/postgresql-ocaml-3.0.0 b/metadata/md5-cache/dev-ml/postgresql-ocaml-3.0.0
new file mode 100644
index 000000000000..c91b4b4be0e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/postgresql-ocaml-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-db/postgresql[server] >=dev-ml/findlib-1.5 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=A package for ocaml that provides access to PostgreSQL databases
+EAPI=5
+HOMEPAGE=http://mmottl.github.io/postgresql-ocaml/
+IUSE=examples +ocamlopt debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-db/postgresql[server] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/3.0.0
+SRC_URI=https://github.com/mmottl/postgresql-ocaml/releases/download/v3.0.0/postgresql-ocaml-3.0.0.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	45027e91f880d9142eec842f0cca0088	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=72753a445c3ae291c5fb2f2470ec3eb3
diff --git a/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3 b/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3
new file mode 100644
index 000000000000..cd8efe552d6b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jenkins-autojobs-0.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-util/jenkins-bin net-analyzer/netcat dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/alabaster-0.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Scripts for automatically creating Jenkins jobs from scm branches
+EAPI=5
+HOMEPAGE=https://github.com/gvalkov/jenkins-autojobs
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>dev-python/jenkins-webapi-0.3.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/lxml-3.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/gvalkov/jenkins-autojobs/archive/v0.14.3.tar.gz -> jenkins-autojobs-0.14.3.tar.gz http://updates.jenkins-ci.org/download/plugins/mercurial/1.41/mercurial.hpi -> jenkins-autojobs-0.14.3_mercurial_1.41.hpi http://updates.jenkins-ci.org/download/plugins/git/1.1.21/git.hpi -> jenkins-autojobs-0.14.3_git_1.1.21.hpi
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=6c2ccff6ce6043da407c4517d9ed2b99
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.0.3 b/metadata/md5-cache/dev-python/python-daemon-2.0.3
deleted file mode 100644
index 8ee470766c84..000000000000
--- a/metadata/md5-cache/dev-python/python-daemon-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/unittest2-0.8.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Library to implement a well-behaved Unix daemon process
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/python-daemon
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=PSF-2
-RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.0.3.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d99c1fcbc34b8c37946a687ffcefd779
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.0.1 b/metadata/md5-cache/dev-python/python-daemon-2.0.5
similarity index 96%
rename from metadata/md5-cache/dev-python/python-daemon-2.0.1
rename to metadata/md5-cache/dev-python/python-daemon-2.0.5
index 307f3a4f1433..1d7fcf098100 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.0.1
+++ b/metadata/md5-cache/dev-python/python-daemon-2.0.5
@@ -9,6 +9,6 @@ LICENSE=PSF-2
 RDEPEND=>=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.0.1.tar.gz
+SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.0.5.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e93fee4aa905206fa65a6cad18dfb58f
+_md5_=aa2a1740ed45190acd4efa64b3af27d3
diff --git a/metadata/md5-cache/dev-python/pyzor-1.0.0 b/metadata/md5-cache/dev-python/pyzor-1.0.0
new file mode 100644
index 000000000000..385a62074699
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyzor-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A distributed, collaborative spam detection and filtering network
+EAPI=5
+HOMEPAGE=https://github.com/SpamExperts/pyzor/
+IUSE=doc gevent mysql pyzord redis test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=mysql? ( python_targets_python2_7? ( >=dev-python/mysql-python-1.2.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) redis? ( ~dev-python/redis-py-2.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) gevent? ( python_targets_python2_7? ( ~dev-python/gevent-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=test? ( mysql redis ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=b38e1c0b2cfa04d04c6857045e3e379e
diff --git a/metadata/md5-cache/dev-python/virtualenv-12.0.6 b/metadata/md5-cache/dev-python/virtualenv-12.0.6
index 0c4133232ce9..c1017c4cb8a8 100644
--- a/metadata/md5-cache/dev-python/virtualenv-12.0.6
+++ b/metadata/md5-cache/dev-python/virtualenv-12.0.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 DESCRIPTION=Virtual Python Environment builder
 EAPI=5
-HOMEPAGE=http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv
+HOMEPAGE=http://www.virtualenv.org/ https://github.com/pypa/virtualenv/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-12.0.6.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8acd292743910af002e66abfd726a4f5
+_md5_=3f7dd7dab4d4131f449df6529023aa60
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.5.0-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.5.0-r1
deleted file mode 100644
index f91cbd7c5c69..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-git-0.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=5
-HOMEPAGE=http://hg-git.github.io https://pypi.python.org/pypi/hg-git
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.5.0.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3fabcf69060a0cd45ee6535e6c03481a
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.6.0 b/metadata/md5-cache/dev-vcs/hg-git-0.6.0
deleted file mode 100644
index df4690175c50..000000000000
--- a/metadata/md5-cache/dev-vcs/hg-git-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=push to and pull from a Git repository using Mercurial
-EAPI=5
-HOMEPAGE=http://hg-git.github.io https://pypi.python.org/pypi/hg-git
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.6.0.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9939b245ecfe6dc132e09ac8ddcfaae0
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.6.1 b/metadata/md5-cache/dev-vcs/hg-git-0.8.0
similarity index 94%
rename from metadata/md5-cache/dev-vcs/hg-git-0.6.1
rename to metadata/md5-cache/dev-vcs/hg-git-0.8.0
index 4f7ca41187b1..99ec43db72f6 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.6.1
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/h/hg-git/hg-git-0.6.1.tar.gz
+SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.0.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b8ab7ee086c02d04e15d5a992572305c
+_md5_=70f31ca94939e3b45d19cd628e455ba8
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.8 b/metadata/md5-cache/dev-vcs/hgsubversion-1.8
new file mode 100644
index 000000000000..a19f7cb1e03a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=hgsubversion is a Mercurial extension for working with Subversion repositories
+EAPI=5
+HOMEPAGE=https://bitbucket.org/durin42/hgsubversion/wiki/Home http://pypi.python.org/pypi/hgsubversion
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/subvertpy-0.7.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/subversion-1.5[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.8.tar.gz
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=55024e3c2aa0fb13a669a4c53c2a9b90
diff --git a/metadata/md5-cache/dev-vcs/mercurial-3.3 b/metadata/md5-cache/dev-vcs/mercurial-3.3
new file mode 100644
index 000000000000..2fc40fce622b
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scalable distributed SCM
+EAPI=5
+HOMEPAGE=http://mercurial.selenic.com/
+IUSE=bugzilla emacs gpg test tk python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://mercurial.selenic.com/release/mercurial-3.3.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=b66c8d35911bfbf27941bbd08553ef96
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.13-r5 b/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
index 62479582f312..dafd088eb3bc 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
@@ -10,4 +10,4 @@ RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls ) !mail-mta/courier
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.13.tar.gz http://dev.gentoo.org/~jlec/distfiles/nullmailer-patches-1.13.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ca83cd55ea39ed6905674c0d390309ec
+_md5_=fba81a7f5a0098f0437e71468aadde7c
diff --git a/metadata/md5-cache/media-libs/libvpx-1.1.0 b/metadata/md5-cache/media-libs/libvpx-1.1.0
index 5c0fa72c2ec9..84be70139c63 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.1.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.1.0
@@ -10,4 +10,4 @@ REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
 SLOT=0
 SRC_URI=http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3fab975745faa222d0cbd5997bd019c4
+_md5_=2b20535266454a9422909899127e8927
diff --git a/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625 b/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
index 497c0d56b98d..f916bdd10d0d 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
+++ b/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cp
 SLOT=0
 SRC_URI=mirror://gentoo/libvpx-1.2.0_pre20130625.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.2.0.tar.bz2 )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=984adc0a1378ae391d25b31c520ebfb1
+_md5_=b844fa219704b31e52c72fdfdb6eecec
diff --git a/metadata/md5-cache/media-libs/libvpx-1.3.0 b/metadata/md5-cache/media-libs/libvpx-1.3.0
index 4e0d03ebe6a8..92d5b1b38cdf 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.3.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_sse? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu
 SLOT=0
 SRC_URI=http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.3.0.tar.bz2 )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3cd546c0e30d38cd1eb8679d6264be82
+_md5_=6ef3b0e14926bbe40e989dc1d670e351
diff --git a/metadata/md5-cache/media-libs/libvpx-9999 b/metadata/md5-cache/media-libs/libvpx-9999
index 63cd485f1ec6..e54bbce0812a 100644
--- a/metadata/md5-cache/media-libs/libvpx-9999
+++ b/metadata/md5-cache/media-libs/libvpx-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=cpu_flags_x86_sse? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu
 SLOT=0
 SRC_URI=test? ( mirror://gentoo/libvpx-testdata-1.3.0.tar.bz2 )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=87d6e757ffd68eb4b00d23b3b28526e1
+_md5_=a125a4edf3b9b92cbff8c1537b2a681c
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.0.3 b/metadata/md5-cache/net-analyzer/ntop-4.0.3
index 19fb16834422..ddd62001c5b4 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.0.3
+++ b/metadata/md5-cache/net-analyzer/ntop-4.0.3
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.ntop.org/products/ntop/
 IUSE=ipv6 ssl
 KEYWORDS=amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-3
 RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop-4.0.3.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=799e1056b6aabb8a70b5ff8ee600d638
+_md5_=0b42ebe86d6be8db2ab0bdd2f6fba362
diff --git a/metadata/md5-cache/net-analyzer/ntop-4.1.0 b/metadata/md5-cache/net-analyzer/ntop-4.1.0
index fb20e97b9732..298e0dd4e287 100644
--- a/metadata/md5-cache/net-analyzer/ntop-4.1.0
+++ b/metadata/md5-cache/net-analyzer/ntop-4.1.0
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.ntop.org/products/ntop/
 IUSE=snmp ssl
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-3
 RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-4.1.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6d7208d2bcc1640aacea4518a48512d8
+_md5_=e3800ce474f1194f291f56d5e027f430
diff --git a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1 b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
index de983372d17b..2b3dcd3314c9 100644
--- a/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/ntop-5.0.1-r1
@@ -5,10 +5,10 @@ EAPI=5
 HOMEPAGE=http://www.ntop.org/products/ntop/
 IUSE=snmp ssl python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-3
 RDEPEND=virtual/awk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool[graph] ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip dev-libs/glib:2 dev-python/mako
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/ntop/ntop/Stable/ntop-5.0.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=768c41c07780405d40057809c4bf6ca2
+_md5_=cbfb650519d504dc561a6528115752ae
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r1 b/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r2
similarity index 98%
rename from metadata/md5-cache/net-fs/nfs-utils-1.3.2-r1
rename to metadata/md5-cache/net-fs/nfs-utils-1.3.2-r2
index 20cba4c57997..661fca64d199 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.3.2.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=af641656e90f495251a2e4ccf13b8ea9
+_md5_=dea1998a8d5aa188e262efa0e49676e0
diff --git a/metadata/md5-cache/net-proxy/squid-3.3.13-r1 b/metadata/md5-cache/net-proxy/squid-3.3.13-r1
index 40bfaa5ea0a5..98731093e8c3 100644
--- a/metadata/md5-cache/net-proxy/squid-3.3.13-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.3.13-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 <=sys-devel/libtool-2.4.2-r1 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client ssl-crtd mysql postgres sqlite qos tproxy pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 <=sys-devel/libtool-2.4.2-r1 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.3/squid-3.3.13.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=65f745bbfb0fd0f569fad2b5d786a44b
+_md5_=bdd061168011511c3c02d4a86a02130f
diff --git a/metadata/md5-cache/net-proxy/squid-3.4.11 b/metadata/md5-cache/net-proxy/squid-3.4.11
index 7c27d1ee7b7a..ff42981c1b87 100644
--- a/metadata/md5-cache/net-proxy/squid-3.4.11
+++ b/metadata/md5-cache/net-proxy/squid-3.4.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl dev-libs/libltdl ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi icap-client ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl dev-libs/libltdl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.4/squid-3.4.11.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c5fca402379843bf9581c984ea35349a
+_md5_=f149d02d0c0e307b01c7b50b10f940cd
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.1 b/metadata/md5-cache/net-proxy/squid-3.5.1
index d5dc5ec97266..191e2d7899cd 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.1
+++ b/metadata/md5-cache/net-proxy/squid-3.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl dev-libs/libltdl ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl dev-libs/libltdl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.1.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4ac2bea4d5608ce5ad5c317a5c6463e7
+_md5_=4ec65e6140a553466d0008b62553681c
diff --git a/metadata/md5-cache/sci-biology/rebase-1502 b/metadata/md5-cache/sci-biology/rebase-1502
new file mode 100644
index 000000000000..926b753d12ab
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/rebase-1502
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+DESCRIPTION=A restriction enzyme database
+EAPI=5
+HOMEPAGE=http://rebase.neb.com
+IUSE=emboss minimal
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1502.tar.xz
+_md5_=e86c13fdf2e4f0e997e02e6547332cc0
diff --git a/metadata/md5-cache/sci-libs/libsvm-2.90-r1 b/metadata/md5-cache/sci-libs/libsvm-2.90-r1
deleted file mode 100644
index bfd904c620fb..000000000000
--- a/metadata/md5-cache/sci-libs/libsvm-2.90-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Library for Support Vector Machines
-EAPI=3
-HOMEPAGE=http://www.csie.ntu.edu.tw/~cjlin/libsvm/
-IUSE=java python tools elibc_FreeBSD java
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=java? ( >=virtual/jdk-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-2.9.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a066db7e3950bbb70bffab0415155628
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.14 b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
similarity index 54%
rename from metadata/md5-cache/sci-libs/libsvm-3.14
rename to metadata/md5-cache/sci-libs/libsvm-3.17-r1
index 9997b2d49788..73dfbaf54e28 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.14
+++ b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Library for Support Vector Machines
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.csie.ntu.edu.tw/~cjlin/libsvm/
-IUSE=java openmp python tools elibc_FreeBSD java
+IUSE=java openmp python tools elibc_FreeBSD java python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.14.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1dcfb31e8e2bccaf0fbcb4e06ef7a5ce
+SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.17.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c78f2227a8fd0e42aac7ff47fd86bedc
diff --git a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
index 67d28f6cc3a5..aa8efa9f79b9 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.10.0.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=07484d48189f5b69d5904eb527400ddb
+_md5_=e77b684e5dc948834266a52e1ec08352
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.29 b/metadata/md5-cache/sci-visualization/gwyddion-2.29
deleted file mode 100644
index 02de776c58db..000000000000
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.29
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test
-DEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
-DESCRIPTION=Framework for Scanning Mode Microscopy data analysis
-EAPI=4
-HOMEPAGE=http://gwyddion.net/
-IUSE=doc fftw gnome kde nls opengl perl python ruby sourceview xml X
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://gwyddion.net/download/2.29/gwyddion-2.29.tar.xz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d490fa62b27537aa9dc2bcf5d5360594
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.30 b/metadata/md5-cache/sci-visualization/gwyddion-2.30
deleted file mode 100644
index d4f5e4cba089..000000000000
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test
-DEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
-DESCRIPTION=Framework for Scanning Mode Microscopy data analysis
-EAPI=4
-HOMEPAGE=http://gwyddion.net/
-IUSE=doc fftw gnome kde nls opengl perl python ruby sourceview xml X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( >=sci-libs/fftw-3 ) gnome? ( gnome-base/gconf:2 ) kde? ( >=kde-base/kdelibs-4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://gwyddion.net/download/2.30/gwyddion-2.30.tar.xz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=821b7fdaa000350d15d7a4bbe3947c3e
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1 b/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1
deleted file mode 100644
index fc1cf85971cb..000000000000
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.30-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup test
-DEPEND=media-libs/libpng:0 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) kde? ( kde-base/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
-DESCRIPTION=Framework for Scanning Mode Microscopy data analysis
-EAPI=4
-HOMEPAGE=http://gwyddion.net/
-IUSE=doc fftw gnome kde nls opengl perl python ruby sourceview xml X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXmu x11-libs/pango fftw? ( sci-libs/fftw:3.0 ) gnome? ( gnome-base/gconf:2 ) kde? ( kde-base/kdelibs:4 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) python? ( dev-python/pygtk:2 ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://gwyddion.net/download/2.30/gwyddion-2.30.tar.xz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bbc87fa3b6fd0c720d8de66656a1583d
diff --git a/metadata/md5-cache/virtual/notification-daemon-0 b/metadata/md5-cache/virtual/notification-daemon-0
index 992fa1ccd79d..6d0819a56ee2 100644
--- a/metadata/md5-cache/virtual/notification-daemon-0
+++ b/metadata/md5-cache/virtual/notification-daemon-0
@@ -3,6 +3,6 @@ DESCRIPTION=Virtual for notification daemon dbus service
 EAPI=5
 IUSE=gnome
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) !gnome? ( || ( x11-misc/notification-daemon xfce-extra/xfce4-notifyd x11-misc/qtnotifydaemon x11-misc/notify-osd x11-misc/dunst >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[enlightenment_modules_notification] x11-wm/enlightenment[e_modules_notification] kde-base/knotify x11-misc/mate-notification-daemon lxqt-base/lxqt-notificationd kde-frameworks/knotifications ) )
+RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) !gnome? ( || ( x11-misc/notification-daemon xfce-extra/xfce4-notifyd x11-misc/qtnotifydaemon x11-misc/notify-osd x11-misc/dunst >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[enlightenment_modules_notification] x11-wm/enlightenment[e_modules_notification] kde-base/knotify kde-apps/knotify x11-misc/mate-notification-daemon lxqt-base/lxqt-notificationd kde-frameworks/knotifications ) )
 SLOT=0
-_md5_=e892e71d221d500191eeae158b469fb6
+_md5_=3d5b15df54b72d55e2fd75055c8a695b
diff --git a/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt b/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt
deleted file mode 100644
index 32fa60324f16..000000000000
--- a/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Title: ffmpeg/libav conflict management: USE=libav
-Author: Michał Górny <mgorny@gentoo.org>
-Content-Type: text/plain
-Posted: 2015-02-01
-Revision: 1
-News-Item-Format: 1.0
-Display-If-Installed: media-video/ffmpeg
-Display-If-Installed: media-video/libav
-
-The support for automatic choice between ffmpeg and libav is going to be
-deprecated in favor of explicit choice via USE flags. This change aims
-to solve multiple repeating issues, including Portage undesirably
-wanting to replace one package with the other, lack of proper reverse
-dependency on ffmpeg/libav upgrades and some of the hard-to-understand
-upgrade failures involving blockers. It also may be used to make ffmpeg
-and libav co-installable in the future.
-
-The current USE=ffmpeg will maintain its role of enabling optional
-support for ffmpeg or a compatible implementation (libav) in a package.
-However, whenever appropriate additional USE=libav will be introduced to
-control the preference of one implementation over the other.
-
-Users who currently use libav (the Gentoo default) do not have to
-perform any action since USE=libav is enabled by default. It should be
-noted that the users still need to enable USE=ffmpeg on packages with
-optional libav support as well. Users who want to use ffmpeg instead
-need to specify USE=-libav in make.conf explicitly.
-
-Please also note that some packages support only one of the two
-implementations. An attempt to install one of those packages may result
-in blockers requiring the user changes the global USE=libav state.
-The most notable example of such package is media-video/mplayer.
-media-video/mpv may be used as a replacement for users who prefer libav.
-
-Please do not alter the state of 'libav' flag on a per-package basis
-(e.g. via package.use). The flag needs to be set globally to have
-consistent value throughout all packages. Otherwise, blockers will
-prevent upgrades.
diff --git a/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt.asc b/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt.asc
deleted file mode 100644
index aba6d3cc004a..000000000000
--- a/metadata/news/2015-02-01-use-libav/2015-02-01-use-libav.en.txt.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAABCgBmBQJUzoW+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgngP/1/amGltpEmEQka3ak7CK30m
-39B2gMaKxa0UEp8Zyiw1Q+QrrtiC0Lu3YVFQBybNBWVASP9DsfuZJbgf0Dnd+oxz
-Vcmv7BrDjLQVjeBlqHN2YzjX5yW+GXUm1+nCvq98oGlFZcQRCSkvkmSSV5At5kJE
-AkRm2kT0VMaQ3WT2vxdMa5BppmZv7bZoh+s0IgAfE2jvOZNG5yFmoRWhVelI6B0J
-eKa5PNPr3aSnyxMQ8YMh6sjLbCeYC3NJkD+P6uWWIKYIpS2QavAZlAjv/7WcmH8U
-IKpMA4bcPPnjaS/GJs6PbcG55oF7ltJYwE67IxVj93zEYtpA6yh91cop1iyOvtj4
-529bAQyh439MSCBsY95Zmy/NQv+I73g47KfcGfsUlxR6YJD2jIEppV1lSgqZyv0T
-wTXS4ijRTlHKitIPeIsSt5dWKHT1zMi/RR6thR/skRF/JQ5ZJ36MollqU5eud4vP
-2oH8AUUVTmhasD5oYWN+6OC6pEpyW19DlgFFonrrXTrEyLHnlt2eL7f4YKHuOV7L
-XRvqWlZ6hpM7XO6yaFEp0KseEz8DkYX05qzfZE+f2e0G8cLt9O3hTXf3V+vKI52B
-OBQQMA+CQLIBC6ed/qfFmHDByh5G8NsafdmXRwEf1/ZtG3+KKdR+nRcdppn4/VK7
-CKNynotp4jErUq43JD9X
-=dgGE
------END PGP SIGNATURE-----
diff --git a/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt b/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt
new file mode 100644
index 000000000000..7e1b2be650ca
--- /dev/null
+++ b/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt
@@ -0,0 +1,39 @@
+Title: nfs service changes
+Author: William Hubbs <williamh@gentoo.org>
+Content-Type: text/plain
+Posted: 2015-02-02
+Revision: 1
+News-Item-Format: 1.0
+Display-If-Installed: <=net-fs/nfs-utils-1.3.1-r1
+
+The upgrade to nfs-utils-1.3.1-r1 includes significant service changes
+both for OpenRC and systemd users.
+
+OpenRC users:
+
+The OpenRC service which handled mounting nfs file systems has been
+changed to only start the nfs client daemons and renamed to nfsclient.
+Because of this change, if you use OpenRC and mount nfs file systems,
+you need to perform the following steps:
+
+Add nfsclient to the runlevel nfsmount was in before. For example, if
+nfsmount was in the default runlevel, run this command:
+
+rc-update add nfsclient default
+
+If you use a permanent network connection to the server, make sure
+netmount is in the same runlevel as nfsclient. If not, it is recommended
+that net-fs/autofs be set up to handle your network mounts.
+
+Systemd users:
+
+The nfs systemd units have been renamed.  If you are exporting nfs
+mounts, you should enable the rpcbind and nfs-server services.  If you
+are mounting nfs mounts systemd should automatically detect this and
+start the nfs-client service.
+
+More Information:
+
+The following wiki page has more information about nfs file systems:
+
+http://wiki.gentoo.org/wiki/NFSv4
diff --git a/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt.asc b/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt.asc
new file mode 100644
index 000000000000..e4b872d4523b
--- /dev/null
+++ b/metadata/news/2015-02-02-nfs-service-changes/2015-02-02-nfs-service-changes.en.txt.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlTOvR8ACgkQblQW9DDEZTgZVQCfet8NCFgtHFd2Td5Njglf3cHo
+lJsAn3qXn3U9YXr313KKe0aNNQ3x6nu2
+=XpII
+-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3d0b73e915fb..b0153be56a99 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Feb 2015 07:06:55 +0000
+Mon, 02 Feb 2015 14:37:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 02baf874e02a..4d1546884acc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb  2 07:06:52 UTC 2015
+Mon Feb  2 14:37:03 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 80c1dac970c2..7aba40e04f5d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Feb 2015 07:30:01 +0000
+Mon, 02 Feb 2015 15:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ef449bdfd8a6..6d78940a54b5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1422860701 Mon 02 Feb 2015 07:05:01 AM UTC UTC
+1422887701 Mon 02 Feb 2015 02:35:01 PM UTC UTC
diff --git a/net-analyzer/ntop/ntop-4.0.3.ebuild b/net-analyzer/ntop/ntop-4.0.3.ebuild
index 8a70618be613..9d9c87218394 100644
--- a/net-analyzer/ntop/ntop-4.0.3.ebuild
+++ b/net-analyzer/ntop/ntop-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.0.3.ebuild,v 1.11 2014/07/15 17:45:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.0.3.ebuild,v 1.12 2015/02/02 10:05:08 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/products/ntop/"
 SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="ipv6 ssl"
diff --git a/net-analyzer/ntop/ntop-4.1.0.ebuild b/net-analyzer/ntop/ntop-4.1.0.ebuild
index 1398a36d9146..e05925a2bdc5 100644
--- a/net-analyzer/ntop/ntop-4.1.0.ebuild
+++ b/net-analyzer/ntop/ntop-4.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.1.0.ebuild,v 1.6 2014/07/15 17:45:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-4.1.0.ebuild,v 1.7 2015/02/02 10:05:08 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/products/ntop/"
 SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="snmp ssl"
diff --git a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
index 7411c5ad47f9..3d57895cd0c4 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.3 2014/07/16 14:15:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-5.0.1-r1.ebuild,v 1.4 2015/02/02 10:05:08 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -11,7 +11,7 @@ DESCRIPTION="Network traffic analyzer with web interface"
 HOMEPAGE="http://www.ntop.org/products/ntop/"
 SRC_URI="mirror://sourceforge/ntop/ntop/Stable/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="snmp ssl"
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
new file mode 100644
index 000000000000..393f70b87a99
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
@@ -0,0 +1,30 @@
+From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Sun, 1 Feb 2015 12:03:46 -0500
+Subject: [PATCH] statd: Fix test for foreground mode
+
+daemon_init parameter has the opposite sense
+to code removed in commit 7addf9d
+
+Signed-off-by: Chris Mayo <aklhfex@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/statd/statd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ 		simulator (--argc, ++argv);	/* simulator() does exit() */
+ #endif
+ 
+-	daemon_init(!(run_mode & MODE_NODAEMON));
++	daemon_init((run_mode & MODE_NODAEMON));
+ 
+ 	if (run_mode & MODE_LOG_STDERR) {
+ 		xlog_syslog(0);
+-- 
+2.2.2
+
diff --git a/net-fs/nfs-utils/files/rpc.statd.initd b/net-fs/nfs-utils/files/rpc.statd.initd
index 9f27074312cc..c82041a4d203 100755
--- a/net-fs/nfs-utils/files/rpc.statd.initd
+++ b/net-fs/nfs-utils/files/rpc.statd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.8 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -22,7 +22,7 @@ start() {
 	fi
 
 	ebegin "Starting NFS statd"
-	start-stop-daemon --start --background --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
+	start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
 	eend $?
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild
similarity index 97%
rename from net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild
rename to net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild
index 02cc0708345c..737c5a5067dd 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild,v 1.1 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild,v 1.1 2015/02/02 13:47:41 radhermit Exp $
 
 EAPI="5"
 
@@ -58,11 +58,13 @@ DEPEND="${DEPEND_COMMON}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.3.2-background-statd.patch
 
 	sed \
 		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
 		-i utils/*/Makefile.am || die
 
+	epatch_user
 	eautoreconf
 }
 
diff --git a/net-proxy/squid/squid-3.3.13-r1.ebuild b/net-proxy/squid/squid-3.3.13-r1.ebuild
index 4f2c8102530f..9c7fdb4d9270 100644
--- a/net-proxy/squid/squid-3.3.13-r1.ebuild
+++ b/net-proxy/squid/squid-3.3.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.13-r1.ebuild,v 1.13 2014/11/21 10:04:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.13-r1.ebuild,v 1.14 2015/02/02 07:34:37 eras Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -29,9 +29,8 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	ecap? ( net-libs/libecap:0.2 )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
-	sys-devel/libtool
-	dev-lang/perl
-	sys-devel/libtool"
+	<=sys-devel/libtool-2.4.2-r1
+	dev-lang/perl"
 DEPEND="${COMMON_DEPEND}
 	sys-apps/ed
 	test? ( dev-util/cppunit )"
diff --git a/net-proxy/squid/squid-3.4.11.ebuild b/net-proxy/squid/squid-3.4.11.ebuild
index 867922961b45..b4814fb46210 100644
--- a/net-proxy/squid/squid-3.4.11.ebuild
+++ b/net-proxy/squid/squid-3.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.11.ebuild,v 1.1 2015/01/15 13:32:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.11.ebuild,v 1.2 2015/02/02 07:36:58 eras Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -32,7 +32,7 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
 	dev-lang/perl
-	sys-devel/libtool"
+	dev-libs/libltdl"
 DEPEND="${COMMON_DEPEND}
 	ecap? ( virtual/pkgconfig )
 	sys-apps/ed
diff --git a/net-proxy/squid/squid-3.5.1.ebuild b/net-proxy/squid/squid-3.5.1.ebuild
index 57de10c40d88..1e0a819d9522 100644
--- a/net-proxy/squid/squid-3.5.1.ebuild
+++ b/net-proxy/squid/squid-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1.ebuild,v 1.2 2015/01/21 06:49:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.1.ebuild,v 1.3 2015/02/02 07:36:58 eras Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -32,7 +32,7 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
 	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
 	>=sys-libs/db-4
 	dev-lang/perl
-	sys-devel/libtool"
+	dev-libs/libltdl"
 DEPEND="${COMMON_DEPEND}
 	ecap? ( virtual/pkgconfig )
 	sys-apps/ed
diff --git a/profiles/package.mask b/profiles/package.mask
index 1e878de7c2fc..e2b91fe86107 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16319 2015/02/01 23:14:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16321 2015/02/02 13:11:08 mgorny Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,25 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (02 Feb 2015)
+# Temporarily mask updated ffmpeg reverse deps to improve
+# the solution used.
+=app-text/unpaper-6.1-r1
+=media-gfx/blender-2.72b-r3
+=media-libs/xine-lib-1.2.6-r1
+=media-tv/xbmc-13.2-r1
+=media-video/ffmpeg2theora-0.29-r2
+=media-video/handbrake-0.10.0-r1
+=media-video/makemkv-1.8.13-r1
+=media-video/mplayer2-2.0_p20131009-r1
+=media-video/mpv-0.3.11-r1
+=media-video/mpv-0.7.2-r1
+=media-video/vlc-2.1.5-r1
+=net-misc/mediatomb-0.12.2_pre20150118-r1
+=virtual/ffmpeg-0.10.3-r1
+=virtual/ffmpeg-9-r2
+=x11-wm/xpra-0.14.12-r1
+
 # Eray Aslan <eras@gentoo.org> (31 Jan 2015)
 # Mask experimental software
 =mail-mta/postfix-3.0*
@@ -412,12 +431,6 @@ net-wireless/cinnamon-bluetooth
 # Removal in a month.
 net-wireless/ussp-push
 
-# Alexis Ballier <aballier@gentoo.org> (01 Dec 2014)
-# Does not build with any recent ocaml compiler.
-# Unmaintained upstream.
-# Removal after 01 Jan 2015
-dev-ml/obrowser
-
 # Richard Yao <ryao@gentoo.org> (29 Nov 2014)
 # Depends on media-libs/lcms:0, which has unspecified security vulnerabilities.
 # Masked until mscms.dll.so that links to media-libs/lcms:2 is backported from
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a19c13d1c8f4..dc284c93a25b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2265,6 +2265,7 @@ dev-python/pyudev:pyqt4 - Install PyQt4 binding
 dev-python/pyudev:pyside - Install PySide binding
 dev-python/pyyaml:libyaml - enable support for C implementation using libyaml
 dev-python/pyzmq:green - Enable gevent compatibility with zeromq
+dev-python/pyzor:gevent - Enable support for the gevent based handler
 dev-python/pyzor:mysql - Enables mysql support
 dev-python/pyzor:pyzord - enable support for pyzord
 dev-python/pyzor:redis - Enables redis support
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index c07e862dd316..bdfa6635757b 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,2 +1,3 @@
 DIST rebase-1412.tar.xz 65051884 SHA256 0056bf0b7f965749aa6704012417db74003576a77fbaee393123c88fab567d49 SHA512 e96d4c003b606eddb1274aa5b9baf422bb49310e5cdeba38c2c918c571420ece300dddff431160199950079b409d5aafe5fc322a1b9aa1f2727f79e571f76fb8 WHIRLPOOL 53ceb8b4a83048d5792fa569dea98830c3ae94400759e28822df7533569d26047f85aca9b0abd861ac89a944a83fb90d224b79fc2bfce4f79ff77daeb69c1b72
 DIST rebase-1501.tar.xz 66478008 SHA256 4ffba0e98524cb25389f6cb0079792a4efc1e0f95101961105ecd67209c79f94 SHA512 46656da15d297d3a58382559da16659f0c01611910cde4284ef45e3f0d181bcb7878ba32465ea154e45a3658b731d4cb2a5a25f62105a05daf284bbd78df3592 WHIRLPOOL 57fdd5ddf01842e0214f64231c9171234e7dedd06b7d1faeef996142c67bfbfa582cd0a85f0156f9f51f1c6c12e7603c2b1aba7c4edb8c6e5c11af6247b84e02
+DIST rebase-1502.tar.xz 513837344 SHA256 9d579b7ea0c93a199defd94fc378871a87f1b238aacd87649a5ad3e63caa4c5b SHA512 945c884c0b940e374e47b41f53d2d24edbab3f627ac015ff6033e2fc1bab1599c20595d03c31ec60b9aaa9f25e9dad09012bfd347a152b2b2b27996e157b730a WHIRLPOOL a8b145ac4cbe2edff39fac9934d5d6d43bcf16a89988e9b5e82682911196adb33ba8681a2de65e3a6f7e136bc259476316bdb24f0e46d83ce5572effe99aaaac
diff --git a/sci-biology/rebase/rebase-1502.ebuild b/sci-biology/rebase/rebase-1502.ebuild
new file mode 100644
index 000000000000..3fa55f3d0d3c
--- /dev/null
+++ b/sci-biology/rebase/rebase-1502.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1502.ebuild,v 1.1 2015/02/02 09:11:22 jlec Exp $
+
+EAPI=5
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+	if use emboss; then
+		echo; einfo "Indexing Rebase for usage with EMBOSS."
+		mkdir REBASE || die
+		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+				-protofile proto.${MY_PV} -equivalences \
+				|| die "Indexing Rebase failed."
+		echo
+	fi
+}
+
+src_install() {
+	if ! use minimal; then
+		insinto /usr/share/${PN}
+		doins withrefm.${MY_PV} proto.${MY_PV}
+	fi
+	newdoc REBASE.DOC README
+	if use emboss; then
+		insinto /usr/share/EMBOSS/data/REBASE
+		doins REBASE/embossre.{enz,ref,sup}
+		insinto /usr/share/EMBOSS/data
+		doins REBASE/embossre.equ
+	fi
+}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index e811e66ea573..1fe5b856d07e 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,3 +1 @@
-DIST libsvm-2.9.tar.gz 563829 SHA256 0cfb4b88c37e431490b65c97a2043f9aa9d2f1ee140344944dfea88b1136c757
-DIST libsvm-3.14.tar.gz 603819 SHA256 c968528b6360a8d420f259ce531f76c3c30070cf20f2d334652f828d04cd4aa3 SHA512 7d8681ba65ea754998fcfa702db4297cb2259e59f53a494e3d4e7aa06a9d2c67bc68bfc7a57d64d4008649523cae0ad7315c338036e9aa59416bb7a3486f33f6 WHIRLPOOL ede159ab92c2b60afe0092dee12386f28e8a9a4162e8300076b5e0917c6371c26dae4a4eb8575fa4200399789d3cd461c4e9212168f6da95d9c0d6e1c9a2f4d2
 DIST libsvm-3.17.tar.gz 607892 SHA256 46a4750d3506e6ccd8adf7e3e1f482d86ce9c5368f9c78e19c7923edf0067a12 SHA512 43f3e7cbee37b583cd65041465ef620ab7b3a24ad3f0e70cc2f41efea847e8c1c7319a92b53262bc5f721a46c0cfb4d51102d2e29c93b6ccae03ecf006e53d2d WHIRLPOOL 9518e2aeb5d2f0ac0945fa193edfaf7ba022729cc9ea91e5a773fed638fdcaef4d4bea0f284f1698571b570f5543afc8987ec81a54637d537c709b09474f6fbc
diff --git a/sci-libs/libsvm/libsvm-2.90-r1.ebuild b/sci-libs/libsvm/libsvm-2.90-r1.ebuild
deleted file mode 100644
index 845d72c80f48..000000000000
--- a/sci-libs/libsvm/libsvm-2.90-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-2.90-r1.ebuild,v 1.5 2010/04/18 17:37:00 nixnut Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils java-pkg-opt-2 python toolchain-funcs multilib
-
-MY_P="${PN}-${PV%0}"
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="http://www.csie.ntu.edu.tw/~cjlin/libsvm/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="java python tools"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	tools? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-fpic.patch
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	epatch "${FILESDIR}"/${PV}-python3.patch
-	python_copy_sources
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CXXFLAGS}" \
-		|| die "emake failed"
-
-	sed -i -e 's@\.\./@/usr/bin/@g' tools/*.py \
-		|| die "Failed to fix paths in python files"
-
-	if use python ; then
-		compilation () {
-			pushd python
-			emake \
-				CXX="$(tc-getCXX)" \
-				LDFLAGS="${LDFLAGS} -shared" \
-				CFLAGS="${CXXFLAGS} -I$(python_get_includedir) -I.." \
-				all || die "emake for python modules failed"
-			popd
-		}
-		python_execute_function -s compilation
-	fi
-
-	if use java ; then
-		pushd java
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			Makefile || die "Failed to fix java makefile"
-		emake || die "emake for java modules failed"
-		popd
-	fi
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale \
-		|| die "Failed to install binaries"
-	dohtml FAQ.html || die
-	dodoc README || die
-
-	if use tools; then
-		pushd tools
-		insinto /usr/share/${PN}/tools
-		doins easy.py grid.py subset.py \
-			|| die "Failed to install python tools"
-		docinto tools
-		dodoc README || die
-		popd
-	fi
-
-	if use python ; then
-		installation() {
-			pushd python
-			insinto $(python_get_sitedir)
-			doins svmc.so svm.py \
-				|| die "Failed to install python scripts"
-			docinto python
-			dodoc README || die
-			popd
-		}
-		python_execute_function -s installation
-	fi
-
-	if use java; then
-		pushd java
-		java-pkg_dojar libsvm.jar
-		docinto java
-		dohtml test_applet.html || die
-		popd
-	fi
-}
diff --git a/sci-libs/libsvm/libsvm-3.14.ebuild b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
similarity index 78%
rename from sci-libs/libsvm/libsvm-3.14.ebuild
rename to sci-libs/libsvm/libsvm-3.17-r1.ebuild
index 7e9bb55317a5..9c78c3681086 100644
--- a/sci-libs/libsvm/libsvm-3.14.ebuild
+++ b/sci-libs/libsvm/libsvm-3.17-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.14.ebuild,v 1.1 2012/11/29 19:04:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libsvm/libsvm-3.17-r1.ebuild,v 1.1 2015/02/02 08:09:51 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
-inherit eutils java-pkg-opt-2 python flag-o-matic toolchain-funcs
+inherit eutils java-pkg-opt-2 python-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for Support Vector Machines"
 HOMEPAGE="http://www.csie.ntu.edu.tw/~cjlin/libsvm/"
@@ -29,11 +29,10 @@ pkg_setup() {
 			die "Need an OpenMP capable compiler"
 		else
 			append-ldflags -fopenmp
-			append-cxxflags -fopenmp
+			append-flags -fopenmp
 		fi
-		append-cxxflags -DOPENMP
+		append-flags -DOPENMP
 	fi
-	use python && python_pkg_setup
 }
 
 src_prepare() {
@@ -49,7 +48,7 @@ src_prepare() {
 			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
 			java/Makefile || die "Failed to fix java makefile"
 	fi
-	tc-export CXX
+	tc-export CXX CC
 }
 
 src_compile() {
@@ -78,10 +77,11 @@ src_install() {
 
 	if use python ; then
 		installation() {
-			insinto $(python_get_sitedir)
-			doins python/*.py
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
 		}
-		python_execute_function installation
+		python_foreach_impl installation
 		newdoc python/README README.python
 	fi
 
diff --git a/sci-libs/libsvm/metadata.xml b/sci-libs/libsvm/metadata.xml
index d3a52c3c71cc..3c124a8104e4 100644
--- a/sci-libs/libsvm/metadata.xml
+++ b/sci-libs/libsvm/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
  The LIBSVM library is used to calculate Support Vector Machine
  optimizations  with a great variety of options. It includes
  one-class, two-class, multiclass, regression-mode, and probablistic
  output functionality. It is primarily of interest to machine-learning
  researchers and artificial intelligence application developers.
 </longdescription>
-<use>
-  <flag name="tools">Install python based tool scripts</flag>
-</use>
+  <use>
+    <flag name="tools">Install python based tool scripts</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/plplot/files/plplot-5.10.0-cmake.patch b/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
new file mode 100644
index 000000000000..dbb0f829147b
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
@@ -0,0 +1,18 @@
+diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
+index 3f842aa..4d269bd 100644
+--- a/cmake/modules/pkg-config.cmake
++++ b/cmake/modules/pkg-config.cmake
+@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
+     set(_xprefix ${_prefix})
+   endif(FORCE_EXTERNAL_STATIC)
+   
+-  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
++  if(CMAKE_VERSION VERSION_LESS "3.1")
++    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
++  else(CMAKE_VERSION VERSION_LESS "3.1")
++    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
++  endif(CMAKE_VERSION VERSION_LESS "3.1")
++    
+   if(${_prefix}_FOUND)
+     cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
+     # If libraries cannot be not found, then that is equivalent to whole
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 7b67d268d00c..f5888937e939 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   PLplot is a library of functions that are useful for making scientific
   plots. It can be used from within compiled languages such as C, C++,
   FORTRAN and Java, as well as interactively from interpreted languages such
@@ -15,13 +15,13 @@
   support for extended characters inculding the Greek alphabet and a host of
   mathematical symbols.
 </longdescription>
-<use>
-  <flag name="ada">Add bindings for the ADA programming language</flag>
-  <flag name="dynamic">Build with dynamic drivers</flag>
-  <flag name="octave">Add bindings for
+  <use>
+    <flag name="ada">Add bindings for the ADA programming language</flag>
+    <flag name="dynamic">Build with dynamic drivers</flag>
+    <flag name="octave">Add bindings for
   <pkg>sci-mathematics/octave</pkg></flag>
-  <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
-  <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
-  <flag name="shapefile">Enable support for ESRI shapefiles</flag>
-</use>
+    <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
+    <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
+    <flag name="shapefile">Enable support for ESRI shapefiles</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
index d7f869766f9e..2d8f3d8194eb 100644
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.2 2014/06/27 19:26:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.3 2015/02/02 10:13:30 jlec Exp $
 
 EAPI=5
 
@@ -99,6 +99,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.11-octave.patch
 	"${FILESDIR}"/${PN}-5.9.11-multiarch.patch
 	"${FILESDIR}"/${PN}-5.10.0-have-config-h.patch
+	"${FILESDIR}"/${PN}-5.10.0-cmake.patch
 )
 
 pkg_setup() {
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 8cf8b62d839c..16e036ba67f8 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,3 +1 @@
-DIST gwyddion-2.29.tar.xz 2808868 SHA256 d7dd3b5bfb254cf158cfed80ebd2495fb1142f8189594c7d6f8f6a9944e5c64b SHA512 2b88ea1a872e8b9a228248d2ba94d96000d46a1a483202ed830198829ff21de21f6d13a1ec833ad0b93a12e112415798963c48b9b8cfca05e9e3fe8c2bb28f2b WHIRLPOOL 025d1552df7871515db8a6d1157dcb1562d16db14007f5adc762f8a5b504d53cc1732400d9f4b32d5ff2ea06726e24b6513f13b2f9c7f058f0f602027560da66
-DIST gwyddion-2.30.tar.xz 2771208 SHA256 3778e56ec5f2d2333297c9aa2b850a1cb2b29b9e71421657223c44f30e05b140 SHA512 b311e086115446eb7d43cbcc2eee244ba145445f3742eb615efd02da4d95e68fc8d8d026ccb5869cd9c54b02978e27a9081aedc20afdb339c6636ee883e43734 WHIRLPOOL c696693f960006458a0af743057579d2516b15a97dff68dc780802c5800c5b14df1012059de83221f7bd0805e9ebbc44425144669f2ce78f32ee6f75a3669f0e
 DIST gwyddion-2.39.tar.xz 3130844 SHA256 f2346a706fa097e9186339f7e10b7837b20ce403b44bc7a85bc78b6b78a506d2 SHA512 5b9631c9eeb71a10d0be3533585eb61e8d27bc1147a1f3cf1ca333020271b579025ce752d302bd9474f1b3ed8c55ce679ac6a75bfb4a1093adef0727b824d435 WHIRLPOOL 90262b86d1bb01b6fdf5a67b447dc1177a523df368fbd040a87d7261e071844b86624dd6bb303c8a32302d16e5f7cb11e5f0744b2808e4f6d467cd27652efe23
diff --git a/sci-visualization/gwyddion/gwyddion-2.29.ebuild b/sci-visualization/gwyddion/gwyddion-2.29.ebuild
deleted file mode 100644
index f71249b2cdc0..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.29.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.29.ebuild,v 1.5 2012/12/06 04:22:09 phajdan.jr Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils fdo-mime gnome2-utils python autotools-utils
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
-
-RDEPEND="media-libs/libpng
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk:2 )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS+=" V=1"
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.25-libpng15.patch
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable doc gtk-doc)
-		$(use_enable nls)
-		$(use_enable python pygwy)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with ruby)
-		$(use_with fftw fftw3)
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview)
-		$(use_with xml libxml2)
-		$(use_with X x)
-		$(use_with kde kde4-thumbnailer)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use python && dodoc modules/pygwy/README.pygwy
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild b/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild
deleted file mode 100644
index 164d24aa2a37..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.30-r1.ebuild,v 1.1 2013/01/23 10:21:53 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fdo-mime gnome2-utils python
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
-
-RDEPEND="
-	media-libs/libpng:0
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fftw? ( sci-libs/fftw:3.0 )
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( kde-base/kdelibs:4 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk:2 )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS+=" V=1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.25-libpng15.patch
-	"${FILESDIR}"/${P}-BGRA.patch
-	"${FILESDIR}"/${P}-color-button-debris-crash.patch
-	)
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable doc gtk-doc)
-		$(use_enable nls)
-		$(use_enable python pygwy)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with ruby)
-		$(use_with fftw fftw3)
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview)
-		$(use_with xml libxml2)
-		$(use_with X x)
-		$(use_with kde kde4-thumbnailer)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use python && dodoc modules/pygwy/README.pygwy
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/gwyddion/gwyddion-2.30.ebuild b/sci-visualization/gwyddion/gwyddion-2.30.ebuild
deleted file mode 100644
index 3e93ac7fa215..000000000000
--- a/sci-visualization/gwyddion/gwyddion-2.30.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.30.ebuild,v 1.1 2012/11/30 05:51:57 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils fdo-mime gnome2-utils python autotools-utils
-
-DESCRIPTION="Framework for Scanning Mode Microscopy data analysis"
-HOMEPAGE="http://gwyddion.net/"
-SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fftw gnome kde nls opengl perl python ruby sourceview xml X"
-
-RDEPEND="media-libs/libpng
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXmu
-	x11-libs/pango
-	fftw? ( >=sci-libs/fftw-3 )
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4 )
-	opengl? ( virtual/opengl x11-libs/gtkglext )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/pygtk:2 )
-	ruby? ( dev-ruby/narray )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	xml? ( dev-libs/libxml2:2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS+=" V=1"
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.25-libpng15.patch
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable doc gtk-doc)
-		$(use_enable nls)
-		$(use_enable python pygwy)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with ruby)
-		$(use_with fftw fftw3)
-		$(use_with opengl gl) \
-		$(use_with sourceview gtksourceview)
-		$(use_with xml libxml2)
-		$(use_with X x)
-		$(use_with kde kde4-thumbnailer)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use python && dodoc modules/pygwy/README.pygwy
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-	fdo-mime_desktop_database_update
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index 8f8ab6f028fc..67e863df2cca 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/notification-daemon/notification-daemon-0.ebuild,v 1.15 2015/01/29 16:45:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/notification-daemon/notification-daemon-0.ebuild,v 1.16 2015/02/02 13:23:54 kensington Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ RDEPEND="
 		x11-wm/enlightenment[enlightenment_modules_notification]
 		x11-wm/enlightenment[e_modules_notification]
 		kde-base/knotify
+		kde-apps/knotify
 		x11-misc/mate-notification-daemon
 		lxqt-base/lxqt-notificationd
 		kde-frameworks/knotifications ) )"
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 9a8ec14329cb..65adc1af34c0 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,3 @@
-DIST adobe-flash-11.2.202.440-debug.i386.tar.gz 7406493 SHA256 9cc836d54d48260ebcd9629e8a221512bceee99411587e2537f20f79f3572fd2 SHA512 3db32b92cfeb1dd306872ad1d1b53b2c4caef5e5379e6bea8b5a570fd169f6107a6667256020845dbab06d2a18f2964659d50d16fc1b47db5e8b8138fbd743d2 WHIRLPOOL 2f2bf561be78dc319151e4926c358440c65f5e4ab06ea7dcbf40d11bb210872667982a65403b4b52f2ed38684642601138095430d737b51944bceea1e4b98305
+DIST adobe-flash-11.2.202.440-debug.i386.tar.gz 7406172 SHA256 227553cf1b4b8bd6ccb6831013e1b1fa386d11156aba6e8dd40a7b26309dc74a SHA512 df7020b508d88f16cb005364e0faf6ff390986d34766b2259729cafc0fce1afaadbdf68a69c4702b6c266ee9b3914b3981f511a7702203a0269e0121badc9b6c WHIRLPOOL ba43742bdbd8e08d06c3a618a4c22b8f0c8a69ac32db544d590d1f9a693256ff092fbcb1e1fd64e4cd23315fa83cf8c57ebfcdafb1d44940e19c3b55e12642ba
 DIST adobe-flash-11.2.202.440.i386.tar.gz 6927249 SHA256 c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 SHA512 85e9fda01f4db13e3d7d51d2bb55419b652bbc6765a75fc5cd0ebd8c0563a5a5d2184718f0fcb372f280ec9642d4fc135ecbd9ac071e57a0b49d31ac03f92d7d WHIRLPOOL f80b284cbc458681f31ea37d57bfcac0344268ac1862e41fad6ad92cde4272ef8db1f0a6600916ac01b1b3b8428913326d38561271267f45a98fa8117ba77709
 DIST adobe-flash-11.2.202.440.x86_64.tar.gz 7240820 SHA256 84c1b890bec0a8e1952e444de58c8c1b8e3a2c06687509323942fdc1cf3aa1eb SHA512 2730e3ce7aeb615cc896672e11fb7ee79475bafced9cafa29a348c9857ecf9b869346579a7df03ee79167b7d7dd214f57534639431546be891fb10d323f4a0ee WHIRLPOOL 410b429c41a9cd6c717b5fa49aee6c434a366ef85bd634d6681694758d54a2d7d52c2138022a71570d8e576b8bf4e109f6c4ed2c74b0f185596da929eec068dd