diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
index 8d2beb38e833..3d3e24f97458 100644
--- a/app-arch/cfv/cfv-1.18.3-r1.ebuild
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="bittorrent"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DEPEND=""
RDEPEND="${PYTHON_DEPS}
diff --git a/app-arch/tar/tar-1.29-r1.ebuild b/app-arch/tar/tar-1.29-r1.ebuild
index 138eccbe0fca..4e767df1d5cc 100644
--- a/app-arch/tar/tar-1.29-r1.ebuild
+++ b/app-arch/tar/tar-1.29-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/sync2cd/sync2cd-1.3.ebuild b/app-cdr/sync2cd/sync2cd-1.3.ebuild
deleted file mode 100644
index 89ef0e2d74cf..000000000000
--- a/app-cdr/sync2cd/sync2cd-1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="An incremental archiving tool to CD/DVD"
-HOMEPAGE="http://www.calins.ch/software/sync2cd.html"
-SRC_URI="http://www.calins.ch/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="cdr dvdr"
-
-RDEPEND="virtual/eject
- cdr? ( virtual/cdrtools )
- dvdr? ( app-cdr/dvd+rw-tools )"
-DEPEND=""
-
-PYTHON_MODNAME="sync2cd.py"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_test() {
- cd tests
- "$(PYTHON)" run.py || die "Unit tests failed"
-}
diff --git a/app-dicts/hunspell-kk/Manifest b/app-dicts/hunspell-kk/Manifest
deleted file mode 100644
index 75d84028a200..000000000000
--- a/app-dicts/hunspell-kk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hunspell-kk-1.1.2.tar.gz 310304 SHA256 a51dfd059eb660d34cf421fb6c46811d3d2609cda94d5d1bf1e30dc02d4177f0 SHA512 ed04d2d0e341b138c7a1646807d18df1044329ade16f18165dc1e70359988302314949102d6bee7a3038e1f12974966598606f0c9dfb28cdeb025460601fa91a WHIRLPOOL 06507c4abf9e2bfa89d0c118c1efbd1185ad1f9c5aff2fa2dead582289d85bbdfd5563d858dad3ad1bf88a22a9fe5496a9a2d50f0a40930b3bfb8e83cd976111
diff --git a/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild b/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
deleted file mode 100644
index 94eae30ea95d..000000000000
--- a/app-dicts/hunspell-kk/hunspell-kk-1.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit vcs-snapshot
-
-MY_P=${PN}-${PV}
-
-DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
-SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses:= )
- readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- app-text/hunspell
- app-dicts/myspell-en
- app-dicts/myspell-ru"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- dodir "/usr/share/myspell"
- insinto "/usr/share/myspell"
- doins "${S}/kk_KZ.aff"
- doins "${S}/kk_noun_adj.aff"
- doins "${S}/kk_test.aff"
- doins "${S}/kk_noun_adj.dic"
- doins "${S}/kk_test.dic"
- doins "${S}/kk_KZ.dic"
- dodoc README_kk_KZ.txt
-}
diff --git a/app-dicts/myspell-kk/Manifest b/app-dicts/myspell-kk/Manifest
new file mode 100644
index 000000000000..0ccf5f4fcc8d
--- /dev/null
+++ b/app-dicts/myspell-kk/Manifest
@@ -0,0 +1 @@
+DIST myspell-kk-1.1.2.tar.gz 310307 SHA256 9af4e684c59f0d6020b615bacaa06a99332e32a697d88eb4da996a6ea6e88e83 SHA512 1373f7af6767a9d81b3fd03207775999eb4be7757ccbe26a849f9b3c47d7dbf0b4e8cfd3e4e6436b45478ab01dc23f7d255c2a9f7100193c6b9b3b0f7935d751 WHIRLPOOL 11012493fb0f0f1dece8e3050a8733a43cd94ddc497cc7dc3c989e09134f9732d56f622858c714d0e35c21a20dfa8c0d50babe29f743711a06b5e2cc270c65dc
diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/myspell-kk/metadata.xml
similarity index 68%
rename from app-dicts/hunspell-kk/metadata.xml
rename to app-dicts/myspell-kk/metadata.xml
index b58b211fed9c..ca127dfa1438 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/myspell-kk/metadata.xml
@@ -4,14 +4,13 @@
kegalym2@mail.ru
Galym Kerimbekov
- Proxy maintainer, assign bugs to him
+ Proxied maintainer, assign bugs to him
proxy-maint@gentoo.org
Proxy Maintainers
- kergalym/hunspell-kk
- hunspell
+ kergalym/myspell-kk
diff --git a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
new file mode 100644
index 000000000000..ec4788278437
--- /dev/null
+++ b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MYSPELL_DICT=(
+ "kk_KZ.aff"
+ "kk_KZ.dic"
+ "kk_noun_adj.aff"
+ "kk_noun_adj.dic"
+ "kk_test.aff"
+ "kk_test.dic"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
+HOMEPAGE="https://github.com/kergalym/myspell-kk"
+SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P}" # override eclass assignment
+RDEPEND="!app-dicts/hunspell-kk"
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
index ff12695c48d0..bb50ed260b45 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="perl python static-libs"
DEPEND="virtual/libusb:0
diff --git a/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild b/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
index debe3dcffa6b..69560f8e8086 100644
--- a/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
+++ b/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
# sys-apps/lsb-release is used by the init script for detecting Gentoo
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
index 12b1be12f933..88bc9b7cd8f5 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.48.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.48.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$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="python"
RDEPEND="app-text/recode
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 4cec73367476..c11873e47705 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,2 +1 @@
-DIST recoll-1.17.3.tar.gz 1757278 SHA256 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c SHA512 b41d28255e6bfbfc8e0025d88c3d56ecfbd35814bfa359c41f3e5d3cc25debe6d66dc617aa4c012e1911aa8c373c48a1661f7fff926e2cce423562af82c2fb31 WHIRLPOOL 3ba9d58a0df401832b1a97f34f4caec1b79aa7de027b936b05195d447e374097bff9205714b1a97c287610c74c0ec2e7e726b144c2295859c293a013c3564644
DIST recoll-1.19.5.tar.gz 1997615 SHA256 c4d63a4cd1a598117a521a883a6078082b30fe63eef84a879da9b467fcb56a8d SHA512 45ae5dc6d4f6d6dbb3d7e634bd60a2835b767e5d2d8d188636ab4b1777d65a6918c09d5bc09e80e4849aea6e8b2c9c430b99a9e56b645531065e558f4161a5f3 WHIRLPOOL df099f39a681aa1956076018861d064445bcb9fc050c866133a830ebeddb33efcc9a06596ce18d17d80bcfdb663bb780434719092c6c571f42b6093a4c750be3
diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild
deleted file mode 100644
index ead4dff26a33..000000000000
--- a/app-misc/recoll/recoll-1.17.3-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-inherit toolchain-funcs qmake-utils qt4-r2 linux-info python
-
-DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
-IUSE="+spell +inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
-
-DEPEND="
- virtual/libiconv
- >=dev-libs/xapian-1.0.12
- sys-libs/zlib
- spell? ( app-text/aspell )
- !inotify? ( fam? ( virtual/fam ) )
- qt4? (
- dev-qt/qtcore:4[qt3support]
- dev-qt/qtwebkit:4
- )
- session? (
- inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
- !inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
- )
-"
-
-RDEPEND="
- ${DEPEND}
- app-arch/unzip
- sys-apps/sed
- virtual/awk
- pdf? ( app-text/poppler )
- postscript? ( app-text/pstotext )
- msdoc? ( app-text/antiword )
- msxls? ( app-text/catdoc )
- msppt? ( app-text/catdoc )
- wordperfect? ( app-text/libwpd:0.9 )
- rtf? ( app-text/unrtf )
- tex? ( dev-tex/detex )
- dvi? ( virtual/tex-base )
- djvu? ( >=app-text/djvu-3.5.15 )
- exif? ( media-libs/exiftool )
- chm? ( dev-python/pychm )
- ics? ( dev-python/icalendar )
- lyx? ( app-office/lyx )
- sound? ( media-libs/mutagen )
- xml? ( dev-libs/libxslt )
- info? ( sys-apps/texinfo )
- "
-
-REQUIRED_USE="^^ ( fam inotify ) session? ( || ( fam inotify ) )"
-
-pkg_pretend() {
- if use inotify; then
- CONFIG_CHECK="~INOTIFY_USER"
- check_extra_config
- fi
-}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-
- local i at_least_one_helper
-
- at_least_one_helper=0
- for i in $INDEX_HELPERS; do
- if use $i; then
- at_least_one_helper=1
- break
- fi
- done
- if [[ $at_least_one_helper -eq 0 ]]; then
- ewarn
- ewarn "You did not enable any of the optional file format flags."
- ewarn "Recoll can read some file formats natively, but many of them"
- ewarn "are optional since they require external helpers."
- ewarn
- fi
-}
-
-src_prepare() {
- # remember configure.ac is b0rked. Fix it before using eautoreconf in the
- # future
- # eautoreconf
-
- # do not strip binaries
- sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
- || die "Failed to fix the installation script"
- # Drop all the QMAKE lines. We will do it ourselves
- sed -i -e "/QMAKE/d" Makefile.in || die
-}
-
-src_configure() {
- local qtconf
-
- use qt4 && qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake"
-
- econf \
- $(use_with spell aspell) \
- $(use_enable xattr) \
- $(use_with inotify) \
- $(use_enable qt4 qtgui) \
- $(use_enable camelcase) \
- $(use_with fam) \
- $(use_with inotify) \
- $(use_enable session x11mon) \
- ${qtconf}
- if use qt4; then
- cd qtgui && eqmake4 ${PN}.pro && cd ..
- fi
-}
-
-src_compile() {
- # Do not let upstream people decide on our behalf
- sed -i "s:ar ru:$(tc-getAR) ru:" lib/Makefile || die
-
- emake \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
- CFLAGS="${CFLAGS} ${LDFLAGS}" \
- CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
- # You probably wonder why I did not fix recollinstall in src_prepare.
- # --prefix requires an absolute path but recollinstall requires prefix
- # to be actually 'usr' because double // makes portage sad. And no, I am not
- # gonna ask upstream to fix the build system
- sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
- sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
-
- emake DESTDIR="${D%/}" install
- dodoc ChangeLog README
- mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
- dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
-}
-
-pkg_postinst() {
- elog
- elog "Default configuration files located at"
- elog "/usr/share/${PN}/examples. Either edit these files to match"
- elog "your needs or copy them to ~/.recoll/ and edit these files"
- elog "instead."
- elog
- if use xattr; then
- elog "Use flag \"xattr\" enables support for fetching field values"
- elog "from extended file attributes. You will also need to set up a"
- elog "map from the attributes names to the Recoll field names"
- elog "(see comment at the end of the fields configuration file."
- fi
-}
diff --git a/app-misc/recoll/recoll-1.19.5-r1.ebuild b/app-misc/recoll/recoll-1.19.5-r1.ebuild
index c234bb64ad91..aac34d026cd4 100644
--- a/app-misc/recoll/recoll-1.19.5-r1.ebuild
+++ b/app-misc/recoll/recoll-1.19.5-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ecce8f1de420..93c2dce17535 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,2 +1,2 @@
-DIST libpeas-1.16.0.tar.xz 548972 SHA256 b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e SHA512 ae3024c8229222f8d683dd88d6f2aeb61e17b676e317e6d824b72e1fecce577f138625933afd7ad6627de961d2b95dcdd5a3593256f2acd05a15e0eede389c6e WHIRLPOOL 367f24916b3289e8e97c16e9367f94533a879945f72a1214d8a67fab070d30a33137768f0be173bd9151f6ea794297225231eade015c476da1ea88b09bc14d32
DIST libpeas-1.18.0.tar.xz 557028 SHA256 bf49842c64c36925bbc41d954de490b6ff7faa29b45f6fd9e91ddcc779165e26 SHA512 537402788519f3659a9ea9ea66de1bbbf365bb264335cefdfe808cd74e753c4d518b651d46ad170c7716ef38cbbc409dc8a87015bcd067f3fe025dea9c4b3ed6 WHIRLPOOL 1dc9516da2d552bf98cf1b0319e182d544b4e8e4b95707861ed42f61d50760af27609d693290794032f26e62a031d23d4a807c23b0fe69ad28ced28b5a62b7c7
+DIST libpeas-1.20.0.tar.xz 557872 SHA256 f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354 SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4 WHIRLPOOL 94e4bd69a13d07a0dbe3b959c7feed3bbe705767351fd9053f266c1120d5356f15b745fb57d357d5a56303afd40deec37033f575c047c28ffb748050f1a983e0
diff --git a/dev-libs/libpeas/libpeas-1.16.0.ebuild b/dev-libs/libpeas/libpeas-1.20.0.ebuild
similarity index 88%
rename from dev-libs/libpeas/libpeas-1.16.0.ebuild
rename to dev-libs/libpeas/libpeas-1.20.0.ebuild
index 6e1567c50caf..d139a6c8106f 100644
--- a/dev-libs/libpeas/libpeas-1.16.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
@@ -14,7 +13,8 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
IUSE="+gtk glade jit lua +python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
src_prepare() {
# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
- epatch "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
+ eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
eautoreconf
gnome2_src_prepare
}
@@ -86,11 +86,13 @@ src_configure() {
}
src_test() {
+ # This looks fixed since 1.18.0:
+ #
# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
# To reproduce:
# >>> from gi.repository import Gtk
# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
# This should return True, it returns False for Xvfb
- Xemake check
+ virtx emake check
}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
index 6ea6db4b0edc..070a486b96ce 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
@@ -11,7 +11,7 @@ inherit eutils perl-module
DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
# embedded=on disables ssl support
# https://metacpan.org/source/MICHIELB/DBD-mysql-4.036/dbdimp.c#L1886
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 52d732f98921..8609a6fa06a4 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,4 +1,4 @@
DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
-DIST ipyparallel-5.0.0.tar.gz 2286751 SHA256 ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a SHA512 ef04b717198246300ad1020eb7f9a65c40553a897653384bd839d5fb05409a276df41f933b0f023c0523fc6d8cebf6e2c6f8478c8be4fe4fdf386ad78b8f4418 WHIRLPOOL 677fd7fa2090b2b75c234c4802fab553105d2e3ce44ab4c390cadc56ba5ff3814005ab478906197d6a9f862e0d69901168d22cdc44c8063cf8e71fc8f8bdc449
DIST ipyparallel-5.0.1.tar.gz 2350472 SHA256 48e319c16995a697c82e72dc4e5cb977be45cb0f0cdcfc482d5e8019ea6afeb2 SHA512 b7fa4f2ec5375398a533c92f07e2ab09180e537366c36ff5a7f3245d63072006ebcffc19dda28d08d5cc2e8a9044bf9101c7eeccf2857ed4a78ddd859ce23a2c WHIRLPOOL 350f67f7f341fe83bd21fb5f84714c43a426fa0d2234a532e781d0b0e9a977e2ee455184da995f5a3fbbf8e260d776dd9ac2607ac86041b5abecf41aeb9a8a9b
DIST ipyparallel-5.1.1.tar.gz 2360986 SHA256 c46cd3bad50bbe12106257241d671ce6edb3faca2ced54ed001b8f1d579720f0 SHA512 66edfafeb6ca99b04ad08a61bbe7cbcfd9ba2689d16d19c476685d73f44ec40a4f2cde75e8394dbdc3b9e4da333afdfff8960bc9f37503aa4b28af90c63878db WHIRLPOOL eebf9c71b67c9ce129e125ca3ed7fb81f38ffb604805b861cc3239e113da52c1fb939fbf400d6c0cc7cfa29330ed60730a36447f7e74c45d788b33e6f1ac60ed
+DIST ipyparallel-5.2.0.tar.gz 2362590 SHA256 d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455 SHA512 1a3a4be28847ad11d43d96192ded62506380374b96a14cc9a6d6e945ac9592da7543fb5f9626a112068e548ed27f3291894a3cef544c65476c22b397458f60f3 WHIRLPOOL 29a77df915dfb487adabfb89ea96ee66253c14c7968699826f5be01073b43c753a2985bd940e09a708c92b4e9945b16d855b65a568523b1a75688a4aca022bca
diff --git a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
index be83c50bd057..85ee8926fa5b 100644
--- a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
index 369de9296053..8eb583ff38a6 100644
--- a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
diff --git a/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
index 9df506b478b3..2c2a907d2fb6 100644
--- a/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
similarity index 74%
rename from dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
rename to dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
index 8bf04a1ec2f5..2f9d662f6f51 100644
--- a/dev-python/ipyparallel/ipyparallel-5.0.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
RDEPEND="
@@ -25,13 +25,18 @@ RDEPEND="
dev-python/ipykernel[${PYTHON_USEDEP}]
!=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+ dev-python/notebook[${PYTHON_USEDEP}]
dev-python/jupyter_client[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
+ dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
)
"
@@ -49,7 +54,7 @@ python_compile_all() {
}
python_test() {
- iptest ipyparallel.tests -- -vsx || die
+ iptest --coverage xml ipyparallel.tests -- -vsx || die
}
python_install_all() {
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index f5ddb85126c5..517d2cb94019 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1 +1,2 @@
DIST instantiator-0.0.6.gem 6144 SHA256 3188fc49f11871d901656c7c01fd8eb035ee4b70f0d619228a69e79e1ec4d555 SHA512 0d24c804dd048c071e5ddd021a1adcb907eb642df16ce841fdca2efdfd5604f73d065ad4496cf6d63bdff73e7488391d7226bdc0d918d2813502ca3d4fc615a1 WHIRLPOOL ee7be68985c79bdece394bc84766e754f115127910ac68f9c1a73f370c2b0e2d271dde23266ffafd3b6f1b784441855c3e1429f674265fe9ab82fe64f3966a47
+DIST instantiator-0.0.7.gem 8192 SHA256 797de5c6e264cbf67aefa24aee31302604b250dd23c0f237a827633fdfe00770 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d WHIRLPOOL 73291a1979dff6fabf79d9d0ebb3c5f05df17af3ac2c3f664556a49531723fbe9e6a587c47a0355ebeb5f7e4edb18f51ed235f2b192fc8a124498be8911cd527
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
new file mode 100644
index 000000000000..040e4a14a06a
--- /dev/null
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Instantiate an arbitrary Ruby class"
+HOMEPAGE="https://github.com/floehopper/introspection"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/blankslate:*"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index 09c6442963f4..6c1081d94cdb 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1 +1,2 @@
DIST introspection-0.0.3.gem 9216 SHA256 3933d9573f20e00cf26a03bb7c3f765ed136da5ca01dc9c5987875877538323c SHA512 423722f402a8a5cb5f415c498cf754a2b5084b0a89ada48b982a97e3951d9af4bcd675d5dc4a2eacdd0673bf08facaba845e767e3e248e0a8ec922eddbc53c37 WHIRLPOOL 1402be6c805c09850c4705970c91aed6e7763f26483f0e131c12d5feee3bf5985de23612e39c055b9a84f70fd513d78c8be31d1cc719591160f2626699a05581
+DIST introspection-0.0.4.gem 9216 SHA256 8abd4f906cc644aa39bf879f28ec9a0267452342c5689d6c75f40336655c56f8 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084 WHIRLPOOL b5d8df9c9b0db1eba7524185fd3cc12715ba1ad5a8997c38a9f6789ff5f594b9f775409dd1ead5f1f0ce43614966d13ef909f7c956526ec7e5a9c787b864a882
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
new file mode 100644
index 000000000000..33dbf229f0d5
--- /dev/null
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Dynamic inspection of the hierarchy of method definitions on a Ruby object"
+HOMEPAGE="http://jamesmead.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/vcr/vcr-1.11.3.ebuild b/dev-ruby/vcr/vcr-1.11.3.ebuild
index 708b9cb3a4cb..c92b7802e7e4 100644
--- a/dev-ruby/vcr/vcr-1.11.3.ebuild
+++ b/dev-ruby/vcr/vcr-1.11.3.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 426a94fdf99c..d5b1045ea2d1 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,3 +1,4 @@
DIST gtk-update-icon-cache-3.16.7.tar.xz 315484 SHA256 dd8f8c7358fd182fad40e3935404909fd35c401cf3117f6517d5146e51d213a4 SHA512 bf07d29d10d2ed75a04b0ac17ef7486352c60fcc2895676201203f821785500600acbcbdbaf2ec90146ad6b55ec52cbee22a49a0b3d55fbe2df14b73ca578442 WHIRLPOOL eb72146c110a94d29ae0efa0ed8baf4de491463728edd8a8ea1f156535ed9fb5e7b0832d2085ebc388e74b00a7fe72ef8b1d04e5dbe6e629077024593c96b273
DIST gtk-update-icon-cache-3.18.4.tar.xz 316884 SHA256 e510c380298077cbe0e79d2f350e9ac50b36dd04f4f1e0f83953a453b0868517 SHA512 a142c06ad83bb4a5ffcb49cab2515483532fa028486f76d26e872518dd5de620bed126146624330b487578c5604a5dc1894c47c03d7ce9d5d4de065f8f37f241 WHIRLPOOL 39af560ad4e41e7def226dd0cf09bede0951ee29cadaf92d7c8511d0d3564d398569d7831d4279992cf6fc6218a03d399845eeb15c5f38c396108ca49d37914b
DIST gtk-update-icon-cache-3.20.9.tar.xz 316684 SHA256 17afc3d8e4c6830f60cdd52fb479c80c0a138597787d5ec93aecc4b0c619ffe0 SHA512 682ded2ed9ea8e13ce443b033a98ad91126fed0eeab19f5a832f41e44c474a3c5f87d687db37940a4671cba91c11c545d936e9bee500b54281c1f43a4d46aa89 WHIRLPOOL a7a6de27d07f8f8ff69c3561fa683d5a087ed5083a18337c9910c67580d6adf112198b6526bace17063791cfb3e2915070b25fda53ed77072ec8db5e93e4a018
+DIST gtk-update-icon-cache-3.22.2.tar.xz 366364 SHA256 6ad38b0fbd84b5a262dbc8dd3102415f8e2b81d5a05a27c0b1e4b28423bc9dd0 SHA512 a9e7f6c865c0648186954bb75f8032666ef8920513f24ecf5a05388f3b739b4418d4513c7eb81fce91ba4eb7efd6d37ade91950bb40c52f50a5b57c0632be959 WHIRLPOOL 904fef0db243ad6368eeda0207b8e0ca2d3219986191b9fab799c4b7cdd5b1606fcb4241e6a16f07b3ac265163899b4afe1d528b3c60b856eaf71d2a767bd80b
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild
new file mode 100644
index 000000000000..e543159860e5
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+ >=dev-libs/glib-2.49.4:2
+ >=x11-libs/gdk-pixbuf-2.30:2
+ !=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # man pages are shipped in tarball
+ gnome2_src_configure --disable-man
+}
+
+src_install() {
+ gnome2_src_install
+ doman docs/${PN}.1
+}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 7b467c56ebd0..a2120d7af1e7 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-control-center-3.18.2.tar.xz 7113676 SHA256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad SHA512 fc1f1075bfd9e86bf2cd38483050895cdbeec1574aa0313245692b2c33fed2db9b92bce634a298e7309f8fc5bf230a122768be9da04f81d0ab1f1feaeaad7754 WHIRLPOOL 00a433686b4d0cb83bcf1e2b63a795bb086241d80441a997c7164476b063e07f006ef0329c7c9a57f0344cf46bb8fb69916984169143d7c455df6927a650a1ce
DIST gnome-control-center-3.20.1.tar.xz 7160304 SHA256 ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed SHA512 f730c5edc1b3995765929efce3aa59602398003949ab97d215bd261c7705eb9277762aec2296af54d1762c62df2b383838645c6b82dd233f046af7dad06ba420 WHIRLPOOL 76562946f839c1850cbc2082e467e7527f7a4b28d78dd91ad201c7f40a44a87d421ad54054ed5d6b2edc1ce3c46799a17073e4fe410bae1e42e52b409aafb05d
DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17
+DIST gnome-control-center-3.22.1.tar.xz 7206136 SHA256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a SHA512 7c1bc17844f1b9ef2ca2b94fb36c3a64cbe88561cc2388e5fa26405dff73f3033dea49bf1aab8a85ee9d9680a8816913a0339855a5b09a8033cdaef5ebbb5c63 WHIRLPOOL 5f4cc4a6c75956a5bf05000d76a0b040b4fd9d6e0b416eaa2e12522f2dcde3506501022432ca8436e3435782ee537e560a30642d330ab66175f4ea44100f287b
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
deleted file mode 100644
index 96b58f655ff1..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
+++ /dev/null
@@ -1,537 +0,0 @@
-From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev
-Date: Fri, 25 Apr 2014 22:17:24 +0200
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
-
-Dropped mm from this revision of the patch since it appears more
-complicated than ever to split it from the network panel.
-
-Signed-Off: Gilles Dartiguelongue
----
- configure.ac | 157 ++++++++++++++++++++++++++------
- panels/Makefile.am | 10 +-
- panels/background/Makefile.am | 8 +-
- panels/background/bg-pictures-source.c | 20 ++++
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 +-
- shell/cc-panel-loader.c | 8 ++
- 7 files changed, 186 insertions(+), 36 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe723d5..f882e23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-- goa-1.0 >= $GOA_REQUIRED_VERSION
-- grilo-0.2 >= $GRILO_REQUIRED_VERSION)
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+
-+build_online_accounts=false
-+background_online_accounts=
-+AC_ARG_ENABLE(goa,
-+ AC_HELP_STRING([--disable-goa],
-+ [disable online accounts management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;;
-+ no) WANT_ONLINE_ACCOUNTS=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
-+ esac],
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
-+
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+ build_online_accounts=true
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
-+fi
-+if test "x$build_online_accounts" = xtrue ; then
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ $background_online_accounts)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-- colord >= $COLORD_REQUIRED_VERSION
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-- libsoup-2.4
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+build_color=false
-+AC_ARG_ENABLE(color,
-+ AC_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_COLOR=yes ;;
-+ no) WANT_COLOR=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+ esac],
-+ [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-+ colord >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+ build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +253,25 @@ fi
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
-- [have_bluetooth=yes], have_bluetooth=no)
-+have_bluetooth=no
-+AC_ARG_ENABLE(bluetooth,
-+ AC_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_BLUETOOTH=yes ;;
-+ no) WANT_BLUETOOTH=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+ esac],
-+ [WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+ # Check for gnome-bluetooth
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
-+ [have_bluetooth=yes], have_bluetooth=no)
-+ have_bluetooth=yes
-+fi
-+
-+
- if test "x$have_bluetooth" = xyes ; then
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
- fi
-@@ -292,15 +356,27 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-- have_wacom=yes
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ AC_ARG_ENABLE(wacom,
-+ AC_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_WACOM=yes ;;
-+ no) WANT_WACOM=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+ esac],
-+ [WANT_WACOM=yes]) dnl Default value
-+
-+ if test x$WANT_WACOM = xyes; then
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ clutter-gtk-1.0
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-+ have_wacom=yes
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ fi
- fi
- ;;
- *)
-@@ -310,16 +386,22 @@ esac
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+ [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+ if test "$KRB5_CONFIG" = "no"; then
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+ fi
-
-+ AC_MSG_CHECKING(for krb5 libraries and flags)
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-
-@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
- else
- AC_MSG_NOTICE([ Bluetooth panel disabled])
- fi
-+if test "x$build_color" = "xtrue"; then
-+ AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+ AC_MSG_NOTICE([ Color panel disabled])
-+fi
- if test "x$enable_cups" = "xyes"; then
- AC_MSG_NOTICE([** CUPS (Printers panel)])
- else
-@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
- else
- AC_MSG_NOTICE([ Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xtrue"; then
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+ AC_MSG_NOTICE([ Online Accounts panel disabled])
-+fi
-+if test "x$build_wacom" = "xtrue"; then
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
-+else
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 9961c25..0c54622 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- common \
- background \
- power \
-- color \
- display \
- mouse \
- notifications \
-- online-accounts \
- region \
- info \
- sound \
-@@ -18,6 +16,10 @@ SUBDIRS= \
- privacy \
- sharing
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb8017..bde4cdf 100644
---- a/panels/background/Makefile.am
-+++ b/panels/background/Makefile.am
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
- $(BUILT_SOURCES) \
- cc-background-chooser-dialog.c \
- cc-background-chooser-dialog.h \
-- cc-background-grilo-miner.c \
-- cc-background-grilo-miner.h \
- cc-background-item.c \
- cc-background-item.h \
- cc-background-xml.c \
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
- bg-colors-source.c \
- bg-colors-source.h
-
-+if BUILD_ONLINE_ACCOUNTS
-+libbackground_chooser_la_SOURCES += \
-+ cc-background-grilo-miner.c \
-+ cc-background-grilo-miner.h
-+endif
-+
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
- libbackground_la_SOURCES = \
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index c165fa3..78ef4a5 100644
---- a/panels/background/bg-pictures-source.c
-+++ b/panels/background/bg-pictures-source.c
-@@ -23,13 +23,17 @@
-
- #include "bg-pictures-source.h"
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include "cc-background-grilo-miner.h"
-+#endif
- #include "cc-background-item.h"
-
- #include
- #include
- #include
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include
-+#endif
- #include
- #include
-
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
- {
- GCancellable *cancellable;
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- CcBackgroundGriloMiner *grl_miner;
-+#endif
-
- GnomeDesktopThumbnailFactory *thumb_factory;
-
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
- g_clear_object (&priv->cancellable);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- g_clear_object (&priv->grl_miner);
-+#endif
- g_clear_object (&priv->thumb_factory);
-
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
- gboolean needs_download;
- gboolean retval = FALSE;
- GFile *pictures_dir, *cache_dir;
-+#ifdef BUILD_ONLINE_ACCOUNTS
- GrlMedia *media;
-+#else
-+ gpointer media = NULL;
-+#endif
-
- /* find png and jpeg files */
- if (!content_type)
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
-
- read_file:
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- media = g_object_get_data (G_OBJECT (file), "grl-media");
-+#endif
- if (media == NULL)
- {
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static gboolean
- add_single_file_from_media (BgPicturesSource *bg_source,
- GFile *file,
-@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
-
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- gboolean
- bg_pictures_source_add (BgPicturesSource *bg_source,
-@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor,
- }
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static void
- media_found_cb (BgPicturesSource *self, GrlMedia *media)
- {
-@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
- add_single_file_from_media (self, file, media);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- static void
- bg_pictures_source_init (BgPicturesSource *self)
-@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
-
- g_object_unref (dir);
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- priv->grl_miner = cc_background_grilo_miner_new ();
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
- cc_background_grilo_miner_start (priv->grl_miner);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- priv->thumb_factory =
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 0849160..58d50a6 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,7 +22,9 @@
-
- #include "um-realm-manager.h"
-
-+#ifdef HAVE_KERBEROS
- #include
-+#endif
-
- #include
- #include
-@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
-
- return code;
- }
-+#endif /* HAVE_KERBEROS */
-
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
- GObject *object,
- GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
- krb5_context k5 = NULL;
- krb5_error_code code;
-@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
-
- if (k5)
- krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+ _("gnome-control-center was built without kerberos support"));
-+#endif
- }
-
- void
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index c0cb91a..0b820fd 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \
- $(top_builddir)/libgd/libgd.la \
- $(top_builddir)/panels/common/liblanguage.la \
- $(top_builddir)/panels/background/libbackground.la \
-- $(top_builddir)/panels/color/libcolor.la \
- $(top_builddir)/panels/datetime/libdate_time.la \
- $(top_builddir)/panels/display/libdisplay.la \
- $(top_builddir)/panels/info/libinfo.la \
- $(top_builddir)/panels/keyboard/libkeyboard.la \
- $(top_builddir)/panels/mouse/libmouse-properties.la \
- $(top_builddir)/panels/notifications/libnotifications.la \
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
- $(top_builddir)/panels/power/libpower.la \
- $(top_builddir)/panels/privacy/libprivacy.la \
- $(top_builddir)/panels/region/libregion.la \
-@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
-
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- # Dbus service file
- servicefiledir = $(datadir)/dbus-1/services
- servicefile_in_files = org.gnome.ControlCenter.service.in
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 26576dc..8a92f95 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- #ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-@@ -77,7 +81,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
- #endif
-+#ifdef BUILD_COLOR
- PANEL_TYPE("color", cc_color_panel_get_type ),
-+#endif
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
-@@ -87,7 +93,9 @@ static struct {
- PANEL_TYPE("network", cc_network_panel_get_type ),
- #endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
-+#endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
- #ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
---
-2.1.2
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
deleted file mode 100644
index 8af818fd1bab..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2[dbus]
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.15:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.17.4:3=
- >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
- >=dev-libs/libpwquality-1.2.2
- dev-libs/libxml2:2
- gnome-base/libgtop:2=
- media-libs/fontconfig
-
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.97
- >=sys-power/upower-0.99:=
- >=x11-libs/libnotify-0.7.3:0=
-
- virtual/libgudev
- virtual/opengl
- x11-apps/xmodmap
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/libXxf86misc
- >=x11-libs/libXi-1.2
-
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
- colord? (
- net-libs/libsoup:2.4
- >=x11-misc/colord-0.1.34:0=
- >=x11-libs/colord-gtk-0.1.24 )
- cups? (
- >=net-print/cups-1.4[dbus]
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
- gnome-online-accounts? (
- >=media-libs/grilo-0.2.12:0.2
- >=net-libs/gnome-online-accounts-3.15.1 )
- i18n? ( >=app-i18n/ibus-1.5.2 )
- kerberos? ( app-crypt/mit-krb5 )
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8[modemmanager]
- >=net-misc/modemmanager-0.7.990 )
- v4l? (
- media-libs/gstreamer:1.0
- media-libs/clutter-gtk:1.0
- >=media-video/cheese-3.5.91 )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=media-libs/clutter-1.11.3:1.0
- media-libs/clutter-gtk:1.0
- >=x11-libs/libXi-1.2 )
-"
-# =sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.39
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
- i18n? ( >=gnome-base/libgnomekbd-3 )
-
- !=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # Make some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
- # Fix some absolute paths to be appropriate for Gentoo
- epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable bluetooth) \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable i18n ibus) \
- $(use_enable kerberos) \
- $(use_enable networkmanager) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
similarity index 84%
rename from gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
index 970bb54260f5..77c52d4b8354 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
@@ -26,24 +26,23 @@ QA_CONFIGURE_OPTIONS=".*"
COMMON_DEPEND="
>=dev-libs/glib-2.44.0:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.20.3:3[X,wayland?]
+ >=x11-libs/gtk+-3.22.0:3[X,wayland?]
>=gnome-base/gsettings-desktop-schemas-3.19.3
- >=gnome-base/gnome-desktop-3.19.93:3=
+ >=gnome-base/gnome-desktop-3.21.2:3=
>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
gnome-base/libgtop:2=
media-libs/fontconfig
+ >=sys-apps/accountsservice-0.6.39
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
>=sys-power/upower-0.99:=
- >=x11-libs/libnotify-0.7.3:0=
virtual/libgudev
- virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
x11-libs/libX11
@@ -57,15 +56,19 @@ COMMON_DEPEND="
>=x11-libs/colord-gtk-0.1.24 )
cups? (
>=net-print/cups-1.4[dbus]
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+ || (
+ ( >=net-fs/samba-3.6.14-r1[smbclient] =net-fs/samba-4.0.0[client]
+ )
+ )
gnome-online-accounts? (
>=media-libs/grilo-0.3.0:0.3=
- >=net-libs/gnome-online-accounts-3.15.1:= )
+ >=net-libs/gnome-online-accounts-3.21.5:= )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
networkmanager? (
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8:=[modemmanager]
+ >=gnome-extra/nm-applet-1.2.0
+ >=net-misc/networkmanager-1.2.0:=[modemmanager]
>=net-misc/modemmanager-0.7.990 )
v4l? (
media-libs/clutter-gtk:1.0
@@ -78,9 +81,12 @@ COMMON_DEPEND="
"
# =gnome-base/libgnomekbd-3 )
+ wayland? ( dev-libs/libinput )
+ !wayland? (
+ >=x11-drivers/xf86-input-libinput-0.19.0
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
!=x11-proto/randrproto-1.2
virtual/pkgconfig
"
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
src_configure() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
- # file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
- # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
gnome2_src_configure \
--disable-static \
--with-gnome-distributor=Gentoo \
--enable-desktop-docs \
- $(use_enable introspection)
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable debug debug-tools) \
+ $(use_enable introspection) \
+ $(use_enable udev)
}
src_test() {
- Xemake check
+ virtx emake check
}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 98105d0d943c..34d028f5ea4a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,3 +2,4 @@ DIST gnome-shell-3.18.5.tar.xz 1591860 SHA256 6fc9cd8b43b1ca0669e1c5a9de092a67ee
DIST gnome-shell-3.20.2.tar.xz 1607440 SHA256 eaff6b177cc5bab16b252c45393a6c9305ad3837a288e738388c7b4d4bae13cd SHA512 9e5bb79cd646b10d1acbd3ab92d57c76bb8efd4df2be9103a19af0db58e9fc9e101d3e1f17d0110c62e036163a7a63621492c3c6eb5d74ca99efa27bfff00b35 WHIRLPOOL 7872976c985d24dd310e01da5cae3281ee9128293cd879456b87850c1e73922856ceaea8decf07bd467415ff744761aa16ea410ebad97644e8816280d5220157
DIST gnome-shell-3.20.3.tar.xz 1607512 SHA256 b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e SHA512 6ad5ede00b475db1951ef354df2515f482850f724f15a02dc0d16f0d6ba57302bb5d38ba10d7d1853581e44ca19c2e047fc9822f0909614ea5aedab05ac2df52 WHIRLPOOL baa77a9fdc64205c424e69716edc11b353906a449dcb024deffe3eced34638fb4e41d6db394d8cc64827e2c53f5d103892f1c1d0be15c4f63635dc9c321b1dca
DIST gnome-shell-3.20.4.tar.xz 1662400 SHA256 0c13eba5ecd3b516538815ab33765ae04bd6faf1549407e81f3bf17b08f2a94d SHA512 40622be949b7d331073982f70ff8ae9b80005e1bf9f5251f0afcd10e564dd48c1d79ae2d874015794c7f99411befd4fc4f586d87a752148aa6097825b1bf931f WHIRLPOOL 226fb3adca9d4aef97bee50d6678c360cf74727a47c9018a16cfbe0f5d6ec32d2282a7965332021643392c1fbcb415a715a41a761d5998f82268d318c40b1942
+DIST gnome-shell-3.22.1.tar.xz 1947140 SHA256 ca9492fae6c647e6bf98624a7cef6e4776894e4888f54b63e60b672b754fb217 SHA512 7ed363f1019affce18b94eb3faee56ade1a570e43f2601305bdee2587733597a770fb239c65fa4d584e5f1839c2eda697101b3d5109f94b484d3fc78d42653fb WHIRLPOOL 51394bec90b7027b2037b9411515ff1748e9bd81d17b0664ee1411055ce3422899449ab4fe349fd5e93eab99838eb9b232d63910788f6e1e01ba6b83cc3d4f85
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
new file mode 100644
index 000000000000..74579702e42f
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.22.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +networkmanager +nls -openrc-force"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXfixes-5.0 needed for pointer barriers
+# FIXME:
+# * gstreamer support is currently automagic
+COMMON_DEPEND="
+ >=app-accessibility/at-spi2-atk-2.5.3
+ >=dev-libs/atk-2[introspection]
+ >=app-crypt/gcr-3.7.5[introspection]
+ >=dev-libs/glib-2.45.3:2[dbus]
+ >=dev-libs/gjs-1.39
+ >=dev-libs/gobject-introspection-1.49.1:=
+ dev-libs/libical:=
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ >=media-libs/clutter-1.21.5:1.0[introspection]
+ >=dev-libs/json-glib-0.13.2
+ >=dev-libs/libcroco-0.6.8:0.6
+ >=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+ >=gnome-base/gsettings-desktop-schemas-3.21.3
+ >=gnome-base/gnome-keyring-3.3.90
+ gnome-base/libgnome-keyring
+ >=gnome-extra/evolution-data-server-3.17.2:=
+ >=media-libs/gstreamer-0.11.92:1.0
+ >=net-im/telepathy-logger-0.2.4[introspection]
+ >=net-libs/telepathy-glib-0.19[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ >=x11-libs/libXfixes-5.0
+ x11-libs/libXtst
+ >=x11-wm/mutter-3.22.1[introspection]
+ >=x11-libs/startup-notification-0.11
+
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+ dev-libs/dbus-glib
+ dev-libs/libxml2:2
+ gnome-base/librsvg
+ media-libs/libcanberra[gtk3]
+ media-libs/mesa
+ >=media-sound/pulseaudio-2
+ >=net-libs/libsoup-2.40:2.4[introspection]
+ x11-libs/libX11
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/pango[introspection]
+ x11-apps/mesa-progs
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+ networkmanager? (
+ app-crypt/libsecret
+ >=gnome-extra/nm-applet-0.9.8
+ >=net-misc/networkmanager-0.9.8:=[introspection] )
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Pull in polkit-0.101 for pretty authorization dialogs
+# 2. Introspection stuff needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. Systemd needed for suspending support
+# 6. xdg-utils needed for xdg-open, used by extension tool
+# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 8. IBus is needed for nls integration
+# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+RDEPEND="${COMMON_DEPEND}
+ >=sys-auth/polkit-0.101[introspection]
+
+ >=app-accessibility/caribou-0.4.8
+ media-libs/cogl[introspection]
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ !openrc-force? ( >=sys-apps/systemd-31 )
+
+ x11-misc/xdg-utils
+
+ media-fonts/dejavu
+ >=x11-themes/adwaita-icon-theme-3.19.90
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+ >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.17
+ gnome-base/gnome-common
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+ !!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+src_prepare() {
+ # Change favorites defaults, bug #479918
+ eapply "${FILESDIR}"/${PN}-3.14.0-defaults.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
+
+ # Fix silent bluetooth linking failure with ld.gold, bug #503952
+ # https://bugzilla.gnome.org/show_bug.cgi?id=726435
+ # This shouldn't be needed per upstream
+# epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Do not error out on warnings
+ gnome2_src_configure \
+ --enable-browser-plugin \
+ --enable-man \
+ $(use_enable !openrc-force systemd) \
+ $(use_with bluetooth) \
+ $(use_enable networkmanager) \
+ BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+src_install() {
+ gnome2_src_install
+ python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
+ python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
+
+ # Required for gnome-shell on hardened/PaX, bug #398941
+ # Future-proof for >=spidermonkey-1.8.7 following polkit's example
+ if has_version '=dev-lang/spidermonkey-1.8.7[jit]'; then
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+ # Required for gnome-shell on hardened/PaX #457146 and #457194
+ # PaX EMUTRAMP need to be on
+ elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+ pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+ else
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+ fi
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version ">=x11-base/xorg-server-1.11"; then
+ ewarn "If you use multiple screens, it is highly recommended that you"
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+ ewarn "pointer barriers which will make it easier to use hot corners."
+ fi
+
+ if has_version "=dev-lang/python-2.7.5-r2:2.7 >=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] bittorrent? ( || ( net-p2p/bittorrent[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) )
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=715687d38db6bf4ce8e0f3c1a68d7527
+_md5_=31ba45fd1ef61dbbe89600b99c34fe58
diff --git a/metadata/md5-cache/app-arch/tar-1.29-r1 b/metadata/md5-cache/app-arch/tar-1.29-r1
index c02d7b7f17be..1749d358cda1 100644
--- a/metadata/md5-cache/app-arch/tar-1.29-r1
+++ b/metadata/md5-cache/app-arch/tar-1.29-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Use this to make tarballs :)
EAPI=5
HOMEPAGE=https://www.gnu.org/software/tar/
IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3+
RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=f85323e862325e939046fe6ce902b7d9
+_md5_=333ae59184789e74a9a832a064d299dd
diff --git a/metadata/md5-cache/app-cdr/sync2cd-1.3 b/metadata/md5-cache/app-cdr/sync2cd-1.3
deleted file mode 100644
index aba703a2996b..000000000000
--- a/metadata/md5-cache/app-cdr/sync2cd-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND==dev-lang/python-2*
-DESCRIPTION=An incremental archiving tool to CD/DVD
-EAPI=3
-HOMEPAGE=http://www.calins.ch/software/sync2cd.html
-IUSE=cdr dvdr
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/eject cdr? ( virtual/cdrtools ) dvdr? ( app-cdr/dvd+rw-tools ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.calins.ch/download/sync2cd/sync2cd-1.3.tar.gz
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b479ba25af4d66389846feae08dc88bb
diff --git a/metadata/md5-cache/app-dicts/hunspell-kk-1.1.2 b/metadata/md5-cache/app-dicts/hunspell-kk-1.1.2
deleted file mode 100644
index 5380be5faa0a..000000000000
--- a/metadata/md5-cache/app-dicts/hunspell-kk-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) sys-devel/gettext app-text/hunspell app-dicts/myspell-en app-dicts/myspell-ru
-DESCRIPTION=Kazakh dictionaries for myspell/hunspell
-EAPI=5
-HOMEPAGE=http://hunspell.sourceforge.net/
-IUSE=ncurses nls readline static-libs
-KEYWORDS=~x86 ~amd64
-LICENSE=MPL-1.1 GPL-2 LGPL-2.1
-RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/kergalym/hunspell-kk/archive/1.1.2.tar.gz -> hunspell-kk-1.1.2.tar.gz
-_eclasses_=vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=520b10e7be18d59fa35b82f0a94305cf
diff --git a/metadata/md5-cache/app-dicts/myspell-kk-1.1.2 b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
new file mode 100644
index 000000000000..4dbd2211be53
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Kazakh dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://github.com/kergalym/myspell-kk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=!app-dicts/hunspell-kk
+SLOT=0
+SRC_URI=https://github.com/kergalym/myspell-kk/archive/1.1.2.tar.gz -> myspell-kk-1.1.2.tar.gz
+_eclasses_=myspell-r2 d7e8733370dd6a9a1a3b64fdda0146d2
+_md5_=4912bd12fc3aab9084ff05ddb25ecfaa
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
index 585c24247943..2c8acceb3d8d 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
@@ -4,11 +4,11 @@ DESCRIPTION=G15daemon takes control of the G15 keyboard, through the linux kerne
EAPI=5
HOMEPAGE=http://g15daemon.sourceforge.net/
IUSE=perl python static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 ) python? ( 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(-)] )
REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 unpacker 45d07319df5f40ee6af58418b0f930be versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=01c12d340e67ecbb8958ea108011c898
+_md5_=63b7eb6a7e4f6db152044fdacabed035
diff --git a/metadata/md5-cache/app-misc/iguanaIR-1.0.1-r1 b/metadata/md5-cache/app-misc/iguanaIR-1.0.1-r1
index b0ad37230fc8..83352ce6f96e 100644
--- a/metadata/md5-cache/app-misc/iguanaIR-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/iguanaIR-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library for Irman control of Unix software
EAPI=6
HOMEPAGE=http://iguanaworks.net/index.php
IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=dev-libs/popt sys-apps/lsb-release virtual/libusb:0 >=dev-lang/python-2.7.5-r2:2.7 >=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=http://iguanaworks.net/downloads/iguanaIR-1.0.1.tar.bz2
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=b6ecec77988e72ead06b5638a8514cd0
+_md5_=cea8f403148f26f3721466dfa6f72b4c
diff --git a/metadata/md5-cache/app-misc/ktoblzcheck-1.48 b/metadata/md5-cache/app-misc/ktoblzcheck-1.48
index e90026f456cd..f3abf0a03f29 100644
--- a/metadata/md5-cache/app-misc/ktoblzcheck-1.48
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.48
@@ -4,11 +4,11 @@ DESCRIPTION=Library to check account numbers and bank codes of German banks
EAPI=5
HOMEPAGE=http://ktoblzcheck.sourceforge.net/
IUSE=python python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1
RDEPEND=app-text/recode virtual/awk sys-apps/grep sys-apps/sed || ( net-misc/wget www-client/lynx ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.48.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=03960d85d7926b74ad998a81fda6a159
+_md5_=2f1e2d189aab062e0d1a4561c1329db1
diff --git a/metadata/md5-cache/app-misc/recoll-1.17.3-r1 b/metadata/md5-cache/app-misc/recoll-1.17.3-r1
deleted file mode 100644
index cb4e17209133..000000000000
--- a/metadata/md5-cache/app-misc/recoll-1.17.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=virtual/libiconv >=dev-libs/xapian-1.0.12 sys-libs/zlib spell? ( app-text/aspell ) !inotify? ( fam? ( virtual/fam ) ) qt4? ( dev-qt/qtcore:4[qt3support] dev-qt/qtwebkit:4 ) session? ( inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) !inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) ) ) =dev-lang/python-2*
-DESCRIPTION=A personal full text search package
-EAPI=4
-HOMEPAGE=http://www.lesbonscomptes.com/recoll/
-IUSE=+spell +inotify +qt4 +session camelcase xattr fam chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libiconv >=dev-libs/xapian-1.0.12 sys-libs/zlib spell? ( app-text/aspell ) !inotify? ( fam? ( virtual/fam ) ) qt4? ( dev-qt/qtcore:4[qt3support] dev-qt/qtwebkit:4 ) session? ( inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) !inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) ) ) app-arch/unzip sys-apps/sed virtual/awk pdf? ( app-text/poppler ) postscript? ( app-text/pstotext ) msdoc? ( app-text/antiword ) msxls? ( app-text/catdoc ) msppt? ( app-text/catdoc ) wordperfect? ( app-text/libwpd:0.9 ) rtf? ( app-text/unrtf ) tex? ( dev-tex/detex ) dvi? ( virtual/tex-base ) djvu? ( >=app-text/djvu-3.5.15 ) exif? ( media-libs/exiftool ) chm? ( dev-python/pychm ) ics? ( dev-python/icalendar ) lyx? ( app-office/lyx ) sound? ( media-libs/mutagen ) xml? ( dev-libs/libxslt ) info? ( sys-apps/texinfo ) =dev-lang/python-2*
-REQUIRED_USE=^^ ( fam inotify ) session? ( || ( fam inotify ) )
-SLOT=0
-SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.17.3.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=299432c54e1def5c686486fb59cffa2f
diff --git a/metadata/md5-cache/app-misc/recoll-1.19.5-r1 b/metadata/md5-cache/app-misc/recoll-1.19.5-r1
index 15c88a2438ce..6c756b096c21 100644
--- a/metadata/md5-cache/app-misc/recoll-1.19.5-r1
+++ b/metadata/md5-cache/app-misc/recoll-1.19.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A personal full text search package
EAPI=5
HOMEPAGE=http://www.lesbonscomptes.com/recoll/
IUSE=+spell inotify +qt4 +session camelcase xattr webkit fam chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/libiconv >=dev-libs/xapian-1.0.12 sys-libs/zlib spell? ( app-text/aspell ) !inotify? ( fam? ( virtual/fam ) ) qt4? ( dev-qt/qtcore:4[qt3support] ) webkit? ( dev-qt/qtwebkit:4 ) session? ( inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) !inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) ) ) >=dev-lang/python-2.7.5-r2:2.7 >=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-arch/unzip sys-apps/sed virtual/awk pdf? ( app-text/poppler ) postscript? ( app-text/pstotext ) msdoc? ( app-text/antiword ) msxls? ( app-text/catdoc ) msppt? ( app-text/catdoc ) wordperfect? ( app-text/libwpd:0.9 ) rtf? ( app-text/unrtf ) tex? ( dev-tex/detex ) dvi? ( virtual/tex-base ) djvu? ( >=app-text/djvu-3.5.15 ) exif? ( media-libs/exiftool ) chm? ( dev-python/pychm[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ics? ( dev-python/icalendar[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) lyx? ( app-office/lyx ) sound? ( media-libs/mutagen ) xml? ( dev-libs/libxslt ) info? ( sys-apps/texinfo )
REQUIRED_USE=session? ( || ( fam inotify ) ) python_targets_python2_7
SLOT=0
SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.19.5.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 d142329ab093dd20c1dd0edb5f094108 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d7831472e22235e96e13b86a1b17324e
+_md5_=641c77cd1c2bbbcab3ff46432f15468b
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.16.0 b/metadata/md5-cache/dev-libs/libpeas-1.20.0
similarity index 92%
rename from metadata/md5-cache/dev-libs/libpeas-1.16.0
rename to metadata/md5-cache/dev-libs/libpeas-1.20.0
index c652a61b980b..0d9e6b141ed5 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.16.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.20.0
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 jit? ( >=dev-lang/luajit-2:2 ) !jit? ( =dev-lang/lua-5.1*:0 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.2:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.40 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=A GObject plugins library
-EAPI=5
+EAPI=6
HOMEPAGE=https://developer.gnome.org/libpeas/stable/
IUSE=+gtk glade jit lua +python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=LGPL-2+
RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 jit? ( >=dev-lang/luajit-2:2 ) !jit? ( =dev-lang/lua-5.1*:0 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.2:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python3_4 python_targets_python3_5 ) )
SLOT=0
-SRC_URI=mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz
+SRC_URI=mirror://gnome/sources/libpeas/1.20/libpeas-1.20.0.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1b3bf8e7c7e8deb6ffbffb062550b4b
+_md5_=617b799c0d09ab00d34234a7d567f9ef
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
index 7d55614f9645..fe8d8b9cfb1b 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
@@ -4,11 +4,11 @@ DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/DBD-mysql/
IUSE=embedded test +ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
REQUIRED_USE=?? ( embedded ssl )
SLOT=0
SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.037.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=deedc2bed85d5cfe5930ed7414d1df0a
+_md5_=82d4ac7dc5bcdf40017461c99d54b5e5
diff --git a/metadata/md5-cache/dev-python/ipyparallel-4.1.0 b/metadata/md5-cache/dev-python/ipyparallel-4.1.0
index c2a15e720124..6c35b95cccbe 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-4.1.0
+++ b/metadata/md5-cache/dev-python/ipyparallel-4.1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-4.1.0.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1d95de18451121ad2b98afd09bafd4da
+_md5_=413c8ca1d2261c54dde67c72ce59a1e4
diff --git a/metadata/md5-cache/dev-python/ipyparallel-5.0.0 b/metadata/md5-cache/dev-python/ipyparallel-5.0.0
deleted file mode 100644
index d5cc5d10c9a6..000000000000
--- a/metadata/md5-cache/dev-python/ipyparallel-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Interactive Parallel Computing with IPython
-EAPI=6
-HOMEPAGE=http://ipython.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-5.0.0.tar.gz
-_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=670e66fe42a0067945e0149ed5c3eed4
diff --git a/metadata/md5-cache/dev-python/ipyparallel-5.0.1 b/metadata/md5-cache/dev-python/ipyparallel-5.0.1
index a061c552c9e8..9bdb78f960cf 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-5.0.1
+++ b/metadata/md5-cache/dev-python/ipyparallel-5.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-5.0.1.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ab18b5f7fecc74d12495a91858c6728a
+_md5_=5371966fbcfbc8c37cb3ef199893a6ff
diff --git a/metadata/md5-cache/dev-python/ipyparallel-5.1.1 b/metadata/md5-cache/dev-python/ipyparallel-5.1.1
index 87bd7710688b..ed4acf81ff89 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-5.1.1
+++ b/metadata/md5-cache/dev-python/ipyparallel-5.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-5.1.1.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e44f0d336515a3a372176ca20ed12233
+_md5_=8a4211e70dd188fcdac099b90e69f339
diff --git a/metadata/md5-cache/dev-python/ipyparallel-5.2.0 b/metadata/md5-cache/dev-python/ipyparallel-5.2.0
new file mode 100644
index 000000000000..1aa3d7ad7864
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipyparallel-5.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/setuptools-18.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Interactive Parallel Computing with IPython
+EAPI=6
+HOMEPAGE=http://ipython.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython_genutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyzmq-14.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !=dev-python/ipython-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jupyter_client[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-5.2.0.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=ed4cae6d7b94581e0a224e04e85a61cc
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
new file mode 100644
index 000000000000..9bf6617714e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/blankslate:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Instantiate an arbitrary Ruby class
+EAPI=5
+HOMEPAGE=https://github.com/floehopper/introspection
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/blankslate:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/blankslate:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/blankslate:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/instantiator-0.0.7.gem
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=75fbd1ee6e356f456e570eb252aa7592
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
new file mode 100644
index 000000000000..6bf89798a7e0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby object
+EAPI=5
+HOMEPAGE=http://jamesmead.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/introspection-0.0.4.gem
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7a5b1d95eb2db270f8a665038f0355e6
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
index d7dd5b2edae0..86f34b13b0cf 100644
--- a/metadata/md5-cache/dev-ruby/vcr-1.11.3
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=Records your test suite's HTTP interactions and replay them during test runs
EAPI=5
HOMEPAGE=https://github.com/myronmarston/vcr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
RESTRICT=test
SLOT=1
SRC_URI=mirror://rubygems/vcr-1.11.3.gem
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=431563ec21c777819f2dff87aa6a7b4e
+_md5_=a73f4ffcefe92f9a7d445116d5b38c1b
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.2 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.2
new file mode 100644
index 000000000000..a7f9597a1c3d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK update icon cache
+EAPI=6
+HOMEPAGE=http://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !=dev-libs/glib-2.39.91:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.15:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/gnome-desktop-3.17.4:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.2.12:0.2 >=net-libs/gnome-online-accounts-3.15.1 ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
-IUSE=+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
-RDEPEND=>=dev-libs/glib-2.39.91:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.15:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/gnome-desktop-3.17.4:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.2.12:0.2 >=net-libs/gnome-online-accounts-3.15.1 ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) >=sys-apps/accountsservice-0.6.39 x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) i18n? ( >=gnome-base/libgnomekbd-3 ) !=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.20.3:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.19.93:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.15.1:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
-IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
-RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.20.3:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.19.93:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.15.1:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) >=sys-apps/accountsservice-0.6.39 x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) i18n? ( >=gnome-base/libgnomekbd-3 ) !=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( ( >=net-fs/samba-3.6.14-r1[smbclient] =net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
+IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
+RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( ( >=net-fs/samba-3.6.14-r1[smbclient] =net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) i18n? ( >=gnome-base/libgnomekbd-3 ) wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
-IUSE=+introspection debug test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) !=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-proto/xproto virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
+IUSE=debug +introspection udev test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.33.0:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) !=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=media-libs/clutter-1.21.5:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 gnome-base/gnome-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +networkmanager +nls -openrc-force python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
+RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=media-libs/clutter-1.21.5:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.1.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=afae33f7ccea17ea7fef2be86f5e0f88
diff --git a/metadata/md5-cache/mail-mta/postfix-3.2_pre20161008 b/metadata/md5-cache/mail-mta/postfix-3.2_pre20161031
similarity index 96%
rename from metadata/md5-cache/mail-mta/postfix-3.2_pre20161008
rename to metadata/md5-cache/mail-mta/postfix-3.2_pre20161031
index ac84f5cfd051..e2ed491bae42 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.2_pre20161008
+++ b/metadata/md5-cache/mail-mta/postfix-3.2_pre20161031
@@ -9,6 +9,6 @@ LICENSE=IBM
RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
REQUIRED_USE=ldap-bind? ( ldap sasl )
SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20161008.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20161031.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=a3ab5b45bc27b5882f19a5dac450d348
+_md5_=f1bf2cc42859533a1e75af2b4209c98a
diff --git a/metadata/md5-cache/net-misc/libteam-1.0 b/metadata/md5-cache/net-misc/libteam-1.0
deleted file mode 100644
index 06e0dd7b33e1..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/jansson dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] sys-apps/dbus !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/libteam/
-IUSE=debug examples static-libs +syslog
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/jansson dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] sys-apps/dbus syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=https://github.com/jpirko/libteam/archive/v1.0.tar.gz -> libteam-1.0.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c524be5eb24a2097383f2ac4894a95ee
diff --git a/metadata/md5-cache/net-misc/libteam-1.11 b/metadata/md5-cache/net-misc/libteam-1.11
deleted file mode 100644
index 1720afe0e158..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=5
-HOMEPAGE=http://libteam.org
-IUSE=dbus debug examples static-libs +syslog
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=http://libteam.org/files/libteam-1.11.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=303a8fc3657054f6ba6623a6824a248b
diff --git a/metadata/md5-cache/net-misc/libteam-1.14 b/metadata/md5-cache/net-misc/libteam-1.14
deleted file mode 100644
index a472c106998c..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=5
-HOMEPAGE=http://libteam.org
-IUSE=dbus debug examples static-libs +syslog zmq
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=http://libteam.org/files/libteam-1.14.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4d623725264f18baa2cf5c9371a5e530
diff --git a/metadata/md5-cache/net-misc/libteam-1.22 b/metadata/md5-cache/net-misc/libteam-1.22
index 15f3ca26f4ee..3f28f36226e8 100644
--- a/metadata/md5-cache/net-misc/libteam-1.22
+++ b/metadata/md5-cache/net-misc/libteam-1.22
@@ -4,10 +4,10 @@ DESCRIPTION=Library and tools set for controlling team network device
EAPI=5
HOMEPAGE=http://libteam.org
IUSE=dbus debug examples static-libs +syslog zmq
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=LGPL-2.1+
RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
SLOT=0
SRC_URI=http://libteam.org/files/libteam-1.22.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d2ce05d1cc8e6a2942709a7058060abe
+_md5_=47627f2199f74c3712bb5607ceb05dfa
diff --git a/metadata/md5-cache/net-print/cups-filters-1.11.4 b/metadata/md5-cache/net-print/cups-filters-1.11.4
deleted file mode 100644
index 772a6f8c2a9a..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig
-DESCRIPTION=Cups PDF filters
-EAPI=6
-HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
-IUSE=dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
-LICENSE=MIT GPL-2
-RDEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.11.4.tar.xz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=7283fb3a0ff13e6308f83d957dbcc05f
diff --git a/metadata/md5-cache/net-print/cups-filters-1.11.5 b/metadata/md5-cache/net-print/cups-filters-1.11.6
similarity index 98%
rename from metadata/md5-cache/net-print/cups-filters-1.11.5
rename to metadata/md5-cache/net-print/cups-filters-1.11.6
index bd0a0405b32e..c5fdc446474d 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.11.5
+++ b/metadata/md5-cache/net-print/cups-filters-1.11.6
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=MIT GPL-2
RDEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.11.5.tar.xz
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.11.6.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=2a708581fc3c44df6fcb8ebbd7f49bc9
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.2.5 b/metadata/md5-cache/sys-apps/ripgrep-0.2.5
deleted file mode 100644
index bd63aa557ea2..000000000000
--- a/metadata/md5-cache/sys-apps/ripgrep-0.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-util/cargo
-DESCRIPTION=a command line search tool that combines usability with raw speed
-EAPI=6
-HOMEPAGE=https://github.com/BurntSushi/ripgrep
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Unlicense )
-SLOT=0
-SRC_URI=https://github.com/BurntSushi/ripgrep/archive/0.2.5.tar.gz -> ripgrep-0.2.5.tar.gz
-_eclasses_=cargo 21eab25085b426f4d1a975b85f624423
-_md5_=31b3d7d5c4f3bd33b77fff021b3e2ded
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.2.5-r1 b/metadata/md5-cache/sys-apps/ripgrep-0.2.5-r1
new file mode 100644
index 000000000000..81f5eb135a59
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.2.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-util/cargo
+DESCRIPTION=a command line search tool that combines usability with raw speed
+EAPI=6
+HOMEPAGE=https://github.com/BurntSushi/ripgrep
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Unlicense )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~radhermit/dist/ripgrep-0.2.5.tar.xz
+_md5_=2a3e3c622147531b28b9c91709e5f50a
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 6e66ecd3841f..98d31f8fca16 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -10,4 +10,4 @@ RDEPEND=~sys-devel/llvm-9999:=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?
REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
SLOT=0/9999
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 e928b84a9f6f1d9076d1d27687876dc6 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d6d876e43967e9bdb29e72befb9dd861
+_md5_=c47e453f97ccc851c684c182efb726ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
new file mode 100644
index 000000000000..9bc9cfdd28f5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.44
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.44
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-43.base.tar.xz mirror://gentoo/genpatches-3.18-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-43.experimental.tar.xz )
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 kernel-2 f31f3b95b5d8f120e14f0b7aafbd8b47 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=93f9fac88f55607cb8b97db207351ea9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.30 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.30
new file mode 100644
index 000000000000..e92e025b08d2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.30
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-32.base.tar.xz mirror://gentoo/genpatches-4.4-32.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-32.experimental.tar.xz )
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 kernel-2 f31f3b95b5d8f120e14f0b7aafbd8b47 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=fa53f4c573902459b59783cf05135ebb
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-3.2.6 b/metadata/md5-cache/www-apache/mod_authnz_external-3.2.6
deleted file mode 100644
index 1d0c25bdc5a7..000000000000
--- a/metadata/md5-cache/www-apache/mod_authnz_external-3.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=An Apache2 authentication DSO using external programs
-EAPI=0
-HOMEPAGE=https://github.com/phokz/mod-auth-external
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND==www-servers/apache-2.2*
-SLOT=2
-SRC_URI=https://mod-auth-external.googlecode.com/files/mod_authnz_external-3.2.6.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=86e4c274865dfe9b28a56dc622a258a2
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2 b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
index 8891e55e42cf..23eced978759 100644
--- a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
+++ b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
@@ -3,10 +3,10 @@ DEPEND==www-servers/apache-2.4*
DESCRIPTION=An Apache2 authentication DSO using external programs
EAPI=5
HOMEPAGE=https://github.com/phokz/mod-auth-external
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-1.1
RDEPEND==www-servers/apache-2.4*
SLOT=2
SRC_URI=https://mod-auth-external.googlecode.com/files/mod_authnz_external-3.3.2.tar.gz
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=56f5242e1135263a8dcc66d071870bb3
+_md5_=4a049c81b29d6e28c46f1906f3b52f62
diff --git a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.2 b/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.2
deleted file mode 100644
index 79215f9ccaa8..000000000000
--- a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=Apache module that rewrites X-Forwarded-For to REMOTE_ADDR for reverse proxy configurations
-EAPI=3
-HOMEPAGE=http://www.openinfo.co.uk/apache/index.html
-IUSE=mod_proxy
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] ) =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://www.openinfo.co.uk/apache/extract_forwarded-2.0.2.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=e913a8aeb7786c6c5d33040345cb87a1
diff --git a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015 b/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
index d62ff0c4330a..4e77beed91ed 100644
--- a/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
+++ b/metadata/md5-cache/www-apache/mod_extract_forwarded-2.0.3_pre2015052015
@@ -4,10 +4,10 @@ DESCRIPTION=Apache module that rewrites X-Forwarded-For to REMOTE_ADDR for rever
EAPI=5
HOMEPAGE=http://www.openinfo.co.uk/apache/index.html
IUSE=mod_proxy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-1.1
RDEPEND=mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] ) =www-servers/apache-2.4*
SLOT=0
SRC_URI=https://dev.gentoo.org/~pacho/maintainer-needed/mod_extract_forwarded-2.0.3_pre2015052015.tar.xz
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=d07c16f6a2dc6fe2d7f1e4d15389cce9
+_md5_=dd319ae088976435bb2db2459aff4009
diff --git a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r1 b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r1
deleted file mode 100644
index 058894cc3f53..000000000000
--- a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl ) =www-servers/apache-2.2*
-DESCRIPTION=An Apache module for logging to an SQL (MySQL) database
-EAPI=0
-HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_log_sql/
-IUSE=dbi ssl
-KEYWORDS=amd64 ppc x86
-LICENSE=Artistic
-RDEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl ) =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://www.outoforder.cc/downloads/mod_log_sql/mod_log_sql-1.101.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=bcc93cdc08f768e16ec13f4d2529ce8f
diff --git a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2 b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
index 819b125346e0..dd10a2b7317e 100644
--- a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
+++ b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
@@ -4,10 +4,10 @@ DESCRIPTION=An Apache module for logging to an SQL (MySQL) database
EAPI=5
HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_log_sql/
IUSE=dbi ssl
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=Artistic
RDEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0 ) =www-servers/apache-2.4*
SLOT=0
SRC_URI=http://www.outoforder.cc/downloads/mod_log_sql/mod_log_sql-1.101.tar.bz2
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=4cf266f2c05664d8e63581c6fc8fb59a
+_md5_=bf2f57fbccc675a41d554ad7bfb15bb8
diff --git a/metadata/md5-cache/www-client/vivaldi-1.5.644.7_p1 b/metadata/md5-cache/www-client/vivaldi-1.5.651.10_p1
similarity index 89%
rename from metadata/md5-cache/www-client/vivaldi-1.5.644.7_p1
rename to metadata/md5-cache/www-client/vivaldi-1.5.651.10_p1
index 86e46798bd70..860a53e1cb01 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.5.644.7_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.5.651.10_p1
@@ -8,6 +8,6 @@ LICENSE=Vivaldi
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/pango[X]
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.5.644.7-1_amd64.deb -> vivaldi-1.5.644.7_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.5.644.7-1_i386.deb -> vivaldi-1.5.644.7_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.5.651.10-1_amd64.deb -> vivaldi-1.5.651.10_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.5.651.10-1_i386.deb -> vivaldi-1.5.651.10_p1-i386.deb )
_eclasses_=chromium-2 c30f482b868782938c772c21d9ede135 eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 unpacker 45d07319df5f40ee6af58418b0f930be versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=414836b4626eac79cf88dd33e0df5cff
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.22.0 b/metadata/md5-cache/x11-libs/gtksourceview-3.22.0
new file mode 100644
index 000000000000..0de06d957bb9
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 dev-util/itstool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A text widget implementing syntax highlighting and other features
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
+IUSE=glade +introspection vala test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=3.0/3
+SRC_URI=mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 vala 764817a25b405b65269d8619e203a52f versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=eb060029c3d22b16bc157dc16eae92b5
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0
new file mode 100644
index 000000000000..dd55555783e4
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME default icon theme
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
+IUSE=branding
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-Sampling-Plus-1.0 )
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !=dev-util/intltool-0.40.0 sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
-EAPI=5
+EAPI=6
HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=!=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DESCRIPTION=Standard Themes for GNOME Applications
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-themes-standard/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=gnome-base/gsettings-desktop-schemas-3.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.2.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e267972f70ef8624be866d394c191b4b
diff --git a/metadata/md5-cache/x11-wm/mutter-3.22.1 b/metadata/md5-cache/x11-wm/mutter-3.22.1
new file mode 100644
index 000000000000..352d141b660d
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-3.22.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/atk-2.5.3 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/cogl-1.21.2:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) kms? ( >=dev-libs/libinput-1.4 media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) udev? ( virtual/libgudev:= ) wayland? ( >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 x11-base/xorg-server[wayland] ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto test? ( app-text/docbook-xml-dtd:4.5 ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME 3 compositing window manager based on Clutter
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/mutter/
+IUSE=input_devices_wacom +introspection +kms test udev wayland
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/atk-2.5.3 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.49.0:2[dbus] >=media-libs/cogl-1.21.2:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) kms? ( >=dev-libs/libinput-1.4 media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) udev? ( virtual/libgudev:= ) wayland? ( >=dev-libs/wayland-1.6.90 >=dev-libs/wayland-protocols-1.7 x11-base/xorg-server[wayland] ) !x11-misc/expocity
+REQUIRED_USE=wayland? ( kms )
+SLOT=0
+SRC_URI=mirror://gnome/sources/mutter/3.22/mutter-3.22.1.tar.xz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3a1360a383010939a427163299ec7c46
diff --git a/metadata/md5-cache/xfce-base/exo-0.11.2 b/metadata/md5-cache/xfce-base/exo-0.11.2
new file mode 100644
index 000000000000..f390d7c7a0ad
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/exo-0.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.6.0:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.10:= dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
+EAPI=5
+HOMEPAGE=http://www.xfce.org/projects/
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.6.0:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.10:=
+SLOT=0
+SRC_URI=mirror://xfce/src/xfce/exo/0.11/exo-0.11.2.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 xfconf d842ab8b2140980394561496bf157447
+_md5_=b0b78977a1be8b09c2057ff27e42416f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e58b4a5decbc..f0ba43ff4851 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Nov 2016 05:43:21 +0000
+Tue, 01 Nov 2016 12:13:23 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d9343792fe88..01020637a1fa 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 1 05:39:33 UTC 2016
+Tue Nov 1 12:09:33 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index aa20214b1b86..dc1d12dbb03a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Nov 2016 06:00:01 +0000
+Tue, 01 Nov 2016 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1992d2e0eb3d..85a43be45952 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1477978801 Tue 01 Nov 2016 05:40:01 AM UTC
+1478002201 Tue 01 Nov 2016 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e58b4a5decbc..f0ba43ff4851 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Nov 2016 05:43:21 +0000
+Tue, 01 Nov 2016 12:13:23 +0000
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 9e6a713ec0e2..ee9be96893c7 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,4 +1 @@
-DIST libteam-1.0.tar.gz 99558 SHA256 5fb6dcf296f07be20e6ff61b4f18f4e98346ed158032f8d733bedd6f39b48f8f SHA512 69206709ebb9ad576b844402ad5c2327bf85a0d48d386a51decafd22f0fd638fa0d6d09e822afb77d511006d20749c3820b84c17e4c6874ce1fdc1499484a313 WHIRLPOOL f68274b50771aa67ac30abf38f9f2af8401eb84cacaf0eeb3468dbb845b3336af78d0459eec087d8081551c13640fa2097e1dfc5d4741c33a2bb7c29682bd7c6
-DIST libteam-1.11.tar.gz 497560 SHA256 b89e81258f8a8f4abd718ec1c91f85cb66d4d29e4d50095a3d2a4ffd8ce4bf7a SHA512 0e7da9ffbe2e0fe15d1caa67bdb2b8acb69f12884656005d4a0bd91beb82c71eb380af46263d92c543b42fc0087d40a4b607847ee895482109a6f34847eafcbf WHIRLPOOL d1eed93acdb6212e0615170f927c77d359f8963262700aa76104859dd102fa4407fbae6f5705b104f2e59905cfa24a3551c9488cf214e1c9456a58004cfba187
-DIST libteam-1.14.tar.gz 524122 SHA256 294cdabd85cddfeac304ecbd4f331ef3f9afbf03f8b8ef7bb3a9c5827ab22d97 SHA512 11cad4baf42b27cf9bce106d202d5e6dd2685bac45784233868f0757c12d9b6f672db6d65e4cd1138de4f22c89665838db578b1ce30c8da283f3e258a56b65e8 WHIRLPOOL 9471099dde384948274c925bfbd38530be71b4676a15283bc645b47aab7d7199ba0c494bd5ccaece8dc4f124044b4f3cd4efcae3b00a809b4d9f6c6978525968
DIST libteam-1.22.tar.gz 544302 SHA256 9a028bf4e77ef21f2812c6d32cbd57a640e409f848fe81b74ecb231d75647ee3 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b WHIRLPOOL d86535a74814ce2fc7c41d56e94574a230e265c350ee5678a81d746a1548b548c7f841af4d2122e10d0d514d99585747c9b6612059f795494a14af5ee90d18b9
diff --git a/net-misc/libteam/libteam-1.0.ebuild b/net-misc/libteam/libteam-1.0.ebuild
deleted file mode 100644
index b3bc121d26c4..000000000000
--- a/net-misc/libteam/libteam-1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils linux-info
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="https://fedorahosted.org/libteam/"
-SRC_URI="https://github.com/jpirko/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug examples static-libs +syslog"
-
-DEPEND="dev-libs/jansson
- dev-libs/libdaemon
- >=dev-libs/libnl-3.2.19[utils]
- sys-apps/dbus
- "
-RDEPEND="${DEPEND}
- syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( HOWTO.BASICS README )
-
-src_prepare() {
- # avoid using -Werror in CFLAGS
- sed -i -e '/^CFLAGS/s/-Werror//' configure.ac || die 'sed on CFLAGS failed'
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable syslog logging)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /etc/dbus-1/system.d
- doins teamd/dbus/teamd.conf
-
- if use examples; then
- docinto examples
- dodoc teamd/example_configs/*
- fi
-}
diff --git a/net-misc/libteam/libteam-1.11.ebuild b/net-misc/libteam/libteam-1.11.ebuild
deleted file mode 100644
index 09ae4905f741..000000000000
--- a/net-misc/libteam/libteam-1.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils linux-info
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-SRC_URI="http://libteam.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="dbus debug examples static-libs +syslog"
-
-DEPEND=">=dev-libs/jansson-2.4
- dev-libs/libdaemon
- >=dev-libs/libnl-3.2.19[utils]
- dbus? ( sys-apps/dbus )
- "
-RDEPEND="${DEPEND}
- syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
- # avoid using -Werror in CFLAGS
- sed -i -e '/^CFLAGS/s/-Werror//' configure.ac || die 'sed on CFLAGS failed'
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable syslog logging)
- $(use_enable dbus)
- --disable-zmq
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /etc/dbus-1/system.d
- doins teamd/dbus/teamd.conf
-
- if use examples; then
- docinto examples
- dodoc teamd/example_configs/*
- fi
-}
diff --git a/net-misc/libteam/libteam-1.14.ebuild b/net-misc/libteam/libteam-1.14.ebuild
deleted file mode 100644
index 1a7781399c59..000000000000
--- a/net-misc/libteam/libteam-1.14.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils linux-info
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-SRC_URI="http://libteam.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4
- dev-libs/libdaemon
- >=dev-libs/libnl-3.2.19[utils]
- dbus? ( sys-apps/dbus )
- zmq? ( >=net-libs/zeromq-3.2.0 )
- "
-
-RDEPEND="${DEPEND}
- syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable syslog logging)
- $(use_enable dbus)
- $(use_enable zmq)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- insinto /etc/dbus-1/system.d
- doins teamd/dbus/teamd.conf
-
- if use examples; then
- docinto examples
- dodoc teamd/example_configs/*
- fi
-}
diff --git a/net-misc/libteam/libteam-1.22.ebuild b/net-misc/libteam/libteam-1.22.ebuild
index 576e5a04ba46..d1d6aa2bb170 100644
--- a/net-misc/libteam/libteam-1.22.ebuild
+++ b/net-misc/libteam/libteam-1.22.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$
@@ -13,7 +13,7 @@ SRC_URI="http://libteam.org/files/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
IUSE="dbus debug examples static-libs +syslog zmq"
DEPEND=">=dev-libs/jansson-2.4
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 249806c8e1bc..7cd0ad010d40 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,3 @@
-DIST cups-filters-1.11.4.tar.xz 1408760 SHA256 d6288dc9d13f16c54e74979fd2a3e3fceee882a13a47553967ae69f51d32b849 SHA512 80ba8a0c7c4f55e879a478a2a8ae78823fa55b988c65c7e9eb7f1a9750a593637be3bd5d7d4f57cc7819430d65da8b9148712bbbde56c0ccd8f0fcda13f133e4 WHIRLPOOL a2f42a9bd5a6881d023b1f1b0b7ea66f15067e828c4d714d32eb7f15ae8b09875504bc55b25d83f23a058ded863699a37cf20f6ffd627c10357dcf1251b36da1
-DIST cups-filters-1.11.5.tar.xz 1409912 SHA256 0e0fb1da155eef71fe0b2819e5ff5131f07da094ca2bef8c52e1a8d01d0b97c1 SHA512 8c837ff4f7c9b9abdf7f6f0ff899aa60444a73934e7e41d0b840a865d44650090b2d00b8a211ea2618a94dd8c1506a83061e6de0fe03947a3aee0e8425349e4f WHIRLPOOL d39e0810fb7cdfe31f68653f4dd385c34d4ef7719befdc51219cccc1dc085fd7bd162a71929e6b24e93d301572b0f15825df695d669981618de62d7ab3927e5c
+DIST cups-filters-1.11.6.tar.xz 1410116 SHA256 ed33a824cfdc4eba6633a7d491468da8eecdf120cb05557980c47b4cdfad9c7f SHA512 425eab182101d7bdd02844febebc7d57ed00d822e12ebb08e57a1244dc9d085f2a3c0eeb8ce4fe7586b32ca1a7cca2019ae62114d86692f0d6a6e60510d2711a WHIRLPOOL f91ea62ad0dcd85a34193f879bf5290a4d7cfa84ae5060bfbd064ee48290fa5eacf367a04264408ba82d549276a6a63215affd08a90f7a0e5515c1028e768228
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4 WHIRLPOOL 0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157
diff --git a/net-print/cups-filters/cups-filters-1.11.4.ebuild b/net-print/cups-filters/cups-filters-1.11.4.ebuild
deleted file mode 100644
index 06ee8f4968d8..000000000000
--- a/net-print/cups-filters/cups-filters-1.11.4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
-"
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --localstatedir="${EPREFIX}"/var \
- --with-cups-rundir="${EPREFIX}"/run/cups \
- $(use_enable dbus) \
- $(use_enable zeroconf avahi) \
- $(use_enable static-libs static) \
- $(use_enable foomatic) \
- $(use_enable ldap) \
- $(use_enable postscript ghostscript) \
- $(use_enable postscript ijs) \
- --with-fontdir="fonts/conf.avail" \
- --with-pdftops=pdftops \
- --enable-imagefilters \
- $(use_with jpeg) \
- $(use_with png) \
- $(use_with tiff) \
- --with-rcdir=no \
- --with-browseremoteprotocols=DNSSD,CUPS \
- --without-php
-}
-
-src_compile() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- prune_libtool_files --all
-
- cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
- emake check
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.11.5.ebuild b/net-print/cups-filters/cups-filters-1.11.6.ebuild
similarity index 100%
rename from net-print/cups-filters/cups-filters-1.11.5.ebuild
rename to net-print/cups-filters/cups-filters-1.11.6.ebuild
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 48e2a4311acf..ce5ee306822d 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,11 @@
#
#--- END OF EXAMPLES ---
+
+# Pacho Ramos (01 Nov 2016)
+# net-misc/libteam is now ~ppc ~ppc64
+net-misc/networkmanager teamd
+
# Michael Palimaka (21 Oct 2016)
# Requires media-libs/opencv which is not stable
media-plugins/frei0r-plugins facedetect
diff --git a/profiles/package.mask b/profiles/package.mask
index 9dd426b5c2e4..3809a0dfe4b9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -401,28 +401,35 @@ x11-terms/terra
>=dev-libs/gobject-introspection-1.49
>=dev-libs/gobject-introspection-common-1.49
>=dev-libs/libgames-support-1.1
+>=dev-libs/libgnome-games-support-1.1
>=dev-libs/libgweather-3.21
>=dev-libs/libpeas-1.19
>=dev-libs/libsigc++-2.9
>=dev-libs/vala-common-0.33
>=dev-python/pyatspi-2.21
>=dev-python/pygobject-3.21
+>=dev-util/anjuta-3.21
>=dev-util/devhelp-3.21
>=dev-util/gdbus-codegen-2.49
+>=dev-util/gnome-devel-docs-3.21
+>=dev-util/gtk-update-icon-cache-3.21
>=dev-vcs/gitg-3.21
>=games-arcade/gnome-nibbles-3.21
>=games-arcade/gnome-robots-3.21
+>=games-board/aisleriot-3.21
>=games-board/four-in-a-row-3.21
>=games-board/gnome-chess-3.21
>=games-board/gnome-mahjongg-3.21
>=games-board/gnome-mines-3.21
>=games-board/iagno-3.21
>=games-board/tali-3.21
+>=games-puzzle/atomix-3.21
>=games-puzzle/five-or-more-3.21
>=games-puzzle/gnome-klotski-3.21
>=games-puzzle/gnome-sudoku-3.21
>=games-puzzle/gnome-taquin-3.21
>=games-puzzle/gnome-tetravex-3.21
+>=games-puzzle/gnome2048-3.21
>=games-puzzle/hitori-3.21
>=games-puzzle/lightsoff-3.21
>=games-puzzle/quadrapassel-3.21
@@ -448,6 +455,7 @@ x11-terms/terra
>=gnome-extra/evolution-data-server-3.21
>=gnome-extra/evolution-ews-3.21
>=gnome-extra/gnome-boxes-3.21
+>=gnome-extra/gnome-builder-3.21
>=gnome-extra/gnome-calculator-3.21
>=gnome-extra/gnome-calendar-3.21
>=gnome-extra/gnome-characters-3.21
@@ -455,6 +463,7 @@ x11-terms/terra
>=gnome-extra/gnome-color-manager-3.21
>=gnome-extra/gnome-contacts-3.21
>=gnome-extra/gnome-documents-3.21
+>=gnome-extra/gnome-getting-started-docs-3.21
>=gnome-extra/gnome-logs-3.21
>=gnome-extra/gnome-packagekit-3.21
>=gnome-extra/gnome-power-manager-3.21
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 5c805b92edf0..19845f5190d5 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1 +1 @@
-DIST ripgrep-0.2.5.tar.gz 389606 SHA256 2e535701ed4c36875a29041b4a47629af514182177b82d681a8e4d0fed4a9767 SHA512 c5359ab5120ed355c8e72fded34c311440b357244be6b3950732953b8b6cd558d429e4c6e86737983bdea9118f58e4f26048c4b2374559cf8e14146afcc20fec WHIRLPOOL c5ead5378942cf9f75bd1681e9d18e58704597dc7512c50edfbf3600d326519fa8493fa7d61addef81b19650fdfcd000a5dbfd905f5d50194ad88a062fefe4c4
+DIST ripgrep-0.2.5.tar.xz 36327796 SHA256 af30c197e8ed4779288023b4b197ebd481f5c644be1ac18495c91556989da5f8 SHA512 4ce2374f677110bc61ac1ee0511a9e801f21f414ba3bf809b3020e82a2a26a7deeff45fea1edc8d20353023e95074899262db2f84e0cd822103dc60b55f39216 WHIRLPOOL e0a50bc59142aa74ecfc93c2089d6916aba6af15d33d9dbd9f7fa7c790b5fa9f46b757419c9db3abd4d17eba6d0e17c6b5a83ceb6842d8a7d57722ef1e6862ff
diff --git a/sys-apps/ripgrep/ripgrep-0.2.5.ebuild b/sys-apps/ripgrep/ripgrep-0.2.5-r1.ebuild
similarity index 57%
rename from sys-apps/ripgrep/ripgrep-0.2.5.ebuild
rename to sys-apps/ripgrep/ripgrep-0.2.5-r1.ebuild
index 82208a01fb3e..11fc9daa0f8e 100644
--- a/sys-apps/ripgrep/ripgrep-0.2.5.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.2.5-r1.ebuild
@@ -4,11 +4,11 @@
EAPI=6
-inherit cargo
-
DESCRIPTION="a command line search tool that combines usability with raw speed"
HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# custom tarball bundling all deps and index, otherwise cargo fetches from the network
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
LICENSE="|| ( MIT Unlicense )"
SLOT="0"
@@ -16,8 +16,15 @@ KEYWORDS="~amd64 ~x86"
DEPEND="dev-util/cargo"
+src_prepare() {
+ default
+
+ # move cache dir where cargo expects it
+ mv .cargo "${HOME}" || die
+}
+
src_compile() {
- cargo build --release || die
+ cargo build --release --verbose || die
}
src_test() {
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index a962a818976c..a4c4aa42c501 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -207,6 +207,10 @@ src_install() {
multilib-minimal_src_install
+ # Move runtime headers to /usr/lib/clang, where they belong
+ dodir /usr/lib
+ mv "${ED}usr/include/clangrt" "${ED}usr/lib/clang" || die
+
# Apply CHOST and version suffix to clang tools
local clang_version=4.0
local clang_tools=( clang clang++ clang-cl clang-cpp )
@@ -247,9 +251,10 @@ src_install() {
multilib_src_install() {
cmake-utils_src_install
- # move headers to the correct directory
- dodir /usr/lib/clang
- cp -pR "${ED}usr/$(get_libdir)/clang"/* "${ED}usr/lib/clang/" || die
+ # move headers to include/ to get them checked for ABI mismatch
+ # (then to the correct directory in src_install())
+ insinto /usr/include/clangrt
+ doins -r "${ED}usr/$(get_libdir)/clang"/.
rm -r "${ED}usr/$(get_libdir)/clang" || die
}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 721dfa2ad16e..cc793e1e1385 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -37,6 +37,9 @@ DIST genpatches-3.18-41.extras.tar.xz 16184 SHA256 e5b6cae811814629110c1fe46d344
DIST genpatches-3.18-42.base.tar.xz 1119348 SHA256 cbf2b331df87e9550ecae055c00693cca0c22c6f1855fe300c7ce8ecf8256bf9 SHA512 846abc55b81fcc71fadb3b1f301ca66a90016b3246615f0030be2902593cb7381529e7d320d084d7b8cb9a4a71ce5025b6cb825662e91868a9d07890ea44354f WHIRLPOOL 94df72a05bf23caad45f7a514fb1de4ca4867dad9db171c2840a0615f5f864e44c23627c92598c080b87e2477eae8cb4c3026030e301d8465c04714f5ddbef16
DIST genpatches-3.18-42.experimental.tar.xz 61740 SHA256 120555c088458b0d6970a66bc755f13bd08a90f707cca99fe377c8ea893cd93e SHA512 fcbb5f9689eafeb723015dccfcacf9d4e72dff36953f322510642d7b162adc44ae8f3dc20ccaa6503dabc4249fdc722947236290b99a032754b7e72cc2a9d5d0 WHIRLPOOL d971b11102f34c2e039290124547e1aa903e2a069a3bbc12b5d864d12608bffc5cf275a30bfaa2b335823a7ca5c025125d481840a5772f55a7ee43616cd39818
DIST genpatches-3.18-42.extras.tar.xz 16188 SHA256 f9006f6a725254184d5b98e2107eec50b04734fd4ae4be4f54e3c0e9affb7daf SHA512 f8088f56b94ebb7e97e430bcf17e46e67c3b292fcc80cc65aaba31f73fe3793ca8be4b06fb42127e8a436ceef8ba2f6f3f54bc758e38d67e32e34efd8f49ca41 WHIRLPOOL e1729cc21dbbe0319d20289ef8c70362da80f9d9dde423c85eb3a65fe1ab2e13a38f9cc1ae886297b387c3e18f8ee5dd21a8bfeef391aec2e166e55e374463dc
+DIST genpatches-3.18-43.base.tar.xz 1120732 SHA256 b56698cb12c7fafe59365ff569ca525fe8c0d399b634498af015e1b04a62e93d SHA512 6319e15cf7860bdb40abebcff1a91878a0a8187314f24fee53bd5678fcd958dfd0e13adc756cf371373abce9b6902b4b629e389d5ace78c3a2364511487ea891 WHIRLPOOL 416dfcb63a9468dd74909bbeb0c7fa8b8786733daa022bcd1ba405a33befc399cef9d55115e8c79178d12c204f2f8b3a3642966398697dd3aaca72643e2d32d5
+DIST genpatches-3.18-43.experimental.tar.xz 61720 SHA256 1f5fcb3613c13821c9757e7ad2f7b0ef0a0d51602f41b769a4e62e289c30c21f SHA512 947b151ae7c5c85809516edef3e50edf84d9543d9d6d6bb1463cdce20cffeff413f73d4326973ef9bad2d87aef2992e39b950c734068a934b066718790344f72 WHIRLPOOL d57650c9fa527124354db6b9f2ce8b0f7127f2ac4d5d635cad3a79c6395448ce0a0069a5f5ee30965b60e7e600371ced9dfd780fa9f640eb0ddc1c9785ba4314
+DIST genpatches-3.18-43.extras.tar.xz 16176 SHA256 5c2df2453a5d742d5b47758cc095910d5bb42e93ac3c7b4655c1d8ebd8c609c3 SHA512 f1f3365e62e059eb119db8cb789eef8e217dfeb1f350e9dfbff57789f1226f3c6fa31df69e86f3883af1ea0f3dd00f96d8a0b40508568c085f52604a4d9f1088 WHIRLPOOL aabbe19c34cad23ddf5ccb251afd8b735f1c1e4e3712e0d2c06ac6219a6ebb24f4f0dc8f5d5c6049e02a47b3d86e9e1b39a6324cb21c6e7b30771106a967ccb4
DIST genpatches-3.4-95.base.tar.xz 1463092 SHA256 9863107c059d597e5126ec025b464d6af167125b6a72f02cfbdb462198d7a193 SHA512 7e0fb0c5ee1b60cc99d6ac233db551f65e2518d1133aa8c58dc33c3096a31e7ea73b7ac12b6f7072083a601a24d394e4594ee1615b8eb20173cde07b44db0b50 WHIRLPOOL afc6555e409152658bd919bff1e7828c1a86f4df146aefbce40e1a85740692c11f573863f7da8034c6da184ffc02c22854e2024cd8673d8891c966d0264222fa
DIST genpatches-3.4-95.extras.tar.xz 18232 SHA256 93a4cf21c8ade507bcfb0500fb7b1e73e324a817b906e5060ff46be18bcd485f SHA512 12ae9f224970cc92eede0b87cca2db9b67d093fd0228105ad4fb4a3914206dba6d10299a5d6a0073521f03141456b4a5be795d54d9d3aa5ed346c014a8fc356b WHIRLPOOL 599c698e464ab7bfe641ca1fa2ddab6be087ea67dc055e43971908d2e860b150f8625335f3648ec9dc0553f6fb92928d8c2a3308c73744b73c39a02d3a6f014a
DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73
@@ -57,6 +60,9 @@ DIST genpatches-4.4-30.extras.tar.xz 16368 SHA256 5ae402de247df572e8ea70d8ef2380
DIST genpatches-4.4-31.base.tar.xz 837740 SHA256 e225b4bf52cb8765f6a6bf8b74e3c5415b8c221bd8fc4337cffa58f43a4b8dbf SHA512 f89ac910a91b5272b2ddcc2d68608db6e4c83fd8515f60514aa3bf7fecc00c7adb02fcdfe4d0ad9ea87d675389a2da492cd0d0a037e034d9a3d1a77d29f225ea WHIRLPOOL 517488397cd7fde3db623686ddfc85f7fe47fc5504d6b42112496e475cc79115d76d10d284f4c795d3738f97ecfd9297f0c5ebaa5577b9aeb35b778480b74a8d
DIST genpatches-4.4-31.experimental.tar.xz 87744 SHA256 76690688b3c1f0140462547668d4e5bf2447ecae20ceb4cfb46834c1ba12b2dc SHA512 215b58f1cbcd3692989d0fc5bf80df49696dce73efbbe0892f5bab5a80af7bae75c846df9d5182b6372cde91fdfdd3299d466fd6730ee891b16291001411e2c0 WHIRLPOOL 7f37df43e74005a53668eccae839e27d8cacd4eac8a0d097ecec12c2a37f965b567604e3a1d383c140a22db3c327db662e2efb9cd6bdc3565ae98f5e186fc60f
DIST genpatches-4.4-31.extras.tar.xz 16352 SHA256 a91fb73fc4a50b6eba05c43120eb13d2b33180c4ea5dc3e3fd69548040c5a15d SHA512 b50379ff5ce665339e20aaf055add9f182dd96138e0ee4d79b776a3aba56dfa67be7699d2e94334ef40a2a800c8b89db29a273b337c2de99c5069c9661f51c0a WHIRLPOOL c79e523eb12d5acffa0248f522c8f8bb2a56cb033ac7d0260c9df401936f8a034ef696d6cb17bb23db5fc407cb77d66200463fd0e23599bffd8a52fd02f5fb73
+DIST genpatches-4.4-32.base.tar.xz 838504 SHA256 590a7e00c4e14c15e243e2c11899e66813a89dcaeac2777b4c38e3b3337a6a99 SHA512 f4e9a0574b8d693aadafb5c0e823bd4d1a0e66560c01ab3cd0dae3d65f9c1efb600e7af3ebe31d3f94bcf8a80753c21df10a9b38a80afbb5977fe04e68d6e734 WHIRLPOOL ed96cce8eeb01370d44c9b0a4c5bc797d08027c4802608be032e845165d1e9829c8da581285193b8b4f01e1e4bb18d8f97ba22c0376dd730aeec207ab4e35c3c
+DIST genpatches-4.4-32.experimental.tar.xz 87776 SHA256 e0478a6c3ffa992396aa78db412ba966de7dc785d427ce931233c7fc09e45216 SHA512 77c04223a8b456bdf607d218aab63e26bb797a7150e9423254f78df7c0f6f520b56faea1d9577d734c4e12cac47fe72b9f060379141b2f4f7c83a5318a17c01d WHIRLPOOL 04c79c0e5e68b4bb3c692f78ac28bbe51f99cf99c441eae4cbda68466d2d541566a107692f88234dda3f3be2b388408b60fccf13faabf36c6535d7b3cdf713a8
+DIST genpatches-4.4-32.extras.tar.xz 16364 SHA256 5f5f268c22aa2d50ca56c0c7d82ce59aad23f0b4363426add34688ee414c2a5e SHA512 bf6f4931626b3fdd913c6ac22e411c472f595c38254c497e8bcfe6e2f5a9b6a0d065a24df4f6c7fc28f7da15af390c2012fb4e076599c7a811b6b4cd0ee1748b WHIRLPOOL 1fb0fe82962ffac364fa0f6037d2b265b435cde25b585c40b3d5ed280c93118eeb88c9ed5ad354be085b186108d4a55f8b14e5ff348133f30973ebf05acfb162
DIST genpatches-4.7-10.base.tar.xz 246032 SHA256 8733ad7fb8422aa7fb05b70dc84e91475e1a72a14fa9e2d2d94784053cee7e0b SHA512 e585a3c5b324dab1855f31c4ad5b879b0a7e46fb2d4884af715719bbd7ced642bd593113cdb88425bf6471b694c8b533ebd6220f7af1c53764891a001523c4aa WHIRLPOOL 95d5929202dce62fe08eba0391733f9e79f8a1875f8e02959b464579f5cad8d38e32f14c2ca36ebaada59c1951a4eb2b7cb8e6977e2d01d55b02d686519b7134
DIST genpatches-4.7-10.experimental.tar.xz 87016 SHA256 f5baf4816e4adac0885c3485732cdf0b4dcda8458388959a94ed002d2b4c67e3 SHA512 7dcf5a4ac69fe1f5db39d8f1b777556587a1695ac16bfa23b82ba60e5f56701b331c552d6efd51a835dba8a74b72a632621369ad6c1305fc9adb6b7fec8478de WHIRLPOOL 83460f7ccac4aa4e926d227bf5161be0fade31401d4ffcca1f6d7410e3c4e8825fa8f10d2b749e2549737efa54c20784b160277a6c9da2c88481d69b30b7a404
DIST genpatches-4.7-10.extras.tar.xz 17604 SHA256 4b72e52ab0eb2f8cece60c7298566ef5f17266d42dc9fa709b63dc823e052276 SHA512 d9a76128401b8cc6fd089f1fbb1c465e8042969e8e15a4d20c94fa2a041447a69c179b4864fd9f74615e2a78b73b046d14dee9559aa9fd32ca69dc4ef563dbed WHIRLPOOL c35b7eb76e6a99f3583a3ae30fb2e760b68659287087ca01c1a15e97944e57ed178e4c2b840dc480d1ccff5e3f36b7303b8ad159de63b250b9818bd8d5efd3a3
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild
new file mode 100644
index 000000000000..dd43a7fd1484
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.44.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="43"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.30.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.30.ebuild
new file mode 100644
index 000000000000..d6348aeb91d6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.30.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="32"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index b66f986ed102..b6e00afc86ad 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,2 +1 @@
-DIST mod_authnz_external-3.2.6.tar.gz 38194 SHA256 67365145100617647c65ec7778cdfea2e12eb70e61bb8cddb5d90abd7979f5e6 SHA512 8446fcf52385a2f0f6380730b2cd2df2c46de363384ef0027c44aa9be52322afa0ad4e487bee1beef939b94fbbb15bd053eb8b4be7555fbd5321b745d7dbfab7 WHIRLPOOL 577a909d7f33d2db9bec7c32452280310f058da82f69c0dd4a9d815a8a95d4de564a31ef170d23f9b966f663d38b2cc69be1c09c36bae087dcd1900a60d917c5
DIST mod_authnz_external-3.3.2.tar.gz 36160 SHA256 a16b31d81c20e024e7efe480fe98b48d5ce40d520b0a13ff38ab003cc527f1e8 SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be WHIRLPOOL 34407a3a62d2bb4ca67fbc08bafff145ed5a52308a13e6e4b21d0b2d774b34e2a2980839d9d4bc145f1197038fe7bcd8674a7bd434f0119e39e1a5fa0a4d1d71
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.2.6.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.2.6.ebuild
deleted file mode 100644
index 97cff0e8386d..000000000000
--- a/www-apache/mod_authnz_external/mod_authnz_external-3.2.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils apache-module
-
-DESCRIPTION="An Apache2 authentication DSO using external programs"
-HOMEPAGE="https://github.com/phokz/mod-auth-external"
-SRC_URI="https://mod-auth-external.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
-
-need_apache2_2
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
index 18fd699c29eb..bea4645ccbd1 100644
--- a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.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$
@@ -11,7 +11,7 @@ SRC_URI="https://mod-auth-external.googlecode.com/files/${P}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
need_apache2_4
diff --git a/www-apache/mod_extract_forwarded/Manifest b/www-apache/mod_extract_forwarded/Manifest
index b0298f45cb15..b1e41f7be37a 100644
--- a/www-apache/mod_extract_forwarded/Manifest
+++ b/www-apache/mod_extract_forwarded/Manifest
@@ -1,2 +1 @@
-DIST extract_forwarded-2.0.2.tar.gz 13812 SHA256 934e2da02a2a71dd40a6050e884ac034174a1bfee0d0d4aeeeb68b942d94cafb SHA512 20b408cc27bd0d92333a90a41c7e93362919693dbeb7643388bb0c70cb0aab88cbd6361d7f5bc3f892da715bcb1d7241a2cc396b5feb6f31f8716f08c83242ca WHIRLPOOL 1ae1d700f92a9e120764c2664029cf8e1d87c1655d2da5913b58c41f185b7da3d365b106af398c33e71197a60c47c06be291e9b54fc8e5ac0c6be33ae3a83ab4
DIST mod_extract_forwarded-2.0.3_pre2015052015.tar.xz 13548 SHA256 284861a3267b8b494408a692cf6b4c7f31957e18b25ba7f6b1a6e0cd3bcd1bd9 SHA512 26cfde6343885eea964dcd96ce9bc5952bfb9b5b27b093abd71358a26548c1361e37449d2f38a68aa0bac0bc43e465d65d6fbfaf91598b94ced2e65b861a14db WHIRLPOOL 2a68b21233616fc77d9faa812dffd51c7629f49059c53cc42c4c9b585a738c2579899105c0eed15fac288232698045e8f0009a576173bf3878f80ae3ea6d807b
diff --git a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild
deleted file mode 100644
index 09a77b1fbbed..000000000000
--- a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit apache-module
-
-DESCRIPTION="Apache module that rewrites X-Forwarded-For to REMOTE_ADDR for reverse proxy configurations"
-HOMEPAGE="http://www.openinfo.co.uk/apache/index.html"
-SRC_URI="http://www.openinfo.co.uk/apache/extract_forwarded-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="mod_proxy"
-
-DEPEND=""
-RDEPEND="mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
-
-S="${WORKDIR}/extract_forwarded"
-
-APACHE2_MOD_CONF="98_${PN}"
-APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
-
-need_apache2_2
-
-src_prepare() {
- if ! use mod_proxy; then
- sed -i -e 's:#define USING_proxy_http_module .*::' mod_extract_forwarded.c || die
- fi
-}
diff --git a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
index f3b1479e285f..a2aaccb0a4d6 100644
--- a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
+++ b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.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$
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
LICENSE="Apache-1.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="mod_proxy"
DEPEND=""
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild
deleted file mode 100644
index c92c273a492f..000000000000
--- a/www-apache/mod_log_sql/mod_log_sql-1.101-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
-HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
-SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbi ssl"
-
-DEPEND="virtual/mysql
- dbi? ( dev-db/libdbi )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="1.101/42_${PN}"
-APACHE2_MOD_DEFINE="LOG_SQL"
-
-APACHE2_EXECFILES="
- .libs/${PN}_dbi.so
- .libs/${PN}_logio.so
- .libs/${PN}_mysql.so
- .libs/${PN}_ssl.so"
-
-DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
-contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
-
-need_apache2_2
-
-src_compile() {
- local myconf="--with-apxs=${APXS}"
- use ssl && myconf="${myconf} --with-ssl-inc=/usr"
- use ssl || myconf="${myconf} --without-ssl-inc"
- use dbi && myconf="${myconf} --with-dbi=/usr"
- use dbi || myconf="${myconf} --without-dbi"
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-pkg_postinst() {
- use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI"
- apache-module_pkg_postinst
- einfo "Refer to /usr/share/doc/${PF}/ for scripts"
- einfo "on how to create logging tables."
-}
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
index 108d83098d98..375b139622b5 100644
--- a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.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$
@@ -11,7 +11,7 @@ SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="dbi ssl"
DEPEND="virtual/mysql
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index ea5b6ad6e85f..509e87618e81 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
DIST vivaldi-1.4.589.29_p1-amd64.deb 46300958 SHA256 e6852d92462c961b04eef7beac3e0ae0a2522c75dc72a6febc0c5b9c312a4b93 SHA512 a0ca45ebe1b7d4c4255d49f5c296765dd4003916d4ff760e97494f9d166ece00244a67236e7f664f4326a05d855a4930d7636e5412cf1cd77dfea1498acd0dec WHIRLPOOL 62e87e460e8e1583c2a378cdc0c64e7d244fbd3e390f49b203f737ccbdf70dd74f388dd2da74fd5b348142f7d2dfc52e11dab73f9615381a130ea2482b4e85d9
DIST vivaldi-1.4.589.29_p1-i386.deb 47999782 SHA256 4cf93c5da656cde9e83d101ae9ce39de1c394a9fb2efac25fbbcd35ea24c9430 SHA512 1592dbfc5b95b95a77ae5523e09b390f71e296775b6dcc84395b8b8d2dee673e8f957df4e006133513c2d86a2dc5133ae3cea3d870b370ddee29151bfea0951a WHIRLPOOL 9a2fa8aeed6e839aea1a0ad46d0eb147caa86e0ce02c8e778fe755188f66e45b4412928d4e1919dc9af1d944439ad504131508e8bb09406fe13ab0b48d03999a
-DIST vivaldi-1.5.644.7_p1-amd64.deb 48002658 SHA256 bc6a0dec7734042655c387b2e9e5d308fc1b4dd21e2448b3bd376c47560190ba SHA512 2eda168f44af0fb36ab8432016ae299b686638cb26dbdc437bf4f10179ce936e35af0da7f2f61d85cfc159a6702e196021ab645528b98c9424d29f28e0833b81 WHIRLPOOL 8e69c45c3fd7fa60e93ce3200488ed41ddd774117bb54b737955a703cb2d5e59529f2fb8f86fe877c3728e7d108784573f0293b095481a3abb466e2985dd07c6
-DIST vivaldi-1.5.644.7_p1-i386.deb 48270544 SHA256 4c8927ad48febf235b4802b05d9fecf00d51f5e842378ce3380ba02d33241b50 SHA512 14ec01a072d4d94ef0e6396d6c551a15e71ebf6535859058446769f3313775a0e4e1712db949d868ed5e74dbc6159dd27217c386a2c2d4eb7f77113063ccbf05 WHIRLPOOL 2dfb53f7ddfdf14402ae306510d7213495c5843db4ec242e971f2121b5367faf3bdb0f8ab4e381efd2bc1739d365786b21d8d9426aa3a740e852c664f060810a
DIST vivaldi-1.5.648.6_p1-amd64.deb 47993482 SHA256 b37bdc8d3fcd4d0ceac819b951194069b6657e37d4399150f58d023144dc1a9b SHA512 171d3491496647ab289b3255bb7314c07bfd5f650933a2141ada6a3d32dcdfc188330ffcd58d9fca121c06814e9fc59fc1c6d2a5bfc3c4401fa585dc15c37ad4 WHIRLPOOL ef990c31d2a5835835dda7c2d40f87f07a53307a04087d4054ef0011fb9e427d2d0bf6cb7bbdb728b682ce72e74fe7bb6c04a7b7ce7816fea7fb9761302e766f
DIST vivaldi-1.5.648.6_p1-i386.deb 48285510 SHA256 5cc08e9920699c23f22a87934c32a2c5c84ac0ea518f960494f37065152271fc SHA512 d9cf6d40853bd6a3409a2dee6ec073ce08945ad7a808d35b9fd23c0d1a0d0f9c9a03decfdd1c54e0308243ebeff8b50cf8dfd56040d3575cd3aaba4d21f8a5b6 WHIRLPOOL 74ee7f1d968b299d9d77c3d1cd627acf57f5f0aa64afeeca1594d200a443c5402314b2befb9adfdef2c2539c16267f0d27ef566a7a8363e1a8e128983c408d84
+DIST vivaldi-1.5.651.10_p1-amd64.deb 48014294 SHA256 7f6752c26ecea325d535dbb08d6a51f2b970546efc46102f6fb27c146f7824fe SHA512 560a3395e160a0ba1567fca1fa7364b3c372f24443a84335f19320ca0100f107aebf3271bf8c084d7d798fb1a546478dd78106938c1a4b42e7952aa09a5c9eb3 WHIRLPOOL 2e45ddbba34632bc1174d073d2bfbdbdf8928664ca12eb75083a520b844ab9e82d2405f2c69c9978df0c8440e77e3a1cbb45b60faa3c9e3fce12db450470a2d9
+DIST vivaldi-1.5.651.10_p1-i386.deb 48302034 SHA256 dcc3339a479ef326a9325f7d651e81d389028ef09653311582e2f83ae3ea803b SHA512 e5ebfeb11b8b1e200a2a3751f7d1cf2c2de6d6a0e265f239554639036b3cc33bfbee7553afffae27001b97add3fb38b6b4e9ea0cce3cea17277725a1a7fe36d6 WHIRLPOOL b05d425a8eb76b01b31610bfaca20bd38a5df02c12ec9c63ca445182e810affcf717229c5e7f5e5633091d8e8f1d9561c0ffaccf25f9dba87ad12fdbbb21da9b
diff --git a/www-client/vivaldi/vivaldi-1.5.644.7_p1.ebuild b/www-client/vivaldi/vivaldi-1.5.651.10_p1.ebuild
similarity index 100%
rename from www-client/vivaldi/vivaldi-1.5.644.7_p1.ebuild
rename to www-client/vivaldi/vivaldi-1.5.651.10_p1.ebuild
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 8f31387e160c..7a8c001bbf37 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,3 +3,4 @@ DIST gtksourceview-3.16.1.tar.xz 1272152 SHA256 669e9846ca744ec4d04ce61377e85df7
DIST gtksourceview-3.18.2.tar.xz 1317804 SHA256 60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2 SHA512 75e502264d7d9f63f9a2c9c884072cfc2d323c7cc49383b9b53916321ce20ef695e7a2dd0f6db67a4daf70ba84a3a907dfc6d9407ba5982adb976210e0589328 WHIRLPOOL 4143a624a0582a5d92de707b5167bc9805a5b484906977c4b0d195703d7bd113ebd677829f6e6c2c2d8d10cdae2041db99e8294e18e7114d53e15da6f233ad80
DIST gtksourceview-3.18.3.tar.xz 1294704 SHA256 4720710d559c372f6add0b73b5ee1511630ba7cf0502e554461503602400e015 SHA512 29fba52d961137a23cadf50aab220e8bd7f1515727cedf081eb59f4f18e297cff40b0ad5432af7b45686c5f7b1fdbae43df3bf2de820ec91654b03bff175c0fe WHIRLPOOL 66c198cf361c55975111288cea07684c538a9ceeb5a77424e1a698be0a0e0baca2126c0dd64e5f6545b91abb2d6c78301c0f47c8ca8d64b939b93760591ad980
DIST gtksourceview-3.20.4.tar.xz 1582240 SHA256 7a0e6ac95ff3862bd8ef77a40e95a942939e73cb407f2eb67af600d7ce533d01 SHA512 4b69759e77acd120da24683e9cacd994e5bcef4c7b6404bad2df930b228a39f99f9391e137583fadb4939189f66f088bd386192b4d23bc232d718804156db941 WHIRLPOOL 7fb3895b3eeb56375ead63b709d4e0b0b02a33fdfed745a9a714af2e72f80c548228201702d317519cc0fb655c8c2e39c60333275889d323a59efb22556b28a1
+DIST gtksourceview-3.22.0.tar.xz 1595016 SHA256 70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5 SHA512 728c5c13de57a6ebd3d837d3d9440daa5e64a18e92cfbf0a635d8e3708ee257b568e110fa88c4e11c18bc0534d58ec1556f3fa974793cadeae3264c9ef449e26 WHIRLPOOL 3806bb90e4e34ff6fbe141b1c2fc95526c8cee108883a8b5821fa85a668bf8ad1ac4f60e23602f5d3bb991d5992c7b4553f0a4215a3378ee2f70d5d6aa55e7f3
diff --git a/x11-libs/gtksourceview/gtksourceview-3.22.0.ebuild b/x11-libs/gtksourceview/gtksourceview-3.22.0.ebuild
new file mode 100644
index 000000000000..9b2b0026c66b
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.22.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"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.48:2
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.20:3[introspection?]
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.25
+ >=sys-devel/gettext-0.19.4
+ dev-util/itstool
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-deprecations \
+ $(use_enable glade glade-catalog) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-3.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index c431f4cd641e..d95358be8c7e 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,5 @@
DIST adwaita-icon-theme-3.16.2.2.tar.xz 18860536 SHA256 3149a815ad165abdd20165891fa72b533b909d7844e3fd41b8d0a0f9d9a99066 SHA512 9984f0aa64a146ca55be77fa3b417eafd2e31e3f213ff93fcc954df22a30bdf42efb3f6967a2d97b302cac2e26e49926eefdfb9b5f70aee79bddc39beef5cd54 WHIRLPOOL 137550131571c3e63442cb102d710efcfffbda60777ae8c55186795b4c0adb1da6db003a75acb0f3a73877e9a8ed6b84285ba77cb6f300b038215c0fc1dc2f0e
DIST adwaita-icon-theme-3.18.0.tar.xz 19015280 SHA256 5e9ce726001fdd8ee93c394fdc3cdb9e1603bbed5b7c62df453ccf521ec50e58 SHA512 67b79918c9261f57997a449230dd3439e5da227e6bda5a85f5ce37fbacafe8761f273d3f52c5d160168de246cbd0ec2caa9565ba277ac2a10c1379879838262d WHIRLPOOL 7d34032ba6c6e285d408b24d358a735b40c250c61b2c8cdac7ef494f29bf7c4e7d172d9c8824c46b6533f1bb793fb49755e5d85e34c4ab89200cbe97814f79c6
DIST adwaita-icon-theme-3.20.tar.xz 18821792 SHA256 7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35 SHA512 df3818b09aa986f0cc6f26c9f0cf39652814518ca51b1a9896ce957ad7a3868a0e19519386ad964a13960e10aa5201da7424113a93ff5149b0c202ba4a44e1dd WHIRLPOOL 228827e1dd4d2217631a5e4a6d0f08e924f9b11f421267e2f3bbfbc74e07aca08e45ef40a9c9e4c665e061b22efaa87b1a5e7b11ec04af1448fd097839fd7ef0
+DIST adwaita-icon-theme-3.22.0.tar.xz 18395856 SHA256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 SHA512 33d5eab0a7295069bb3cc8939bebeed0bad8ff72bfe42b0a90e616190ce519e7d7e2b4e9e4c145d04911ea37c205c12ca39972fd00e6ef34271b66a25ff24983 WHIRLPOOL 656556360a4535b4fd29de163f73b03c3f82c568c5d21cc94a6dd35fa478804b39f0c563430edcc5f9f3cdfc920bdf14a0290ecb58314dfd089b62078d873bfb
DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0.ebuild
new file mode 100644
index 000000000000..fd563cbbd623
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"
+
+SRC_URI="${SRC_URI}
+ branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+LICENSE="
+ || ( LGPL-3 CC-BY-SA-3.0 )
+ branding? ( CC-Sampling-Plus-1.0 )
+"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ >=x11-themes/hicolor-icon-theme-0.10
+"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/librsvg:2
+ !
+Date: Mon, 3 Oct 2016 00:38:57 +0200
+Subject: [PATCH] Control build of gtk+2 adwaita theme engine from configure
+
+Rather than whole gtk+-2 theme.
+
+This only makes sense in Gentoo as the theme engine has been split to
+a separate package to allow gtk+2 free systems.
+---
+ themes/Adwaita-dark/Makefile.am | 6 +-----
+ themes/Adwaita/Makefile.am | 6 +-----
+ themes/Adwaita/gtk-2.0/Makefile.am | 2 ++
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/themes/Adwaita-dark/Makefile.am b/themes/Adwaita-dark/Makefile.am
+index 8a381b9..c5efcbf 100644
+--- a/themes/Adwaita-dark/Makefile.am
++++ b/themes/Adwaita-dark/Makefile.am
+@@ -1,8 +1,4 @@
+-SUBDIRS = gtk-3.0
+-
+-if GTK2_ENGINE
+-SUBDIRS += gtk-2.0
+-endif
++SUBDIRS = gtk-2.0 gtk-3.0
+
+ THEME_NAME=Adwaita-dark
+ THEME_IN_FILES=index.theme.in
+diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am
+index 8583535..617b9a6 100644
+--- a/themes/Adwaita/Makefile.am
++++ b/themes/Adwaita/Makefile.am
+@@ -1,8 +1,4 @@
+-SUBDIRS = gtk-3.0
+-
+-if GTK2_ENGINE
+-SUBDIRS += gtk-2.0
+-endif
++SUBDIRS = gtk-2.0 gtk-3.0
+
+ THEME_NAME=Adwaita
+ THEME_IN_FILES=index.theme.in
+diff --git a/themes/Adwaita/gtk-2.0/Makefile.am b/themes/Adwaita/gtk-2.0/Makefile.am
+index 1e56f7f..9108cc4 100644
+--- a/themes/Adwaita/gtk-2.0/Makefile.am
++++ b/themes/Adwaita/gtk-2.0/Makefile.am
+@@ -1,3 +1,4 @@
++if GTK2_ENGINE
+ enginedir = $(libdir)/gtk-2.0/$(GTK2_VERSION)/engines
+ engine_LTLIBRARIES = libadwaita.la
+
+@@ -5,6 +6,7 @@ libadwaita_la_CFLAGS = $(GTK2_ENGINE_CFLAGS)
+ libadwaita_la_SOURCES = adwaita_engine.c
+ libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined
+ libadwaita_la_LIBADD = $(GTK2_ENGINE_LIBS)
++endif
+
+ themedir = $(datadir)/themes/Adwaita/gtk-2.0
+ theme_DATA = gtkrc main.rc apps.rc hacks.rc
+--
+2.10.1
+
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild
new file mode 100644
index 000000000000..e1845b238c16
--- /dev/null
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.22.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools gnome.org
+
+DESCRIPTION="Standard Themes for GNOME Applications"
+HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
+# their default background image
+RDEPEND="
+ >=gnome-base/gsettings-desktop-schemas-3.4
+"
+DEPEND="
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # https://bugzilla.gnome.org/show_bug.cgi?id=746920
+ "${FILESDIR}"/${PN}-3.14.2.3-srcdir.patch
+ # Leave build of gtk+:2 engine to x11-themes/gtk-engines-adwaita
+ "${FILESDIR}"/${PN}-3.22.2-exclude-engine.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-static \
+ --disable-gtk2-engine \
+ --disable-gtk3-engine \
+ GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e5e73d169a95..0c5958cddd2c 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,4 @@
DIST mutter-3.18.4.tar.xz 1469140 SHA256 3cd2d49ac269139a8860d84dfba4d5d5a8318c1510515b99681916ba8334d393 SHA512 2324de33f98fc7e1f6eca217411f289929eb22771b78e7615f569413ad90f63cadc5d3a4d280eb20cdb5490f1772fd64ca519bf7dc9246720569dba958b8d8b7 WHIRLPOOL 082370d2263885d8a3ec5f24bfb5fcdc5ff61c0f957e87ec9020b81a4fcdcd861ae51a0784b4a9fba6584422b2b163003de509dd09a4d126c2fa8a52bf99988f
DIST mutter-3.20.2.tar.xz 1488636 SHA256 1e8c46a81e21f382f56729282fcd0bb1c3a2067135f4b0f3651b307bf7a5b454 SHA512 27ba92444e0388b4d54d6fa00d7bd36323a444ea128c445c1d96207526293aca6d96ade344b11f7a05eccd76e9527c93cf5e627cf476bcea8acfd4e5bee614b3 WHIRLPOOL 8075d0d00bdcfedaaa34c7fc0343b77411aa06cfd7c98f6ea04d9ba3463a32b99e983f241b9290a10f626faf65ae69f42cde36ada4463455f3eabb64ad89e54b
DIST mutter-3.20.3.tar.xz 1488396 SHA256 142c5271df4bde968c725ed09026173292c07b4dd7ba75f19c4b14fc363af916 SHA512 7c408490d87191f96f82ab3510bbbcb3f5e597dfb6404475fa81b0cfef51b093706f55a1b263d98acf51997232dd25a1482f79e95431b1f2a647a0e5bc09d8d0 WHIRLPOOL ebdead38e9dec2a9a7e7419c6dd1effb194fd68839dd2e0fe927a650330cd444921b9bae0858e32b544aa58363084dab67ac80232bc6a66bf6c81481dfc52c20
+DIST mutter-3.22.1.tar.xz 3532404 SHA256 ffba28b955dc1b8a4734020de4ed4dff4afed435f0a059974be9bf3168acf59e SHA512 59fbd83888e16c8847f0efc5c1343a2aa473221fe167c96ae286010a57212cec614fdaea0b277452f4166940b740207ec78d5cefbe18def39ed5554e676e45c6 WHIRLPOOL 0d7ae0eb2a97cbb91ff3800d7db7a8d0242fe4f857f4921361deb2a579ad5cb7fb166856f636607a9257afcd5a36a414cc629248e34ced1d38dcc08141952be6
diff --git a/x11-wm/mutter/mutter-3.22.1.ebuild b/x11-wm/mutter/mutter-3.22.1.ebuild
new file mode 100644
index 000000000000..d3d13a06790b
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.22.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="input_devices_wacom +introspection +kms test udev wayland"
+REQUIRED_USE="
+ wayland? ( kms )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
+COMMON_DEPEND="
+ >=dev-libs/atk-2.5.3
+ >=dev-libs/json-glib-0.12.0
+ >=x11-libs/pango-1.2[X,introspection?]
+ >=x11-libs/cairo-1.10[X]
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+ >=dev-libs/glib-2.49.0:2[dbus]
+ >=media-libs/cogl-1.21.2:1.0=[introspection?]
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/startup-notification-0.7
+ >=x11-libs/libXcomposite-0.2
+ >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+ gnome-base/gnome-desktop:3=
+ >sys-power/upower-0.99:=
+
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libXcomposite-0.2
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libXinerama
+ >=x11-libs/libXrandr-1.5
+ x11-libs/libXrender
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-misc/xkeyboard-config
+
+ gnome-extra/zenity
+
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+ kms? (
+ >=dev-libs/libinput-1.4
+ media-libs/cogl:1.0=[kms]
+ >=media-libs/mesa-10.3[gbm]
+ sys-apps/systemd
+ virtual/libgudev
+ x11-libs/libdrm:= )
+ udev? ( virtual/libgudev:= )
+ wayland? (
+ >=dev-libs/wayland-1.6.90
+ >=dev-libs/wayland-protocols-1.7
+ x11-base/xorg-server[wayland] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !x11-misc/expocity
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-sm \
+ --enable-startup-notification \
+ --enable-verbose-mode \
+ --with-libcanberra \
+ $(use_enable introspection) \
+ $(use_enable kms native-backend) \
+ $(use_enable wayland) \
+ $(use_with input_devices_wacom libwacom) \
+ $(use_with udev gudev)
+}
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index dc84a7b56f5d..b2224cd8c76d 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,3 +1,4 @@
DIST exo-0.10.6.tar.bz2 1276178 SHA256 1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752 SHA512 be537145ea0f0ea87566908f3ed4850ee3b20caf292d27dd752a9eaba7047598b585b398c2a6e4c925d832b5b2f76e0b9cc763ee3c955f08d47c6ac8bf3a2805 WHIRLPOOL 8daa7a8021faea4b87a5204d2a6604fde732efd183aa3d7404b6b0b52444edbceab28ac636a254f145c705689baa3996a4ccd39256edd4a3ae148b7b40dc9034
DIST exo-0.10.7.tar.bz2 1262301 SHA256 521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60 WHIRLPOOL 4c8a71b70e67f0db0bfaa752b0b1f01a80a83cbe84d754b44b3d45811743cf4276abe5d9cde40cef13f87f6013666255ccc5a1cc64afe129a55fe813b4dbcb1e
DIST exo-0.11.1.tar.bz2 1231288 SHA256 c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4 SHA512 626640c135f316ceb9e9cdff7c1ae4f537737ac71a2e0b242dd723e35cc7a3119ba198c894d22f373b58c49c4b1640eaf64658a27c3341a6efbb0c52807c67cf WHIRLPOOL ae0c0b3f8993fdf463bc0936a9565e12cb11e815c6202ad2234fecb63498fbf3e5a7b8a848516bb38bba2a78453e2bda4e10c8ba9ecc8032fb8f94ae81908c64
+DIST exo-0.11.2.tar.bz2 1313336 SHA256 76bd1c4229503ff3c301485de3a41c55dec93e98de1a9eef1be77fe502ca4f77 SHA512 72aef7e44168224b810c0c3aead44011e4e810f631d908a82712f0b717e90b5ac38df9f849845bd55cc63f22199f68178387c8096c0b13923c7247b26b7b0162 WHIRLPOOL 696a72dcd79b7a80be8f28d49de2641550448d856616cb18a4af762ef7bd2ef6c15fb3106d7c6a48941d0c86f7ad5ee14174c6e0959412a2535959bc646e4146
diff --git a/xfce-base/exo/exo-0.11.2.ebuild b/xfce-base/exo/exo-0.11.2.ebuild
new file mode 100644
index 000000000000..194f7832e23f
--- /dev/null
+++ b/xfce-base/exo/exo-0.11.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/perl-5.6
+ >=dev-libs/glib-2.30:=
+ dev-perl/URI
+ >=x11-libs/gtk+-2.24:2=
+ >=x11-libs/gtk+-3.6.0:3=
+ >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+ >=xfce-base/libxfce4util-4.10:="
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(xfconf_use_debug)
+ # both required for GTK+3 support
+ # (non-GTK+3 variant fails to build, as predicted)
+ --enable-gtk3
+ --enable-libxfce4ui2
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+ DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}