Sync with portage [Thu Jun 9 16:39:36 MSK 2016].

8 years ago · 80d36cd02a
parent 1de883fb7e
commit 80d36cd02a
82 changed files with 1285 additions and 335 deletions
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@ -1,5 +1,7 @@
 DIST qxmledit-0.9.3-src.tgz 17564710 SHA256 f4f1e305712ca033d8fe9cef8ddce6a94fd4deffd9e723c1734786e18a49fc50 SHA512 b7377c73d2e2aff1670e94c8c86c146e85d70841c638878f6be17ff939167c7d17f28095d4929388212380957cd4e3537450549827d8a8b239f5510f27e01afa WHIRLPOOL 214662e68d42c86745524278ac5809e6beb3d7e36ecffa4e6041447c521b733a97673adb93f00ab8513be870bfdb12a3adb950f8238bab15591993f3677373c2
+DIST qxmledit-0.9.4-src.tgz 18834064 SHA256 ef78d66c6214a1af2d95ea98c441cad5be91e3064faca4bf9edef952ed6d0133 SHA512 ff479ca8930bd2cbeaa26d09eeafcdff4520f0e62c79c8f8c854ed119967a3c11555a5aa8f92edda2be53adb6d6511c6ebb8e2aeb274a922964eed4fd9e0b056 WHIRLPOOL 9917e8b205dad00d2150afa4c3b660454fa529cf347b937a55b905295c37977221854b8b4ea76701f57d4ceb9289be245bcdde4c294168062eee2a0fafa62164
 EBUILD qxmledit-0.9.3.ebuild 1406 SHA256 16b5ff6b2838c39387056e31f683c94b39ea3ec258b6d04627a9c6bd2dd8fb2d SHA512 87f6457163f22438d4847410553be667dfc16ea949ff6f832fc12eedb9677cb176f194ee8afe7db736d70041040be7c6678e768c8fbb2e3470d57b118f8d5b96 WHIRLPOOL 401d0d6192873d4b6e309be55402044d187a751a0b1077cc9ba93af4ffb3599011c91ff6917eec562b5e7bdfa1efff751d40f8b2117a2a584374e3ae051aa7be
+EBUILD qxmledit-0.9.4.ebuild 1545 SHA256 49c47a8713d17a87e74fadb7044950941f964651f34fa6eb2d078654cb2946ce SHA512 41d36bfb42162fb7691a1d3af8b2b17e62e7d10a627917866c4431ba82a116ba64ed4e08db9b8c7fe2b15ca59994761002d160b647fd5dd07c4b316eb4d68491 WHIRLPOOL 1beeddf8b206022e06e07ac00fe6aa85dee6829ddb377c603cfc9539bdc61fdc67b52f6df18a8dc391d9cbb07da7de454e0b7ffd63e600b3f103fd7c49a22d94
 MISC ChangeLog 4585 SHA256 c2fdf06f0570c7b1806c9aca6f276f04bd9aca50f1d6d81263ff0c627f28c870 SHA512 2499b4e48bda4f02c1c4951aa2f66b2bd97f456685f27cd8e22e19fdbf20385b2722cc0f39b365c71d13cd81f7911334736e0a36d4e921711f93179fff01be23 WHIRLPOOL 4ca26fa18076627baf7795904a58d1dd66e1d0f112f1025d92266380c76782d6256288316ace8ea87a4d18e1e8b2d8475cddeecaaf2cd01ca0cdbbc5358bd63e
 MISC ChangeLog-2015 6256 SHA256 ae96d9c999e8bdd0a78030361ddf74a8a9bdf2e6705c3f38376c071338b45b58 SHA512 556ed70ef01a9f045315f230c2f1d6cdf8d940bc676373d1bf564631522a21172f4e1c8260a14a07b9e6114e3236107f4cc72514a93a72b7a2cff22460031b97 WHIRLPOOL 4d370c93e9607a6e3cb771a10a794ba9d0229291323bf0a754365320bf4dd1c992b33d89029b66c00827f2f38ea0fc3f8d0470aa00bd58d39bd4ac3d5537ccc9
 MISC metadata.xml 808 SHA256 b8f52eb71a988a7e6d51ff65e65e5a38fd799722d3401feb220a64ab2ad8e26c SHA512 cc07aca4a252dca47a6bbe6a41230ae9fc32bc42ce28bad7df8e21a1053a00afed4f1e500adb2f85f49f1a221b445037ba81a9c37f7b6eab799a97f973a2b049 WHIRLPOOL 80cd1a4c7077f28c0569d5fb236daee7f43f28149595a0a7076305ee9fd95e4662e82a75d4f7768d195b148ac76f70c5a7ee09055a33e581da620cb1b7491242
--- a/app-editors/qxmledit/qxmledit-0.9.4.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.4.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fdo-mime qmake-utils
+
+DESCRIPTION="Simple Qt-based XML editor"
+HOMEPAGE="http://qxmledit.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+DEPEND="
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4
+		dev-qt/qtsvg:4
+		dev-qt/qtxmlpatterns:4
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+
+	# bug 568746
+	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
+		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
+}
+
+src_configure() {
+	export \
+		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
+		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
+		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
+		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	doicon install_scripts/environment/icon/qxmledit.png
+	domenu install_scripts/environment/desktop/QXmlEdit.desktop
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@ -1,6 +1,9 @@
 AUX svrcore-4.0.4-gentoo.patch 3063 SHA256 6d734bc618c1db5d5eb0e0b6795bb7bd5ee44fb99ba7c63ebe8e6098926c4d05 SHA512 b27e02f31d17cbb3fbf7972da2147831070068ab4981cb439dff00c1d80888193c4a39376ab77cb8f202b09100f514e5e536d65e08e54253be93cadae00a2321 WHIRLPOOL f2f12cd74ceddca45944328369cbda1dedd9f1821d98b686bd8fbc6b5e8ce9849c8ffd7810c1dc8e49af4826169381994508524d1a5ace6d67ea2954c86e5fc2
+AUX svrcore-4.1-gentoo.patch 3066 SHA256 07a5eb0ff10bbe71616317f0f558dfe7d5eea099add50baf3a262fb864c5bb28 SHA512 f5a16cadbef104c5658176e3684cd0de03245b6ded86d14965d7f98e2d2c65e4eba43d0630199c8c6f18f922302027ab856d1c96f592cbe79207cc327db786ab WHIRLPOOL aaed43a8f6a1bd3467f16bf7f8f42225dff6c971047f9ff750790ec5c699f4d85032f8126a11c474fcc58bfe7848093708f0f8763577208ff4f8c070139e6118
 DIST svrcore-4.0.4.tar.bz2 217076 SHA256 4772fb4705492de11f10d3e020f0ceca2541415c009ae5444988d6becca36a58 SHA512 4a63e2618ef8f508e71adf212eefae56e3c9d9898b924f405399bb99793de57bd178a3417f9e837c474e7960b6eb8a3cbe775b420c8fecbd974e89b4196b78fc WHIRLPOOL 0bf45637685cb03753cd68840381cd5c906e01a61f813156e756e99fa97e7c6d61bc96b4c1f18aa016acf45d54d6288f733c39bf259c241416c1efc89cb0fc93
-EBUILD svrcore-4.0.4.ebuild 868 SHA256 acb3f996b0c7a2642ae62586c02f7d59a22100e0adafedf0e6e56417cb78a3ba SHA512 e8b31fde5153275333402aaea254cc2ec0a7a26f8463d99af2f0ae600cd5a0bd90e48a7b5e1d1427572f93cbf0c212729230d421223eb7d249aa620ab91c2e19 WHIRLPOOL 561fd326c74a302885314a15c7aaac36895cb643c1bb830e31d7642b1316814e91ec6f64d0075c91d2fab0f88faae95cf504acdb22416b1f49b7ffb3b771b138
+DIST svrcore-4.1.2.tar.bz2 263891 SHA256 67e51a868c8dc2ddbf5661ecb0a07dea7721a9ed99f6261cedd3351bfc4cd023 SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40 WHIRLPOOL ef21e7e94bd9ea1a1d64666c01099581054949bf7faa07055aa2b430388ad2ba2722fcc4065fb480c9bb5d334470dc37c8aea4a5f7eec4450a843390d95a2be3
+EBUILD svrcore-4.0.4-r1.ebuild 844 SHA256 7f5a2275bd3f6d023f162866166683497ea700948645838392ae39b2893c2e7a SHA512 6d3e5cbd47da29f128870585993e379ca1b6f23a1c0230af7dfc2bd440dd68158479f879fb8cbcfb9fac7fc6a6ba16643fd0ca6eafe04ccc3ed2d6232305799e WHIRLPOOL 111d00230a9787a68a2bcd075f155921840fbd4e642fcbecdb2ce04967e8b2536b5bf0a35717235fb7c22b0faff42836e4f96d8d0ee61553f7d90fffb2c44acf
+EBUILD svrcore-4.1.2.ebuild 699 SHA256 d8993674d629d12c2f910032ff0a14ba0615a3d436d034b8e7f8ddb8dbf39bbd SHA512 a86e4781d1ce8bfd24a7e5d9e69c9383d46b9dc7be32c1d98481e3a19d4500ecd3a8c8337f34eaef71e0d8b559f74666abff8c78002ad38ae3f53ad675855991 WHIRLPOOL ea1badc2acdfed77daa45830153e3e7d46c6b13522b845c5aa7ff8adcea3ca923956b27c41bcea7d95aea3347c5939a11237beabd740ea5e9c8f1114792780cd
 MISC ChangeLog 2335 SHA256 924e0cbcb4f82edd343ec3b505c3bcfe5a10ffcd27ec57b5c8f47023f41f9c25 SHA512 9dfd5c58d9158632a57933f5869fe7ede202bae327a861365a1f1815d4c43ed4517a507a884a6b7255523af8f8decb69a4405f69f16324fffb02c6d3e7ba4861 WHIRLPOOL 5f26ffdeaeffb7970606e4e8d1591bd863c49a719cdbd6ec1ca41c06f186619f1bc996880dc1422e825640a539df4883b0b9c64763bcd57823db1e70b536ee2c
 MISC ChangeLog-2015 629 SHA256 9904a3245ff6b9ebf66d8caf2542f2a1c9ab34a7829cd19a92734cc47af8411e SHA512 249c28184ce469d3fc3f342431506562b9956a58f933ba2594684afbd33374bb6d0e8a353b8cc5604f18abc050040c6ca8472008857ad560de9b71b8ab01dcec WHIRLPOOL 92b663949ba04c0681cbc04940d8aa0b08234e3e29985ad848d88ec9aa929e628922474e5ce0d79cfd64985ae496d33ef9f556b4553147880ee43c705c0c4175
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
--- a/dev-libs/svrcore/files/svrcore-4.1-gentoo.patch
+++ b/dev-libs/svrcore/files/svrcore-4.1-gentoo.patch
@ -0,0 +1,100 @@
+diff -uNr a/m4/nspr.m4 b/m4/nspr.m4
+--- a/m4/nspr.m4	2016-04-22 06:30:23.000000000 +1000
+++ b/m4/nspr.m4	2016-06-08 15:06:49.923333338 +1000
+@@ -52,28 +52,6 @@
+ ],
+ AC_MSG_RESULT(no))
+ 
+-# see if we are doing an "in-tree" build with the other
+-# mozilla components
+-if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
+-    for nsprpath in "../../dist" "../../dist/*.OBJ" ; do
+-        savedir=`pwd`
+-        cd $nsprpath
+-        abs_nsprpath=`pwd`
+-        cd $savedir
+-        if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
+-            nspr_inc="-I$abs_nsprpath/include/nspr"
+-        elif test -f "$abs_nsprpath/include/nspr.h" ; then
+-            nspr_inc="-I$abs_nsprpath/include"
+-        fi
+-        if test -d "$abs_nsprpath/lib" ; then
+-            nspr_lib="-L$abs_nsprpath/lib"
+-        fi
+-        if test -n "$nspr_inc" -a -n "$nspr_lib" ; then
+-            break
+-        fi
+-    done
+-fi
+-
+ # if NSPR is not found yet, try pkg-config
+ # last resort
+ if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
+diff -uNr a/m4/nss.m4 b/m4/nss.m4
+--- a/m4/nss.m4	2016-04-22 06:30:23.000000000 +1000
+++ b/m4/nss.m4	2016-06-08 15:06:49.923333338 +1000
+@@ -52,32 +52,6 @@
+ ],
+ AC_MSG_RESULT(no))
+ 
+-# see if we are building "in tree" with the
+-# other mozilla components
+-if test -z "$nss_inc" -o -z "$nss_lib"; then
+-    nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '`
+-    savedir=`pwd`
+-    cd $nsslibpath
+-    abs_nsslibpath=`pwd`
+-    cd $savedir
+-    nssincpath=../../dist/public/nss
+-    savedir=`pwd`
+-    cd $nssincpath
+-    abs_nssincpath=`pwd`
+-    cd $savedir
+-    if test -f "$abs_nssincpath/nss.h" ; then
+-        nss_inc="-I$abs_nssincpath"
+-    fi
+-    if test -d "$abs_nsslibpath" ; then
+-        nss_lib="-L$abs_nsslibpath"
+-    fi
+-    if test -n "$nss_inc" -a -n "$nss_lib" ; then
+-        AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath)
+-    else
+-        AC_MSG_CHECKING(could not find in-tree NSS in ../../dist)
+-    fi
+-fi
+-
+ # if NSS is not found yet, try pkg-config
+ # last resort
+ if test -z "$nss_inc" -o -z "$nss_lib"; then
+diff -uNr a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2016-04-22 06:30:23.000000000 +1000
+++ b/src/Makefile.am	2016-06-08 15:06:49.923333338 +1000
+@@ -10,8 +10,8 @@
+ 	     Makefile.win \
+ 	     ntgetpin.rc
+ 
+-lib_LTLIBRARIES = libsvrcore.la
+-include_HEADERS = svrcore.h
+pkglib_LTLIBRARIES = libsvrcore.la
+pkginclude_HEADERS = svrcore.h
+ libsvrcore_la_SOURCES =	alt.c \
+ 		      	cache.c \
+ 		      	errors.c \
+diff -uNr a/svrcore.pc.in b/svrcore.pc.in
+--- a/svrcore.pc.in	2016-04-22 06:30:23.000000000 +1000
+++ b/svrcore.pc.in	2016-06-08 15:06:49.923333338 +1000
+@@ -1,11 +1,11 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+libdir=@libdir@/@PACKAGE@
+includedir=@includedir@/@PACKAGE@
+ 
+ Name: svrcore
+ Description: Svrcore - Secure PIN handling using NSS crypto
+ Version: @VERSION@
+ Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
+-Libs: -lsvrcore
+Libs: -L${libdir} -lsvrcore
+ Cflags: -I${includedir}
--- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
+++ b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=2
+EAPI=5

 inherit multilib autotools eutils

@ -30,7 +30,7 @@ src_configure() {
 }

 src_install () {
-	einstall  || die "emake failed"
+	default

 	# cope with libraries being in /usr/lib/svrcore
 	echo "LDPATH=/usr/$(get_libdir)/svrcore" > 08svrcore
--- a/dev-libs/svrcore/svrcore-4.1.2.ebuild
+++ b/dev-libs/svrcore/svrcore-4.1.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://www.port389.org/"
+SRC_URI="http://www.port389.org/binaries/${P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/nss-3.11
+	>=dev-libs/nspr-4.6"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1-gentoo.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	# cope with libraries being in /usr/lib/svrcore
+	echo "LDPATH='/usr/$(get_libdir)/${PN}'" > "${T}/08svrcore" || die "Unable to create env file"
+	doenvd "${T}/08svrcore"
+}
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@ -3,11 +3,13 @@ DIST ocaml-ctypes-0.4.2.tar.gz 162968 SHA256 704efcbf3b99c180855ad4faed0dd7cec4f
 DIST ocaml-ctypes-0.5.0.tar.gz 168414 SHA256 d15df8a065b5b9850400727c0e5cb4eb8ad567c3504278b03065cc766b57bf3e SHA512 0d59b6aec0421e7eb79792bfd02a8f77311bca1787f7b17af0eca4fdaa82a55d27de24bc2c6fa937e3c2b86585cd496d929a7490165e27c49da360e6efd3d67d WHIRLPOOL a84b3d14437cf8a47d09d15a3af67b48ed57a147e09d12f93711102879b2962fbe7b4ea1c327e92da262334bed40d8175c9dd18902f8bc4a19f552b97406fd15
 DIST ocaml-ctypes-0.5.1.tar.gz 168540 SHA256 51da7276abccb274fd09fda9d024a3469b819d534492afe9c8d549dd953114ec SHA512 03a67c6b995b87c229b04577d2f38a8d699223d5c44c4597e6ac5ff1d74bc22474aea248e9b54d913b83a99ac7ccc61c7c67ca288e4f41b71a63da683b085331 WHIRLPOOL 0eed3a97a7c0fdf568d97b07718171f140aed34d440fa55bb8d21380dddba2f52fa2c3bf61d044da24cd30479c0bdea23bd23b86997adbc14a99bd630fc1ee17
 DIST ocaml-ctypes-0.6.0.tar.gz 179019 SHA256 098980e68c4bd1cad1e859fa2bcea4d3dc8a4f9d04c00bc3ebcf28a7480a3fb7 SHA512 3939df612f4d1aba178737269da55ba85b92730112a5c8011ecd006b61c48d8742b8e5a214662879eb7dc72e5b8a990b587b25696e18b9dda71b5280e1ed1be2 WHIRLPOOL fd11ad1b2624a526c69bda89bb17e45d3a22e3cf4d730734b5a551836034ba9bc057156add0af32ce9f3278d60aadfc2610253c76e53cba7d3aff157d2157dba
+DIST ocaml-ctypes-0.6.2.tar.gz 179953 SHA256 f31671c6515b9f9df245ec08e8ac6842cf33b7d9b76799cc07f8b77b093de55f SHA512 65b975f51daa29f59c07eec558eb5f688452a8e30edeeeca186d60f4cb56e087c5943b6f59d7dfa5f69ae9cace22ecc135148f99754693af684fd75178dafa24 WHIRLPOOL ad016187e9ce0657d38b8d98a986e9886e01b5f21f2090e89ba6d6dc91e16fce91c9d284b826f4dd1e46b9ffd9df3a4656f22e2023cece5994642a74547501c4
 EBUILD ocaml-ctypes-0.4.1-r1.ebuild 652 SHA256 de70f7c80601797f7686d8f7bdd672fc01c400e0c2399651e1650576b5efd789 SHA512 2454fbbc3bf97cb49e55e9b15364b87fcecbb9a5bf7936d70946705fc955a62f6cd82e5eb773bae763492903f4140077dedca6658271ea3a73ec67ef7e5f07d3 WHIRLPOOL 70a2f7c2786059de0145d378105ecc22c43bd09d413741e37c20cc9800f998a890f4dff1684a3961c0887188ec3b9654ab89cec833cf0b6be68ee91306b73aa5
 EBUILD ocaml-ctypes-0.4.2.ebuild 655 SHA256 9e853f374293e26311364aabc91586380fd30353a4287f8fe9b7f46bcdbc6b04 SHA512 3250329171c7d3402893f1b83425c7c4e0998be0c648da56c34908091af291b78793e3dbd8463bd7db160b7766c4a27c82c82b5efe24a62b0a5401ca0432130f WHIRLPOOL b78328669b952df8cad42c2875f18f222338972e3d263219adc80c636fde3b65225a7383b1998d2e4fd008a6334e80cce959264d6f889b43981bdc6872b776e3
 EBUILD ocaml-ctypes-0.5.0.ebuild 655 SHA256 9e853f374293e26311364aabc91586380fd30353a4287f8fe9b7f46bcdbc6b04 SHA512 3250329171c7d3402893f1b83425c7c4e0998be0c648da56c34908091af291b78793e3dbd8463bd7db160b7766c4a27c82c82b5efe24a62b0a5401ca0432130f WHIRLPOOL b78328669b952df8cad42c2875f18f222338972e3d263219adc80c636fde3b65225a7383b1998d2e4fd008a6334e80cce959264d6f889b43981bdc6872b776e3
 EBUILD ocaml-ctypes-0.5.1.ebuild 655 SHA256 9e853f374293e26311364aabc91586380fd30353a4287f8fe9b7f46bcdbc6b04 SHA512 3250329171c7d3402893f1b83425c7c4e0998be0c648da56c34908091af291b78793e3dbd8463bd7db160b7766c4a27c82c82b5efe24a62b0a5401ca0432130f WHIRLPOOL b78328669b952df8cad42c2875f18f222338972e3d263219adc80c636fde3b65225a7383b1998d2e4fd008a6334e80cce959264d6f889b43981bdc6872b776e3
 EBUILD ocaml-ctypes-0.6.0.ebuild 655 SHA256 867fd3aed712fcde2c580289e5cebc6093679708477f6e95fcc4a4d99f6eeb8d SHA512 3eba8cf9ea769d9bcbcc4dd06f058e8333321ce5fd9ed09a395a92791e9e12591a9a2b1694d3bbf9fc62e09c61a02b11e062037c6918ca856d4459f1c7adaf4e WHIRLPOOL 483849734b883d2ef6b3219749faa0db44a110b23dab861872487b5fb95010bcb8a81113eb3f92ef863cfbac651ce29a9ee9070b48ec1154bf1c17d0a727b2e1
+EBUILD ocaml-ctypes-0.6.2.ebuild 655 SHA256 867fd3aed712fcde2c580289e5cebc6093679708477f6e95fcc4a4d99f6eeb8d SHA512 3eba8cf9ea769d9bcbcc4dd06f058e8333321ce5fd9ed09a395a92791e9e12591a9a2b1694d3bbf9fc62e09c61a02b11e062037c6918ca856d4459f1c7adaf4e WHIRLPOOL 483849734b883d2ef6b3219749faa0db44a110b23dab861872487b5fb95010bcb8a81113eb3f92ef863cfbac651ce29a9ee9070b48ec1154bf1c17d0a727b2e1
 MISC ChangeLog 4030 SHA256 bb92c84f3d8ec292940f7f85778b3e15c9da06ce903605bc493c890bc7ce6e32 SHA512 88637d27cc17e2f9c8a3fedbc7f5c12ff8d9919a566324218b73cac7cc41ed83039488f561fea25bdab626e09b07024e893b92f875a25d0b5a17c0c27aee68b7 WHIRLPOOL 7ab142279dae98c9df66309385f3373adc59ab845e1c0b4fa7ee44d8bc4a2230773d807c738a237c7ab7f66595e485f9a72485bb264ba64546acaf694244d360
 MISC ChangeLog-2015 1278 SHA256 f975b28f710f3d26021f868c2e43bc2d4f9dee51c67649c672e9d4e93708b61f SHA512 574d93fc933f3da7a1a3484fb5c6a600b036da5d0d48837f825caf55aa8ed3d126293b05d6b5e2c69ec87c4d8d0611e89d9ccc4a524b1de9e0ef3e3915340243 WHIRLPOOL 5707ab59326eef4233c9ea1ee199b601a9d32bc06f921734a1ec2e2030129ea1ecc3c36edfa6b62358a8f66ba080b13685453c3f75479d83bf4d68d3d7e71fda
 MISC metadata.xml 344 SHA256 44c9b7c8e4f07cd7bb7e2a4255f0dc70fab88d36946c4e8f724a5d86f63626d1 SHA512 2b6b7c412feffa4bdfab820b2cafd5fc842f2e56b045642f3c9c0ed371817917714e7f20015ba57710a366cc622a4d7883f2d40e86f7128da2aaf19a2a1f5551 WHIRLPOOL 740f98a005e8b631c58a1652bcb0dcebeee1b8b99044be9883446df3af5da668a9f59484d2d0d9bcbe7e6fd4bf4196eb590122e97ec85b91b0946ec362b0ed66
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.6.2.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.6.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@ -1,4 +1,6 @@
+DIST mongoengine-0.10.6.tar.gz 469469 SHA256 0fa34c2747c987eebe624a794d18ffefbed440e374e3d230b2baed7c98b9513d SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7 WHIRLPOOL 58f511cfe80cae44c41fe1f451bd19edfc653e7c885547b16f1cd3436f62273c947c7ce893639d1fe3e1417bc6c4c97034bb84a85cf76886252b426b2e776bf4
 DIST mongoengine-0.8.3.tar.gz 219978 SHA256 e8e8acbffda03d70ab09615135b823b7707bd11a4e6c9327c2fd8cbed145c14a SHA512 b77c36ae008fb31f26a60135fbba3a9cf08375506a760daa3fe9e2558a6c67f4ea769eccf7c472c9ddef900fe50548aca00a81d0e666b007398b31cb4d32e368 WHIRLPOOL 241c0b51a2c9a130ed8416266baa1394d06def7c7b074cec7c6a35da6add251cd0aa05f0350bf9334ee9d3921e6a686c23dbdf5a3120a1459a4adfc134c244e1
+EBUILD mongoengine-0.10.6.ebuild 825 SHA256 262078968fb59dbf89c3ff0ed8db9a3b8ab709cbcd4a3664a4178af4cbb7eacb SHA512 6fb0d0a0c1314db069ec14c5f0e118efc062192cdd2ef478cde404005b189f008d4734911f81f3443deee689bd0c532dc1489eeba1f02c87194d6dd59050ea45 WHIRLPOOL d019bfa4af42d4012657c148aa1daff57efe129c8c30bcf471d842010182356c859a61f3533136fb257de3f2a0692ec24d8a05a3f57cd7c7a1ec363ea9086b8f
 EBUILD mongoengine-0.8.3.ebuild 783 SHA256 81291aba3ecd63cdfb1fe8c73bcf8ef4db619d5f55813233df4247dca2d65461 SHA512 5bd505d3bbcb9744dbb49b83dab08e03f44ef7e29e7b6df9087f9a1ed0fb1f9259a50153275ba517cafba67b72e4354d1d01ef9a808c3c8ff6ff630e2a5effd3 WHIRLPOOL cd30fead8f7022cf317b205d69eb9c8b3d32d868a8703dc49039cc984819c48da27bac7fd4ec345edb21f6970bf713d7c0f2de5f5e70e927ee6eb6872ce33b22
 MISC ChangeLog 2441 SHA256 f2bd0face9efc77e98c8bf05d425c3f4c6051abd3d301095f63448fa5b17cc7c SHA512 511ca3a3ed3e788c7b7d8c37480f6dc28da1c5cd9523e1733c742cf64659f4976499aaaea52a0cc0775dca06cadeea1648ef24d2b740e70f41357228203443c3 WHIRLPOOL a7cda96d2a469c3c775cba18e3d6acb92e885cfb992712e99a8b3889beb8b27273f7e32c7cfc2cb0f5e46e3b483fce182a032d440927a5daa60aaba5f41a031f
 MISC ChangeLog-2015 682 SHA256 26ba8b33d33874de96c0263fd59ce02dbb87ca927503be422b63b845b00fecd4 SHA512 fd884368bdef6f4b2fbbc05cba4e964a67c8d1d06919d771656bd63f526f1d1d76ce7421b76519db41fc2670cfa7f02548a922660ae5cdef9b8dfabad3f55024 WHIRLPOOL 4e754593b854eae31a7babb59ed6450e45df2f7a72cc410f68a1fd55fa9cc2ee6a96f5fa211f99f70871207348c3ea3752bd2516b82b96ff9087d88175f05255
--- a/dev-python/mongoengine/mongoengine-0.10.6.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+RESTRICT="test" # connects to local DB and other nonsense
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e 's/tests/tests*/g' setup.py || die "Failed to fix test removal thingy"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@ -3,6 +3,7 @@ AUX python-gnupg-0.3.7-msg-handle.patch 1429 SHA256 9672d4d7d90e8dc4b7ec10386ce7
 DIST python-gnupg-0.3.7.tar.gz 48728 SHA256 2bf59ff55c036e49d5da12d370447679f14d242567df4c2c0fc61b4601ca0d59 SHA512 6166cef11307dd4782000ab7263778436998a816a45e4471fcbe244b123703bf9ded5bc6ef5cd47ed0c561ef42660980576edf57c62029bb0326642b7c538dd3 WHIRLPOOL 93770439486689dfcaf296d158c3978a71c72d32ba9f0e5b4ec4c97dfda16177ee5e06f0b616112cdfb9cd96c3a93700a0d4302116401c6146f3cd7437b7e29b
 DIST python-gnupg-0.3.8.tar.gz 38993 SHA256 3872ced77d69203f31817107b324b0dd33d4437a330dc58eca140c8758d26b5a SHA512 128ba1f89e8baf0d1ae53153d7cbe73bfc99617a1aadfd9a02e2e2e2c5f0bb9c7482023bf54f32989e92cc14a9eb32325e4c358c63bce48a70a78d068103ed4f WHIRLPOOL 9080ceeade7e4c614a532eccbd4e9818d62233a6d1751acb159e8e0f13c71edf177d2c1592f0685c7e4139ba59826b8cb13864c11c37e33445a176c693d84f52
 EBUILD python-gnupg-0.3.7.ebuild 706 SHA256 972ff1ea229169ca7a53707653f7d45b2c9d3423e4f7d08902453fb262a26ba5 SHA512 b8f9f23210c73c5be0b6473d098f735709fa5cbb5d6b03978fe8a68eb19e4da0a401ab77e370c6119c8ad5d3acedf684c73825ffccf80288b1a7c8c6f4219f5d WHIRLPOOL d17d299211b29a1d837dd50664cfb06d65fc472279306f816e495b92f186a0023e590ca311807ca2b4c8d1305918c8d9e65b342d6c39a431448bfa219035dd6e
+EBUILD python-gnupg-0.3.8-r1.ebuild 667 SHA256 653faa82d1c81c8988df4107a1aae9114d577ab2ff69980c9ba3839524dfd896 SHA512 e606e6128d2ad09683b9e04c8511298e5b184982fbe5fd164afbcd85a162d67f37b6662d45682a237a06cedab0924d3f30bf5dd8b5892d254d40ac7d2272c3bc WHIRLPOOL 763ef84a98da2398fdf4428ef66ec94d07000755656ebd53d21059fa384ee6825c3784cbcd62ac2f58abcfc2a7900f88ea407f35a6dadd3efe2a7c79b80896b0
 EBUILD python-gnupg-0.3.8.ebuild 663 SHA256 dd8a7c476e4b3c011caa91749ea6aea8826b2dcb0bf4555ef2e0acd579510abd SHA512 e5769c6c98844922b15616404adcaad441c14e932f2f8300eb339745f3d1486acdecb2a3cb36d455dc8e01ada10de4d79cb60367f114e964ef980f423f6e6969 WHIRLPOOL ec940e3af0daa9b05a16c6bf9d071cad389dc3d85c4a82f2bb704d7aeae33cefe6e6d8d93e45efbf6d928fc595755f59b0a1421dc917728e786951b6927c1bec
 MISC ChangeLog 3297 SHA256 abd72f244d53939cea4803de7cfd1dbfe69ec5de9946466de80a95bafbef7a5b SHA512 bf2989c133fab8f7a53ee05ae572406330c2923de487e983d299acafc2b796c9017923c47e5ed1d3eb208a4d28470962a5125c4f77df5241c755553810aa2ca7 WHIRLPOOL 64d38a1dd0be8e3383d9d0a67cc059b4300d496e386dc93bf07e8eb45817ee8481acef636c455045588e63f3eb3969e3dbc59c0771997e291b9ef42d54ecf03e
 MISC ChangeLog-2015 2425 SHA256 f8ce1daba6a76f1977d5459e99ed958a2d52065aa3b5d8d955726fa8415aefb9 SHA512 ab937456a51cabe1e7199943cb11fd39b5c21e01bf7787ad94ada4daec6a798d34a7be896d0b080663b78d0936ac7351c235b61882d660f0b7d7400f36b72a11 WHIRLPOOL ad0a454a206be237615bb1eaea9b3802c51a9279979dd4cdcb938cd08d810962aae527032e3b8ca8b4d75a123fbd69c43467b401e17086d3eb71917910d0bb1a
--- a/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for GNU Privacy Guard"
+HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.6-skip-search-keys-tests.patch )
+
+python_test() {
+	# Note; 1 test fails under pypy only
+	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@ -1,15 +1,5 @@
-DIST vision_opencv-1.11.10.tar.gz 106660 SHA256 f9e120a780252b0234cbf3e65260ce3033dd25a81b32f27ccfdda41a3e765a3e SHA512 c8ba5991a50526a2341552f95dcaeb1b1ccf8ea7684f543e50ebcdd5ef0abdcd578364efcf25d4adad976c4382c67ee3d2550c107e569be2fbb675dcf4b8d51e WHIRLPOOL 2d2ba6916a73172035a772fe845b73cec19119370f4955d4c4bf36592d44f22b158d58b8bc67d3ec3fce395e54dcd7ef7eba1dcdefc51d8c85aa1e739b5877b9
-DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e09568085f84763a7b8e76b075962c449 SHA512 ab8d8065937c017ec42e9f0e8ec69934830f7b4de8a47b3d01d56ad4bc661e19f98ef52a8a10bfcd48d448b7187cf44f9cedb48e500e85da052ea1616b686e9e WHIRLPOOL 7c7878e1bb582f98b857d233c5462969e6b4f2488bcd096563e233f6310255c917a2e09ba73550b6d9ab46cd047d3cd3a58548457d1717a06cddf2609085c0c6
-DIST vision_opencv-1.11.12.tar.gz 110974 SHA256 9537246f167dcb1689888be127efd6706e66518583b74bac2d8a4ff6646a7a43 SHA512 6e836514931a6528ca609ab1c465484309ec85b21ae4d18b3dd596a0bbaf59283e07b269d953611af5d24eb48a1dd81a966fee8f74ea947e107b0d0f3ef833f1 WHIRLPOOL 0070e6c170f0e450f654e2c2502c99bd0f1c5d73921984b0efedc3aa34da7ec61eb8c3259de79cbf55841c7958e313ae014ffb0ad8513c2d60b54baa448c3367
-DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
-DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
 DIST vision_opencv-1.12.0.tar.gz 110922 SHA256 bff37fe2d80d1fe125aa514791fe4aef5042d7715f621e39af696629881bf4ac SHA512 9aa5764cb97ab48b96484cfd1bcf492f726cdeb9a75338945f8a65c9fcf753e339fc1738d96091a01884a5f5b66af710c6ade651b09459c5f3cd08180cd135b4 WHIRLPOOL e214a7a03011ad66611ceb10a9fb88de03975538f8d52c44d0d4c82830c5c6b7e8fd3a6fe901faa7f1415f483acceb46b30db88f72125aed45fb6bda485ec231
-EBUILD cv_bridge-1.11.10.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-1.11.11.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-1.11.12.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-1.11.8.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-1.11.9.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-1.12.0.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
-EBUILD cv_bridge-9999.ebuild 581 SHA256 4e9ad769a38af0a5752e2a291c2235ff40b2fc3a6972e57f8af081d5887c49bd SHA512 b08380c1245ceb4fc5cbeba6587ad3058d2c18654ee849663539e72840e967bcdbbadbecbce2ed94bc88d46f0ebc044140258735830877d6d41eee16d5f2f4dd WHIRLPOOL b13e3c57d08b4c421eac92bcd49a0cb843edb20b5e87673119bcbcad05b9b663c64bd0bfc1b9a186e9622fb659a948d41b51a9a919a654ebaf9a7a9ff3e61e43
+EBUILD cv_bridge-1.12.0.ebuild 593 SHA256 949077451053b42987e96c7e399354eb3cc3a2a2e2c04eb995bc94ab972e34e8 SHA512 a35c7ecbe1bc74228050df33237f845eade2086023db42380750574fbdd63be6d13c07ed80a2fe7fffbb80abb4105943d0c903808d946b82f96d8e2e3a6cbb24 WHIRLPOOL b83368f676f231e99a58ca7953fd187d1aedfb27815a70943c8cfeb4d9a97253a22db727712f3a80ae53353ee5b788a44c2de8a3b748108ee59172c026d57d74
+EBUILD cv_bridge-9999.ebuild 593 SHA256 949077451053b42987e96c7e399354eb3cc3a2a2e2c04eb995bc94ab972e34e8 SHA512 a35c7ecbe1bc74228050df33237f845eade2086023db42380750574fbdd63be6d13c07ed80a2fe7fffbb80abb4105943d0c903808d946b82f96d8e2e3a6cbb24 WHIRLPOOL b83368f676f231e99a58ca7953fd187d1aedfb27815a70943c8cfeb4d9a97253a22db727712f3a80ae53353ee5b788a44c2de8a3b748108ee59172c026d57d74
 MISC ChangeLog 2393 SHA256 5a069224b579a0de0181f9a9dc5052c333042ba76873528f04ad3f82ec6e486f SHA512 2e26e7b5eab5c457972f31d963c5c3e6180b49717934ecdc8c786d4d24db20481089cd5a369bb9ce2c457741963a8e3b60c7666544c6f4144e5cbf56cbd15dc7 WHIRLPOOL e63a204ff0d032b189ee3989d25863561f55190ed66fba43b75e0cdff8d76cfc945f63a0538b73e25536d2d983519bed104f5783bf1ff3de846f7029a81967a6
 MISC metadata.xml 342 SHA256 6d16b9ef140a8a427645b29c102446c52e209e71528895e69d3db026e7431fa9 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693 WHIRLPOOL 596af0d4a006e91becc53cc2079531f79d452fbd05e5f29471e7ebea58d19f91e0a21c2ad4eaf92e93a30115b00b8e02bce8cd9cdfb7d2d176eaaab73f2e1206
--- a/dev-ros/cv_bridge/cv_bridge-1.11.10.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.10.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	media-libs/opencv
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
--- a/dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	media-libs/opencv
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
--- a/dev-ros/cv_bridge/cv_bridge-1.11.12.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.12.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	media-libs/opencv
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
--- a/dev-ros/cv_bridge/cv_bridge-1.11.8.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.8.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	media-libs/opencv
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
--- a/dev-ros/cv_bridge/cv_bridge-1.11.9.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.11.9.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	media-libs/opencv
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
--- a/dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -17,7 +17,7 @@ IUSE=""

 RDEPEND="
 	dev-ros/rosconsole
-	media-libs/opencv
+	media-libs/opencv[contrib(+)]
 	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -17,7 +17,7 @@ IUSE=""

 RDEPEND="
 	dev-ros/rosconsole
-	media-libs/opencv
+	media-libs/opencv[contrib(+)]
 	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@ -1,7 +1,7 @@
 DIST mavros-0.17.2.tar.gz 201320 SHA256 d968733575777efbb3e6c396967d5dd82a42cee18f4fd54e47aef2833ff6ebad SHA512 c174a3caeed406aa7778365ce96f410c32d5ce2ee3d4ff039d283e242392e71543daea175184b35f8cee7000aa1b0491a8696c11661c3b8af3f37e39ce0f50e2 WHIRLPOOL e9242e9ba28bc65c254e245375cfa143f33e3864ec916212088c87e86fedf0c7466e2b0c2febf7564e45dc05251dba186169cadd8cf8222668d0088ad34d2014
 DIST mavros-0.17.3.tar.gz 201861 SHA256 32da0be2d9f59f4eafb8a583ad9eba5aea44f776a47d5a54625f2915b0bb1aad SHA512 054e0268750ba6622e0af6ba2e60c9f71b10c7fc4836bed3f1037b9abc386beb9c21d5ee3abacfee7b5a7140f377a07d5414d612c5b744ae9bf5d0cec680b8d7 WHIRLPOOL afc195c8743cda6afed8ac8f5745599ecdddc988c3978349d3b18c7d34353e89b309a34e80422ff7f601830e88beda3d42e94453022210928692ebba730392a5
 EBUILD mavros-0.17.2.ebuild 943 SHA256 bc1d232d9f1f095320625a4339b8c2737ef62bbba5934118f463b0dfb725b51f SHA512 be70f606275640924a61cf2983a39949630cf71babf9b8dbcd520c7727aee18fc6e475cda0fe44274fbf7ea6d47adcfb6d1a087e353463fe9fb889b140beda15 WHIRLPOOL d24622fb8a19f327177896507c406fc1f0fd57a972c56fc34501a1d2a08605fc72e7473ea6782bd07cf1367e2d7d64fcee40cedf4280c55c45c0c237f581b827
-EBUILD mavros-0.17.3.ebuild 943 SHA256 49bebb6ed7fa2765a6fd48904d6ac6daa5bfe2901d22f6dd56943d0960e4bb7f SHA512 c94848dd75507f33c86b843501b41ebb8ad5614bca5789d4cd218efb06330f16494ee5de5b033e206797f00bf1a66dcc7ce497e5f1936f394b35f4964e1b78ca WHIRLPOOL a40a30145c88795e4ed994353aadd485fc39bdb513f804397a2543c8c2054f6f3b6c78bfe0a14ca258584087b5eaf44ec13c9cfa84762073d89c2a8795a07f95
-EBUILD mavros-9999.ebuild 943 SHA256 bc1d232d9f1f095320625a4339b8c2737ef62bbba5934118f463b0dfb725b51f SHA512 be70f606275640924a61cf2983a39949630cf71babf9b8dbcd520c7727aee18fc6e475cda0fe44274fbf7ea6d47adcfb6d1a087e353463fe9fb889b140beda15 WHIRLPOOL d24622fb8a19f327177896507c406fc1f0fd57a972c56fc34501a1d2a08605fc72e7473ea6782bd07cf1367e2d7d64fcee40cedf4280c55c45c0c237f581b827
+EBUILD mavros-0.17.3.ebuild 992 SHA256 f74d592c33b7a77fcd5c809f9b055b192da9ce8baaef2c172c7f68718e7bb4e0 SHA512 db08885a9ef9ee8cf804ba81075fe1757e3ee4ebc26fcdca9d298eac9376d5bccf0ec2cd3116b3e9a039b26059d3aa7e335e252bab9b21e62a99500958e35289 WHIRLPOOL 9137467b08e5c9956a73e7ebb7dfe402c33d82da17237153cc70300964e0c24fbdfd7ba0fb579ca4bff4b898ecfd7324a2ef79acd8da5fd9b274991393351965
+EBUILD mavros-9999.ebuild 992 SHA256 f74d592c33b7a77fcd5c809f9b055b192da9ce8baaef2c172c7f68718e7bb4e0 SHA512 db08885a9ef9ee8cf804ba81075fe1757e3ee4ebc26fcdca9d298eac9376d5bccf0ec2cd3116b3e9a039b26059d3aa7e335e252bab9b21e62a99500958e35289 WHIRLPOOL 9137467b08e5c9956a73e7ebb7dfe402c33d82da17237153cc70300964e0c24fbdfd7ba0fb579ca4bff4b898ecfd7324a2ef79acd8da5fd9b274991393351965
 MISC ChangeLog 4773 SHA256 8c54c8f618ed48c4b6e6a0132075b162fbc26799a3b00f1f4304a4207307c742 SHA512 60d58a37c0cff1ff989e5016c8c3ba1cd0f722a64b646ac51e0e3b1337e6ea079524e11980ba126710ad3a25c6c20f46e1843c66732884a770363adbe0776d52 WHIRLPOOL fee5be08c5b55b5c7631152ec49d5bfde9faf067203ac762460ec2586616f795e5f668c980f5e38d91f88a8b6bb860b7eb938ed5b1178a8bdbde890688b9a0bb
 MISC metadata.xml 328 SHA256 7c83ca644dc16469397550eba7c71098074abbcb7a0226c2764324743c9f01b6 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e WHIRLPOOL 607322ded8c476fca21678a480dc17ea1f2d6d2e99c12cb9afc1c0175b2d5d4638603c211393fa31f8018719160b778bc19920df801833f2559be39a29611d7e
--- a/dev-ros/mavros/mavros-0.17.3.ebuild
+++ b/dev-ros/mavros/mavros-0.17.3.ebuild
@ -31,6 +31,7 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	>=dev-ros/mavlink-gbp-release-2015.12.12
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,6 +31,7 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	>=dev-ros/mavlink-gbp-release-2015.12.12
 "
 DEPEND="${RDEPEND}"
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@ -1,7 +1,9 @@
 DIST openni2_camera-0.2.5.tar.gz 22450 SHA256 dc642789e51869fc99ae507ab02d970778485d9c8c7d7cf32d01e46f62e2ceee SHA512 3b19475785d50e9157f61ca91a55fbf7f9fbbc3006f44d44925ec8f23f77068d26d8c7afb00f886b9699b147e8ddb01700539c0d91432cebee0de2b926fa627b WHIRLPOOL ebcb1949c3235be0f734ecb19773f26d562bd7d6453d0ed44630ca394fbd06c795b53fbf8e6e43a013ef6f7bf1352de80c8536dcf1399ddccc6653060d940887
 DIST openni2_camera-0.2.6.tar.gz 22968 SHA256 64600dea37099a51b247d752b248ed977487abbc985ae4d2fed5c6dfc97b290a SHA512 456df79ef9b8a1c1cce9b175954b39abefe2ac4499e11cf28587ba42d2f79cf4bb52fd7c07ac8329e54c093f3cdac05c8e85e80f596027109a502ff6235f8642 WHIRLPOOL a1072eda38e10c3f74086d481b54306910b37628733db82109a170f4a12363f95b21ce65e7fd781d815ae495bdf197702f632fe5b4dbd4be66574af9bb9a345c
+DIST openni2_camera-0.2.7.tar.gz 23033 SHA256 29e0875b9a22fb9e0908f1b59acc496de1ecebef09a0c0ba7a3b7a7b328882aa SHA512 cb13672970c5c66b4756dcfd246d102a123f2b5f42afabeed56bff78013e244ea64a784c629c85de1d5291d3ca7737d41bd114e62bd9e1b7bba2a5546fe2f828 WHIRLPOOL 98b832e21c852e9799bfbdf2e4ccd2fc1c029c79cfc3f65d0bacd37724392f10179721ee71b36d8e97f1b418280c8df3671bd4fe072956cca41761d781e589c3
 EBUILD openni2_camera-0.2.5.ebuild 615 SHA256 f048f56f069d02c5de3025a4537533d8691f1197caa1253b1c4fe711e1289cf3 SHA512 69932280662bff12c90ac4be13a9a2a9525c91197cc2d3c5d5b0bffa81d3f68a3cedf9a180f0974693b43ad8f955000d18cc1931ebdbdda66031aa70c9c7321f WHIRLPOOL 742e9af66d4e8f1992a0ef0d5c33e9dc4d6d17c9d9f1255da313b1302677769ee3229fde14871d548401d84e66b9488e78092c7e7d557855b55558baf0f94248
 EBUILD openni2_camera-0.2.6.ebuild 615 SHA256 f048f56f069d02c5de3025a4537533d8691f1197caa1253b1c4fe711e1289cf3 SHA512 69932280662bff12c90ac4be13a9a2a9525c91197cc2d3c5d5b0bffa81d3f68a3cedf9a180f0974693b43ad8f955000d18cc1931ebdbdda66031aa70c9c7321f WHIRLPOOL 742e9af66d4e8f1992a0ef0d5c33e9dc4d6d17c9d9f1255da313b1302677769ee3229fde14871d548401d84e66b9488e78092c7e7d557855b55558baf0f94248
+EBUILD openni2_camera-0.2.7.ebuild 615 SHA256 6387e0df916d91c7daa3c12b350eefb74394b215a0b44fa77d8fdeb4a21c066e SHA512 b784688448b2f653564b0244495df4a7053bfa503d4e7c2720d341f80d9becbbf6c3e12c50fa60d1cd2ea3b69f9795d0007a42e677b1b5a49398c21712cdd329 WHIRLPOOL 2fd3a8daf706b579bd6212ab83d0ed62668983f4998d5028264c01a46d6b10c74aeccca3fa3287426e73f2cdf85baaa75c39c4126d7b1aafdc2002563385e3e6
 EBUILD openni2_camera-9999.ebuild 615 SHA256 f048f56f069d02c5de3025a4537533d8691f1197caa1253b1c4fe711e1289cf3 SHA512 69932280662bff12c90ac4be13a9a2a9525c91197cc2d3c5d5b0bffa81d3f68a3cedf9a180f0974693b43ad8f955000d18cc1931ebdbdda66031aa70c9c7321f WHIRLPOOL 742e9af66d4e8f1992a0ef0d5c33e9dc4d6d17c9d9f1255da313b1302677769ee3229fde14871d548401d84e66b9488e78092c7e7d557855b55558baf0f94248
 MISC ChangeLog 1508 SHA256 11f314dbd989ff85dd332c6456c81e41512fcafefda523fc0ef247530d3678b4 SHA512 164d688253fc7e0baf493933c53c34fa08ce55e4816b167713e18d4c8e9278c29005f588f68e85f474c41a88f7a6900eb6d84bef9ded64d33499e05f9e45c94e WHIRLPOOL dbfbbd7b9c8f95f05ce106650874c454cca4bf8f2ad251f08c1da8a09b6ed90c0d6c2328650a0bf498392f99d2525e0b293df1fa2ec60a8e0f66b86529b09d61
 MISC metadata.xml 340 SHA256 13f5d737e8c5a6b785235802f913b58bb477d0fabbfa937b654d350ad087811d SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064 WHIRLPOOL a4c6d72992fbb672633eb9565fc182918647cb37cf51ef81a36558504c9e0b68c4bcccda6dccde6906f640c645e903bf0942b2f81106b8c34a201a675a938751
--- a/dev-ros/openni2_camera/openni2_camera-0.2.7.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-0.2.7.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/camera_info_manager
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/OpenNI2
+"
+DEPEND="${RDEPEND}"
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@ -4,8 +4,10 @@ AUX nomacs-3.0.0-quazip-link.patch 1419 SHA256 e3f3edb809e4d7fe961ed43e4a03aabc0
 AUX nomacs-3.0.0-tiff-build.patch 640 SHA256 a6cacd23ba4e3f56f10699c7165d5ba13b5bb09bcbf0650ef26ce2aacb058b5a SHA512 6b1d1dd2fd4f81b8e872bdca7a6fb7c0ea762642cabf394d9e630ebe518924ed8e00e78c2a9692dd26a375a23ebb797d4d35545f0ca76be707f9d7a4bd3ab695 WHIRLPOOL f5db21d8cccb9bc48f766e86e2592518214d4175c738757afe4972b511e8678f6516d9186a1d1be08540378c303c09026dcb783a9b9a7d2fae8de0818ee131b7
 DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
 DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d
+DIST nomacs-3.2.0-source.tar.bz2 1090076 SHA256 82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad SHA512 efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049 WHIRLPOOL 076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec
 EBUILD nomacs-2.4.6.ebuild 1460 SHA256 88e648e000376fd2eecaccded46892444fa8b6fb51098e2200f5d6a3f0e672f8 SHA512 40e72b60f2940b1ca6359e9304d2511fda44bc904a782201e9ea3b322fdd9159c4de5cc1f99c441676bfbd880dab0cb5cded57024091433cdf5482aeee40bbe8 WHIRLPOOL 5f9a2ea152163c9ab778ac4de260b6a95c034bfce839525bc969aae3d32bae68ae0c4c7130881c7f450e5c2eb77ba5ac74e8da6a58c2c29ac7e07c5b4825b50b
 EBUILD nomacs-3.0.0.ebuild 1425 SHA256 b53b9588bb756d0657cea700bd0d00f2b8856b03759adc0514712e7cab205136 SHA512 549f450a80998115bbf6bacc508cdff2bbbdf9bf7026c57ce7c06cb8ddcbd649326cc91482fb58fbbd567c5142483ff9f17a9bcc30070d1e92bb4aaf25f3058d WHIRLPOOL 8846ddaa9deeaf6dd69c69ca67e0cb0916705b9f37ac2df4d79798a7ca7af0286007a5bc4ae239fc7ac183f0e53cc7452f90fc322c3b14c50b5a3c212868d5ba
+EBUILD nomacs-3.2.0.ebuild 1143 SHA256 25557efcefec6aed280bd9895fb26936314d7925c7079d0e9593f93af0f7df19 SHA512 975e6fe29889448e227c77b34db564e4360c76e8ec9d51abe8c1c0ad68e305a0398edd97261d98898f01af7e4a5518e4ab5e4f2ac61b4b267fdb904e64591d8d WHIRLPOOL c8c8d6ba5ed9f4a4c5f3821085b07a873fb808b353297227077e702d902d64a957f57822223223800bebe76dd55c322cbd84c74d5ab2187cf74e06283f004393
 MISC ChangeLog 3912 SHA256 9a10126056ff185566e7bf7b39e5b2a31f5b278b18cf1a48e2ee5bd59f25d4ac SHA512 7da57f7c7c624d609b19aeae3a0dcac6243cca02ba8de5b58e837732c132d628af3ba477e3f7381e866fd235a9fc4d191516269a9112785663613bdabd9d5526 WHIRLPOOL ecf1eeec4fe57174e52ba0a6cbf6e771fd25b0f7e2f6bfcbfec1a6d46846557ffb75f83ecc8bc48bab695f2986d2db448625a9224fdf384938b13e5946d61148
 MISC ChangeLog-2015 1867 SHA256 981b87d0d8a15c3be8899cad47bb0e9662dcd256a237d15ed0d83aa49be16f3e SHA512 318c7d79f712236455ed7776d505ce6e1db9bdef9888804040af0c8e4956dcc20bbb7d0a3ca4bbd57229d7e3c7f9e15e24f3cd04492f6541a9a7ad7a9e8dcd85 WHIRLPOOL 304b7bd01cd0f4e30c0eac91ca07fe814391fba3644707e05dc9e0102f5bf00fa935ec88092ac13804087536641c23df9035536d0c2fc499163a642c025ca002
 MISC metadata.xml 601 SHA256 670e18d9bbd12ce529123f43498839b2fe1ede94be5cef8fa64ba666cf71715d SHA512 c14c8569afddcb33fa539baa4817a054ec400c1f119a47b585c20a709662a49880827613c6e3c1b071b86749b49ce2cb699667e9f1a1d437a00de240f954fbaf WHIRLPOOL ca848b89f00fe066413511c5b0f1d4dcd6d52dc7f08df6b54a66a0c807d7da8c7b6727af585112c66af606ed9b8ecacf081cdb1a0299444f7f8f1c316ba147ef
--- a/media-gfx/nomacs/nomacs-3.2.0.ebuild
+++ b/media-gfx/nomacs/nomacs-3.2.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[qt5] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? ( media-libs/tiff:0 )
+	zip? ( dev-libs/quazip[qt5] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@ -2,7 +2,9 @@ AUX libebur128-1.0.3_fix-tests.patch 783 SHA256 3208ff9cd80f3f943c8e92709aedc8f6
 DIST ebu-loudness-test-setv03.zip 80837115 SHA256 c97e8e1f962ee0a97dca37d205418b3469dd0d1e2a627fa9f505f2f1c01f54ec SHA512 ffa60e3f17370a7436614269ce33b2e3c8ec84c2477f05bd42b436bbd07b7018ae9ef935c9fd75ccff731bdf24b8231397ccc95fd003cdf6e04578ee62a663d5 WHIRLPOOL d4d128c90759c6462c1d76183960d46eae8f434a47059c1e448d8550e9ba04daef3452d9a7bd2b38f1a85ac5551ae2983bd5fa6bcd66f7df6a88dcbc38bf3bd3
 DIST libebur128-1.0.2.tar.gz 29794 SHA256 9b334d31a26b47ba6740bb7bbee7a24461d535f426b1ed42368c187e27c08323 SHA512 10f0248db9ebae48c0b3a62f5bab668d77bf10cd004267593b0cec1c5fcd5b1223fff2ae82d6753db7329210a0d7feb5a65a1c030e92607805d05c1b9885416a WHIRLPOOL 4656d8e05d98d2a1b8d286602b2671d2016ec0b8e35f66689d97ad700c61fcb1234e85308ab00f01a6ac51d741232054b251da04594f646138eb5d0103564585
 DIST libebur128-1.0.3.tar.gz 19804 SHA256 dd90d0e44bd4db1e038d990b4538a7317b2f44f29eaf2e206c247663234d9d52 SHA512 586ae80c31b9ef1d315821cef6901edd3f3d5309299411e969cce18cdc1911639971ad249b3b49edae9195b428557dbfa3281a5dc22da20a245e66c497eb0422 WHIRLPOOL c5d62232ed6bc05bf909a809fc38c15d79d1278ecc708ca94d4b41e37d38985d50764eeff9a6c5a4582baf3963864d512ba90d6b7a90c363b3bb334ebb860fda
+DIST libebur128-1.1.0.tar.gz 19318 SHA256 c60e78f4bfda387a0895c64a4fc9850445e3a4425cc98f9140885966ce17c1d1 SHA512 13a0d92eae8d991a15cb090e5f3ca34fbe285bf7e8e01e10b5ccc8be4f066e8bbff6920370d4506284f02dbfca3a5189ddfe9135f195179d356257055768c08a WHIRLPOOL 0775f4b220a690310f736dccd1748fe48c643cf0889378b4238b7aa4cc57967fb77c81f28cd4bdd4de220e832c220d45524fd63834e6e5ce37cfe381118cc0eb
 EBUILD libebur128-1.0.2.ebuild 949 SHA256 9811a08a70fd1873d203db6e67195f2c99549ae955adac0c08490a58be202593 SHA512 7c136b3a06b771d4f2f71671082483e5935c10b996c75ee5a3499f598c668daaf9e8316dab5a7f0651976ddeb826c81ecf7b6e6f0aece890e98aa6ad25417c5b WHIRLPOOL 6f6db2aa00c9a3eefaefdfc504bf43f0b784f1ace7cd7288ee4f205e6fae3b8fed8c013b7c54c6a706adfc4fd9d45987a9fc42add57b5e5cc87b3792bcbf4588
 EBUILD libebur128-1.0.3.ebuild 1166 SHA256 ee0756f601643ad47b8111a66b46be498a9e2a9f3075f8250e563d2e297a2c5a SHA512 f0f277c9208f623487e1bc75c9f8075764f0fc88b58e7ca15072e242a7f4577c18db654e78b4f7e15b8425a6865b8cce5c64f045c342cc613c8a9d736017999c WHIRLPOOL 99e2f57afbaad1ff7ba92fefddaa769170193e9cc6b3f4ed9661b8863399307abfe263b085acb043eeb79a53d796d86f750ae7fb6a05b4990d5f0ed28f59825f
+EBUILD libebur128-1.1.0.ebuild 1076 SHA256 df9fcf2d22c10fc8dda25a4dcd178b264ba3e88654e9ed0469ccbbb5cea85219 SHA512 8224cb9743f1b8fcc93b9ad438132fc34e29c44202883ae5fca408d06c16560579c89683a714d79dbd2ad0664b8179f2db780f6dda51229573edaa24c31144f4 WHIRLPOOL 62f22c8e1df0d27c319f0078d7d2c5e16e82f277b1ff65bedd441ae742cdf5e766a2550a9c62328b64f7b478749773f5022ea4812d3eb85d6695ec61045ea339
 MISC ChangeLog 1664 SHA256 6749c2d405adad38e93e15a8c68ed9b88c0ec980d1e792bc57f524ea44136eb7 SHA512 85a6adb1c6775229151f3fb4de600f95bf0e5d9fd09a86f04abde5dff7e8aba40256e015d3c451a3e500c6244ff2f3e2a03c29fdc6eceb09ddcc953578a861bf WHIRLPOOL 0e21ac5987754d492415205f51be27a4c5573675d2a9476dfd3274e5c3dfaf4551de66129fbe715ae34c1863ebc5d08680b9249242ebcc04c9d17a27c9a5d87f
 MISC metadata.xml 752 SHA256 597cff2b00a6181949c6de5c7ff0a72f508182399cea89037c18fa4601e7f943 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218 WHIRLPOOL 5c3eafc521504d640bba37edb3b563c66feb50713486a880c741c9c2e38420673465954f3dce4a7432709a6115e8b7700c329696a82cdd9a89d813f825f53c62
--- a/media-libs/libebur128/libebur128-1.1.0.ebuild
+++ b/media-libs/libebur128/libebur128-1.1.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A library implementing the EBU R128 loudness standard"
+HOMEPAGE="https://github.com/jiixyj/libebur128"
+SRC_URI="https://github.com/jiixyj/libebur128/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+speex static-libs test"
+
+RDEPEND="speex? ( media-libs/speex[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( media-libs/libsndfile[${MULTILIB_USEDEP}]
+		app-arch/unzip )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_disable speex SPEEXDSP)
+		$(cmake-utils_use_build static-libs STATIC_LIBS)
+		$(cmake-utils_use_enable test TESTS)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cd "${WORKDIR}"
+	"${BUILD_DIR}"/r128-test-library | tee test-results
+	grep -c "^FAILED" test-results > /dev/null \
+		&& die "At least one test failed"
+}
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@ -1,7 +1,9 @@
 DIST libyami-0.3.0.tar.gz 484586 SHA256 67064558999d63185025a6d63d08458375003bb86369abca50aca97fd2c63acb SHA512 691cbe90840d8cb30da958bb6621434c9962ae6cbfc75b016454570c303a01e7a465baa8622368cf1ef1c670dbc861fb1d49e0c414d684feae04ea742e8e0599 WHIRLPOOL d842f1ce57d40894b80f868934d687603014b6460bdbd274b64893d8f290f8a6a779239f931beb759a7fb8e5ed1649b90fb545391c1d9c8395bb05f6600218d2
 DIST libyami-0.3.1.tar.gz 492223 SHA256 7ab680138a1d34eb306bc941198f0715631bc8e5b0ee5717b3171f6672ca3bcb SHA512 eb58a6925de8379e40b2482780340becdb8c9295041bba11bf439cc2ff19c25f10ce4b1fc2b6c421342855946ddd471745bdfb364a227499658867911325b375 WHIRLPOOL ce44614aa04127c828761319dd96ee35956daea9cf7577e7631083e10db744c76596da7135f8f6c16952639c601ee065afe8c0097bf6d23829dc9893c4aa414f
+DIST libyami-0.4.0.tar.gz 445389 SHA256 b4a139fac81b6644828e8c9c377fe251128d2b4440ffd656f973c0bee14a2821 SHA512 b3c5394f1980e799717cfcb44d95dc93da10d6acb94eed106bc251ca3162194a55cedb111ac7023257b77c868807e9546df461c061ab3e1b02e3f2bbd30d3687 WHIRLPOOL 1a01901dd67d49bd26a74a00684e807e162986c9674a647e96ba5e1b573a25fca78835e377b83e348d275882c69611ce1008d01a74276468f5d475d369ba23e0
 EBUILD libyami-0.3.0.ebuild 2508 SHA256 b43b5c39db3b0baf2620aedc7dc79577cbd21cc68290e76ceea3be8ce5283501 SHA512 a516874f6a5238b35da8f0615093c84364505a6959bfc6afbf8a2386316e081439b6611285d88f0db1f079bef14639402cca8cd36b93f5f9875582d4fe1c5d6f WHIRLPOOL 64a70c7b6a9334588b99aa7c9fafcf40b1c8d4dbc0c1188f8f63d09a0678bf910df19c5d21fc1d8d52a4f23a995bb3ecc92d33699d766cd28e096eec0f3a191e
 EBUILD libyami-0.3.1.ebuild 2508 SHA256 b43b5c39db3b0baf2620aedc7dc79577cbd21cc68290e76ceea3be8ce5283501 SHA512 a516874f6a5238b35da8f0615093c84364505a6959bfc6afbf8a2386316e081439b6611285d88f0db1f079bef14639402cca8cd36b93f5f9875582d4fe1c5d6f WHIRLPOOL 64a70c7b6a9334588b99aa7c9fafcf40b1c8d4dbc0c1188f8f63d09a0678bf910df19c5d21fc1d8d52a4f23a995bb3ecc92d33699d766cd28e096eec0f3a191e
-EBUILD libyami-9999.ebuild 2508 SHA256 b43b5c39db3b0baf2620aedc7dc79577cbd21cc68290e76ceea3be8ce5283501 SHA512 a516874f6a5238b35da8f0615093c84364505a6959bfc6afbf8a2386316e081439b6611285d88f0db1f079bef14639402cca8cd36b93f5f9875582d4fe1c5d6f WHIRLPOOL 64a70c7b6a9334588b99aa7c9fafcf40b1c8d4dbc0c1188f8f63d09a0678bf910df19c5d21fc1d8d52a4f23a995bb3ecc92d33699d766cd28e096eec0f3a191e
+EBUILD libyami-0.4.0.ebuild 1981 SHA256 1d190904a55765389e84a40bce17340c6a381d2ef88dbfe23ec8b60e8c77e38f SHA512 6543f556902c6e31eff1cf97b5d8300b0ae30d3e0e0eeaf313fea9a170da68d1bc97e746eed514b4ff4f2a86b7ef6fc0eb8fd8c715704b298742c99bf427df52 WHIRLPOOL 58879695d6ac8890aca5745f8b93dbcdf5a7dc4629175b8f07a0dd4aca929c655145853743f8b86c5dc0a9f68b5d6d379fb752a9afb38eef7b3a25a0eaf67ed5
+EBUILD libyami-9999.ebuild 1981 SHA256 1d190904a55765389e84a40bce17340c6a381d2ef88dbfe23ec8b60e8c77e38f SHA512 6543f556902c6e31eff1cf97b5d8300b0ae30d3e0e0eeaf313fea9a170da68d1bc97e746eed514b4ff4f2a86b7ef6fc0eb8fd8c715704b298742c99bf427df52 WHIRLPOOL 58879695d6ac8890aca5745f8b93dbcdf5a7dc4629175b8f07a0dd4aca929c655145853743f8b86c5dc0a9f68b5d6d379fb752a9afb38eef7b3a25a0eaf67ed5
 MISC ChangeLog 1491 SHA256 e117f92e36960ba99cffe3fba7957f2f96395a18a2e6fba95472770bb8f38a26 SHA512 be0f3d99250f74c3a84c7a7e9aec099317d3c87bcf23a2dddcdd5a90e179bb20e8994822193f4c578f847c3bf4db2b0381c196aecffc53853ea573256b962b8c WHIRLPOOL 0e9be948448b4d1f7edcde3eb1566459027c41f389fb83532249201fef091c104aea2cdb7b54d2aeafc8b24e1616756dcc134029f300b89e02bbbb194e2e2020
 MISC metadata.xml 821 SHA256 292a22ee970646df00b1eb32a274979a53fcbf5e594fb7cee2d99001c0e11e9d SHA512 8d4b77b6fea6fbff8d5cee41253c1eb0bb7cae10c6ea5cead8ee33b0a8c7b90e00e2a600237dc9ab3cf8accdc8163d15ab8455ad7f1fd1ba84d1daf654cc9614 WHIRLPOOL 9e79b433e937c9fc9e461d4b8c200a88810ca6c8a0239cf89dd133c7b17398d9bc4329cc5c79d55941e100a5fc46dc4a654c27e01111f0507ab628583eab2afe
--- a/media-libs/libyami/libyami-0.4.0.ebuild
+++ b/media-libs/libyami/libyami-0.4.0.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM=git-r3
+	EGIT_REPO_URI="https://github.com/01org/libyami"
+fi
+
+inherit ${SCM} autotools multilib-minimal
+
+DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
+HOMEPAGE="https://github.com/01org/libyami"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+capi debug dmabuf doc md5 v4l X test"
+
+RDEPEND="
+	>=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
+	v4l? (
+		>=virtual/opengl-7[${MULTILIB_USEDEP}]
+		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
+	)
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7 )
+"
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable v4l v4l2) \
+		$(use_enable v4l v4l2-ops) \
+		$(use_enable capi) \
+		$(use_enable X x11) \
+		$(use_enable dmabuf) \
+		$(use_enable md5) \
+		$(use_enable test gtest) \
+		$(multilib_native_use_enable doc docs) \
+		--enable-h265dec \
+		--enable-vc1dec \
+		--enable-h264dec \
+		--enable-jpegdec \
+		--enable-mpeg2dec \
+		--enable-vp8dec \
+		--enable-vp9dec \
+		--enable-h265enc \
+		--enable-h264enc \
+		--enable-jpegenc \
+		--enable-vp8enc
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && emake -C doc
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dohtml -r doc/html/*
+}
+
+src_install() {
+	multilib-minimal_src_install
+	find "${ED}" -name '*.la' -delete
+}
--- a/media-libs/libyami/libyami-9999.ebuild
+++ b/media-libs/libyami/libyami-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -24,36 +24,25 @@ else
 	S="${WORKDIR}/${PN}-${P}"
 fi

-LICENSE="LGPL-2.1"
+LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X"
+IUSE="+capi debug dmabuf doc md5 v4l X test"

 RDEPEND="
-	>=x11-libs/libva-1.6[drm,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
 	v4l? (
-		glx? (
-			>=x11-libs/libva-1.6[X,${MULTILIB_USEDEP}]
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		)
-		!glx? ( >=media-libs/mesa-10[egl,${MULTILIB_USEDEP}] )
+		>=virtual/opengl-7[${MULTILIB_USEDEP}]
 		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
 	)
 	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-		libav? ( media-video/libav:=[${MULTILIB_USEDEP}] )
-	)
 	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	tools? (
-		gles? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] )
-		v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] ) )
-	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7 )
 "

 src_prepare() {
@ -63,27 +52,25 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug) \
-		$(multilib_native_use_enable tools tests) \
-		$(use gles && multilib_native_use_enable tools tests-gles) \
 		$(use_enable v4l v4l2) \
-		$(usex v4l $(use_enable glx v4l2-glx) "--disable-v4l2-glx") \
+		$(use_enable v4l v4l2-ops) \
 		$(use_enable capi) \
 		$(use_enable X x11) \
 		$(use_enable dmabuf) \
-		$(use_enable ffmpeg avformat) \
 		$(use_enable md5) \
+		$(use_enable test gtest) \
 		$(multilib_native_use_enable doc docs) \
+		--enable-h265dec \
+		--enable-vc1dec \
+		--enable-h264dec \
+		--enable-jpegdec \
+		--enable-mpeg2dec \
 		--enable-vp8dec \
 		--enable-vp9dec \
-		--enable-jpegdec \
-		--enable-h264dec \
-		--disable-h265dec \
+		--enable-h265enc \
 		--enable-h264enc \
 		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-h265enc
-
-	# h265 decoder doesnt build here with gcc 5.2
+		--enable-vp8enc
 }

 multilib_src_compile() {
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@ -6,8 +6,8 @@ EBUILD ffmpeg-2.8.6.ebuild 14657 SHA256 06c5e24314adae4c0ab6aa19677e35c0712c1477
 EBUILD ffmpeg-2.8.7.ebuild 14666 SHA256 de1bca2ba60ed2ff2748e916805a08e72789c37fce6912dd39957b4a9d092bff SHA512 13a42dd7ff4f18232c6773db446273b841de176b6d789335b13da887df4d8742d53dc358d20e229e94e6b041153531fc2e9e72d0c7afab76235b6313cc2933fb WHIRLPOOL ea3a8ea9d6d8ad50002d9f27b0220a1d0ca1062a7e7336dc305efc890a1382f8637b21d89671ef289aafde33988f00a1779149239effc87fd5ea23778605964d
 EBUILD ffmpeg-3.0.1.ebuild 14798 SHA256 ce4264e2b27cef085e7fe28aec8a21145a0872c8e740346c211b1032165dbe6d SHA512 e638704e30f87fd94be23b22f5cec0f875903b527ccdf35e6169cbe2b1aa43beba7ebe6bacd6859b5c8f80b92bb8c155e6d19b312d73cf3c6c72f4633694d83a WHIRLPOOL 5f6b3e23a48e76c791f345125fdb83b5f90c38e97124ca6959399aa5e0ea66f27460585bcb4d3c01df2d61d227c6437c16942ab706f68a33ac39dfe295ff7278
 EBUILD ffmpeg-3.0.2.ebuild 14798 SHA256 ce4264e2b27cef085e7fe28aec8a21145a0872c8e740346c211b1032165dbe6d SHA512 e638704e30f87fd94be23b22f5cec0f875903b527ccdf35e6169cbe2b1aa43beba7ebe6bacd6859b5c8f80b92bb8c155e6d19b312d73cf3c6c72f4633694d83a WHIRLPOOL 5f6b3e23a48e76c791f345125fdb83b5f90c38e97124ca6959399aa5e0ea66f27460585bcb4d3c01df2d61d227c6437c16942ab706f68a33ac39dfe295ff7278
-EBUILD ffmpeg-9999.ebuild 14745 SHA256 cfd0f31e78bbdfc06104f4fe91d3aa941d74dea018ed6f9e42683d6633f7d38b SHA512 fe1730a9f5319385b2adca076fe614e7c9866e3446e022fed3b281bd9befc42b7e4fb607f8578a9fd73a366ef9b95b6785f5a2278a327b5864286f52204a71c3 WHIRLPOOL 6b16a1d486ed411edd5ca29473892c1d5810608b369ecc16da5a12693b8e59b3153d07750e14cc3803fca8a52a735df863c51ba0b356e266ecdf7a73a33f2eee
+EBUILD ffmpeg-9999.ebuild 14828 SHA256 7b7da973884581c5c96c129a832836ca8f90a72eb7520a0d4cad3fdd95d78690 SHA512 60d700ed31674f066b21813b1cdf8715a407585a4de8518188c8d174201b3ede9f34ae8c4b3f8dd1ab379782a62eaa34781240abcce572c65ec3722e2fffeede WHIRLPOOL 5be80e92501cd6d04679865421e95557011c83753d267e9519834f3f535e4099e18c0e59f963afb3cbbf02a7551ffda4191cd1ba5acd2d18068892a031153620
 MISC ChangeLog 19448 SHA256 ec2d8ed724fbafecbdb513291cd49f7bdba3a8df5d575aa04595e9d025875cf7 SHA512 7964fdb46f3368d07917aa729636663b87f621396aa4fcf2c85b95f3de551bdd835ac0a2843d858264415cb9d85e4b401635173bd394abb3d5fd132160744561 WHIRLPOOL 9b56918052ec1cf636ed0c3c81ffaea05bed3793b5a5e23ddcc757f1219cf0b0b8491124d25912fdd6098ff613e664e7823c8c77c492e0e599dad8dfd3611e17
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
 MISC ChangeLog-2015 8933 SHA256 24148e3f70412c102205ed06eb8c94ad223a8a5c27fc9c57cddc507debc166ba SHA512 032c283b925782c6f2dc95fc747e97caf3743c8cb53785882c5e9066abf6d603ba49b52bc4742688c2aadad11afbd4d5fa95d05213cb50aa285bb466863fa9d0 WHIRLPOOL 383477f273a7a255e571ab1a2dd51205832bf82010438abf2b0c3b31f748d2a6b3075b4a264c49f2806bceb8fac4851ac9ad65c314f8b298d863ea9028283d7f
-MISC metadata.xml 5531 SHA256 8502a9092ae9611798940c65c32dd1abee3ac38b3e863b93487d82f6efe591cb SHA512 d35e7a41ad761c39a4c6b722ac59198575a0c354b40437423f10103c66a156426dd32ec9821d0b444f4e8c6c896e152e34395f17fd8932182b53e873a671fe4c WHIRLPOOL b081cfdd3eac85e8b405910d958c77e9c0263bb1b2c8a5764e9dff7c7bd990f28e36e2c8ba80d0a758df3e999d478c62002ee1a31f9152fc3f727c1b4a2251e5
+MISC metadata.xml 5644 SHA256 d6e10ace2c2dd159b9557e871960e1eedbdab3df4951dbdd87c64a7e5048a42b SHA512 25be829c43d1c6d1476b7e5cb5159024df520bda9dfc184a8492ab6efce1f878f1b54d9d0798033a611aed1618f79bd1478275692cdb84359145c6d6b2682fbf WHIRLPOOL 6a6c5a968f6bbd972e5349a75c47b3195be6709c037ebcd7f9f8260e4f135418fd4f7ea312aa4ae227ea49b0977667e0934fa5cf32d8c2a49b9b576d70067c49
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@ -79,9 +79,9 @@ FFMPEG_FLAG_MAP=(
 		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi
-		fontconfig ladspa libass truetype:libfreetype rubberband:librubberband
-		zimg:libzimg
+		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zimg:libzimg
 		# libswresample options
 		libsoxr
 		# Threads; we only support pthread for now but ffmpeg supports more
@ -162,6 +162,7 @@ RDEPEND="
 	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
 	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@ -19,6 +19,7 @@
 	<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
 	<flag name="dcadec">Enables DCA decoding with <pkg>media-sound/dcadec</pkg>.</flag>
+	<flag name="ebur128">Enables EBU R128 loudness normalization filter via <pkg>media-libs/libebur128</pkg></flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
 	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 09 Jun 2016 09:45:45 +0000
+Thu, 09 Jun 2016 13:10:55 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 09 Jun 2016 09:45:45 +0000
+Thu, 09 Jun 2016 13:10:55 +0000
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.4
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 )
+DESCRIPTION=Simple Qt-based XML editor
+EAPI=6
+HOMEPAGE=http://qxmledit.org/
+IUSE=qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.4-src.tgz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=297ea8dfa8012bfb89d2a2eb2ffa9c1b
--- a/metadata/md5-cache/dev-libs/svrcore-4.0.4-r1
+++ b/metadata/md5-cache/dev-libs/svrcore-4.0.4-r1
@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mozilla LDAP C SDK
-EAPI=2
+EAPI=5
 HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
 KEYWORDS=amd64 x86
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6
 SLOT=0
 SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.4/src/svrcore-4.0.4.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=caf3fc7e12ee5af7af414dbb2b1ed133
+_md5_=8021efbf4f267a4c78d3a83ac060a266
--- a/metadata/md5-cache/dev-libs/svrcore-4.1.2
+++ b/metadata/md5-cache/dev-libs/svrcore-4.1.2
@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Mozilla LDAP C SDK
+EAPI=6
+HOMEPAGE=http://www.port389.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6
+SLOT=0
+SRC_URI=http://www.port389.org/binaries/svrcore-4.1.2.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=1af75d4e42beb2afd14fea61902e2be1
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.6.2
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.6.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Library for binding to C libraries using pure OCaml
+EAPI=5
+HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+SLOT=0/0.6.2
+SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.6.2.tar.gz -> ocaml-ctypes-0.6.2.tar.gz
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=bdbeec80c14ac764a9bcf3a032f0d1e7
--- a/metadata/md5-cache/dev-python/mongoengine-0.10.6
+++ b/metadata/md5-cache/dev-python/mongoengine-0.10.6
@ -0,0 +1,15 @@
+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_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A Python Object-Document-Mapper for working with MongoDB
+EAPI=6
+HOMEPAGE=https://github.com/MongoEngine/mongoengine/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.10.6.tar.gz -> mongoengine-0.10.6.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=87bfc1e9cba19f80b725e2ef1c694166
--- a/metadata/md5-cache/dev-python/python-gnupg-0.3.8-r1
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.3.8-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gnupg python_targets_pypy? ( virtual/pypy:0= ) 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_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python wrapper for GNU Privacy Guard
+EAPI=6
+HOMEPAGE=http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg python_targets_pypy? ( virtual/pypy:0= ) 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_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.3.8.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=ec31e86b0cca1dcf6848a05c83a9e335
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.11.10
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.11.10
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/cv_bridge
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.10.tar.gz -> vision_opencv-1.11.10.tar.gz
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.11.11
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.11.11
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/cv_bridge
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.11.tar.gz -> vision_opencv-1.11.11.tar.gz
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.11.12
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.11.12
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/cv_bridge
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.12.tar.gz -> vision_opencv-1.11.12.tar.gz
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.11.8
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.11.8
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/cv_bridge
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.8.tar.gz -> vision_opencv-1.11.8.tar.gz
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.11.9
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.11.9
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/cv_bridge
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.9.tar.gz -> vision_opencv-1.11.9.tar.gz
-_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.0.tar.gz -> vision_opencv-1.12.0.tar.gz
 _eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
+_md5_=60f46a22671da74d9b4dc3b4401207d5
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole media-libs/opencv dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c946c655c1d5bfce8d87d55ee886a1ce
+_md5_=60f46a22671da74d9b4dc3b4401207d5
--- a/metadata/md5-cache/dev-ros/mavros-0.17.3
+++ b/metadata/md5-cache/dev-ros/mavros-0.17.3
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.17.3.tar.gz -> mavros-0.17.3.tar.gz
 _eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2fce9e4e80c0c1f8398dfeb12581012d
+_md5_=1f03933c7aaff42fce2405a6c3ac9827
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
 IUSE=python_targets_python2_7 test
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f34d60443253e78819c267efcdd0e8c0
+_md5_=1f03933c7aaff42fce2405a6c3ac9827
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.2.7
+++ b/metadata/md5-cache/dev-ros/openni2_camera-0.2.7
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/openni2_camera
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.2.7.tar.gz -> openni2_camera-0.2.7.tar.gz
+_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e1934580024f320e7d01cc486c1deb1d
--- a/metadata/md5-cache/media-gfx/nomacs-3.2.0
+++ b/metadata/md5-cache/media-gfx/nomacs-3.2.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Qt-based image viewer
+EAPI=6
+HOMEPAGE=http://www.nomacs.org/
+IUSE=opencv raw tiff zip
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[qt5] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( media-libs/tiff:0 ) zip? ( dev-libs/quazip[qt5] )
+REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
+SLOT=0
+SRC_URI=https://github.com/nomacs/nomacs/releases/download/3.2.0/nomacs-3.2.0-source.tar.bz2
+_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b6b8efa83dabef153d70a2d41fb08d1d
--- a/metadata/md5-cache/media-libs/libebur128-1.1.0
+++ b/metadata/md5-cache/media-libs/libebur128-1.1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/unzip ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=A library implementing the EBU R128 loudness standard
+EAPI=5
+HOMEPAGE=https://github.com/jiixyj/libebur128
+IUSE=+speex static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1
+SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.1.0.tar.gz -> libebur128-1.1.0.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )
+_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e213821432e84c359d1cf4c13a042749
--- a/metadata/md5-cache/media-libs/libyami-0.4.0
+++ b/metadata/md5-cache/media-libs/libyami-0.4.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libva-1.7[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
+EAPI=5
+HOMEPAGE=https://github.com/01org/libyami
+IUSE=+capi debug dmabuf doc md5 v4l X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=x11-libs/libva-1.7[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/01org/libyami/archive/libyami-0.4.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=176e77043c9d57435810c8a6910f8b22
--- a/metadata/md5-cache/media-libs/libyami-9999
+++ b/metadata/md5-cache/media-libs/libyami-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/libva-1.6[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( glx? ( >=x11-libs/libva-1.6[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !glx? ( >=media-libs/mesa-10[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( media-video/libav:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( gles? ( >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/libva-1.7[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
 EAPI=5
 HOMEPAGE=https://github.com/01org/libyami
-IUSE=+capi debug dmabuf doc ffmpeg gles +glx libav md5 tools v4l X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/libva-1.6[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( glx? ( >=x11-libs/libva-1.6[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !glx? ( >=media-libs/mesa-10[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( media-video/libav:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( gles? ( >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( !glx? ( >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+IUSE=+capi debug dmabuf doc md5 v4l X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0
+RDEPEND=>=x11-libs/libva-1.7[drm,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=e9a19b8377e287fc0dc6ad1e03b83f32
+_md5_=176e77043c9d57435810c8a6910f8b22
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
--- a/metadata/md5-cache/net-fs/samba-4.4.4
+++ b/metadata/md5-cache/net-fs/samba-4.4.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap >=sys-libs/ldb-1.1.26[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= virtual/libiconv dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap >=sys-libs/ldb-1.1.26[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.6[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.4.4.tar.gz https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.4.2.tar.xz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce
+_md5_=ba0578550d33edd8e32f369dcf737deb
--- a/metadata/md5-cache/sci-electronics/gerbv-2.6.1
+++ b/metadata/md5-cache/sci-electronics/gerbv-2.6.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=x11-libs/gtk+:2 x11-libs/cairo virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A RS-274X (Gerber) and NC drill (Excellon) file viewer
+EAPI=6
+HOMEPAGE=http://gerbv.geda-project.org/
+IUSE=doc examples static-libs unit-mm
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 x11-libs/cairo
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/gerbv/gerbv-2.6.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=2ad69adb3aaaa20d76303997192f94bd
--- a/metadata/md5-cache/www-client/opera-38.0.2220.29
+++ b/metadata/md5-cache/www-client/opera-38.0.2220.29
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
+KEYWORDS=~amd64 ~x86
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera/desktop/38.0.2220.29/linux/opera-stable_38.0.2220.29_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera/desktop/38.0.2220.29/linux/opera-stable_38.0.2220.29_i386.deb )
+_eclasses_=chromium	68a1fdd848f60137c312a25c9888fbd1	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=29fd6af86a54002fc210598d8ac82c91
--- a/metadata/md5-cache/x11-themes/smplayer-skins-14.9.0
+++ b/metadata/md5-cache/x11-themes/smplayer-skins-14.9.0
@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Skins for SMPlayer
-EAPI=5
-HOMEPAGE=http://www.smplayer.eu/
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3
-RDEPEND=media-video/smplayer
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-skins-14.9.0.tar.bz2
-_md5_=5fa3c11c3523097d122aa669e7b873e1
--- a/metadata/md5-cache/x11-themes/smplayer-themes-16.6.0
+++ b/metadata/md5-cache/x11-themes/smplayer-themes-16.6.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-qt/qtcore:4
+DESCRIPTION=Icon themes for smplayer
+EAPI=6
+HOMEPAGE=http://www.smplayer.eu/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 CC0-1.0 GPL-2 GPL-3+ LGPL-3
+RDEPEND=media-video/smplayer
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smplayer-themes-16.6.0.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=018a8a948486bf10652f6cda40f5c16c
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Thu, 09 Jun 2016 09:45:45 +0000
+Thu, 09 Jun 2016 13:10:56 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Thu Jun  9 09:44:50 UTC 2016
+Thu Jun  9 13:10:00 UTC 2016
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@ -525,6 +525,7 @@
 1606080643 ./app-editors/le/le-1.16.3.ebuild
 1602011503 ./app-editors/le/le-1.16.1.ebuild
 1602011503 ./app-editors/le/le-1.14.3.ebuild
+1606091450 ./app-editors/qxmledit/qxmledit-0.9.4.ebuild
 1606081854 ./app-editors/qxmledit/qxmledit-0.9.3.ebuild
 1603151820 ./app-editors/focuswriter/focuswriter-1.5.5.ebuild
 1508090338 ./app-editors/fe/fe-1.9.ebuild
@ -1054,7 +1055,8 @@
 1604202241 ./dev-libs/wayland/wayland-1.7.0.ebuild
 1606022009 ./dev-libs/wayland/wayland-1.9.0.ebuild
 1604202241 ./dev-libs/wayland/wayland-1.8.1.ebuild
-1508090338 ./dev-libs/svrcore/svrcore-4.0.4.ebuild
+1606091549 ./dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
+1606091549 ./dev-libs/svrcore/svrcore-4.1.2.ebuild
 1508090338 ./dev-libs/gf2x/gf2x-1.1.ebuild
 1508090338 ./dev-libs/gf2x/gf2x-1.0-r1.ebuild
 1606090414 ./dev-libs/starpu/starpu-1.1.5.ebuild
@ -3634,6 +3636,7 @@
 1606050451 ./dev-python/os-win/os-win-0.4.0.ebuild
 1508090338 ./dev-python/egg-python/egg-python-2.25.3-r1.ebuild
 1508090338 ./dev-python/mongoengine/mongoengine-0.8.3.ebuild
+1606091311 ./dev-python/mongoengine/mongoengine-0.10.6.ebuild
 1508090338 ./dev-python/python-dsv/python-dsv-1.4.1-r1.ebuild
 1511110453 ./dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
 1512161149 ./dev-python/cvxopt/cvxopt-1.1.8.ebuild
@ -4866,6 +4869,7 @@
 1602161659 ./dev-python/django-tables2/django-tables2-1.1.2.ebuild
 1601271226 ./dev-python/django-tables2/django-tables2-1.1.1.ebuild
 1509251036 ./dev-python/python-gnupg/python-gnupg-0.3.8.ebuild
+1606091318 ./dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
 1508090338 ./dev-python/python-gnupg/python-gnupg-0.3.7.ebuild
 1511140100 ./dev-python/bashate/bashate-0.3.1.ebuild
 1508090338 ./dev-python/json-tools/json-tools-0.4.0.ebuild
@ -9077,13 +9081,8 @@
 1604251156 ./dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild
 1509231351 ./dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.9.2.ebuild
 1509231351 ./dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
-1509231244 ./dev-ros/cv_bridge/cv_bridge-1.11.8.ebuild
-1512011451 ./dev-ros/cv_bridge/cv_bridge-1.11.9.ebuild
-1509231244 ./dev-ros/cv_bridge/cv_bridge-9999.ebuild
-1603191655 ./dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild
-1603141438 ./dev-ros/cv_bridge/cv_bridge-1.11.12.ebuild
-1601191435 ./dev-ros/cv_bridge/cv_bridge-1.11.10.ebuild
-1602041412 ./dev-ros/cv_bridge/cv_bridge-1.11.11.ebuild
+1606091257 ./dev-ros/cv_bridge/cv_bridge-9999.ebuild
+1606091257 ./dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild
 1510111734 ./dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
 1510111734 ./dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
 1604191607 ./dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
@ -9661,9 +9660,9 @@
 1604191552 ./dev-ros/qt_gui_app/qt_gui_app-0.3.1.ebuild
 1604051353 ./dev-ros/qt_gui_app/qt_gui_app-9999.ebuild
 1604010829 ./dev-ros/qt_gui_app/qt_gui_app-0.2.30.ebuild
-1605241034 ./dev-ros/mavros/mavros-0.17.3.ebuild
+1606091248 ./dev-ros/mavros/mavros-0.17.3.ebuild
 1605111046 ./dev-ros/mavros/mavros-0.17.2.ebuild
-1512160113 ./dev-ros/mavros/mavros-9999.ebuild
+1606091248 ./dev-ros/mavros/mavros-9999.ebuild
 1509221912 ./dev-ros/turtle_actionlib/turtle_actionlib-0.1.8.ebuild
 1509221912 ./dev-ros/turtle_actionlib/turtle_actionlib-9999.ebuild
 1510111734 ./dev-ros/settlerlib/settlerlib-0.10.13.ebuild
@ -9810,6 +9809,7 @@
 1604251156 ./dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild
 1511021201 ./dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild
 1511021201 ./dev-ros/openni2_camera/openni2_camera-9999.ebuild
+1606091225 ./dev-ros/openni2_camera/openni2_camera-0.2.7.ebuild
 1605121407 ./dev-ros/openni2_camera/openni2_camera-0.2.6.ebuild
 1509231516 ./dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
 1509231516 ./dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
@ -12729,6 +12729,7 @@
 1508090338 ./sci-electronics/gresistor/gresistor-0.0.1-r1.ebuild
 1508090338 ./sci-electronics/gresistor/gresistor-0.0.1.ebuild
 1508090338 ./sci-electronics/gerbv/gerbv-2.6.0.ebuild
+1606091551 ./sci-electronics/gerbv/gerbv-2.6.1.ebuild
 1508090338 ./sci-electronics/geda-suite/geda-suite-20110427.ebuild
 1605150216 ./sci-electronics/pcb/pcb-20140316.ebuild
 1508090338 ./sci-electronics/gwave/gwave-20090213-r1.ebuild
@ -16732,7 +16733,7 @@
 1508090338 ./media-video/snappy/snappy-1.0.ebuild
 1603071106 ./media-video/snappy/snappy-1.0-r1.ebuild
 1508090338 ./media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild
-1605111145 ./media-video/ffmpeg/ffmpeg-9999.ebuild
+1606091332 ./media-video/ffmpeg/ffmpeg-9999.ebuild
 1604212028 ./media-video/ffmpeg/ffmpeg-2.8.6.ebuild
 1604301718 ./media-video/ffmpeg/ffmpeg-3.0.2.ebuild
 1604301718 ./media-video/ffmpeg/ffmpeg-2.8.7.ebuild
@ -22314,7 +22315,6 @@
 1508090338 ./x11-themes/sawfish-themes/sawfish-themes-0.0.1-r3.ebuild
 1508090338 ./x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1.ebuild
 1603021646 ./x11-themes/smplayer-skins/smplayer-skins-15.2.0.ebuild
-1603021646 ./x11-themes/smplayer-skins/smplayer-skins-14.9.0.ebuild
 1603142231 ./x11-themes/xcursor-themes/xcursor-themes-1.0.4.ebuild
 1603210109 ./x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.ebuild
 1511211739 ./x11-themes/nuovo-icon-theme/nuovo-icon-theme-0.5.ebuild
@ -22451,6 +22451,7 @@
 1508090338 ./x11-themes/psi-themes/psi-themes-0.9.3_p1-r2.ebuild
 1508241641 ./x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
 1508241641 ./x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.ebuild
+1606091434 ./x11-themes/smplayer-themes/smplayer-themes-16.6.0.ebuild
 1603021646 ./x11-themes/smplayer-themes/smplayer-themes-14.9.0.ebuild
 1605261538 ./x11-themes/smplayer-themes/smplayer-themes-16.5.2.ebuild
 1604061526 ./x11-themes/smplayer-themes/smplayer-themes-15.12.0.ebuild
@ -25303,6 +25304,7 @@
 1605220040 ./net-fs/samba/samba-4.4.3.ebuild
 1605220040 ./net-fs/samba/samba-4.2.9.ebuild
 1508241349 ./net-fs/samba/samba-3.5.21.ebuild
+1606091440 ./net-fs/samba/samba-4.4.4.ebuild
 1605220040 ./net-fs/samba/samba-4.2.12.ebuild
 1605220040 ./net-fs/samba/samba-4.2.11.ebuild
 1508110439 ./net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
@ -25867,6 +25869,7 @@
 1508241641 ./media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
 1508090338 ./media-gfx/gimageview/gimageview-0.2.27-r3.ebuild
 1509012238 ./media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild
+1606091418 ./media-gfx/nomacs/nomacs-3.2.0.ebuild
 1603071106 ./media-gfx/nomacs/nomacs-2.4.6.ebuild
 1602010347 ./media-gfx/nomacs/nomacs-3.0.0.ebuild
 1508090338 ./media-gfx/jigl/jigl-2.0.1.ebuild
@ -32378,6 +32381,7 @@
 1511270659 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild
 1605031340 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.5.1.ebuild
 1603221219 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.5.0.ebuild
+1606091245 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.6.2.ebuild
 1602052359 ./dev-ml/typerep/typerep-113.24.00.ebuild
 1601191435 ./dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild
 1604221601 ./dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
@ -36623,6 +36627,7 @@
 1508241641 ./media-libs/libkate/libkate-0.4.1.ebuild
 1508241641 ./media-libs/libkate/libkate-0.3.7.ebuild
 1508241641 ./media-libs/libkate/libkate-0.3.8.ebuild
+1606091332 ./media-libs/libebur128/libebur128-1.1.0.ebuild
 1603300201 ./media-libs/libebur128/libebur128-1.0.3.ebuild
 1603300201 ./media-libs/libebur128/libebur128-1.0.2.ebuild
 1604031430 ./media-libs/kodi-platform/kodi-platform-16.9999.ebuild
@ -37047,8 +37052,9 @@
 1605032337 ./media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
 1508090338 ./media-libs/resid/resid-0.16_p2.ebuild
 1508090338 ./media-libs/libcue/libcue-1.4.0.ebuild
+1606091225 ./media-libs/libyami/libyami-0.4.0.ebuild
 1510151425 ./media-libs/libyami/libyami-0.3.0.ebuild
-1510151425 ./media-libs/libyami/libyami-9999.ebuild
+1606091225 ./media-libs/libyami/libyami-9999.ebuild
 1512291658 ./media-libs/libyami/libyami-0.3.1.ebuild
 1508241641 ./media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
 1508241641 ./media-libs/libmp4v2/libmp4v2-1.9.1-r1.ebuild
@ -39537,6 +39543,7 @@
 1603151037 ./www-client/qutebrowser/qutebrowser-0.5.1.ebuild
 1508090338 ./www-client/opera/opera-12.16_p1860-r1.ebuild
 1606010812 ./www-client/opera/opera-37.0.2178.54.ebuild
+1606091523 ./www-client/opera/opera-38.0.2220.29.ebuild
 1508090338 ./www-client/vimprobable2/vimprobable2-9999.ebuild
 1508090338 ./www-client/vimprobable2/vimprobable2-1.4.0.ebuild
 1508090338 ./www-client/vimprobable2/vimprobable2-1.4.2.ebuild
@ -41074,6 +41081,7 @@
 1606062308 metadata/md5-cache/app-editors/vim-9999
 1508100508 metadata/md5-cache/app-editors/yudit-2.9.6
 1605091937 metadata/md5-cache/app-editors/aee-2.2.15b
+1606091509 metadata/md5-cache/app-editors/qxmledit-0.9.4
 1508281008 metadata/md5-cache/app-editors/xvile-9.8p
 1605091937 metadata/md5-cache/app-editors/moe-1.7
 1605091937 metadata/md5-cache/app-editors/vim-core-7.4.1583
@ -42115,6 +42123,7 @@
 1605091941 metadata/md5-cache/dev-libs/libatomic_ops-1.2-r1
 1606062309 metadata/md5-cache/dev-libs/urdfdom-9999
 1606071039 metadata/md5-cache/dev-libs/libgusb-0.2.9
+1606091609 metadata/md5-cache/dev-libs/svrcore-4.1.2
 1511090807 metadata/md5-cache/dev-libs/btparse-0.35
 1605091941 metadata/md5-cache/dev-libs/libfilezilla-0.4.0.1
 1605261140 metadata/md5-cache/dev-libs/libgit2-0.23.3
@ -42263,7 +42272,6 @@
 1605091942 metadata/md5-cache/dev-libs/socketstream-0.7.0-r1
 1605091942 metadata/md5-cache/dev-libs/userspace-rcu-0.7.12
 1605091941 metadata/md5-cache/dev-libs/libIDL-0.8.14
-1605091942 metadata/md5-cache/dev-libs/svrcore-4.0.4
 1605091942 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r2
 1605091941 metadata/md5-cache/dev-libs/gmp-6.0.0a
 1508100513 metadata/md5-cache/dev-libs/eb-4.4.1-r1
@ -42589,6 +42597,7 @@
 1605091941 metadata/md5-cache/dev-libs/libstrl-0.5.1
 1605261140 metadata/md5-cache/dev-libs/libwbxml-0.11.2
 1605091941 metadata/md5-cache/dev-libs/libwacom-0.19
+1606091609 metadata/md5-cache/dev-libs/svrcore-4.0.4-r1
 1605091942 metadata/md5-cache/dev-libs/ltxml-1.2.9
 1605091941 metadata/md5-cache/dev-libs/libatomic_ops-7.4.0
 1605091941 metadata/md5-cache/dev-libs/libstroke-0.5.1
@ -43836,6 +43845,7 @@
 1606062310 metadata/md5-cache/dev-python/jaraco-classes-1.2
 1606062310 metadata/md5-cache/dev-python/pytest-catchlog-1.2.1
 1606062310 metadata/md5-cache/dev-python/pyopengl-3.0.2-r1
+1606091339 metadata/md5-cache/dev-python/python-gnupg-0.3.8-r1
 1606062310 metadata/md5-cache/dev-python/pbkdf2-1.3
 1606062311 metadata/md5-cache/dev-python/rtslib-fb-2.1.57
 1606062310 metadata/md5-cache/dev-python/keystonemiddleware-1.5.0
@ -44413,6 +44423,7 @@
 1606062311 metadata/md5-cache/dev-python/yapsy-1.11.023
 1606062310 metadata/md5-cache/dev-python/newt_syrup-0.1.2-r1
 1606062309 metadata/md5-cache/dev-python/addons-0.7
+1606091339 metadata/md5-cache/dev-python/mongoengine-0.10.6
 1606062310 metadata/md5-cache/dev-python/pudb-2013.3.6
 1606062309 metadata/md5-cache/dev-python/botocore-1.4.19
 1606062310 metadata/md5-cache/dev-python/qscintilla-python-2.9.2
@ -49126,6 +49137,7 @@
 1606062312 metadata/md5-cache/dev-ros/rqt_console-0.4.1
 1605261140 metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.8
 1606062312 metadata/md5-cache/dev-ros/rqt_action-0.4.0
+1606091309 metadata/md5-cache/dev-ros/openni2_camera-0.2.7
 1606062311 metadata/md5-cache/dev-ros/opencv_apps-1.12.0
 1606062311 metadata/md5-cache/dev-ros/diagnostic_updater-9999
 1605261140 metadata/md5-cache/dev-ros/rosbag_storage-1.11.17
@ -49322,7 +49334,6 @@
 1606062311 metadata/md5-cache/dev-ros/bondpy-9999
 1606062311 metadata/md5-cache/dev-ros/rosauth-0.1.7
 1605261140 metadata/md5-cache/dev-ros/rosbash-1.13.1
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.11.12
 1606062312 metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.2
 1606062312 metadata/md5-cache/dev-ros/rqt_gui_py-9999
 1605311709 metadata/md5-cache/dev-ros/imu_transformer-9999
@ -49408,7 +49419,7 @@
 1605261141 metadata/md5-cache/dev-ros/xmlrpcpp-1.11.14
 1606062312 metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
 1606062311 metadata/md5-cache/dev-ros/robot_state_publisher-1.13.0
-1606062311 metadata/md5-cache/dev-ros/mavros-9999
+1606091309 metadata/md5-cache/dev-ros/mavros-9999
 1606062311 metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
 1605261141 metadata/md5-cache/dev-ros/voxel_grid-1.13.1
 1606062311 metadata/md5-cache/dev-ros/rosclean-1.13.1
@ -49467,7 +49478,7 @@
 1606062311 metadata/md5-cache/dev-ros/opencv_apps-1.11.11
 1606062311 metadata/md5-cache/dev-ros/costmap_2d-1.14.0
 1606062312 metadata/md5-cache/dev-ros/rqt_logger_level-0.4.0
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.12.0
+1606091309 metadata/md5-cache/dev-ros/cv_bridge-1.12.0
 1606062311 metadata/md5-cache/dev-ros/kdl_parser_py-1.11.9
 1606062312 metadata/md5-cache/dev-ros/test_roslaunch-1.12.2
 1605261140 metadata/md5-cache/dev-ros/collada_urdf-1.12.0
@ -49519,7 +49530,7 @@
 1606062311 metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
 1605311709 metadata/md5-cache/dev-ros/roslang-9999
 1606062312 metadata/md5-cache/dev-ros/roslaunch-1.12.2
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-9999
+1606091309 metadata/md5-cache/dev-ros/cv_bridge-9999
 1606062311 metadata/md5-cache/dev-ros/mavros_extras-9999
 1606062312 metadata/md5-cache/dev-ros/test_rosgraph-1.11.14
 1606062311 metadata/md5-cache/dev-ros/gazebo_plugins-9999
@ -49604,7 +49615,6 @@
 1606062312 metadata/md5-cache/dev-ros/rqt_action-0.3.12
 1605261140 metadata/md5-cache/dev-ros/pcl_conversions-0.2.1
 1605261140 metadata/md5-cache/dev-ros/rosbuild-1.12.5
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.11.10
 1606062311 metadata/md5-cache/dev-ros/base_local_planner-9999
 1606062311 metadata/md5-cache/dev-ros/geneus-2.2.5
 1606062312 metadata/md5-cache/dev-ros/rqt_topic-0.3.13
@ -50093,7 +50103,7 @@
 1606062311 metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
 1606062312 metadata/md5-cache/dev-ros/rospy-1.12.2
 1606062311 metadata/md5-cache/dev-ros/image_proc-1.12.16
-1606062311 metadata/md5-cache/dev-ros/mavros-0.17.3
+1606091309 metadata/md5-cache/dev-ros/mavros-0.17.3
 1606062312 metadata/md5-cache/dev-ros/rqt_image_view-0.3.13
 1606062312 metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.2
 1605311709 metadata/md5-cache/dev-ros/transmission_interface-9999
@ -50206,7 +50216,6 @@
 1606062311 metadata/md5-cache/dev-ros/base_local_planner-1.13.1
 1606062312 metadata/md5-cache/dev-ros/rosservice-1.12.1
 1605261141 metadata/md5-cache/dev-ros/voxel_grid-1.14.0
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.11.8
 1606062312 metadata/md5-cache/dev-ros/visualization_msgs-9999
 1606062311 metadata/md5-cache/dev-ros/geodesy-9999
 1605261140 metadata/md5-cache/dev-ros/openni2_launch-0.2.2
@ -50319,7 +50328,6 @@
 1606062312 metadata/md5-cache/dev-ros/rospy-1.12.1
 1605261141 metadata/md5-cache/dev-ros/transmission_interface-0.11.0
 1606062312 metadata/md5-cache/dev-ros/visp_camera_calibration-0.9.1
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.11.9
 1606062311 metadata/md5-cache/dev-ros/joint_limits_interface-9999
 1606062312 metadata/md5-cache/dev-ros/rqt_gui-0.2.14
 1606062311 metadata/md5-cache/dev-ros/base_local_planner-1.13.0
@ -50333,7 +50341,6 @@
 1606062311 metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.0
 1606062311 metadata/md5-cache/dev-ros/image_proc-1.12.14
 1605261140 metadata/md5-cache/dev-ros/rosconsole-1.11.17
-1606062311 metadata/md5-cache/dev-ros/cv_bridge-1.11.11
 1605091958 metadata/md5-cache/sci-geosciences/swmm-5.0.022
 1605261144 metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5-r1
 1605091958 metadata/md5-cache/sci-geosciences/gnome-maps-3.16.2
@ -53167,6 +53174,7 @@
 1605150309 metadata/md5-cache/sci-electronics/magic-7.5.231
 1605091958 metadata/md5-cache/sci-electronics/oregano-0.82
 1605150011 metadata/md5-cache/sci-electronics/electric-8.09
+1606091609 metadata/md5-cache/sci-electronics/gerbv-2.6.1
 1605091958 metadata/md5-cache/sci-electronics/geda-1.8.1
 1605091958 metadata/md5-cache/sci-electronics/eagle-7.3.0
 1605091958 metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
@ -57408,7 +57416,7 @@
 1605091955 metadata/md5-cache/media-video/ffmpeg-2.8.6
 1605091955 metadata/md5-cache/media-video/matroxset-0.4
 1605091955 metadata/md5-cache/media-video/kino-1.3.4
-1605311709 metadata/md5-cache/media-video/ffmpeg-9999
+1606091409 metadata/md5-cache/media-video/ffmpeg-9999
 1605091955 metadata/md5-cache/media-video/mkvtoolnix-8.7.0
 1605091955 metadata/md5-cache/media-video/devede-3.22.0
 1606062313 metadata/md5-cache/media-video/griffith-0.13-r1
@ -62802,7 +62810,6 @@
 1508100531 metadata/md5-cache/x11-themes/murrine-themes-0.98.0
 1605092004 metadata/md5-cache/x11-themes/gnome-themes-standard-3.18.0
 1511090808 metadata/md5-cache/x11-themes/icewm-themes-0.0.1-r1
-1603021707 metadata/md5-cache/x11-themes/smplayer-skins-14.9.0
 1605092004 metadata/md5-cache/x11-themes/mate-icon-theme-faenza-1.8.0
 1508241509 metadata/md5-cache/x11-themes/notify-osd-icons-0.7
 1605092004 metadata/md5-cache/x11-themes/gnustep-silver-theme-2.5
@ -62877,6 +62884,7 @@
 1606011709 metadata/md5-cache/x11-themes/bespin-0_p20140225
 1511090808 metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2007.0
 1605092004 metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1
+1606091509 metadata/md5-cache/x11-themes/smplayer-themes-16.6.0
 1605092004 metadata/md5-cache/x11-themes/solar-backgrounds-0.92.0.5
 1605092004 metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0
 1606030009 metadata/md5-cache/x11-themes/qtcurve-1.8.17-r1
@ -65749,6 +65757,7 @@
 1605091956 metadata/md5-cache/net-fs/samba-3.5.22
 1605261143 metadata/md5-cache/net-fs/smbtatools-1.2.6-r1
 1605091956 metadata/md5-cache/net-fs/autofs-5.1.1
+1606091509 metadata/md5-cache/net-fs/samba-4.4.4
 1606062313 metadata/md5-cache/net-fs/samba-4.2.9
 1605091956 metadata/md5-cache/net-fs/wdfs-1.4.2-r1
 1605091956 metadata/md5-cache/net-fs/smbnetfs-0.6.0
@ -66489,6 +66498,7 @@
 1605091953 metadata/md5-cache/media-gfx/ipe-7.1.2
 1605091953 metadata/md5-cache/media-gfx/dcraw-9.24.4
 1606062313 metadata/md5-cache/media-gfx/zbar-0.10_p20121015
+1606091439 metadata/md5-cache/media-gfx/nomacs-3.2.0
 1606062313 metadata/md5-cache/media-gfx/uniconvertor-2.0_pre379-r1
 1508100521 metadata/md5-cache/media-gfx/gpicview-0.2.4
 1508100521 metadata/md5-cache/media-gfx/gifsicle-1.87
@ -72751,6 +72761,7 @@
 1605111206 metadata/md5-cache/dev-ml/variantslib-113.24.00
 1605091942 metadata/md5-cache/dev-ml/ocaml-base64-2.0.0
 1605091942 metadata/md5-cache/dev-ml/pcre-ocaml-6.2.5
+1606091309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.6.2
 1604221637 metadata/md5-cache/dev-ml/cppo-1.3.2
 1605091942 metadata/md5-cache/dev-ml/ppx_compare-113.33.00
 1605091942 metadata/md5-cache/dev-ml/camlzip-1.05
@ -77275,7 +77286,7 @@
 1605261143 metadata/md5-cache/media-libs/soxr-0.1.0
 1508100522 metadata/md5-cache/media-libs/quvi-0.2.19
 1605091954 metadata/md5-cache/media-libs/vips-7.26.7
-1605311709 metadata/md5-cache/media-libs/libyami-9999
+1606091309 metadata/md5-cache/media-libs/libyami-9999
 1605091954 metadata/md5-cache/media-libs/iulib-0.4-r1
 1605091954 metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
 1605091954 metadata/md5-cache/media-libs/libbdplus-0.1.2
@ -77344,6 +77355,7 @@
 1606062313 metadata/md5-cache/media-libs/avidemux-plugins-9999
 1605091954 metadata/md5-cache/media-libs/mlt-0.9.0
 1508100522 metadata/md5-cache/media-libs/libquvi-scripts-0.4.21
+1606091309 metadata/md5-cache/media-libs/libyami-0.4.0
 1511090807 metadata/md5-cache/media-libs/sdlmm-0.1.8-r1
 1605091954 metadata/md5-cache/media-libs/libwebp-0.4.0
 1605091954 metadata/md5-cache/media-libs/libzen-0.4.30
@ -77833,6 +77845,7 @@
 1606062313 metadata/md5-cache/media-libs/raul-0.8.0-r1
 1606071039 metadata/md5-cache/media-libs/libgphoto2-2.5.10
 1605091954 metadata/md5-cache/media-libs/libaacs-0.7.1
+1606091409 metadata/md5-cache/media-libs/libebur128-1.1.0
 1605091954 metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
 1605311709 metadata/md5-cache/media-libs/libcdr-9999
 1605091954 metadata/md5-cache/media-libs/ctl-1.4.1
@ -79971,6 +79984,7 @@
 1606062314 metadata/md5-cache/www-client/weboob-9998
 1606062314 metadata/md5-cache/www-client/elinks-9999
 1605092002 metadata/md5-cache/www-client/surf-0.6-r1
+1606091539 metadata/md5-cache/www-client/opera-38.0.2220.29
 1606062314 metadata/md5-cache/www-client/firefox-38.8.0
 1605092002 metadata/md5-cache/www-client/jumanji-0.0.0_p20150527
 1606062314 metadata/md5-cache/www-client/qutebrowser-0.6.1
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Thu, 09 Jun 2016 10:00:01 +0000
+Thu, 09 Jun 2016 13:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1465465501 Thu 09 Jun 2016 09:45:01 AM UTC
+1465477801 Thu 09 Jun 2016 01:10:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Thu, 09 Jun 2016 09:45:45 +0000
+Thu, 09 Jun 2016 13:10:55 +0000
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@ -48,6 +48,7 @@ DIST samba-4.2.12.tar.gz 20878216 SHA256 b334a86a92a1c2759c0b3dce20965e7fe820f0a
 DIST samba-4.2.9.tar.gz 20750339 SHA256 ba0229485e8bebac22bd3ae98b1e393e7127f3a958cc90e205a6d752e575354c SHA512 438196f268c0ca0b83e8e7e9eb8e9a8b503d6408d5e2b0dca1d041185e06cfc08147122d5495b72c46ce58dc3cb4be4766551f0101c69b2620b89e749d89ad98 WHIRLPOOL aa7a655a3d2f2bf81d2747d83c86a0c7d464a31414b6e27a413461e1e0ad0ce3d3af5d756d8ce213e775f5141c44ef9c41a792e88d246bcab002b7623552260a
 DIST samba-4.3.9.tar.gz 20570849 SHA256 1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 SHA512 bc90c88d8defd3acec7c671e8ceacec31e3111540aabee7ec6f11cdeaf61bbd993525e2b765e3b50801c8079e1168cf496b3e5e6a56118d6493ae5da60d34c41 WHIRLPOOL e33efba4bfbaab5278ec62cbadb5f14fe2220d4b4ad1e57a4d26233d8b6bdf4318ad86d839b2638a490a195c04aabb02dafff67bb1e2999fab4f116b3c6367cc
 DIST samba-4.4.3.tar.gz 20705861 SHA256 031e6ada6d15deae6850845eed41497af32207fb679d6c6c74f19acc99d437ba SHA512 25c447f476a54c7e5992d3010957401373eb99b89bcab3e80d7a5aee08413fab87d0dc87d43e7c541b4fa1778a8707121639f56a208dd634e0b1f905eb8afa7c WHIRLPOOL 4c62e58cf9d851ca114f3d3eea20350a589006acbe5fb9209c7be0617f435cee0c4a706906238a354a78d97aa6fdd45d40aef699a2c179ced3671f996fb2afc7
+DIST samba-4.4.4.tar.gz 20711340 SHA256 262f9edabbd1c0112819b5063718588c22b0ee4c1a2f648f79f233fdfba25c8b SHA512 e982c09051fd4e7a14abfe4ae5add3d8da61e4e761511a403c911fadc3d8809dad19d5591c71baa35f80fe5c07b4fa67b46b6565aa03144c57d5a17476bb343b WHIRLPOOL 9a214aedcaefc66cb5e34a73544986ae31c12061e4b3f7f3958ec4d16e7b6db92650ee4b77f426418124461bcdd7ecde31e6bbe0b5ee95dea7cfd3cb12e4b4a9
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
 DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256 83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512 ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5 WHIRLPOOL 3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
@ -61,6 +62,7 @@ EBUILD samba-4.2.12.ebuild 7036 SHA256 51e2fe2abab4fec6bde49999148a376e7eefde0cd
 EBUILD samba-4.2.9.ebuild 7047 SHA256 662a21ef07f4d21f8e4a7587d6855555a26269c422c35a1e96b3404a7aaec0e1 SHA512 468da9f0b5603a259d146a221a8bb722f66d50fc3cabab1769338efda7224fa548e05c68e986220aa93a11168a5ad708bd1f928301110739f6cd10a07b8dfbaf WHIRLPOOL 06805522639e3d79f313984d78f777d370072ded19bcbaf397ef4794de5e16d06f52d2b1c6356319e4d3b941a163ff3705fceae37c9b3cb685981bfd3373652e
 EBUILD samba-4.3.9.ebuild 6684 SHA256 9cc9763e58a0b6cf537287eefd98b1ad0ef33106ab3f61e4398141f4fe644d0f SHA512 00764d3a3ec15f0e47e4d3ed9e83fdc665ffc685b93ab58798c0eb920d7f067cdec99037b7641b4a7d28ffd4b9d6e6ea1a07df83f9f2f479456327ac18c4f9a9 WHIRLPOOL 70e120156cd09100b1c930f94d89aa09a53b256e04641d0ee089abd31cb64cf6fd9b86c1a08f270e1196eb82fb9d4597bc75d64277a695f43564d3e1bdd03970
 EBUILD samba-4.4.3.ebuild 6187 SHA256 aa66827ed5e5c752d9e8ddea9a176d9a3d2865ee95815cb6b87424ac5abcbad6 SHA512 49b2e5a42a121d9682abfbcba74a1fa05d10e3d1b14f4cab88e94263bc53916db89c9561bc8ae8e9aecfd2ef552a555b7287236594e4a76794e707f420312d79 WHIRLPOOL 6e4f23b8ec010b79f5aea177021cf5d05796a825e264656101220933fb8f031265e63e7209517ad8c2d71a91eeb1a7078ddfeca7a35c15b6a88750e7892d1cf1
+EBUILD samba-4.4.4.ebuild 6187 SHA256 aa66827ed5e5c752d9e8ddea9a176d9a3d2865ee95815cb6b87424ac5abcbad6 SHA512 49b2e5a42a121d9682abfbcba74a1fa05d10e3d1b14f4cab88e94263bc53916db89c9561bc8ae8e9aecfd2ef552a555b7287236594e4a76794e707f420312d79 WHIRLPOOL 6e4f23b8ec010b79f5aea177021cf5d05796a825e264656101220933fb8f031265e63e7209517ad8c2d71a91eeb1a7078ddfeca7a35c15b6a88750e7892d1cf1
 MISC ChangeLog 23595 SHA256 dc8dc0f71275a84292be485f4a320b330db2ece13be9b28214247a60301b8779 SHA512 da2af514b796104d21c00093da1cca22a1141afe06a05f7440c7db44c6e5d14fef9dce047d6d5d3b159f5b5a631fdf1e0b30284a516865413960dffa42df24a7 WHIRLPOOL 1d1731357167de71259fa3eb8712831a0fe969f08a3c7cfbaaef062439972d2df907a6abf53f08442cc0ec252fcb0dd8d1a92a94ebe74f0b91a8fb05e7bf1766
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC ChangeLog-2015 11570 SHA256 700ea64c0586d7957e3ef95425683f9bd711ae4311c7cd19575b6d1cdd814e94 SHA512 8d5d99a08a409db4cf8c8e9c3a82a080de66d9aac6ff39e53bb6eb5eeadb625d0ebd07c6fc81bce1755d2441ab91d96f90787d3975814f572e2ce2a366038299 WHIRLPOOL 340948bfd379c419985c93c21a543bb10d10a0c95c8ec2cf1d01697a3e47613b2b6e9f2292c1d03f353121a39b6be809ba432535ccab67b71adf333c69c5bc2e
--- a/net-fs/samba/samba-4.4.4.ebuild
+++ b/net-fs/samba/samba-4.4.4.ebuild
@ -0,0 +1,233 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~axs/distfiles/samba-disable-python-patches-4.4.2.tar.xz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~hppa ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.26[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.28[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+)
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches/"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(usex ads '--with-shared-modules=idmap_ad' '')
+			$(use_enable avahi)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex test '--enable-selftest' '')
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -30,6 +30,22 @@

 #--- END OF EXAMPLES ---

+# Michael Palimaka <kensington@gentoo.org> (9 Jun 2016)
+# Fails to build with newer giflib. Unmaintained. Dead upstream.
+# Use media-gfx/fbida instead.
+# Masked for removal in 30 days. Bug 571686.
+media-gfx/fbv
+
+# Michael Palimaka <kensington@gentoo.org> (9 Jun 2016)
+# Fails to build. Unmaintained. Masked for removal in 30 days.
+# Bug 574756
+media-gfx/wings
+
+# Michael Palimaka <kensington@gentoo.org> (9 Jun 2016)
+# Fails to build. Dead upstream. Masked for removal in 30 days.
+# Bug 575374.
+app-i18n/xsim
+
 # Sebastien Fabbro <bicatali@gentoo.org>  (6 Jun 2016)
 # Dead upstream, several bugs: 513972, 542384, 548988
 # Removal in 30 days
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -4719,6 +4719,7 @@ media-video/ffmpeg:celt - Adds Xiph CELT audio decoding support via media-libs/c
 media-video/ffmpeg:chromaprint - Enables audio fingerprinting support with media-libs/chromaprint.
 media-video/ffmpeg:cpudetection - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)
 media-video/ffmpeg:dcadec - Enables DCA decoding with media-sound/dcadec.
+media-video/ffmpeg:ebur128 - Enables EBU R128 loudness normalization filter via media-libs/libebur128
 media-video/ffmpeg:faac - Use external faac library for AAC encoding
 media-video/ffmpeg:fdk - Use external fdk-aac library for AAC encoding
 media-video/ffmpeg:flite - Adds a text-to-speech filter based on app-accessibility/flite.
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@ -1,5 +1,8 @@
+AUX gerbv-2.6.1-ru.patch 341 SHA256 ade4454095cc6bfb78ef9f946cb8aa0c91447f4263ea4f66b0045f40705793b5 SHA512 7cd39b1648f67bbf28a56afe03975ce0f57afeec8021f14f0a56e6ea015e5148c245ad960db7d544a2c5b8e2e33d682ee5ae5b00a6384d303494f3430933a3bb WHIRLPOOL 877775a149cb1dd5646399369c18d2f9ae83dd89938112956a760a6bf2bd75f8d809b7b550bfc3ea8373fa291ca4eb4b46fb76faa845aea77004c59570ed42f3
 DIST gerbv-2.6.0.tar.gz 2346299 SHA256 5c55425c3493bc8407949be8b4e572434a6b378f5727cc0dcef97dc2e7574dd0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377 WHIRLPOOL 07fd10e35d7f384bfdf8d16c9e1a42bdf3010dcd45c2cb3cb359f7c0478b0739c784900e8448c117841511e7d6fed2fe5bd69051fd61e2c64750f83e931909c4
+DIST gerbv-2.6.1.tar.gz 4432481 SHA256 7aa6a2c622dc9ff7acd88411dddf95ae25ae3b5d97020f3ea91e97d82bf0d96c SHA512 cbf4ce4fd2b401d65ffc6bb5a7f9da0e6fa31cb3f754ea12092c86f197c72c833805eb395562b286f6d03c2eb38e363b649f8aa1040a6207baf975fa15e48b29 WHIRLPOOL c59feee8a6c5879cf9686bebb79adcd15b55d73e65641866c90c85d8b757113a7e119cf3b58f08f40e8c0c532fde23411ed9245ee0b011698364da974f9b65fa
 EBUILD gerbv-2.6.0.ebuild 1073 SHA256 3e2fa02e0305581d12e265d665dd14145a6123f6812402ab088bd6e3d238d55d SHA512 eb71f21660a32cf1642da19ac219dc65d3a54b6d663dcb5a44543db24baf3d41d31df88deceaea75ebd793f3e55a070c859c2ac2d6a20e876edc43dcc8e01721 WHIRLPOOL 68ba6398755a9308924fb7a76b01d6e5285957008483917666a2606910a2408dfb679148d0f829cbde245dcc1416e81562789c55c55f57159b312ccb00f762cb
+EBUILD gerbv-2.6.1.ebuild 1236 SHA256 1049cb5c010486688908d335ad7c52bf8f2d9b38d692a8fac2636a1ddf62e841 SHA512 3cc6d0fea4a2369da6362a843869606dc25056e9770b36c24550b7cc2d7e3cb3802b2eeadddb3d3ca3a6d652ddc878e39c4d9a08c20cf5d773de2867a0fdc817 WHIRLPOOL 14088a998dc1f685453b97fcdd638c0b6024ce339f957481c8ca9c185209eb1bb42c3788a4879ec6cc1e130c2f529282431302172aa3a18820bc0c4f4902bbdd
 MISC ChangeLog 2428 SHA256 38e6a6a094888c0ac5869fc2bad34528197ce693cd302b199e331a2179803759 SHA512 859f71831c1ab9b6d3f5d14e621f10e474485e5493140fd8523d00d4bfc9ac0193fac279eb0fdddb1be805d5df33eda184b210bdaec945e42fa777a1c853f3d2 WHIRLPOOL c6240a1e29c65c11fa30e0838c57041af0e4f43f8ee175fc6b362aac85a606f716986377f67ba037f3ede002ef4bbf10c1cc3c4190417bf801f12a0a85524768
 MISC ChangeLog-2015 7176 SHA256 559922e6362d437e60f00eb86db26df12315798f813d2ff35f8172068ce4f736 SHA512 f8ed747fefb836f2aa38cd70db447eed882099e3f5ec588420a612703b31bc6f01b8446a6a3330323ee84ef1b838d9be58a75df9d2516fdfb1c9e2b687520cb8 WHIRLPOOL ca0107601db8350030006844da7b2396bfd8a0bc2e8f08f822a76a6c4764d52de3707e3f411a939a256121ed323c5206bed0034b6d0e4bb898e8aec4e0fdf57f
 MISC metadata.xml 802 SHA256 9f13001793dd923c2005dc3f153bed4a31985c79c5d588d0692434fc92634d57 SHA512 cd322dbcdba34e76f450b4368e2a3eb63885726c09f8b8baad3137cc8e5e8e8537776fd776b86112b2fb71ae5720490dda586ca805e0ba8662744703eed25982 WHIRLPOOL 5dbc3a77aa7418ad2851fa4a13525514055526beda87254c7977b2deff0a15a96fb97fac1271619bb006feeec641a8cd77b63ec3c97b139dc9b4505ab2133417
--- a/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
+++ b/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
@ -0,0 +1,12 @@
+--- a/man/Makefile.am
+++ b/man/Makefile.am
+@@ -19,8 +19,7 @@
+ ##  along with this program; if not, write to the Free Software
+ ##  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ 
+-man_MANS = gerbv.1 gerbv.ru.1
+-PO_FILES= gerbv.ru.1.in.po
+man_MANS = gerbv.1
+ 
+ MOSTLYCLEANFILES = *~
+ CLEANFILES = *~  *.pot $(man_MANS)
--- a/sci-electronics/gerbv/gerbv-2.6.1.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.6.1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://gerbv.geda-project.org/"
+
+IUSE="doc examples static-libs unit-mm"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	x11-libs/cairo"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# No Russian translation shipped
+	echo > po/LINGUAS || die
+	eapply "${FILESDIR}"/${P}-ru.patch
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable unit-mm) \
+		--disable-update-desktop-database
+}
+
+src_install () {
+	default
+
+	dodoc AUTHORS BUGS ChangeLog CONTRIBUTORS HACKING NEWS README* TODO
+
+	rm doc/Doxyfile.nopreprocessing
+	if use doc; then
+		find doc -name "Makefile*" -exec rm -f '{}' \;
+		dodoc -r doc/*
+	fi
+
+	if use examples; then
+		find example -name "Makefile*" -exec rm -f '{}' \;
+		dodoc -r example/*
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@ -4,8 +4,11 @@ DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
 DIST opera-stable_37.0.2178.54_amd64.deb 48512846 SHA256 25a3e7a2ebc2468e251cc840a54fd4d16e3ff7d49fa1bb71511b34458179a4fc SHA512 953c8e0cce49c61e4e6ea26ef482cef1ea2a60326d0577ceeeb8c81ffdb52d42321f0e108da8330501c2ad8dbc41498ab0cb5930be2b9f5ad0c51aca49d38bb5 WHIRLPOOL 9333ca21aeafa0ddf3d1522de2c56823ccd3f8a98cddccbf7c5128dc6f4049fa7bcc8d1c8850991e63b7503205bc0719fbc4f13265c5ab13b553d3cf1128fc03
 DIST opera-stable_37.0.2178.54_i386.deb 50175044 SHA256 67b5637261a1973d2fa302b03a5c21c3751bc86bb3e84d2a49f1096efdf3fc2c SHA512 1e5201430dc39424d5ec82f6f32b5583c083cdd0f3a8f8263dc40d8251aa0e7491a09a7a7eec362d2032955ae5c15c407eff874a4c5f2028d9eec85448bc0865 WHIRLPOOL 3c694e57df031046f68cefb227e4736cd1e32966b31d5eea685eba9bd8ff6c4dcef045fe903e25c507de8cdc4f9945bb1a777ca0a743e85fa14a7006a8839053
+DIST opera-stable_38.0.2220.29_amd64.deb 49285042 SHA256 57048c5eab3382c83a7af1962390bcd0d1edc86d9625a20c75bbbfd1a2b17636 SHA512 68897a2f83a08b81b59a4fe7ea47ee590f6fa5a5b25c1c125826a74498d5ba33eee6aa6b7bd7ea88066032cf837f5a942659c6d4c33df0bd00f18fa94dc731c0 WHIRLPOOL 034b44d61e6f55834032e0b8eb61215913710836299fe8e9428dd260d884bceef3c8703bd1c36db5ce5e97a4097ad64e49b3fee5ddabe09ed3c01a3a863e59e8
+DIST opera-stable_38.0.2220.29_i386.deb 51506326 SHA256 06015b90bc825f5f61428f2c4d884a1c731cf508f2013b2fee1191a8fdede57e SHA512 6e5ff9724e85bc01900ea75af1ed4317c0539b0300a5f309c61c20be0930991a6cc5512379b43375fd9bcdfd7c4df8d7e95acfa0e5929304b5fc12a94f59c17e WHIRLPOOL 1447698a9eeb24bc07e21842adcf27a51f2e74e87bfeb74fa1b4d7b492121d26817d008339d2900ebea7d7261391a05e46547cab7792fa83fd3b5f65e5fc2a8c
 EBUILD opera-12.16_p1860-r1.ebuild 6307 SHA256 e306e03f7a4c4e5d1ea6aab71621e562619634f43d2473a131e8292390893cdb SHA512 115b9c5238e7829463828d5a57b85e30cadd34769d18a2022f2c5c9614dee31776af4ae56882c2080e8b4123e9609bb5fc8ab766f8fc0672b504e74ee0f29c50 WHIRLPOOL 1513d4e84759d8ab29e44c118e5cc5efb8e9539ad152218ac45673df0fa543d33d8da5469d47572f3098cb7423fb2b148f2d03b7fa52f92533fd23faad2c4488
 EBUILD opera-37.0.2178.54.ebuild 1970 SHA256 12f76ae9fb82a8fb6a47c8b86f29f8ca9a1d15aea7f187f1e92995fa8620df66 SHA512 fa90f8729bc50dfe4b6a4cf6e4207848ccc83f1dcb967564d8822c79a0498973ca5eea23cd64b837e1a8446332a3b75dd537a81d8c78349b27a2fa6ecc5faec6 WHIRLPOOL acb735e659e43379db0cd45b87b74509ed025b16dcd4423dd8cbbc53d89bc0147d76ed7eec7d31850ec223673d82b445982d16eb8a678d328bece0bbb9a2af53
+EBUILD opera-38.0.2220.29.ebuild 1970 SHA256 12f76ae9fb82a8fb6a47c8b86f29f8ca9a1d15aea7f187f1e92995fa8620df66 SHA512 fa90f8729bc50dfe4b6a4cf6e4207848ccc83f1dcb967564d8822c79a0498973ca5eea23cd64b837e1a8446332a3b75dd537a81d8c78349b27a2fa6ecc5faec6 WHIRLPOOL acb735e659e43379db0cd45b87b74509ed025b16dcd4423dd8cbbc53d89bc0147d76ed7eec7d31850ec223673d82b445982d16eb8a678d328bece0bbb9a2af53
 MISC ChangeLog 7582 SHA256 1cd4f7e545301a4006b72efba23869980be2ffe2dd26065f5c0534250ad726ee SHA512 5de441328c7f9d94d640b38501170a8a5760d02503af79d7a1ec30ef0e01374167cdf035b266f783f0a83a816156a3ba1038abaf157f83b24ec2f909ac9155fa WHIRLPOOL b8fd4d9e4838e45d09c8b4bb29ca5b9ddf61428cb5d1e0ca54eb3ec61f40ab326f8f25ffaec9ad66eeaa7e84b5f338b44cf0bd36014fcd8001fc36ba777d6e42
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC ChangeLog-2015 41138 SHA256 6209a7f61e8f513d7bd17f64d8c4d12e5e4318227d9033d7117427b1d241ac8b SHA512 2bbbd008b586cc177280674c2dcacf7464645ebd3ddd4b18fe86ecea30d9e9f973d286b4fcab65cd1f09d994938dc6449b28f606c2a190fbc07301a2f919e6ed WHIRLPOOL e6fca4beb9f81f9633c56b02c7e94d3f9cc46fd8ed0a66ab297f790b00b8c132c10048996d9c4427283048cebb76c74602d8e9ccb0e1edd2f68b7245d9fee092
--- a/www-client/opera/opera-38.0.2220.29.ebuild
+++ b/www-client/opera/opera-38.0.2220.29.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
+	sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
+	x86? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
--- a/x11-themes/smplayer-skins/Manifest
+++ b/x11-themes/smplayer-skins/Manifest
@ -1,6 +1,4 @@
-DIST smplayer-skins-14.9.0.tar.bz2 382195 SHA256 88889dbbeb90215ef5c16f29627437cdf7df0759a7d1868b2e19ffdfe2b6ad53 SHA512 887a9b0ea44f0a1820f6c9fdc922d20e9cc466903e4dc71ace17063d826c4fc01eb004dae2da95147ac707d2bed5da8783f975f69fa6e3a28ceb6ad081141323 WHIRLPOOL 22f4f9e4ca10026f97fd5c619bb7785d119a95fdaf7e9a56a74bd7ae1810b35a8e6cdae026c8833aaf08bd29a359855c29f027e7dd0a8d333c1f4559a8977b8f
 DIST smplayer-skins-15.2.0.tar.bz2 382879 SHA256 a73fe16f8b8802780bbac4485767f309ea8064a48e98f0b37523dc2fb7245197 SHA512 58d1dcc9caf5d93b7f0692ffa7ff4875eb8dd83db78293aee25a713a1f6007c83af556215cd1f7666dec98bc323b074c6b1fdb66eb9560176db842669c206a83 WHIRLPOOL 1a380e2bf4cfc6424c9ead4558fd93b740c52091a5c9e09facc1a4dcc44abe2510ced427243f56027bf94537151cb1e8fc0405948258fb94a1a1a8e9f72c6a08
-EBUILD smplayer-skins-14.9.0.ebuild 527 SHA256 95ea5d30aa05b3cf63a13a1e0cc4ed17522c3b4b59b8db6e3a239a5d50a35dc9 SHA512 05eb6fcff3851c304551c9af7b7038bd11547ce00ff8d9868965660f52093bb77de9f3a673148f5328167e1f58b90c714ec5842cddca98a4e5dee7b5d9e46571 WHIRLPOOL 6b40818f27438b45647e768292ace15bb483dab116b22a0cfece914ddae2c80f1612bd159cc2fa886bee27378034908a2def8a2c65a78da35554300872113696
 EBUILD smplayer-skins-15.2.0.ebuild 527 SHA256 1c303295e004771ab25aa65bda44ffdad1edc5ff7ba57b2c464ffe5c1cd206c6 SHA512 645ce30da34cef08e514a4cb8f1e247e2883025ab94fad866c8baf23e98decd5e21d998239310874a44587e840515c448740e13bc2d82b52e431f7b4fb0d272d WHIRLPOOL 3df6e6455a0a7b9c84ae87e60b749337b0fbcb634e9713b684de68af0de30051cd5e97b23cac4102f85e6e174d171fe3cd7e89dc0995bd942cd8793d4d42f76d
 MISC ChangeLog 2686 SHA256 3e7261d7f87c82cb14a2c38584fe86246bb78ef5f71bd85760e996dfcb8bd413 SHA512 a96ba41d7afa94af3b8219ad3cdb13034dd6939d590e53eb906dc935912299e8fadadf914b331b26efa9beed5f4dd764fe2ce94a23ff71950827549be94672e0 WHIRLPOOL 5b47d9745d936068ac28b705f158d2defc1562e5aab99043af2dd447cb104ce57b43bb12aa4bd9b1aed3ea4dd47b1159986e493292e007bbe5b54c30049f4099
 MISC ChangeLog-2015 1077 SHA256 5809009c590c4dfef7b892f6cff818b20555b5b22508df075e3802cff405843e SHA512 69bf8990c0d875dc42e9b4ab885c9ca3a12247d4339cf155ffa6ef747e5f795a7c5f88bba4dadf560fc2416f8fceff0d5204758d649051bf29eeb9d82df5f766 WHIRLPOOL d115895ce0b840bc9d440fd80df82f673bc7fcdd07ba053e781c42b7015136319aa2035e2b39b94be615ec82b5c7249610f6cdeeb65082ab5a1888f7eac537e2
--- a/x11-themes/smplayer-skins/smplayer-skins-14.9.0.ebuild
+++ b/x11-themes/smplayer-skins/smplayer-skins-14.9.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Skins for SMPlayer"
-HOMEPAGE="http://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
-
-LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="media-video/smplayer"
-
-src_install() {
-	rm themes/Makefile
-	insinto /usr/share/smplayer
-	doins -r themes
-	dodoc Changelog README.txt
-}
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@ -1,9 +1,11 @@
 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5
 DIST smplayer-themes-15.12.0.tar.bz2 3229694 SHA256 bd30b4cee576c4b1e4e8b59c986f93f2c2d150554d3eedb6e1dd37aa2e0fd110 SHA512 27fa91ed878c5b69d6d80ea90be15360a1224ff14e3828d71a9dccb8fbea10158377b1149c80e3260033a7d99a02586881ba2a57dc0e2b07cdacf26ae9c03ba5 WHIRLPOOL 2e13c3f1f244cdac3e58edfe3e9bb228927b3e7b28ed64360b1cd66fd36a6444be922054c4d2e9f208c83a0c79899a94e2a64d9ab3b2972fa2b82a7aea417e2f
 DIST smplayer-themes-16.5.2.tar.bz2 3647376 SHA256 8e574b79559b2e6a6347fff496ac1f3a878e4fa23d47582b7f8d903f87ab3f86 SHA512 f86131e624409c285d8f374c332b326378ee608b398e58c1c6440876735130d78386f652f37909abd2d89c5c80ea68253d36b69cd1681e8afde0b47767a8bfb1 WHIRLPOOL 3aa24b896e7bd356a5ec00e40a68a1745780f3dfd7f22208be5121e9a61d9516ab141b8a8e4e8a125b77830611f5ad9e75eeeefbc2e4a3b977b65445d48ece2e
+DIST smplayer-themes-16.6.0.tar.bz2 3900645 SHA256 a5ec99809bf1cfdf872d569a66f97fc9c06ce00cba0aec7c7d46de3b2591edbc SHA512 a30afeae041e76bf330222271a1ba6cc925e5e9dd4b35527cbf7a403f6e5b45cf8c97fe712c27ac41a368b0595058795487d79073bcf0ec6b1958b7ac29ee40b WHIRLPOOL 383c492d9ffb7ed0f0024ebcc7e59720b4047af56f37d0e3c9d9ffd5abde3ee7b93d32693e99b1920624d9a4be8ebcf339364733547200916b0e6d75a409dadd
 EBUILD smplayer-themes-14.9.0.ebuild 530 SHA256 770205f028a2afb651fde479089b705cfb6676f8702da4a005de774d4ee62be5 SHA512 f56b055a401cd83dbf977317b193f689986dcd6ddcba1486bcedfde5483919caccb394f303d88caba0ed20f3b20040c8cd642b0b557322362008c70ff0a33fe9 WHIRLPOOL c08617ee736c9daa119247cbd992545bc71ec7810f10ea6a94b23f3bedc960abacc44094385bad48be99be5f85fb0e5ea732cd2274b85f9882bcf656fe32d343
 EBUILD smplayer-themes-15.12.0.ebuild 769 SHA256 a135323e633f5588460f45354dd339d63995c8b5bac5b798581f36e2af69e3cd SHA512 4b7d9be949acccdd4f7c497ed7403b5051de76fd1d9b5a9b22e0d9465ccd361696a21b1f1bb46581306718babe1e53c4972c2ce33ccc4fe5757c5c21e597d676 WHIRLPOOL 41f3b5ac4527a9bb1e8a39bd664be521124c65458d1c2d6a21bfd312ad895c3c61cff5e2074d88b8e146acd2e759b75d4890f49ddd1485cfa9dd1d534062f8fb
 EBUILD smplayer-themes-16.5.2.ebuild 785 SHA256 6f24cb9c8ad71df735c8e34671e9253ec60ce1a2fc42ef09be58f6b2d5d9156f SHA512 d52bcd218c78e800904bea0f8618337294cba19c73778563695b92218280b967694bbb300f752cb456209ed0a489adc5acc2d3d04b5dfacd909db865249856e6 WHIRLPOOL a5d631f1055b4a65df08634f338f163f8d2b05a28e998094068b4c41448fa859819e3930eeac849b703b8b60fb3e979c4a61601cbf7b5387bea8eb70da524f15
+EBUILD smplayer-themes-16.6.0.ebuild 785 SHA256 6f24cb9c8ad71df735c8e34671e9253ec60ce1a2fc42ef09be58f6b2d5d9156f SHA512 d52bcd218c78e800904bea0f8618337294cba19c73778563695b92218280b967694bbb300f752cb456209ed0a489adc5acc2d3d04b5dfacd909db865249856e6 WHIRLPOOL a5d631f1055b4a65df08634f338f163f8d2b05a28e998094068b4c41448fa859819e3930eeac849b703b8b60fb3e979c4a61601cbf7b5387bea8eb70da524f15
 MISC ChangeLog 3793 SHA256 852812f6c92f4e6c69362dec64f166b28b5e35ba592ae11fa05ab00ef2f0c6a7 SHA512 63696bfd9fd5f8b0db0d1084d130909c63391ebb9f702536d23ad25c35344f864fefac15ab962af9c39ea43a1ec570dc22a4b94fe44b55f1e73060a9d54561bf WHIRLPOOL 4aefded7b4b3c9fd34acb50405205cbacb07e2242d44a62c92fd93007ed0d684e26f5f1562d3b0cce159e7642dd5de4524a86df2ae52de3d7309738388aaec02
 MISC ChangeLog-2015 5674 SHA256 989d7ecea6d09d4b94498aa86930fcefafa98c012291473693cff26cfbba91a9 SHA512 b4bc0a8dced7072cbabde7ee733821198be70b868294bfeee44569a409735978683db5eba66f3d32280216b4cc1c25f53745748a9976f9a9ab113a54966e9e13 WHIRLPOOL 7cd303de94549adfbb4d0c347ff96e59418a5bbdade8a0adc8eecfa95c87a2235fabd85ed86f003740accd7e97e38e33fb269b3f4757a24df023ac0caa893563
 MISC metadata.xml 445 SHA256 560fc42b42e2efa2b20e2dd788ca267a209109a864a1fe1fddf08cc7bdfde41a SHA512 3886c993922515ec56ae8bd971bdb47f582cd6ec2fb9341e89902394f30a9186d8b66d958e3ef1b042ce0dbbb39fd35f28abed6e4056c27b53ba25d97a2b7a8e WHIRLPOOL 9315005b6c851b88060a364a4a0c4df8e70abb499c3b176caf262f074433b1007b8b1cf27ab401f28af1cccc597bf4e10943853d369271d4d6eda5566772eead
--- a/x11-themes/smplayer-themes/smplayer-themes-16.6.0.ebuild
+++ b/x11-themes/smplayer-themes/smplayer-themes-16.6.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Icon themes for smplayer"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+
+LICENSE="CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 CC0-1.0 GPL-2 GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4"
+RDEPEND="media-video/smplayer"
+
+src_prepare() {
+	default
+
+	# bug 544108
+	sed -i -e "s|	rcc|	\"$(qt4_get_bindir)\"/rcc|" themes/Makefile || die
+
+	# bug 544160
+	sed -i -e 's/make/$(MAKE)/' Makefile || die
+}
+
+src_install() {
+	rm themes/Makefile themes/H2O/Makefile || die
+	insinto /usr/share/smplayer
+	doins -r themes
+	dodoc Changelog README.txt
+}