diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
new file mode 100644
index 000000000000..f74622d2f437
--- /dev/null
+++ b/app-editors/kakoune/Manifest
@@ -0,0 +1 @@
+DIST kakoune-2016.05.05.tar.gz 367575 SHA256 e79655b89d6138547d7158e715b520c98316b0358ced6c356496b361c9ea0049 SHA512 9b6cc2c9c6c356a27f5a42a226ba2fb2ce32e21e795423a6354127f9dce7edd423e61a9356a0582d609efc4c28dd012788556cc32ba3f8f791a901f07a36bbc8 WHIRLPOOL e71748f69bca77dd9cd6c02c92f032123d322861bf86ab63bd5561b1f7957ec68c6b7ce0e1f8dd493166cf22aceae7cd49e6ffd42816c7c265712e554b224fe0
diff --git a/app-editors/kakoune/files/kakoune-makefile.patch b/app-editors/kakoune/files/kakoune-makefile.patch
new file mode 100644
index 000000000000..076c42f92ea8
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-makefile.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index c79c270..9409a8c 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,10 +3,10 @@ pedantic ?= yes
+
+ ifeq ($(debug),yes)
+ CPPFLAGS += -DKAK_DEBUG
++ CXXFLAGS += -g
+ suffix := .debug
+ else
+ ifeq ($(debug),no)
+- CXXFLAGS += -O3
+ suffix := .opt
+ else
+ $(error debug should be either yes or no)
+@@ -26,8 +26,6 @@ mandocs := $(docs:.asciidoc=.gz)
+ PREFIX ?= /usr/local
+ DESTDIR ?= # root dir
+
+-NCURSESW_INCLUDE ?= /usr/include/ncursesw
+-
+ bindir := $(DESTDIR)$(PREFIX)/bin
+ sharedir := $(DESTDIR)$(PREFIX)/share/kak
+ docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
+@@ -53,11 +51,10 @@ else ifneq (,$(findstring CYGWIN,$(os)))
+ LIBS += -lncursesw -lboost_regex -ldbghelp
+ else
+ LIBS += -lncursesw -lboost_regex
+- CPPFLAGS += -I$(NCURSESW_INCLUDE)
+ LDFLAGS += -rdynamic
+ endif
+
+-CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
++CXXFLAGS += -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
+
+ kak : $(objects)
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(objects) $(LIBS) -o $@
diff --git a/app-editors/kakoune/kakoune-2016.05.05.ebuild b/app-editors/kakoune/kakoune-2016.05.05.ebuild
new file mode 100644
index 000000000000..da4850106685
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2016.05.05.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs vcs-snapshot
+
+REF="9298efd19bd024f96df3eab0cef92d03581969ba"
+
+DESCRIPTION="Selection-oriented code editor inspired by vim"
+HOMEPAGE="https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ sys-libs/ncurses:*[unicode]
+ dev-libs/boost
+"
+DEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_configure() {
+ append-cppflags $(pkg-config --cflags ncursesw)
+ export CXX=$(tc-getCXX)
+ export debug=$(usex debug)
+}
+
+src_compile() {
+ emake -C src
+}
+
+src_test() {
+ emake -C src test
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
new file mode 100644
index 000000000000..f448c1b5403d
--- /dev/null
+++ b/app-editors/kakoune/kakoune-9999.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 flag-o-matic toolchain-funcs git-r3
+
+DESCRIPTION="Selection-oriented code editor inspired by vim"
+HOMEPAGE="https://github.com/mawww/kakoune"
+EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+ sys-libs/ncurses:*[unicode]
+ dev-libs/boost
+"
+DEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_configure() {
+ append-cppflags $(pkg-config --cflags ncursesw)
+ export CXX=$(tc-getCXX)
+ export debug=$(usex debug)
+}
+
+src_compile() {
+ emake -C src
+}
+
+src_test() {
+ emake -C src test
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
new file mode 100644
index 000000000000..753a3985cd00
--- /dev/null
+++ b/app-editors/kakoune/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ hilobakho@gmail.com
+ Mykyta Holubakha
+
+
+ proxy-maint@gentoo.org
+ Gentoo Proxy Maintainers Project
+
+
+ mawww/kakoune
+
+
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index 2b3fd2b3a005..76f4f98b81de 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,2 +1,3 @@
DIST emacs-daemon-0.20.tar.xz 5120 SHA256 5c0f0bc9a1fab391657737fc3b6af4088eff1ead2e05987fe50e02f5b6e50eb3 SHA512 ac1bfc543f38dd86aeef544a8d03aa2f2a6cb02ee2042ecb3f339baed98294deac1fc6d3d002e654f3d9f32f00379c4de40efa226ddd07715aee7fe0fcb41e43 WHIRLPOOL 5941c1ea18d238275aab312123eb598f3d3265f279674191a75bec6bfd6efeebadb20dc7e6db6454a9da10ed8e98b2916fad195741b4d5fddbb270528e040d63
DIST emacs-daemon-0.21.tar.xz 5212 SHA256 e07c24d3a92f77d49cecaffdc9dc20d9268505d4ee4879557d0656e6b3c7acd3 SHA512 7131cbd78bb2f11ce3dc5686a3729b8ec11a673e9011c70d72bc04bd5d36373507c9f446ef100d2d37b569850740bf4fb68e06c9e78f3a3bc2b9cdfef8418062 WHIRLPOOL 5c51f985c460a440e6f2b282ad7d289700f621ee1a90c023b4a6f8f317cfd29297ba20f6a8714f27746ee41f9cbae02f200c8bfd39b26d32b0d1c20a56fba48b
+DIST emacs-daemon-0.22.tar.xz 5276 SHA256 62743bc32f48bd5406dedb1d5356e7959c413dbc295977de0315a6ea8c1c6272 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094 WHIRLPOOL ccc9a7bc1d378b4b64873f9458284bef9008b1380a58700d5210404a216a62fe98d0b4547e28a2f52d0b3e958b45c84e8654eddb4fab48854629cb513462b948
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
new file mode 100644
index 000000000000..0374115cf6c2
--- /dev/null
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Gentoo support for Emacs running as a server in the background"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DEPEND=">=virtual/emacs-23"
+RDEPEND="${DEPEND}"
+
+SITEFILE="10${PN}-gentoo.el"
+
+pkg_setup() {
+ local has_daemon has_gtk line
+ has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
+ has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
+
+ if [[ ${has_daemon} != t ]]; then
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your current Emacs version does not support running as a daemon which
+ is required for ${CATEGORY}/${PN}.
+ Use "eselect emacs" to select an Emacs version >= 23.
+ EOF
+ elif [[ ${has_gtk} == t ]]; then
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your current Emacs is compiled with GTK+. There is a long-standing bug
+ in GTK+ that prevents Emacs from recovering from X disconnects:
+
+ If you run Emacs as a daemon, then it is strongly recommended that you
+ compile it with the Lucid or the Motif toolkit instead, i.e. with
+ USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
+ EOF
+ fi
+}
+
+src_compile() { :; }
+
+src_install() {
+ newinitd emacs.rc emacs
+ newconfd emacs.conf emacs
+ exeinto /usr/libexec/emacs
+ doexe emacs-wrapper.sh emacs-stop.sh
+ elisp-site-file-install "${SITEFILE}"
+ dodoc README ChangeLog
+}
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 9ddebb610ac3..945e262997d2 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,4 +1,3 @@
DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
DIST ess-15.09-2.tgz 3248241 SHA256 706c41237e1edf33a369902f503bb25254b2bbb750b9ed1adee244e875264afb SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b WHIRLPOOL 3ad3cba11dc33f7b9c909017e6db2850fa078c736e4637e5bc15a8bbb23e2f66996186c31092caf3bb522d5e5d15543c9f4df6fe4f013ac8744695faf19bbd4f
-DIST ess-15.09.tgz 3239642 SHA256 3438683af3232280d9281938ad101a1e0bb92aa7c97f330c07d8ef7d10489465 SHA512 95350c1d558ba2bc8582978441569f40ba4c59609c21cd473908cc152c8cc6e4e38b9236cc47dd73469dcf14c8a359652e54de5632a21700835350764f401d4f WHIRLPOOL 426659087f7ace498cf99bcc67502c0d83c140ae8e5576d80747ba9fe22db641e2ef48dbbb0771231d880dddfc9fcf3ca8c482578e77c15c2d1b6a114509da46
diff --git a/app-emacs/ess/ess-15.09.ebuild b/app-emacs/ess/ess-15.09.ebuild
deleted file mode 100644
index 69531175fdab..000000000000
--- a/app-emacs/ess/ess-15.09.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-DEPEND="app-text/texi2html
- virtual/latex-base"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- default
-}
-
-src_install() {
- emake PREFIX="${ED}/usr" \
- INFODIR="${ED}/usr/share/info" \
- LISPDIR="${ED}${SITELISP}/ess" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- install
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
- # Most documentation is installed by the package's build system.
- rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
- dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
- newdoc doc/ChangeLog ChangeLog-doc
- newdoc lisp/ChangeLog ChangeLog-lisp
-
- DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
- documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
- readme.gentoo_create_doc
-}
diff --git a/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch b/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch
new file mode 100644
index 000000000000..b5b670060117
--- /dev/null
+++ b/app-leechcraft/lc-core/files/lc-core-0.6.70-c++11-direct-list-initialization.patch
@@ -0,0 +1,35 @@
+GCC 5.1 and upwards are more strict with direct initialization:
+* /var/tmp/portage/app-leechcraft/lc-core-0.6.70/work/leechcraft-0.6.70/src/util/network/addresses.cpp:46:3: error: direct-list-* initialization of ‘auto’ requires exactly one element [-fpermissive]
+* };
+See also:
+https://bugs.gentoo.org/show_bug.cgi?id=574030
+
+--- leechcraft-0.6.70/src/util/network/addresses.cpp
++++ leechcraft-0.6.70/src/util/network/addresses.cpp
+@@ -38,7 +38,7 @@
+ AddrList_t GetLocalAddresses (int defaultPort)
+ {
+ AddrList_t defaultAddrs;
+- const auto locals
++ const auto locals =
+ {
+ QHostAddress::parseSubnet ("10.0.0.0/8"),
+ QHostAddress::parseSubnet ("172.16.0.0/12"),
+--- leechcraft-0.6.70/src/util/xdg/xdg.cpp
++++ leechcraft-0.6.70/src/util/xdg/xdg.cpp
+@@ -44,13 +44,13 @@
+
+ QPixmap GetAppPixmap (const QString& name)
+ {
+- const auto prefixes
++ const auto prefixes =
+ {
+ "/usr/share/pixmaps/",
+ "/usr/local/share/pixmaps/"
+ };
+
+- const auto sizes { "192", "128", "96", "72", "64", "48", "36", "32" };
++ const auto sizes = { "192", "128", "96", "72", "64", "48", "36", "32" };
+ const QStringList themes
+ {
+ "/usr/local/share/icons/hicolor/",
diff --git a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild b/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
index f7ca3c9a465b..2f10caeec088 100644
--- a/app-leechcraft/lc-core/lc-core-0.6.70.ebuild
+++ b/app-leechcraft/lc-core/lc-core-0.6.70.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$
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS=" amd64 ~x86"
IUSE="debug doc +sqlite postgres +qwt"
-COMMON_DEPEND=">=dev-libs/boost-1.46
+COMMON_DEPEND=">=dev-libs/boost-1.46:=[threads]
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtdeclarative:4
@@ -36,6 +36,10 @@ RDEPEND="${COMMON_DEPEND}
REQUIRED_USE="|| ( postgres sqlite )"
+PATCHES=(
+ "${FILESDIR}/${P}-c++11-direct-list-initialization.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DWITH_PLUGINS=False
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index cab832a34d2d..cf1672ea34c9 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -6,3 +6,4 @@ DIST elasticsearch-2.2.0.tar.gz 29419005 SHA256 ed70cc81e1f55cd5f0032beea2907227
DIST elasticsearch-2.2.2.tar.gz 29425370 SHA256 c706db594f1feb5051d90697c6c412eadd60e00a9ec3b4f345a122801183af69 SHA512 144ca47dd3b9730e5ff81dd93e5db09d57a6f0d61d4445e8609c0ece833f57ca05d81fdf702d56008bc5e370604deb83d2d527132783467d5ae1eddc6cefeb84 WHIRLPOOL 4d6ced926237490a6ee8531ccf09128cc6bff5d73cff6f36159552a4a7a0dfbe01df0dfafb583d1c7ddc47ad5fa054ab6dd8c188cc7e3fe196f6917519e1afac
DIST elasticsearch-2.3.0.tar.gz 27556947 SHA256 d68482c7633f2986263bc5f11f93b8a58c54c6cf5e337b615446d0a7c6fdcd8b SHA512 26671d64e6cd3406ad1de4543d84c66f58be4906d00ad22584350c5b28359c2b878850fb7cd0e49c9913d968380e8e386d77376c4f32fc37d3a43913c21558db WHIRLPOOL d26a3128d12630fca4defb669b7e23749f9742e1bf7c9497860effdbe6f51c8e86b467d3a16c78c77b7dd93efaa25e21c9694308292567eaa8e07794c57d60db
DIST elasticsearch-2.3.1.tar.gz 27540442 SHA256 f0092e73038e0472fcdd923e5f2792e13692ea0f09ca034a54dd49b217110ebb SHA512 447d8824c4bfbec9b8431d213e3a8ae6720d1486e1389c271cc67cce5546861a817ef8c7db1c3c3669a50a61b5305739ac26f46b04d5674bbca203c3b5dbcf2f WHIRLPOOL e55501ca7fa702c33cd826d51c2d90dcfcc2843fb5b24b2d20df917cc291fe53f203360bfac6249b57c4c2914d92da92ca56b6505b6be885ece196983c176b9c
+DIST elasticsearch-2.3.2.tar.gz 27543334 SHA256 04c4d3913d496d217e038da88df939108369ae2e78eea29cb1adf1c4ab3a000a SHA512 73c4ca82eb0f4dc22907a94b9025e79183f6fcd38dbb82795800d10fc810dbee412784e62f9247390f0fb9aa19545976584bd2b62f1afe79d2cd64bb55f76dc8 WHIRLPOOL 5cc44a827de5281a9fb823a8a2e43755e0853dc5aa27f5ef7f8d1c5605d80a2dbf4c8756f01811a54307938cb3030634be6c8af2ffa465e2f35cd2a4aabeeb20
diff --git a/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
new file mode 100644
index 000000000000..a0baa8b09d90
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-2.3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+pkg_preinst() {
+ if has_version '
+
+
+
+ neil@digimed.co.uk
+ Neil Bothwick
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+
diff --git a/app-misc/mosquitto/mosquitto-1.4.8.ebuild b/app-misc/mosquitto/mosquitto-1.4.8.ebuild
new file mode 100644
index 000000000000..a9ebf1685599
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.8.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd user python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ srv? ( net-dns/c-ares )"
+
+LIBDIR=$(get_libdir)
+QA_PRESTRIPPED="/usr/sbin/mosquitto
+ /usr/bin/mosquitto_passwd
+ /usr/bin/mosquitto_sub
+ /usr/bin/mosquitto_pub
+ /usr/${LIBDIR}/libmosquittopp.so.1
+ /usr/${LIBDIR}/libmosquitto.so.1"
+
+pkg_setup() {
+ enewgroup mosquitto
+ enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-conditional-tests.patch"
+ if use persistence; then
+ sed -i -e "s:^#autosave_interval:autosave_interval:" \
+ -e "s:^#persistence false$:persistence true:" \
+ -e "s:^#persistence_file:persistence_file:" \
+ -e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+ mosquitto.conf || die
+ fi
+ python_setup
+ python_fix_shebang test
+}
+
+src_configure() {
+ makeopts=(
+ "LIB_SUFFIX=${LIBDIR:3}"
+ "WITH_BRIDGE=$(usex bridge)"
+ "WITH_PERSISTENCE=$(usex persistence)"
+ "WITH_SRV=$(usex srv)"
+ "WITH_TLS=$(usex ssl)"
+ "WITH_WRAP=$(usex tcpd)"
+ )
+ einfo "${makeopts[@]}"
+}
+
+src_compile() {
+ emake "${makeopts[@]}"
+}
+
+src_test() {
+ emake "${makeopts[@]}" test
+}
+
+src_install() {
+ emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+ keepdir /var/lib/mosquitto
+ fowners mosquitto:mosquitto /var/lib/mosquitto
+ dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+ doinitd "${FILESDIR}"/mosquitto
+ insinto /etc/mosquitto
+ doins mosquitto.conf
+ systemd_dounit "${FILESDIR}/mosquitto.service"
+
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r examples/*
+ fi
+}
+
+pkg_postinst() {
+ elog ""
+ elog "The Python module has been moved out of mosquitto."
+ elog "See http://mosquitto.org/documentation/python/"
+ elog ""
+ elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+ elog ""
+ elog " rc-update add mosquitto default"
+ elog " or"
+ elog " systemctl enable mosquitto"
+}
diff --git a/app-text/po4a/po4a-0.45-r3.ebuild b/app-text/po4a/po4a-0.45-r3.ebuild
new file mode 100644
index 000000000000..fb6c05f1022c
--- /dev/null
+++ b/app-text/po4a/po4a-0.45-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
+PLOCALES_BACKUP="en"
+
+# Needed because this package also installs to vendor_perl
+GENTOO_DEPEND_ON_PERL_SUBSLOT="yes"
+inherit perl-app perl-module l10n
+
+DESCRIPTION="Tools for helping translation of documentation"
+HOMEPAGE="http://po4a.alioth.debian.org"
+SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/SGMLSpm
+ >=sys-devel/gettext-0.13
+ app-text/openjade
+ dev-libs/libxslt
+ dev-perl/Locale-gettext
+ dev-perl/TermReadKey
+ dev-perl/Text-WrapI18N"
+DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.380.0
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ test? ( app-text/docbook-sgml-dtd
+ app-text/docbook-sgml-utils
+ virtual/tex-base )"
+
+SRC_TEST="do"
+
+src_prepare() {
+ # Check against locale files in ${S}/pod/bin for mismatches
+ # with languages listed in PLOCALES
+ local locales_path="$S/po/bin"
+ l10n_find_plocales_changes "$locales_path" "" ".po"
+
+ # Array containing locale files to remove
+ local locales_to_remove=( )
+
+ # Get rid of disabled locales
+ my_get_disabled_locales() {
+ locales_to_remove=( "${locales_to_remove[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
+ }
+
+ l10n_for_each_disabled_locale_do my_get_disabled_locales
+
+ einfo "Your LINGUAS lists the following languages: $LINGUAS"
+ einfo "Removing locale files not listed in it ..."
+
+ # perl_rm_files also updates the Manifest file
+ # and therefore silences Perl as to .po files we're about to clean
+ perl_rm_files "${locales_to_remove[@]}"
+}
diff --git a/dev-ml/batteries/batteries-2.4.0.ebuild b/dev-ml/batteries/batteries-2.4.0.ebuild
index 7ea0d79a32fa..b5a7c8f8590b 100644
--- a/dev-ml/batteries/batteries-2.4.0.ebuild
+++ b/dev-ml/batteries/batteries-2.4.0.ebuild
@@ -22,8 +22,10 @@ DEPEND="${RDEPEND}
DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" )
S="${WORKDIR}/${PN}-included-${PV}"
-PATCHES=(
- "${FILESDIR}/oc43-1.patch"
- "${FILESDIR}/oc43-2.patch"
- "${FILESDIR}/oc43-3.patch"
-)
+
+src_prepare() {
+ has_version '>=dev-lang/ocaml-4.03' && epatch \
+ "${FILESDIR}/oc43-1.patch" \
+ "${FILESDIR}/oc43-2.patch" \
+ "${FILESDIR}/oc43-3.patch"
+}
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 0e91b435a096..d0a659a76397 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -2,3 +2,4 @@ DIST camlimages-4.0.1.tar.bz2 2010729 SHA256 b6a5e79abcfba1316a516f2e0290e6f06c9
DIST camlimages-4.1.1.tar.bz2 1098450 SHA256 22c4485f69ddda6fa94fcb62c1f996756c93ceb59d6d61962d41df59fa27e346 SHA512 79dc5680ef632968d39513cac161f0e5daf4faecec12f100d56755051d257b1c0e4e45990d4215c4b95596b5d94cebc93b6d828953450b15a4e48993013637b2 WHIRLPOOL f18c3b7046c39c7ae05c91845cd4bd7f8cc52043180be6e21d9f19cfd055aba630cc7f9fc839d2caaba47946269008e952ee31e27aee5e0f184366ab2a183f7c
DIST camlimages-4.1.2.tar.bz2 1099399 SHA256 71de393656d60555ce3fb0ca7da13a6e0a74fdebad541a7790395e3b1d6cedde SHA512 8c41eef07418719643fc69d62f2d02b248731cb64efd81bc02cc61363da71ad11cf85eb9010674a10d17f9e90d169ca98e5c61d95ae835d0476cf9cfc492f453 WHIRLPOOL d6b3908b6d9c18462b69d7806113e423a5835812148e6e835329c3ab378a351c7f58423e63c942771e37bb30bdf4d61c089ab2d0212936150f0b1831b961d966
DIST camlimages-4.2.1.tar.bz2 1098703 SHA256 3d9b9d6a41f4b80e36574e8046acbe0514c1fcf2c5ffa11d375891485be1f266 SHA512 611a5f1eb383efed9b3ffd4801b28386f8317abe7bb25ff45a61a7e7ba911b6632852c8d3082b830d9e780fc70c03cb480c7a9f1440aa1259c60036813d07792 WHIRLPOOL eecf3a4ff1adfc458c2a48d5091ff4432fdd137e127a496cf288e13a071dbc0421045242a3fc43b8efe0d3041e8cc490d8e941290dd3f52e1888762eb69cd585
+DIST camlimages-4.2.2.tar.bz2 789441 SHA256 eb96aa60afb139797836c2569ba1d4e3f2d0e4dbb025c117d7325468ce6c9633 SHA512 672e192255a9335c45d208b7589a344f712baa798dfc7bc7ccee7d3bda71e603bc06c7b012761f9c6372c683560c67ffa9d2af2742552884211ad4ffb541e3dd WHIRLPOOL dfe61d34da78b1d70feba1c2cf2717430ae4c99386d39fde3cfe14163665bd35a02947fcbc05f67c03de56b2fba1a13cd60a40031e1adbf6320ac239c1485c15
diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild b/dev-ml/camlimages/camlimages-4.2.2.ebuild
new file mode 100644
index 000000000000..87c3252c69ce
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-4.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc exif gif gtk jpeg png postscript tiff truetype X xpm"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+ exif? ( media-libs/libexif )
+ gif? ( media-libs/giflib )
+ gtk? ( dev-ml/lablgtk )
+ jpeg? ( virtual/jpeg )
+ tiff? ( media-libs/tiff )
+ png? ( >=media-libs/libpng-1.4:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ truetype? ( >=media-libs/freetype-2 )
+ xpm? ( x11-libs/libXpm )
+ X? ( x11-apps/rgb )
+ sys-libs/zlib
+ "
+DEPEND="${DEPEND}
+ doc? ( dev-python/sphinx[latex] )
+ dev-util/omake
+ virtual/pkgconfig
+ dev-ml/findlib"
+
+camlimages_arg_want() {
+ echo "ARG_WANT_${2}=$(usex $1 1 0)"
+}
+
+src_compile() {
+ omake \
+ $(camlimages_arg_want exif EXIF ) \
+ $(camlimages_arg_want gif GIF ) \
+ $(camlimages_arg_want png PNG ) \
+ $(camlimages_arg_want jpeg JPEG ) \
+ $(camlimages_arg_want tiff TIFF ) \
+ $(camlimages_arg_want xpm XPM ) \
+ $(camlimages_arg_want postscript GS ) \
+ $(camlimages_arg_want gtk LABLGTK2) \
+ $(camlimages_arg_want X GRAPHICS) \
+ $(camlimages_arg_want truetype FREETYPE) \
+ PATH_GS=/bin/true \
+ --force-dotomake || die
+
+ if use doc ; then
+ sphinx-build doc/sphinx sphinxdoc || die
+ fi
+}
+
+src_install() {
+ findlib_src_preinst
+ omake --force-dotomake DESTDIR="${D}" install || die
+ dodoc README.md
+ use doc && dohtml -r sphinxdoc/*
+}
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
index 9c06c78f6eda..442bf10697a5 100644
--- a/dev-ml/csv/Manifest
+++ b/dev-ml/csv/Manifest
@@ -1 +1,2 @@
DIST csv-1.4.2.tar.gz 83091 SHA256 d6185e9ef8e600493aa32db3e56c095b7d4912168b027602dce879671734b2e8 SHA512 efba3ca4d48439dbea241b348d851c12fb0dbd784eece20766a2dc7e7f3675c9de0a98b893bd450dcadce6be9eedeeb933d2cc401cc63b38459136b4fee82e15 WHIRLPOOL 80f34d9b33c077ca69a81efbd56e8e665272d167444a5d91b22b226fe005d188c36e523c241fb466952297132a4055a1c42a71e0eac7fc469a8fcad579588e5a
+DIST csv-1.5.tar.gz 83642 SHA256 f6307634e5f5fe3d64b90fdf8841b3f50dac80ed45b40d390ee44490c62bf58f SHA512 1c8af0ce8abd8a5710115c194eee34928399964447309ee974665cf427396def42bca4f983904bfec706f7944aea419a87bf54bc6c379cb8b7372be801be4126 WHIRLPOOL fe39114b74cb12b382da64307b8253297614f537ef4309cdcec58e9ec68ff49791d6ef90b4870200f24f6726471ceb925d0a79336853c27769af07413a3c373d
diff --git a/dev-ml/csv/csv-1.5.ebuild b/dev-ml/csv/csv-1.5.ebuild
new file mode 100644
index 000000000000..b74ab2b04ed2
--- /dev/null
+++ b/dev-ml/csv/csv-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml library to read and write CSV files"
+HOMEPAGE="https://github.com/Chris00/ocaml-csv"
+SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
index c9d402c8c3d3..f41d8c496056 100644
--- a/dev-ml/ocaml-cstruct/Manifest
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -2,3 +2,4 @@ DIST ocaml-cstruct-1.7.1.tar.gz 245894 SHA256 7869d096fe7c6231bbceefe3b2205417b2
DIST ocaml-cstruct-1.8.0.tar.gz 250696 SHA256 e1635072283ae5db7889966ce92e916749bcd192012a0c46285827beba1263d7 SHA512 38ea6301b48603f8b63c73a7aa42312d25bbd16fb8524e1de2b69a54e45e9e1c1326201e19fcf2953d2719607139c903d76296a32fb7058998c079ac112adc9c WHIRLPOOL 6fdabfc1143331662757826de11c62c3947fb59155ba68e866a2f9939963deacd52d5832417997833deff9a9ff902675d266a98b41e0d2cf9f29c4d4c628601e
DIST ocaml-cstruct-1.9.0.tar.gz 254162 SHA256 2d175bf1e2cdc5ca43cb30bd3fa507beee2f18b2cbecae801ab6ffaecde16c9c SHA512 fad3788c0888599a3171d4062b9d9f4c539c0cbb1d8b6d4f6be2f3456ffe235444def4e619a94ca75336cf555b5133e6e60edc07a03dc0abdd772acf9371b666 WHIRLPOOL 99984c32625d9dbf452a7191f4103228bedbd7eee23bfb1eee7834022a023dee1582fca9704fcbe09ed37424ca7d684c482426d3b30b5f1dc66cc55b78769532
DIST ocaml-cstruct-2.0.0.tar.gz 250245 SHA256 285341c6b5bdfc456f2b63c072210771aeb7110d777bbdaec5087234a505acf5 SHA512 4fc1f09824bf943c45a2afe8908d80fb3d9857f5e9f426479520713c92c04eac588a38fbf036352a17e787165476a7a5647f34df9c89f6c93a195f80ae11c3dd WHIRLPOOL ef8c3770ed73323c292152b5b29b8b0737158b84f0f738ac0841257e07d787edf5e0c7c55c0d5630c7f44fcd878d00585e320b12d9ece22a98a906cc7e86c08c
+DIST ocaml-cstruct-2.1.0.tar.gz 251162 SHA256 fab6525753af5f726810b321a97b8a0b226bf0318a3ed594e2ed93f2f293c9a1 SHA512 129650ec17d8c96d6e68fc6a814e2b44cecc6fc69dfd5327c48d842447caf172c36112ef4fe0fa85c7391172ba72e2f2d3c119f44075cf1240a89134830ec428 WHIRLPOOL 4daf175682710cc0b102858df5b66c8cc14caf0ab35d4d8430324ed65bcaab9d951f391bdb3c39c5b6edfca4fac50300f4c394a3adbae43269a31abf04955661
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-2.1.0.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-2.1.0.ebuild
new file mode 100644
index 000000000000..7c5d31d8d73b
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +lwt +ppx"
+
+RDEPEND="
+ async? ( dev-ml/async:= )
+ lwt? ( dev-ml/lwt:= )
+ ppx? ( dev-ml/ppx_tools:= )
+ >=dev-lang/ocaml-4.01:=
+ dev-ml/ocplib-endian:=
+ dev-ml/sexplib:=
+ dev-ml/type-conv:=
+"
+DEPEND="
+ test? ( dev-ml/ounit )
+ ${RDEPEND}
+"
+
+src_configure() {
+ oasis_configure_opts="
+ $(use_enable lwt)
+ $(use_enable async)
+ $(use_enable ppx)
+ --enable-unix
+ " oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
index f2a00ccb529d..5b5ac9211b0c 100644
--- a/dev-ml/ocaml-dns/Manifest
+++ b/dev-ml/ocaml-dns/Manifest
@@ -1,3 +1,4 @@
DIST ocaml-dns-0.15.3.tar.gz 143042 SHA256 cc1361e51d1a7b6fa8d552dc06cad09288ba00e78a9ddcd5a0e49ab3d12a9619 SHA512 7176e93a263975d31a6757acf01ac5be10eb34b19a2c3a5d5e92b087a574e76db16861923162ad73833379dc5132868d0b91e1f2ed692e2bdff5667938a76db6 WHIRLPOOL 9b282ffdaf9fd834d449e33176fb9e5a231e6a7f2a1a12b0da4825a96f820b3f87a73c9e4751c19bbf80c9b8ab2f30c1730003b010bd6153b83bb9009334986d
DIST ocaml-dns-0.16.0.tar.gz 146761 SHA256 b8b56f9979b650ae3f1a9a52385027c5a80e7f5bd25e6326d0fef480a5f0a56f SHA512 8d5f8c63074dae68d31dd1a592d3fa6b69e0963aa674110e501a575b4cb75c3a9a5ad6b1efffd118d69eff6dcf71f34b102264a127c9b336b2f04de5a90ee976 WHIRLPOOL f927983e894c65c1ed007897bd0dae2f2b45fdf215a12c50e15c4a554f6c9c9f69e5ea5defd60f71478ad527995957698b63cf48b24601f82098c55e97002e05
DIST ocaml-dns-0.18.0.tar.gz 144807 SHA256 f4d0911814c98534a92a5aadc2978153e849752b4f59276adc9a3c8e53e81a5d SHA512 a614bac04ffc7eedd6a83865d9ee93416faac7a1cb500d0cca2462993a08864ec5081e9c05b432f623f388bbc87a67c2d401ad44a3e14bf24be2fb520d7706a3 WHIRLPOOL 2e26fb43888147859a15a639b9d90151bde5c2d89dfa2f226a1a2aadfb417f6cf5832f5023cfdc3ac59bfbbd035026f0f73777a0cbf6fc94f837c5f072190241
+DIST ocaml-dns-0.18.1.tar.gz 144857 SHA256 c570a9f215bbafacb83319fd1d21fd393357c97359c237b941767d81764cc5e6 SHA512 909e7de8b434769aee04c4837cbcecd2856ad11b863f061eca650621b0caab81327107b58ecf20d65270f36b192d438baa3868b906cd9243163b2c697bf68684 WHIRLPOOL 043200a93926bc67859e6ff6f03ecfc1184ad3e13595fa71891a9e8ba3932ab2d3e46f32a145b11989d185e519548693af605b617ce7914dda1711d40a2d2d88
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.18.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.18.1.ebuild
new file mode 100644
index 000000000000..c0c9038faed9
--- /dev/null
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.18.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml implementation of the DNS protocol"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +lwt"
+
+RDEPEND="
+ async? ( >=dev-ml/async-112.24.00:= )
+ lwt? ( >=dev-ml/lwt-2.4.7:=
+ dev-ml/ocaml-cstruct:=[lwt(-)] )
+ >=dev-lang/ocaml-4:=
+ dev-ml/cmdliner:=
+ dev-ml/mirage-profile:=
+ >=dev-ml/ocaml-base64-2.0.0:=
+ >=dev-ml/ocaml-cstruct-1.9.0:=
+ >=dev-ml/ocaml-ipaddr-2.6.0:=
+ dev-ml/ocaml-re:=
+ >=dev-ml/ocaml-uri-1.7.0:=
+ dev-ml/ocaml-hashcons:=[ocamlopt?]
+ !
+
+
+
+ o.freyermuth@googlemail.com
+ Oliver Freyermuth
+ Proxy-maintainer, assign bugs
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ BGO-OD/serialtalk
+
+
diff --git a/dev-util/serialtalk/serialtalk-1.2.ebuild b/dev-util/serialtalk/serialtalk-1.2.ebuild
new file mode 100644
index 000000000000..b083e3feb644
--- /dev/null
+++ b/dev-util/serialtalk/serialtalk-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
+else
+ SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple command-line tool to talk to serial devices"
+HOMEPAGE="https://github.com/BGO-OD/serialtalk"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/dev-util/serialtalk/serialtalk-9999.ebuild b/dev-util/serialtalk/serialtalk-9999.ebuild
new file mode 100644
index 000000000000..b083e3feb644
--- /dev/null
+++ b/dev-util/serialtalk/serialtalk-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
+else
+ SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple command-line tool to talk to serial devices"
+HOMEPAGE="https://github.com/BGO-OD/serialtalk"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 84c0d87b4712..71cf9154a128 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1 +1,2 @@
DIST bzflag-2.4.2.tar.bz2 15971448 SHA256 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811 SHA512 e5645e825f19896ad4dc1e3bf97c9b52ed3838210d97d5532936a9306623283330c9535288af90f86e32c88a1a7996b2c872b9c081558eea48400b86b3a1a6ff WHIRLPOOL 82a5e543a8fdcb80c516394c63901c80c77fc659090f952cb36f65a9fb14c5ca06d6547dc9d347c6abf0ee706c40437f80edf20c424775bf6e202423e025794c
+DIST bzflag-2.4.4.tar.bz2 13922761 SHA256 5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb SHA512 ee9eefe6a24250f1aa0ac808755f2e3700ea97c559019ca8beefb8d236afd1571314f07a8f19662677526ae364d38617a1a62b356e851c27669cb9acef1a8fd3 WHIRLPOOL c96853e3f1053a9b53c9d6ba27a6f638c2913e87a26d6188151a66f8f78aeeb78fac28e8cefde10d23d65fe02e49b93cd4516993e5b48a6f3f240ec67ab0fc8e
diff --git a/games-action/bzflag/bzflag-2.4.4.ebuild b/games-action/bzflag/bzflag-2.4.4.ebuild
new file mode 100644
index 000000000000..a840982cb34a
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic games
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="http://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated upnp"
+
+UIDEPEND=""
+DEPEND=">=net-misc/curl-7.15.0
+ sys-libs/ncurses:0
+ net-dns/c-ares
+ sys-libs/zlib
+ upnp? ( net-libs/miniupnpc )
+ !dedicated? (
+ virtual/opengl
+ virtual/glu
+ media-libs/libsdl[sound,joystick,video] )"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-configure.patch
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use dedicated ; then
+ ewarn
+ ewarn "You are building a server-only copy of BZFlag"
+ ewarn
+ myconf="--disable-client --without-SDL"
+ fi
+ egamesconf \
+ $(use_enable upnp UPnP) \
+ ${myconf}
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+ default
+
+ if ! use dedicated ; then
+ newicon data/bzflag-48x48.png ${PN}.png
+ make_desktop_entry ${PN} "BZFlag"
+ fi
+
+ prune_libtool_files --modules
+ prepgamesdirs
+}
diff --git a/games-action/bzflag/files/bzflag-2.4.4-configure.patch b/games-action/bzflag/files/bzflag-2.4.4-configure.patch
new file mode 100644
index 000000000000..b280621f6ec2
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.4-configure.patch
@@ -0,0 +1,37 @@
+diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
+--- bzflag-2.4.4.orig/configure.ac 2016-02-14 19:09:51.000000000 -0500
++++ bzflag-2.4.4/configure.ac 2016-05-05 16:35:35.475935345 -0400
+@@ -215,7 +215,7 @@
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+
+-AC_PATH_PROG(CCACHE, ccache)
++AC_PATH_PROG(CCACHE, ccachex)
+ if test "$CCACHE" ; then
+ CC="ccache $CC"
+ CXX="ccache $CXX"
+@@ -747,13 +747,13 @@
+ #
+ # the GCC version is known to be at least 4.3 because it has C++0x support
+ # possible future warnings: -Wconversion (1894) -Wfloat-equal (317)
+-FLAGS="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
++FLAGSx="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+ case $host_os in
+ linux*)
+ AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+ CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
+ CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS"
+- case $host_vendor in
++ case $host_vendorx in
+ pc)
+ if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
+ FLAGS=-mtune
+@@ -836,7 +836,7 @@
+ CXXFLAGS="$user_CXXFLAGS"
+ AC_DEFINE(DEBUG, 1, [Debugging enabled])
+ else
+- if test "$GCC" = yes ; then
++ if test "$GCC" = yesx ; then
+ case "`$CC --version 2>&1`" in
+ *LLVM*)
+ # Apple LLVM falsely claims to be GCC
diff --git a/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch b/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch
index b4076579f9a6..13ca8019ff9f 100644
--- a/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch
+++ b/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch
@@ -1,174 +1,174 @@
--- savagewheels-1.6.0/src/Main.cpp.old 2016-04-14 21:18:38.115071742 -0700
+++ savagewheels-1.6.0/src/Main.cpp 2016-04-14 22:01:42.375422000 -0700
@@ -43,10 +43,17 @@
- * Alpha Release: 29.06.2003
- */
-
- #include "Main.h"
-
-+const char *sys_datadir;
-+const char *usr_cfgdir;
-+const char *usr_datadir;
-+
-+char *ART_FILE;
-+char *BINDINGS_FILE;
-+
- int main( int argc, char *argv[] )
- {
- bool hardware_support = true;
- /*
- * Start the game in a window by default.
+ * Alpha Release: 29.06.2003
+ */
+
+ #include "Main.h"
+
++const char *sys_datadir;
++const char *usr_cfgdir;
++const char *usr_datadir;
++
++char *ART_FILE;
++char *BINDINGS_FILE;
++
+ int main( int argc, char *argv[] )
+ {
+ bool hardware_support = true;
+ /*
+ * Start the game in a window by default.
@@ -57,16 +64,92 @@ int main( int argc, char *argv[] )
- * Linux Note: Running the game in fullscreen would sometimes crash the gfx manager.
- * This is probably due to some video drivers. I was so far able to reproduce it on
- * ATI Mobility type of video cards.
- */
- bool fullscreen = false;
-+ String tmp;
-
- #ifdef LINUX_BUILD
-+ sys_datadir = getenv("SAVAGEWHEELS_SYS_DATADIR");
-+ if (sys_datadir == NULL)
-+ {
-+ fprintf(stderr, "SAVAGEWHEELS_SYS_DATADIR not set.\n");
-+ return 1;
-+ }
-+ sys_datadir = strdup(sys_datadir);
-+
-+ usr_cfgdir = getenv("SAVAGEWHEELS_USR_CONFDIR");
-+ if (usr_cfgdir == NULL)
-+ {
-+ fprintf(stderr, "SAVAGEWHEELS_USR_CONFDIR not set.\n");
-+ return 1;
-+ }
-+ usr_cfgdir = strdup(usr_cfgdir);
-+
-+ usr_datadir = getenv("SAVAGEWHEELS_USR_DATADIR");
-+ if (usr_datadir == NULL)
-+ {
-+ fprintf(stderr, "SAVAGEWHEELS_USR_DATADIR not set.\n");
-+ return 1;
-+ }
-+ usr_datadir = strdup(usr_datadir);
-+
-+ if (sys_datadir == NULL || usr_cfgdir == NULL || usr_datadir == NULL)
-+ {
-+ fprintf(stderr, "Insufficient memory. Execution aborted.\n");
-+ return 1;
-+ }
-+
- setenv("SDL_VIDEO_CENTERED", "1", 1);
- #else
-+ sys_datadir = usr_cfgdir = usr_datadir = "./";
- _putenv("SDL_VIDEO_CENTERED=1");
- #endif
-+ int len;
-+ len = snprintf(NULL, 0, "%s/graphics/gfxdata.kdf", sys_datadir);
-+ if (len < 0)
-+ {
-+ fprintf(stderr,
-+ "Unable to store '%s/graphics/gfxdata.kdf': %s\n",
-+ sys_datadir, strerror(errno));
-+ return 1;
-+ }
-+ if (len == INT_MAX)
-+ {
-+ fprintf(stderr, "Unable to store '%s/graphics/gfxdata.kdf': "
-+ "Path too log\n", sys_datadir);
-+ return 1;
-+ }
-+ ART_FILE = new (std::nothrow) char[len + 1];
-+ if (ART_FILE == NULL)
-+ {
-+ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
-+ return 1;
-+ }
-+ sprintf(ART_FILE, "%s/graphics/gfxdata.kdf", sys_datadir);
-+
-+ len = snprintf(NULL, 0, "%s/bindings.xml", usr_cfgdir);
-+ if (len < 0)
-+ {
-+ fprintf(stderr,
-+ "Unable to store '%s/bindings.xml': %s\n", usr_cfgdir,
-+ strerror(errno));
-+ return 1;
-+ }
-+ if (len == INT_MAX)
-+ {
-+ fprintf(stderr, "Unable to store '%s/bindings.xml': "
-+ "Path too log\n", usr_cfgdir);
-+ return 1;
-+ }
-+ BINDINGS_FILE = new (std::nothrow) char[len + 1];
-+ if (BINDINGS_FILE == NULL)
-+ {
-+ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
-+ return 1;
-+ }
-+ sprintf(BINDINGS_FILE, "%s/bindings.xml", usr_cfgdir);
-
- if (argc > 1) {
- for (int i = 1; i < argc; i++) {
- if (!strncmp(argv[i], "-wnd", 4)) {
- fullscreen = false;
+ * Linux Note: Running the game in fullscreen would sometimes crash the gfx manager.
+ * This is probably due to some video drivers. I was so far able to reproduce it on
+ * ATI Mobility type of video cards.
+ */
+ bool fullscreen = false;
++ String tmp;
+
+ #ifdef LINUX_BUILD
++ sys_datadir = getenv("SAVAGEWHEELS_SYS_DATADIR");
++ if (sys_datadir == NULL)
++ {
++ fprintf(stderr, "SAVAGEWHEELS_SYS_DATADIR not set.\n");
++ return 1;
++ }
++ sys_datadir = strdup(sys_datadir);
++
++ usr_cfgdir = getenv("SAVAGEWHEELS_USR_CONFDIR");
++ if (usr_cfgdir == NULL)
++ {
++ fprintf(stderr, "SAVAGEWHEELS_USR_CONFDIR not set.\n");
++ return 1;
++ }
++ usr_cfgdir = strdup(usr_cfgdir);
++
++ usr_datadir = getenv("SAVAGEWHEELS_USR_DATADIR");
++ if (usr_datadir == NULL)
++ {
++ fprintf(stderr, "SAVAGEWHEELS_USR_DATADIR not set.\n");
++ return 1;
++ }
++ usr_datadir = strdup(usr_datadir);
++
++ if (sys_datadir == NULL || usr_cfgdir == NULL || usr_datadir == NULL)
++ {
++ fprintf(stderr, "Insufficient memory. Execution aborted.\n");
++ return 1;
++ }
++
+ setenv("SDL_VIDEO_CENTERED", "1", 1);
+ #else
++ sys_datadir = usr_cfgdir = usr_datadir = "./";
+ _putenv("SDL_VIDEO_CENTERED=1");
+ #endif
++ int len;
++ len = snprintf(NULL, 0, "%s/graphics/gfxdata.kdf", sys_datadir);
++ if (len < 0)
++ {
++ fprintf(stderr,
++ "Unable to store '%s/graphics/gfxdata.kdf': %s\n",
++ sys_datadir, strerror(errno));
++ return 1;
++ }
++ if (len == INT_MAX)
++ {
++ fprintf(stderr, "Unable to store '%s/graphics/gfxdata.kdf': "
++ "Path too log\n", sys_datadir);
++ return 1;
++ }
++ ART_FILE = new (std::nothrow) char[len + 1];
++ if (ART_FILE == NULL)
++ {
++ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
++ return 1;
++ }
++ sprintf(ART_FILE, "%s/graphics/gfxdata.kdf", sys_datadir);
++
++ len = snprintf(NULL, 0, "%s/bindings.xml", usr_cfgdir);
++ if (len < 0)
++ {
++ fprintf(stderr,
++ "Unable to store '%s/bindings.xml': %s\n", usr_cfgdir,
++ strerror(errno));
++ return 1;
++ }
++ if (len == INT_MAX)
++ {
++ fprintf(stderr, "Unable to store '%s/bindings.xml': "
++ "Path too log\n", usr_cfgdir);
++ return 1;
++ }
++ BINDINGS_FILE = new (std::nothrow) char[len + 1];
++ if (BINDINGS_FILE == NULL)
++ {
++ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
++ return 1;
++ }
++ sprintf(BINDINGS_FILE, "%s/bindings.xml", usr_cfgdir);
+
+ if (argc > 1) {
+ for (int i = 1; i < argc; i++) {
+ if (!strncmp(argv[i], "-wnd", 4)) {
+ fullscreen = false;
@@ -104,11 +187,12 @@
-
- /*
- * Load & Start Game
- */
-
-- OpenLog("debug.html");
-+ tmp = String(usr_datadir).append("/debug.html");
-+ OpenLog(tmp.c_str());
-
- CGame game;
- game.Execute(fullscreen, hardware_support);
- game.Close();
-
+
+ /*
+ * Load & Start Game
+ */
+
+- OpenLog("debug.html");
++ tmp = String(usr_datadir).append("/debug.html");
++ OpenLog(tmp.c_str());
+
+ CGame game;
+ game.Execute(fullscreen, hardware_support);
+ game.Close();
+
--- savagewheels-1.6.0/src/Main.h.old 2016-04-14 21:20:27.443522441 -0700
+++ savagewheels-1.6.0/src/Main.h 2016-04-14 21:56:22.449964486 -0700
@@ -35,10 +35,11 @@
- #include
- #include
- #include
- #include
- #include
-+#include
-
- #include
- #include
- #include
- #include
+ #include
+ #include
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+ #include
+ #include
@@ -84,12 +85,10 @@
-
- // --- version
- #include "Config.h"
-
- // --- global game defines
--#define ART_FILE "graphics/gfxdata.kdf"
--#define BINDINGS_FILE "bindings.xml"
- #define LOAD_OK (-1)
- #define LOAD_FAILED (0)
- #define HRESULT(x) ( (x) == NULL : LOAD_OK ? LOAD_FAILED )
- #define NLPTR_SURF 0 //((SDL_Surface *)NULL)
-
+
+ // --- version
+ #include "Config.h"
+
+ // --- global game defines
+-#define ART_FILE "graphics/gfxdata.kdf"
+-#define BINDINGS_FILE "bindings.xml"
+ #define LOAD_OK (-1)
+ #define LOAD_FAILED (0)
+ #define HRESULT(x) ( (x) == NULL : LOAD_OK ? LOAD_FAILED )
+ #define NLPTR_SURF 0 //((SDL_Surface *)NULL)
+
@@ -100,10 +99,16 @@
- #endif
-
- typedef std::string String;
- typedef std::ostringstream OutputSStream;
-
-+extern const char *sys_datadir;
-+extern const char *usr_cfgdir;
-+extern const char *usr_datadir;
-+
-+extern char *ART_FILE;
-+extern char *BINDINGS_FILE;
- //#include "pstdint.h" // portable types
- #include "Utils.h"
- #include "CKdf.h"
- #include "CSdl.h"
- #include "CSwv_module.h"
+ #endif
+
+ typedef std::string String;
+ typedef std::ostringstream OutputSStream;
+
++extern const char *sys_datadir;
++extern const char *usr_cfgdir;
++extern const char *usr_datadir;
++
++extern char *ART_FILE;
++extern char *BINDINGS_FILE;
+ //#include "pstdint.h" // portable types
+ #include "Utils.h"
+ #include "CKdf.h"
+ #include "CSdl.h"
+ #include "CSwv_module.h"
--- savagewheels-1.6.0/src/Utils.cpp.old 2016-04-15 19:28:21.757879157 -0700
+++ savagewheels-1.6.0/src/Utils.cpp 2016-04-15 19:28:28.478786779 -0700
@@ -261,11 +261,11 @@ inline String GetFormattedTime()
@@ -187,173 +187,173 @@
--- savagewheels-1.6.0/src/CGame.cpp.old 2016-04-15 20:43:37.479330001 -0700
+++ savagewheels-1.6.0/src/CGame.cpp 2016-04-15 21:04:48.044721904 -0700
@@ -116,10 +116,11 @@ void CGame::Close()
- ///////////////////////////////////////////////////////////////////////
- bool CGame::LoadGame()
- {
- char buf[255];
- int i = 0;
-+ String tmp (sys_datadir);
-
- AppendToLog( LOG_DASH );
- AppendToLog("Loading Game...");
-
- // global screen rect
+ ///////////////////////////////////////////////////////////////////////
+ bool CGame::LoadGame()
+ {
+ char buf[255];
+ int i = 0;
++ String tmp (sys_datadir);
+
+ AppendToLog( LOG_DASH );
+ AppendToLog("Loading Game...");
+
+ // global screen rect
@@ -161,11 +162,14 @@ bool CGame::LoadGame()
- srand( (unsigned)SDL_GetTicks() );
-
- UpdateSplash(); // UPDATESPLASH...
-
- // search for vehicles
-- if ( Swv.SearchAndLoad( "autos" ) != SWV_SUCCESS ) return false;
-+ tmp.resize(strlen(sys_datadir));
-+ tmp.append("/autos");
-+ if ( Swv.SearchAndLoad( tmp.c_str() ) != SWV_SUCCESS )
-+ return false;
-
- // check for vehicle number
- if ( Swv.GetVehicles() < 4 )
- {
- AppendToLog( "Not enough vehicles in the /auto dir!" );
+ srand( (unsigned)SDL_GetTicks() );
+
+ UpdateSplash(); // UPDATESPLASH...
+
+ // search for vehicles
+- if ( Swv.SearchAndLoad( "autos" ) != SWV_SUCCESS ) return false;
++ tmp.resize(strlen(sys_datadir));
++ tmp.append("/autos");
++ if ( Swv.SearchAndLoad( tmp.c_str() ) != SWV_SUCCESS )
++ return false;
+
+ // check for vehicle number
+ if ( Swv.GetVehicles() < 4 )
+ {
+ AppendToLog( "Not enough vehicles in the /auto dir!" );
--- savagewheels-1.6.0/src/CSdl.cpp.old 2016-04-16 16:00:56.600502348 -0700
+++ savagewheels-1.6.0/src/CSdl.cpp 2016-04-16 16:01:16.152226435 -0700
@@ -1298,13 +1298,10 @@
- return NULL;
- #else
-
- SDL_Surface *sdl_surf = NULL;
-
-- char filename_buf[255];
-- sprintf( filename_buf, "../%s", filename );
--
- if ( ( sdl_surf = SDL_LoadBMP( filename_buf )) == NULL )
- {
- LOG("...failed to load graphics from : " << filename_buf );
- return NULL;
- }
+ return NULL;
+ #else
+
+ SDL_Surface *sdl_surf = NULL;
+
+- char filename_buf[255];
+- sprintf( filename_buf, "../%s", filename );
+-
+ if ( ( sdl_surf = SDL_LoadBMP( filename_buf )) == NULL )
+ {
+ LOG("...failed to load graphics from : " << filename_buf );
+ return NULL;
+ }
--- savagewheels-1.6.0/src/CSounds.cpp.old 2016-04-16 16:06:43.887600441 -0700
+++ savagewheels-1.6.0/src/CSounds.cpp 2016-04-16 16:17:44.729332218 -0700
@@ -46,22 +46,39 @@
- // Name: Initialize()
- // Desc: Load all ingame sounds
- //////////////////////////////////////////////////////////////////////
- bool CSounds::Initialize( CSdl *pSdl )
- {
-- ASSERT( _sdl != NULL );
-+ ASSERT( pSdl != NULL );
- this->_sdl = pSdl;
-
- #if defined(WITH_FMOD) || defined(WITH_SDLMIXER)
-+ String tmp (sys_datadir);
-
--#define LOAD_SOUND( container, name, buffered ) if ( (sounds[container] = _sdl->LoadSound( name, buffered )) == -1 ) { \
-- LOG( "Failed to load " << name << " ! "); \
-- return false; }
-+#define LOAD_SOUND( container, name, buffered) \
-+ do { \
-+ tmp.append("/").append(name); \
-+ sounds[container] = \
-+ _sdl->LoadSound( tmp.c_str(), buffered ); \
-+ if ( sounds[container] == -1 ) { \
-+ LOG( "Failed to load " << name << " ! " ); \
-+ return false; \
-+ } \
-+ tmp.resize(strlen(sys_datadir)); \
-+ } while(0)
-
--#define LOAD_MUSIC( container, name ) if ( (music[container] = _sdl->LoadSound( name, false, true )) == -1 ) { \
-- LOG( "Failed to load music " << name << " ! "); \
-- return false; }
-+#define LOAD_MUSIC( container, name) \
-+ do { \
-+ tmp.append("/").append(name); \
-+ music[container] = \
-+ _sdl->LoadSound( tmp.c_str(), false, true ); \
-+ if ( music[container] == -1 ) { \
-+ LOG( "Failed to load music " << name << " ! " ); \
-+ return false; \
-+ } \
-+ tmp.resize(strlen(sys_datadir)); \
-+ } while(0)
-
- LOAD_SOUND( SND_CRASHLIGHT1, "sound/crash3.wav", true );
- LOAD_SOUND( SND_CRASHLIGHT2, "sound/crash2.wav", true );
- LOAD_SOUND( SND_CRASHLIGHT3, "sound/crash1.wav", true );
- LOAD_SOUND( SND_EXPLOSION1, "sound/exp.wav", true );
+ // Name: Initialize()
+ // Desc: Load all ingame sounds
+ //////////////////////////////////////////////////////////////////////
+ bool CSounds::Initialize( CSdl *pSdl )
+ {
+- ASSERT( _sdl != NULL );
++ ASSERT( pSdl != NULL );
+ this->_sdl = pSdl;
+
+ #if defined(WITH_FMOD) || defined(WITH_SDLMIXER)
++ String tmp (sys_datadir);
+
+-#define LOAD_SOUND( container, name, buffered ) if ( (sounds[container] = _sdl->LoadSound( name, buffered )) == -1 ) { \
+- LOG( "Failed to load " << name << " ! "); \
+- return false; }
++#define LOAD_SOUND( container, name, buffered) \
++ do { \
++ tmp.append("/").append(name); \
++ sounds[container] = \
++ _sdl->LoadSound( tmp.c_str(), buffered ); \
++ if ( sounds[container] == -1 ) { \
++ LOG( "Failed to load " << name << " ! " ); \
++ return false; \
++ } \
++ tmp.resize(strlen(sys_datadir)); \
++ } while(0)
+
+-#define LOAD_MUSIC( container, name ) if ( (music[container] = _sdl->LoadSound( name, false, true )) == -1 ) { \
+- LOG( "Failed to load music " << name << " ! "); \
+- return false; }
++#define LOAD_MUSIC( container, name) \
++ do { \
++ tmp.append("/").append(name); \
++ music[container] = \
++ _sdl->LoadSound( tmp.c_str(), false, true ); \
++ if ( music[container] == -1 ) { \
++ LOG( "Failed to load music " << name << " ! " ); \
++ return false; \
++ } \
++ tmp.resize(strlen(sys_datadir)); \
++ } while(0)
+
+ LOAD_SOUND( SND_CRASHLIGHT1, "sound/crash3.wav", true );
+ LOAD_SOUND( SND_CRASHLIGHT2, "sound/crash2.wav", true );
+ LOAD_SOUND( SND_CRASHLIGHT3, "sound/crash1.wav", true );
+ LOAD_SOUND( SND_EXPLOSION1, "sound/exp.wav", true );
--- savagewheels-1.6.0/src/CSwv_module.cpp.old 2016-04-16 20:58:04.366973388 -0700
+++ savagewheels-1.6.0/src/CSwv_module.cpp 2016-04-16 20:58:13.026851358 -0700
@@ -204,12 +204,10 @@ int CSwv_module::Load( char *filename, S
- // DBG("pos: " << swv_file->pfiles[i].pos
- // << " size (KB): " << swv_file->pfiles[i].length
- // << " name: " << swv_file->pfiles[i].filename);
- // }
-
-- // set module filename
-- sprintf( swv_file->filename, "%s", filename );
-
- if ( fp != NULL )
- fclose( fp );
-
- return SWV_SUCCESS;
+ // DBG("pos: " << swv_file->pfiles[i].pos
+ // << " size (KB): " << swv_file->pfiles[i].length
+ // << " name: " << swv_file->pfiles[i].filename);
+ // }
+
+- // set module filename
+- sprintf( swv_file->filename, "%s", filename );
+
+ if ( fp != NULL )
+ fclose( fp );
+
+ return SWV_SUCCESS;
--- savagewheels-1.6.0/src/CSdl.cpp.old 2016-04-16 21:02:07.680544534 -0700
+++ savagewheels-1.6.0/src/CSdl.cpp 2016-04-16 21:06:59.400432874 -0700
-@@ -1336,12 +1336,25 @@ SDL_Surface* CSdl::LoadBitmap( const cha
- SDL_Surface* CSdl::LoadBitmap( const char *filename, int32_t file_offset, Uint32 file_size, Uint32 color_key, Uint16 alpha_value )
- {
- SDL_Surface *sdl_surf = NULL; // temp surface
- FILE *fp = NULL; // file pointer
- SDL_RWops *sdl_rw = NULL; // sdl_read_write_operations
-+ String tmp;
-
-- if ( ( fp = fopen( filename, "rb")) == NULL )
-+#ifdef LINUX_BUILD
-+ if ( filename[0] != '/' )
-+ {
-+ tmp = String(sys_datadir).append("/autos/").append(filename);
-+ }
-+ else
-+ {
-+ tmp = String(filename);
-+ }
-+#else
-+ tmp = String(filename);
-+#endif
-+ if ( ( fp = fopen( tmp.c_str(), "rb")) == NULL )
- {
- LOG("...failed to open file : " << filename );
- return NULL;
- }
-
+@@ -1336,12 +1339,25 @@ SDL_Surface* CSdl::LoadBitmap( const cha
+ SDL_Surface* CSdl::LoadBitmap( const char *filename, int32_t file_offset, Uint32 file_size, Uint32 color_key, Uint16 alpha_value )
+ {
+ SDL_Surface *sdl_surf = NULL; // temp surface
+ FILE *fp = NULL; // file pointer
+ SDL_RWops *sdl_rw = NULL; // sdl_read_write_operations
++ String tmp;
+
+- if ( ( fp = fopen( filename, "rb")) == NULL )
++#ifdef LINUX_BUILD
++ if ( filename[0] != '/' )
++ {
++ tmp = String(sys_datadir).append("/autos/").append(filename);
++ }
++ else
++ {
++ tmp = String(filename);
++ }
++#else
++ tmp = String(filename);
++#endif
++ if ( ( fp = fopen( tmp.c_str(), "rb")) == NULL )
+ {
+ LOG("...failed to open file : " << filename );
+ return NULL;
+ }
+
--- savagewheels-1.6.0/src/CMainMenu.cpp.old 2016-04-16 22:13:23.442523534 -0700
+++ savagewheels-1.6.0/src/CMainMenu.cpp 2016-04-16 22:13:17.701605381 -0700
@@ -1121,12 +1121,13 @@ void CMainMenu::SaveSettings()
- if ( _game == NULL )
- return;
-
- FILE *fp = NULL;
- char header[3] = { 'S', 'W', 'P' };
-+ String strPref(String(usr_cfgdir) + "/pref");
-
-- if ( ( fp = fopen( "pref", "wb" ) ) == NULL )
-+ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
- {
- AppendToLog( "Error writing to /pref file !" );
- return;
- }
-
+ if ( _game == NULL )
+ return;
+
+ FILE *fp = NULL;
+ char header[3] = { 'S', 'W', 'P' };
++ String strPref(String(usr_cfgdir) + "/pref");
+
+- if ( ( fp = fopen( "pref", "wb" ) ) == NULL )
++ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
+ {
+ AppendToLog( "Error writing to /pref file !" );
+ return;
+ }
+
--- savagewheels-1.6.0/src/CMainMenu.cpp.old 2016-04-17 07:38:09.417653268 -0700
+++ savagewheels-1.6.0/src/CMainMenu.cpp 2016-04-17 07:38:24.277437113 -0700
-@@ -1167,12 +1168,13 @@ void CMainMenu::SaveSettings()
- void CMainMenu::LoadSettings()
- {
- FILE *fp = NULL;
- char header[3];
- bool success = true;
-+ String strPref(String(usr_cfgdir) + "/pref");
-
-- if ( ( fp = fopen( "pref", "rb" ) ) == NULL )
-+ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
- {
- AppendToLog( "Error opening /pref file !" );
- success = false;
- }
-
+@@ -1168,12 +1167,13 @@ void CMainMenu::SaveSettings()
+ void CMainMenu::LoadSettings()
+ {
+ FILE *fp = NULL;
+ char header[3];
+ bool success = true;
++ String strPref(String(usr_cfgdir) + "/pref");
+
+- if ( ( fp = fopen( "pref", "rb" ) ) == NULL )
++ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
+ {
+ AppendToLog( "Error opening /pref file !" );
+ success = false;
+ }
+
diff --git a/games-emulation/yabause/yabause-0.9.14.ebuild b/games-emulation/yabause/yabause-0.9.14.ebuild
index 93e58c9afd34..03d52f6b67e0 100644
--- a/games-emulation/yabause/yabause-0.9.14.ebuild
+++ b/games-emulation/yabause/yabause-0.9.14.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$
@@ -28,7 +28,7 @@ RDEPEND="
)
qt5? (
dev-qt/qtcore:5
- dev-qt/qtwidgets:5[opengl?]
+ dev-qt/qtwidgets:5
opengl? ( dev-qt/qtopengl:5 )
)
!qt5? (
diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
index 1826340d710d..c4489d172b40 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -20,7 +20,7 @@ IUSE="sdl X"
DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
X? ( x11-libs/libX11 )
- !sdl? ( !X? ( sys-libs/ncurses ) )"
+ !sdl? ( !X? ( sys-libs/ncurses:0 ) )"
RDEPEND=${DEPEND}
S=${WORKDIR}/${MY_P}
diff --git a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
new file mode 100644
index 000000000000..e9482222ad15
--- /dev/null
+++ b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch
@@ -0,0 +1,53 @@
+commit ed566185fe698c71714009602c4dfbe4a91e0313
+Author: Andreas Sturmlechner
+Date: Thu May 5 00:32:34 2016 +0200
+
+ Fix dependencies (drop unused, add missing)
+
+ REVIEW: 127832
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2df6ca6..884a4b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,23 +6,18 @@ set (QT_MIN_VERSION "5.3.0")
+ find_package(ECM 1.7.0 REQUIRED CONFIG)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
+-find_package(KF5 REQUIRED COMPONENTS
+- CoreAddons
+- Config
+- ItemModels
+- WidgetsAddons
+- WindowSystem
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml)
++find_package(KF5 REQUIRED COMPONENTS
++ Completion
+ Config
++ ConfigWidgets
++ CoreAddons
+ DBusAddons
+ I18n
+- ConfigWidgets
+- TextWidgets
++ KDELibs4Support #TODO eventually remove kdelibs4support
++ WidgetsAddons
+ XmlGui
+- KIO
+- NotifyConfig
+- NewStuff
+- KDELibs4Support) #TODO eventually remove kdelibs4support
++)
+
+ find_package(KF5KDEGames 4.9.0 REQUIRED)
+ find_package(Phonon4Qt5 CONFIG REQUIRED)
+@@ -58,7 +53,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-ktuberling.png")
+ ecm_add_app_icon(ktuberling_SRCS ICONS ${ICONS_SRCS})
+ add_executable(ktuberling ${ktuberling_SRCS})
+
+-target_link_libraries(ktuberling KF5::KIOCore KF5KDEGames Phonon::phonon4qt5 Qt5::Svg Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
++target_link_libraries(ktuberling KF5KDEGames Phonon::phonon4qt5 Qt5::Svg KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support)
+
+ install(TARGETS ktuberling ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+
diff --git a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild b/kde-apps/ktuberling/ktuberling-15.12.3.ebuild
index 9fd065c03701..ceea7be52d7d 100644
--- a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-15.12.3.ebuild
@@ -4,8 +4,7 @@
EAPI=6
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
KDE_SELINUX_MODULE="games"
inherit kde5
@@ -35,5 +34,6 @@ DEPEND="
$(add_qt_dep qtxml)
media-libs/phonon[qt5]
"
-
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
diff --git a/mail-filter/opendkim/files/opendkim-r1.service b/mail-filter/opendkim/files/opendkim-r1.service
new file mode 100644
index 000000000000..f2e937a6bf16
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-r1.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=DomainKeys Identified Mail (DKIM) Milter
+Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html
+After=network.target nss-lookup.target syslog.target
+
+[Service]
+ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf
+ExecReload=/bin/kill -USR1 $MAINPID
+RuntimeDirectory=opendkim
+RuntimeDirectoryMode=0750
+User=milter
+Group=milter
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..73ec108d26cc
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools db-use eutils systemd user
+
+# for betas
+#MY_P=${P/_b/.B}
+#S=${WORKDIR}/${PN}-2.8.0
+#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
+
+DESCRIPTION="A milter-based application to provide DKIM signing and verification"
+HOMEPAGE="http://opendkim.org"
+SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+ dev-libs/libbsd
+ ssl? ( >=dev-libs/openssl-0.9.8:* )
+ berkdb? ( >=sys-libs/db-3.2:* )
+ opendbx? ( >=dev-db/opendbx-1.4.0 )
+ lua? ( dev-lang/lua:* )
+ ldap? ( net-nds/openldap )
+ lmdb? ( dev-db/lmdb )
+ memcached? ( dev-libs/libmemcached )
+ sasl? ( dev-libs/cyrus-sasl )
+ unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
+ !unbound? ( net-libs/ldns )
+ gnutls? ( >=net-libs/gnutls-2.11.7 )"
+
+RDEPEND="${DEPEND}
+ sys-process/psmisc
+ selinux? ( sec-policy/selinux-dkim )
+"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+pkg_setup() {
+ enewgroup milter
+ # mail-milter/spamass-milter creates milter user with this home directory
+ # For consistency reasons, milter user must be created here with this home directory
+ # even though this package doesn't need a home directory for this user (#280571)
+ enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+ sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
+ -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
+ -e 's:/etc/mail:/etc/opendkim:g' \
+ -e 's:mailnull:milter:g' \
+ -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
+ opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+ stats/opendkim-reportstats{,.in} || die
+
+ sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+ || die
+
+ sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
+ sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ if use berkdb ; then
+ myconf=$(db_includedir)
+ myconf="--with-db-incdir=${myconf#-I}"
+ myconf+=" --enable-popauth"
+ myconf+=" --enable-query_cache"
+ myconf+=" --enable-stats"
+ fi
+ if use unbound; then
+ myconf+=" --with-unbound"
+ else
+ myconf+=" --with-ldns"
+ fi
+ if use ldap; then
+ myconf+=" $(use_with sasl)"
+ fi
+ econf \
+ $(use_with berkdb db) \
+ $(use_with opendbx odbx) \
+ $(use_with lua) \
+ $(use_enable lua rbl) \
+ $(use_with ldap openldap) \
+ $(use_with lmdb) \
+ $(use_enable poll) \
+ $(use_enable static-libs static) \
+ $(use_with gnutls) \
+ $(use_with memcached libmemcached) \
+ ${myconf} \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --enable-filter \
+ --enable-atps \
+ --enable-identity_header \
+ --enable-rate_limit \
+ --enable-resign \
+ --enable-replace_rules \
+ --enable-default_sender \
+ --enable-sender_macro \
+ --enable-vbr \
+ --disable-live-testing
+ #--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
+ #--disable-rpath
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dosbin stats/opendkim-reportstats
+
+ newinitd "${FILESDIR}/opendkim.init.r3" opendkim
+ systemd_dounit "${FILESDIR}/opendkim-r1.service"
+
+ dodir /etc/opendkim /var/lib/opendkim
+ fowners milter:milter /var/lib/opendkim
+
+ # default configuration
+ if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+ grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+ > "${D}"/etc/opendkim/opendkim.conf
+ if use unbound; then
+ echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
+ fi
+ echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
+ if use berkdb; then
+ echo Statistics /var/lib/opendkim/stats.dat >> \
+ "${D}"/etc/opendkim/opendkim.conf
+ fi
+ fi
+
+ use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSION} ]]; then
+ elog "If you want to sign your mail messages and need some help"
+ elog "please run:"
+ elog " emerge --config ${CATEGORY}/${PN}"
+ elog "It will help you create your key and give you hints on how"
+ elog "to configure your DNS and MTA."
+
+ ewarn "Make sure your MTA has r/w access to the socket file."
+ ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
+ ewarn "to milter group or you can simply set UMask to 000."
+ fi
+}
+
+pkg_config() {
+ local selector keysize pubkey
+
+ read -p "Enter the selector name (default ${HOSTNAME}): " selector
+ [[ -n "${selector}" ]] || selector=${HOSTNAME}
+ if [[ -z "${selector}" ]]; then
+ eerror "Oddly enough, you don't have a HOSTNAME."
+ return 1
+ fi
+ if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+ ewarn "The private key for this selector already exists."
+ else
+ keysize=1024
+ # generate the private and public keys
+ opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+ -s ${selector} -d '(your domain)' && \
+ chown milter:milter \
+ "${ROOT}"etc/opendkim/"${selector}".private || \
+ { eerror "Failed to create private and public keys." ; return 1; }
+ chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+ fi
+
+ # opendkim selector configuration
+ echo
+ einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+ einfo " Keyfile /etc/opendkim/${selector}.private"
+ einfo " Selector ${selector}"
+
+ # MTA configuration
+ echo
+ einfo "If you are using Postfix, add following lines to your main.cf:"
+ einfo " smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+ einfo " non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+ einfo " and read http://www.postfix.org/MILTER_README.html"
+
+ # DNS configuration
+ einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+ cat "${ROOT}"etc/opendkim/${selector}.txt
+ einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+ einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 2f64355b4468..b878bc552484 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,2 +1 @@
-DIST SDL2-2.0.3.tar.gz 3871267 SHA256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540 WHIRLPOOL d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch b/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch
deleted file mode 100644
index e71f46533831..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.3-gles-wayland.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-# HG changeset patch
-# User Gabriel Jacobo
-# Date 1400020960 10800
-# Node ID 3e2b3019a879f2efd846a6c04b55c20fc2752238
-# Parent 83077b1f989a44670a69286848034d7f4999b8fe
-Fixes #2541, build failure with Wayland enabled, OpenGL ES disabled
-
-Also includes an attempt at fixing building SDL on Ubuntu 13.10, which hopefully
-won't break 14.04
-
-diff -r 83077b1f989a -r 3e2b3019a879 configure.in
---- a/configure.in Tue May 13 12:10:37 2014 -0700
-+++ b/configure.in Tue May 13 19:42:40 2014 -0300
-@@ -1174,7 +1174,9 @@
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- AC_MSG_CHECKING(for Wayland support)
- video_wayland=no
-- if test x$PKG_CONFIG != xno; then
-+ if test x$PKG_CONFIG != xno && \
-+ test x$video_opengl_egl = xyes && \
-+ test x$video_opengles_v2 = xyes; then
- if $PKG_CONFIG --exists wayland-client wayland-egl wayland-cursor egl xkbcommon ; then
- WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`
- WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
-@@ -1256,7 +1258,18 @@
- if $PKG_CONFIG --exists mirclient egl xkbcommon ; then
- MIR_CFLAGS=`$PKG_CONFIG --cflags mirclient egl xkbcommon`
- MIR_LIBS=`$PKG_CONFIG --libs mirclient egl xkbcommon`
-+ save_CFLAGS="$CFLAGS"
-+ CFLAGS="$save_CFLAGS $MIR_CFLAGS"
-+
-+ dnl This will disable Mir on Ubuntu < 14.04
-+ AC_TRY_COMPILE([
-+ #include
-+ ],[
-+ MirMotionToolType tool = mir_motion_tool_type_mouse;
-+ ],[
- video_mir=yes
-+ ])
-+ CFLAGS="$save_CFLAGS"
- fi
- fi
- AC_MSG_RESULT($video_mir)
-@@ -2691,12 +2704,12 @@
- CheckNAS
- CheckSNDIO
- CheckX11
-- CheckWayland
-- CheckMir
- CheckDirectFB
- CheckFusionSound
- CheckOpenGLX11
- CheckOpenGLESX11
-+ CheckMir
-+ CheckWayland
- CheckLibUDev
- CheckDBus
- CheckInputEvents
-
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch
deleted file mode 100644
index e4823e1b0531..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.3-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- SDL2-2.0.2.orig/Makefile.in
-+++ SDL2-2.0.2/Makefile.in
-@@ -33,10 +33,10 @@
- OBJECTS = @OBJECTS@
- VERSION_OBJECTS = @VERSION_OBJECTS@
-
--SDLMAIN_TARGET = libSDL2main.a
-+SDLMAIN_TARGET = libSDL2main.la
- SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
-
--SDLTEST_TARGET = libSDL2_test.a
-+SDLTEST_TARGET = libSDL2_test.la
- SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
-
- SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS
-@@ -123,15 +123,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
-
- $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
-- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
-- $(AR) cru $@ $(SDLMAIN_OBJECTS)
-- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
-
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
-- $(AR) cru $@ $(SDLTEST_OBJECTS)
-- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
-
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
-@@ -152,10 +150,8 @@
- install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
- $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
-- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
-- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
-- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
-- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
- install-data:
- $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
- $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
---- SDL2-2.0.2.orig/configure.in
-+++ SDL2-2.0.2/configure.in
-@@ -2858,7 +2858,7 @@
- if test -f /lib/w32api/libuuid.a; then
- LIBUUID=/lib/w32api/libuuid.a
- else
-- LIBUUID=-luuid
-+ LIBUUID=-Wl,-luuid
- fi
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -XCClinker -static-libgcc"
- # The Windows platform requires special setup
-@@ -3132,23 +3132,23 @@
-
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
--\\$(objects)/\\2.o: \\1/\\2.rc\\\\
-- \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
-
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
--SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
-
- SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
- SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
--SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
-
- # Set runtime shared library paths as needed
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
deleted file mode 100644
index fd10c264be1c..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: convert FusionSound #484250
-
-EAPI=5
-inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
-
-MY_P=SDL2-${PV}
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc64 x86"
-
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
-REQUIRED_USE="
- alsa? ( sound )
- fusionsound? ( sound )
- gles? ( video )
- nas? ( sound )
- opengl? ( video )
- pulseaudio? ( sound )
- xinerama? ( X )
- xscreensaver? ( X )"
-
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
- gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
- nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},wayland]
- >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
- )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
- )"
-DEPEND="${RDEPEND}
- X? (
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
- epatch "${FILESDIR}"/${P}-static-libs.patch \
- "${FILESDIR}"/${P}-gles-wayland.patch
- sed -i \
- -e 's/configure.in/configure.ac/' \
- Makefile.in || die
- mv configure.{in,ac} || die
- AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
- use custom-cflags || strip-flags
-
- # sorted by `./configure --help`
- ECONF_SOURCE="${S}" econf \
- $(use_enable static-libs static) \
- $(use_enable sound audio) \
- $(use_enable video) \
- --enable-render \
- --enable-events \
- $(use_enable joystick) \
- $(use_enable haptic) \
- --enable-power \
- $(use_enable threads) \
- --enable-timers \
- --enable-file \
- --disable-loadso \
- --enable-cpuinfo \
- --enable-atomic \
- --enable-assembly \
- $(use_enable cpu_flags_x86_sse ssemath) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_3dnow 3dnow) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable altivec) \
- $(use_enable oss) \
- $(use_enable alsa) \
- --disable-alsa-shared \
- --disable-esd \
- $(use_enable pulseaudio) \
- --disable-pulseaudio-shared \
- --disable-arts \
- $(use_enable nas) \
- --disable-nas-shared \
- --disable-sndio \
- --disable-sndio-shared \
- $(use_enable sound diskaudio) \
- $(use_enable sound dummyaudio) \
- $(use_enable X video-x11) \
- --disable-x11-shared \
- $(use_enable wayland video-wayland) \
- --disable-wayland-shared \
- $(use_enable X video-x11-xcursor) \
- $(use_enable xinerama video-x11-xinerama) \
- $(use_enable X video-x11-xinput) \
- $(use_enable X video-x11-xrandr) \
- $(use_enable xscreensaver video-x11-scrnsaver) \
- $(use_enable X video-x11-xshape) \
- $(use_enable X video-x11-vm) \
- --disable-video-cocoa \
- --disable-video-directfb \
- $(multilib_native_use_enable fusionsound) \
- --disable-fusionsound-shared \
- $(use_enable video video-dummy) \
- $(use_enable opengl video-opengl) \
- $(use_enable gles video-opengles) \
- $(use_enable udev libudev) \
- $(use_enable dbus) \
- $(use_enable tslib input-tslib) \
- --disable-directx \
- --disable-rpath \
- --disable-render-d3d \
- $(use_with X x)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- use static-libs || prune_libtool_files
- dodoc {BUGS,CREDITS,README,README-SDL,README-hg,TODO,WhatsNew}.txt
-}
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
index 6188c98edb83..d6d96b047296 100644
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
+++ b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
@@ -1,50 +1,64 @@
---- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c.opencv3 2013-02-24 14:43:22.000000000 +0100
-+++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c 2015-07-08 12:44:30.987056878 +0200
-@@ -211,8 +211,8 @@ CvSeq* detect_and_draw( IplImage* img, C
+diff -ur a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c
+--- a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c 2013-02-24 15:43:22.000000000 +0200
++++ b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c 2015-12-19 12:27:05.984180725 +0200
+@@ -211,8 +211,13 @@
double scale = 1.3;
IplImage* gray = cvCreateImage( cvSize(img->width,img->height), 8, 1 );
-- IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
-- cvRound (img->height/scale)),
++#if (CV_VERSION_EPOCH != 2)
+ IplImage* small_img = cvCreateImage( cvSize( cvRound ((double)img->width/scale),
+ cvRound ((double)img->height/scale)),
++#else
+ IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
+ cvRound (img->height/scale)),
++#endif
8, 1 );
int i;
---- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp.opencv3 2013-02-24 14:43:22.000000000 +0100
-+++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp 2015-07-08 12:48:32.754615885 +0200
-@@ -259,11 +259,11 @@ private:
+diff -ur a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp
+--- a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp 2013-02-24 15:43:22.000000000 +0200
++++ b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp 2015-12-19 12:24:00.023349871 +0200
+@@ -259,11 +259,19 @@
{
double scale = this->scale == 0? 1.0 : this->scale;
CvScalar colors[5] = {
-- {{cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)}},
-- {{cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)}},
-- {{cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)}},
-- {{cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)}},
-- {{cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)}},
++#if (CV_VERSION_EPOCH != 2)
+ CvScalar(cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)),
+ CvScalar(cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)),
+ CvScalar(cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)),
+ CvScalar(cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)),
+ CvScalar(cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)),
++#else
+ {{cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)}},
+ {{cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)}},
+ {{cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)}},
+ {{cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)}},
+ {{cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)}},
++#endif
};
for (int i = 0; i < (objects ? objects->total : 0); i++)
-@@ -287,14 +287,14 @@ private:
+@@ -287,14 +295,23 @@
}
case 1:
{
-- CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++#if (CV_VERSION_EPOCH != 2)
+ CvBox2D box = CvBox2D(CvPoint2D32f(center.x, center.y), CvSize2D32f(r->width / scale, (r->height / scale) * 1.2), 90);
++#else
+ CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++#endif
cvEllipseBox(image, box, colors[i % 5], thickness, linetype);
break;
}
case 2:
{
-- CvPoint pt1 = {r->x / scale, r->y / scale};
-- CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
++#if (CV_VERSION_EPOCH != 2)
+ CvPoint pt1 = CvPoint(r->x / scale, r->y / scale);
+ CvPoint pt2 = CvPoint((r->x + r->width) / scale, (r->y + r->height) / scale);
++#else
+ CvPoint pt1 = {r->x / scale, r->y / scale};
+ CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
++#endif
cvRectangle(image, pt1, pt2, colors[i % 5], thickness, linetype);
break;
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bc95ccb1e218..3bca1af92244 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2016 10:38:48 +0000
+Fri, 06 May 2016 19:38:50 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index bc95ccb1e218..3bca1af92244 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2016 10:38:48 +0000
+Fri, 06 May 2016 19:38:50 +0000
diff --git a/metadata/md5-cache/app-editors/kakoune-2016.05.05 b/metadata/md5-cache/app-editors/kakoune-2016.05.05
new file mode 100644
index 000000000000..36211432a48c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kakoune-2016.05.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=app-text/asciidoc virtual/pkgconfig sys-libs/ncurses:*[unicode] dev-libs/boost
+DESCRIPTION=Selection-oriented code editor inspired by vim
+EAPI=6
+HOMEPAGE=https://github.com/mawww/kakoune
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:*[unicode] dev-libs/boost
+SLOT=0
+SRC_URI=https://github.com/mawww/kakoune/tarball/9298efd19bd024f96df3eab0cef92d03581969ba -> kakoune-2016.05.05.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb vcs-snapshot b45be87e7012be0af8424e8a5644da1d
+_md5_=e6e9013250f9ad670f216b65af6e7fbd
diff --git a/metadata/md5-cache/app-editors/kakoune-9999 b/metadata/md5-cache/app-editors/kakoune-9999
new file mode 100644
index 000000000000..a5403ca91c0c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/kakoune-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=app-text/asciidoc virtual/pkgconfig sys-libs/ncurses:*[unicode] dev-libs/boost >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Selection-oriented code editor inspired by vim
+EAPI=6
+HOMEPAGE=https://github.com/mawww/kakoune
+IUSE=debug
+LICENSE=Unlicense
+RDEPEND=sys-libs/ncurses:*[unicode] dev-libs/boost
+SLOT=0
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e git-r3 ef66dfc3db09f327af21cf32f140fb2b multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=f0a6baab2396124b71eb4d035cfc2264
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
new file mode 100644
index 000000000000..b2f5e95553ca
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23 >=virtual/emacs-23
+DESCRIPTION=Gentoo support for Emacs running as a server in the background
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23 >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
+_eclasses_=elisp 7e36316fe822639d5a29fa10d5529eb9 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=864652ca52a8af241546297de5d3f4db
diff --git a/metadata/md5-cache/app-emacs/ess-15.09 b/metadata/md5-cache/app-emacs/ess-15.09
deleted file mode 100644
index aa15c67b693b..000000000000
--- a/metadata/md5-cache/app-emacs/ess-15.09
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
-DESCRIPTION=Emacs Speaks Statistics
-EAPI=5
-HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+ GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.09.tgz
-_eclasses_=elisp 7e36316fe822639d5a29fa10d5529eb9 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 792f83d5ec9536cb5ccef375469d8bde multilib 23ae8c186171e6476af098d2a50d0ee0 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=46e7da8d304cbfa5fc59b12f77bfbe12
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
index 6bba85eef090..e728db2e3d18 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-core-0.6.70
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtdbus:4 qwt? ( x11-libs/qwt:6 ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 app-arch/xz-utils
+DEPEND=>=dev-libs/boost-1.46:=[threads] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtdbus:4 qwt? ( x11-libs/qwt:6 ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 app-arch/xz-utils
DESCRIPTION=Core of LeechCraft, the modular network client
EAPI=5
HOMEPAGE=http://leechcraft.org/
IUSE=debug doc +sqlite postgres +qwt
KEYWORDS=amd64 ~x86
LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtdbus:4 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsvg:4 || ( kde-frameworks/oxygen-icons x11-themes/kfaenza )
+RDEPEND=>=dev-libs/boost-1.46:=[threads] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtdbus:4 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsvg:4 || ( kde-frameworks/oxygen-icons x11-themes/kfaenza )
REQUIRED_USE=|| ( postgres sqlite )
SLOT=0
SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
_eclasses_=cmake-utils 422bbd1bee2557490177a34dbe0a662b confutils 18995f74ac4ffafb7ad853dfe133f209 eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e leechcraft 31c814e6a5231038f3abd13d747fefaf multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b4e13cbc3c171cd200136a7487cdc546
+_md5_=8982eb44100b25f22ac30a6563de4d20
diff --git a/metadata/md5-cache/app-misc/elasticsearch-2.3.2 b/metadata/md5-cache/app-misc/elasticsearch-2.3.2
new file mode 100644
index 000000000000..629aa38e04e8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-2.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=5
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.3.2/elasticsearch-2.3.2.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib 23ae8c186171e6476af098d2a50d0ee0 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=519cedae9e5e27a0db2abf5b9042c0cf
diff --git a/metadata/md5-cache/app-misc/mosquitto-1.4.8 b/metadata/md5-cache/app-misc/mosquitto-1.4.8
new file mode 100644
index 000000000000..9491437fb1e3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mosquitto-1.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) srv? ( net-dns/c-ares ) virtual/pkgconfig
+DESCRIPTION=An Open Source MQTT v3 Broker
+EAPI=5
+HOMEPAGE=http://mosquitto.org/
+IUSE=bridge examples +persistence +srv ssl tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://mosquitto.org/files/source/mosquitto-1.4.8.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib 23ae8c186171e6476af098d2a50d0ee0 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=c55a57a2ee853cd2faf7d5215607987b
diff --git a/metadata/md5-cache/app-text/po4a-0.45-r3 b/metadata/md5-cache/app-text/po4a-0.45-r3
new file mode 100644
index 000000000000..611f9e0ee946
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.45-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N >=dev-perl/Module-Build-0.380.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 test? ( app-text/docbook-sgml-dtd app-text/docbook-sgml-utils virtual/tex-base ) dev-lang/perl:=[-build(-)] dev-lang/perl:=[-build(-)]
+DESCRIPTION=Tools for helping translation of documentation
+EAPI=5
+HOMEPAGE=http://po4a.alioth.debian.org
+IUSE=test linguas_af linguas_ca linguas_cs linguas_da linguas_de linguas_eo linguas_es linguas_et linguas_eu linguas_fr linguas_hr linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sl linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_HK
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=[-build(-)] dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.45.orig.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde l10n 714aaf78929eade946da5eaff7d2001a multilib 23ae8c186171e6476af098d2a50d0ee0 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-app 11f61997f1d4923276dd72a750617c7d perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce toolchain-funcs d513d423d449877e49d99af3f7af7acb unpacker 45d07319df5f40ee6af58418b0f930be
+_md5_=ac4ca55eb4e0642c38ff1ec261fd7841
diff --git a/metadata/md5-cache/dev-ml/batteries-2.4.0 b/metadata/md5-cache/dev-ml/batteries-2.4.0
index 1131b705e2b0..96d6364c3b6c 100644
--- a/metadata/md5-cache/dev-ml/batteries-2.4.0
+++ b/metadata/md5-cache/dev-ml/batteries-2.4.0
@@ -10,4 +10,4 @@ RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
SLOT=0/2.4.0
SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.4.0.tar.gz -> batteries-2.4.0.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 23ae8c186171e6476af098d2a50d0ee0 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=fd5e39eef6d0e7542ff77abafea8164a
+_md5_=ba19303e346f6b90eae3544b957cffa3
diff --git a/metadata/md5-cache/dev-ml/camlimages-4.2.2 b/metadata/md5-cache/dev-ml/camlimages-4.2.2
new file mode 100644
index 000000000000..03c8d1e950b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlimages-4.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=doc? ( dev-python/sphinx[latex] ) dev-util/omake virtual/pkgconfig dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=An image manipulation library for ocaml
+EAPI=5
+HOMEPAGE=http://gallium.inria.fr/camlimages/
+IUSE=doc exif gif gtk jpeg png postscript tiff truetype X xpm
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) X? ( x11-apps/rgb ) sys-libs/zlib
+SLOT=0/4.2.2
+SRC_URI=https://bitbucket.org/camlspotter/camlimages/get/4.2.2.tar.bz2 -> camlimages-4.2.2.tar.bz2
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb vcs-snapshot b45be87e7012be0af8424e8a5644da1d
+_md5_=da5f43095920117149d486829ca0b975
diff --git a/metadata/md5-cache/dev-ml/csv-1.5 b/metadata/md5-cache/dev-ml/csv-1.5
new file mode 100644
index 000000000000..31a5f63c1c9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/csv-1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/1.5
+SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz
+_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 23ae8c186171e6476af098d2a50d0ee0 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=e6b147b13e40b372a880823867a121e1
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-2.1.0 b/metadata/md5-cache/dev-ml/ocaml-cstruct-2.1.0
new file mode 100644
index 000000000000..4427a61c93a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-ml/ounit ) async? ( dev-ml/async:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/2.1.0
+SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v2.1.0.tar.gz -> ocaml-cstruct-2.1.0.tar.gz
+_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 23ae8c186171e6476af098d2a50d0ee0 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=0d5d9d92105d1a26260ce1b1d3ba5960
diff --git a/metadata/md5-cache/dev-ml/ocaml-dns-0.18.1 b/metadata/md5-cache/dev-ml/ocaml-dns-0.18.1
new file mode 100644
index 000000000000..38f122f13c01
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-dns-0.18.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-ml/ounit dev-ml/ocaml-pcap ) async? ( >=dev-ml/async-112.24.00:= ) lwt? ( >=dev-ml/lwt-2.4.7:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.9.0:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/ocaml-hashcons:=[ocamlopt?] !=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild =dev-ml/async-112.24.00:= ) lwt? ( >=dev-ml/lwt-2.4.7:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.9.0:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/ocaml-hashcons:=[ocamlopt?] !=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.18.1
+SRC_URI=https://github.com/mirage/ocaml-dns/archive/v0.18.1.tar.gz -> ocaml-dns-0.18.1.tar.gz
+_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 23ae8c186171e6476af098d2a50d0ee0 oasis cc6dfb8b0c04cedd9840ff2ec5e38539 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=73b2a8a999d60be13d52a17146ff397d
diff --git a/metadata/md5-cache/dev-python/progressbar-2.3-r2 b/metadata/md5-cache/dev-python/progressbar-2.3-r2
index e3d9861868b4..8ef4aaa9e79c 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.3-r2
+++ b/metadata/md5-cache/dev-python/progressbar-2.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Text progressbar library for python
EAPI=5
HOMEPAGE=https://code.google.com/p/python-progressbar/ https://pypi.python.org/pypi/progressbar
IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-2.1 BSD )
RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://python-progressbar.googlecode.com/files/progressbar-2.3.tar.gz
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 23ae8c186171e6476af098d2a50d0ee0 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=2fa06c5f85624a3e4d7fb5f35b80eb6d
+_md5_=4dd944027ad54ac1b397a144a7ab5f50
diff --git a/metadata/md5-cache/dev-util/serialtalk-1.2 b/metadata/md5-cache/dev-util/serialtalk-1.2
new file mode 100644
index 000000000000..8bb7825f7ba8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/serialtalk-1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=simple command-line tool to talk to serial devices
+EAPI=6
+HOMEPAGE=https://github.com/BGO-OD/serialtalk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/BGO-OD/serialtalk/archive/v1.2.tar.gz -> serialtalk-1.2.tar.gz
+_eclasses_=cmake-utils 422bbd1bee2557490177a34dbe0a662b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=627f12b221a32b66de3921fde97195cf
diff --git a/metadata/md5-cache/dev-util/serialtalk-9999 b/metadata/md5-cache/dev-util/serialtalk-9999
new file mode 100644
index 000000000000..fb4e70da48f6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/serialtalk-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=simple command-line tool to talk to serial devices
+EAPI=6
+HOMEPAGE=https://github.com/BGO-OD/serialtalk
+LICENSE=GPL-3
+SLOT=0
+_eclasses_=cmake-utils 422bbd1bee2557490177a34dbe0a662b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e git-r3 ef66dfc3db09f327af21cf32f140fb2b multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=627f12b221a32b66de3921fde97195cf
diff --git a/metadata/md5-cache/games-action/bzflag-2.4.4 b/metadata/md5-cache/games-action/bzflag-2.4.4
new file mode 100644
index 000000000000..dce0c8c1e967
--- /dev/null
+++ b/metadata/md5-cache/games-action/bzflag-2.4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses:0 net-dns/c-ares sys-libs/zlib upnp? ( net-libs/miniupnpc ) !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[sound,joystick,video] ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=3D tank combat simulator game
+EAPI=5
+HOMEPAGE=http://www.bzflag.org/
+IUSE=dedicated upnp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=net-misc/curl-7.15.0 sys-libs/ncurses:0 net-dns/c-ares sys-libs/zlib upnp? ( net-libs/miniupnpc ) !dedicated? ( virtual/opengl virtual/glu media-libs/libsdl[sound,joystick,video] ) games-misc/games-envd
+SLOT=0
+SRC_URI=https://download.bzflag.org/bzflag/source/2.4.4/bzflag-2.4.4.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e games 2cf0d67d765e6358b435ccda30c13ad8 libtool 4890219c51da247200223277f993e054 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=05d8722e90202bb1eaf899d273cc4946
diff --git a/metadata/md5-cache/games-emulation/yabause-0.9.14 b/metadata/md5-cache/games-emulation/yabause-0.9.14
index 93cd51894c51..92b505317536 100644
--- a/metadata/md5-cache/games-emulation/yabause-0.9.14
+++ b/metadata/md5-cache/games-emulation/yabause-0.9.14
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5[opengl?] opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=A Sega Saturn emulator
EAPI=5
HOMEPAGE=http://yabause.org/
IUSE=openal opengl pic qt5 sdl
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5[opengl?] opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) games-misc/games-envd
+RDEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) games-misc/games-envd
SLOT=0
SRC_URI=mirror://sourceforge/yabause/yabause-0.9.14.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe cmake-utils 422bbd1bee2557490177a34dbe0a662b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e games 2cf0d67d765e6358b435ccda30c13ad8 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c7a2d74786dc91f4d74e5a725986b8f3
+_md5_=a66afc40be630eceb788f3a9f22179f4
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e
index aecdc4c8d6b2..a24abe4988b1 100644
--- a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e
+++ b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses ) )
+DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0 ) )
DESCRIPTION=Portable redcode simulator's sdl port for core war
EAPI=5
HOMEPAGE=http://corewar.co.uk/pihlaja/pmars-sdl/
IUSE=sdl X
KEYWORDS=amd64 ~ppc x86
LICENSE=BSD GPL-2
-RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses ) ) games-misc/games-envd
+RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0 ) ) games-misc/games-envd
SLOT=0
SRC_URI=http://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde games 2cf0d67d765e6358b435ccda30c13ad8 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=a5267aaf9f7d9161324c4af1f673bd84
+_md5_=88633b45949229ec89c6cae53f64dece
diff --git a/metadata/md5-cache/kde-apps/ktuberling-15.12.3 b/metadata/md5-cache/kde-apps/ktuberling-15.12.3
index 38a4ed52ad66..d4298fcf9b94 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-15.12.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-15.12.3
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kcompletion-5.18.0:5 >=kde-frameworks/kconfig-5.18.0:5
SLOT=5
SRC_URI=mirror://kde/stable/applications/15.12.3/src/ktuberling-15.12.3.tar.xz
_eclasses_=cmake-utils 422bbd1bee2557490177a34dbe0a662b eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 kde5 a5941934910ae305d227b38b180f68a2 kde5-functions 5e89f74fb9c544ed0a6760cc62b98517 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bbf63e0a2657bfc5af63fc824cc9a689
+_md5_=73230e4e3a9584e0da5f18fb49030060
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r1 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r1
new file mode 100644
index 000000000000..3f7d07bd9753
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8:* ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A milter-based application to provide DKIM signing and verification
+EAPI=5
+HOMEPAGE=http://opendkim.org
+IUSE=+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Sendmail-Open-Source BSD
+RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8:* ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc selinux? ( sec-policy/selinux-dkim )
+REQUIRED_USE=sasl? ( ldap )
+SLOT=0
+SRC_URI=mirror://sourceforge/opendkim/opendkim-2.10.3.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c db-use a4966c7f4f7df444ead1212848c13cc9 eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib 23ae8c186171e6476af098d2a50d0ee0 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b47a24a60f9dae07e22e04e53295fc13
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200 b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
deleted file mode 100644
index d459905c3c12..000000000000
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) X? ( >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simple Direct Media Layer
-EAPI=5
-HOMEPAGE=http://www.libsdl.org
-IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ppc64 x86
-LICENSE=ZLIB
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) xinerama? ( X ) xscreensaver? ( X )
-SLOT=0
-SRC_URI=http://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 23ae8c186171e6476af098d2a50d0ee0 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=ae56386aaa677e5a01b5bbf0d4846262
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.7.1 b/metadata/md5-cache/net-libs/nghttp2-1.7.1
index a94d12dd7e61..56ae4798eba5 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.7.1
+++ b/metadata/md5-cache/net-libs/nghttp2-1.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP/2 C Library
EAPI=5
HOMEPAGE=https://nghttp2.org/
IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
LICENSE=MIT
RDEPEND=cxx? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] ) libressl? ( dev-libs/libressl ) >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7:2 )
SLOT=0/1.14
SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.7.1/nghttp2-1.7.1.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 23ae8c186171e6476af098d2a50d0ee0 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=ff4342009a1a397e9d35233a3ef8f1e9
+_md5_=6c157edb6153d4ffc15dc20f218e377d
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1 b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
new file mode 100644
index 000000000000..b56fe06b1b9a
--- /dev/null
+++ b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=A toolkit for dealing with the qmail queue directory structure
+EAPI=6
+HOMEPAGE=http://pyropus.ca/software/queue-repair/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
+SLOT=0
+SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
+_eclasses_=multilib 23ae8c186171e6476af098d2a50d0ee0 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=72865df1dcd272f9a15f7aa2338d8ca9
diff --git a/metadata/md5-cache/x11-misc/pathfinder-1.6.36 b/metadata/md5-cache/x11-misc/pathfinder-1.6.36
index e1f1bfb058f4..c38ebf895650 100644
--- a/metadata/md5-cache/x11-misc/pathfinder-1.6.36
+++ b/metadata/md5-cache/x11-misc/pathfinder-1.6.36
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tif
SLOT=0
SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde fox e4d855999fa2c4077e6723d257808bbe libtool 4890219c51da247200223277f993e054 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dfe98b3ef4d321a54c7c1a5bc22f019c
+_md5_=00b4aa8ab3856a289da8b259301fa244
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.6.36 b/metadata/md5-cache/x11-misc/shutterbug-1.6.36
index 6cf4f07ea953..c135492a9bcc 100644
--- a/metadata/md5-cache/x11-misc/shutterbug-1.6.36
+++ b/metadata/md5-cache/x11-misc/shutterbug-1.6.36
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tif
SLOT=0
SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde fox e4d855999fa2c4077e6723d257808bbe libtool 4890219c51da247200223277f993e054 multilib 23ae8c186171e6476af098d2a50d0ee0 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ba062ae00e4d71e5ccd3858a084288ff
+_md5_=97315197b0713c97d8c41defa9023461
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bc95ccb1e218..3bca1af92244 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2016 10:38:48 +0000
+Fri, 06 May 2016 19:38:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b657a21a3992..ab930e976bf0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May 6 10:37:56 UTC 2016
+Fri May 6 19:37:57 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d5c59630ca23..c948e3fbcbb3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2016 11:00:01 +0000
+Fri, 06 May 2016 20:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a22a074eea43..3e64bbfb15e8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1462531201 Fri 06 May 2016 10:40:01 AM UTC
+1462563602 Fri 06 May 2016 07:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bc95ccb1e218..3bca1af92244 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 06 May 2016 10:38:48 +0000
+Fri, 06 May 2016 19:38:50 +0000
diff --git a/net-libs/nghttp2/nghttp2-1.7.1.ebuild b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
index 118731fe2bb4..f65b7c128412 100644
--- a/net-libs/nghttp2/nghttp2-1.7.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-2
else
SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..33bcb55bbde1
--- /dev/null
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
+HOMEPAGE="http://pyropus.ca/software/queue-repair/"
+SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+REQURIED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( BLURB TODO CHANGELOG )
+
+src_install () {
+ python_newscript queue_repair.py queue-repair.py
+ dosym /usr/bin/queue-repair.py /usr/bin/queue-repair
+ einstalldocs
+}
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 6b5a15aa9e86..90c86670a48b 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -190,11 +190,6 @@ dev-qt/qt-mobility messaging
# Do it! No reason to ask permission before!
>=media-sound/easytag-2.2.0 opus test
-# Johannes Huber (16 Apr 2014)
-# unkeyworded deps
-kde-apps/gwenview semantic-desktop
-kde-apps/okular dpi
-
# Yixun Lan (12 Apr 2014)
# app-emulation/qemu is not keyworded on arm arch.
app-emulation/xen-tools system-qemu
@@ -391,16 +386,11 @@ app-accessibility/speech-dispatcher flite
# Markus Meier (23 Dec 2012)
# mask kde-base/* flags due to unkeyworded dependencies
kde-apps/kalzium editor solver
-kde-apps/krdc rdesktop
-kde-apps/kopete jingle msn sms
-kde-base/kdeplasma-addons fcitx oauth qwt scim
-kde-apps/okular ebook chm
+kde-apps/kopete jingle sms
+kde-base/kdeplasma-addons fcitx oauth
kde-apps/kstars indi
kde-apps/kdeutils-meta floppy
kde-apps/kdenetwork-meta ppp
-kde-base/smokeqt qscintilla qwt
-kde-base/qtruby qscintilla qwt
-kde-base/perlqt qscintilla qwt
# Alexandre Rostovtsev (15 Dec 2012)
# media-video/coherence not keyworded
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 29181555c1e9..802eac7589db 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -78,10 +78,6 @@ app-text/atril ps
# media-tv/xawtv is masked for removal
net-im/ayttm webcam
-# Brian Evans (17 Dec 2015)
-# Drizzle is slated for removal
-sys-cluster/gearmand drizzle
-
# Patrice Clement (27 Nov 2015)
# Unsastified dependencies are upsetting repoman. Needs investigation.
app-arch/cfv bittorrent
@@ -222,8 +218,7 @@ dev-java/proguard j2me
# Lars Wendler (19 Mar 2015)
# >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
-# No stable qt5 yet.
-games-strategy/freeciv system-lua qt5
+games-strategy/freeciv system-lua
# Brian Evans (17 Mar 2015)
# Mask the cluster flag for deprecation. Use dev-db/mysql-cluster if
@@ -237,11 +232,6 @@ dev-db/percona-server cluster
# Mask bdplus support and unmask on arches where libbdplus is keyworded.
media-libs/libbluray bdplus
-# Michael Sterrett (09 Mar 2015)
-# Mask qt5 support until qt5 is stable so as to not
-# hold up making yabause stable.
-games-emulation/yabause qt5
-
# Michał Górny (01 Mar 2015)
# pidgin-opensteamworks is only available for amd64, ppc32 and x86
net-im/telepathy-connection-managers steam
@@ -260,14 +250,6 @@ app-admin/clsync cluster mhash
# Mask for all arches, can be unmasked on arm once keyworded there
games-board/stockfish armv7
-# Michael Palimaka (03 Feb 2015)
-# Requires unreleased version of dev-libs/soprano
-app-office/akonadi-server qt5
-
-# Brian Evans (02 Feb 2015)
-# Masked for dev-php/PEAR-MDB2_Driver_sqlite last rites Bug 538584
-dev-php/PHPonTrax sqlite
-
# Brian Evans (22 Jan 2015)
# PHP module split into dev-php/ming-php which is still ~arch
(14 Sep 2014)
-# Masked until dev-libs/extra-cmake-modules is in tree.
-dev-libs/libattica qt5
-
# Michał Górny (06 Sep 2014)
# Mask the removed/deprecated flags for old ebuilds that do not use
# the python-r1 eclass.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0b1186d048ff..8aa10bf241c9 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -43,10 +43,6 @@ dev-lang/python-exec -python_targets_python3_5
=app-office/libreoffice-5.0* gtk3
=app-office/libreoffice-5.1* gtk3
-# Johannes Huber (27 Aug 2015)
-# Needs KF 5 stable, bug #558460
-net-irc/quassel qt5
-
# Davide Pesavento (26 Aug 2015)
# The corresponding Qt5 modules are not stable yet, and we don't want
# to stabilize them solely because of PyQt5 when there are no other
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 27b4156cdac2..252abdbb847f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -953,6 +953,9 @@ app-misc/mc:mclib - Compile and install the libmc.so shared library
app-misc/mc:sftp - Add support for sftp (uses net-libs/libssh2 for it).
app-misc/mc:slang - Use sys-libs/slang instead of sys-libs/ncurses.
app-misc/mc:xdg - Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc
+app-misc/mosquitto:bridge - Enable bridge support in the MQTT broker.
+app-misc/mosquitto:persistence - Store messages and subscriptions to a file.
+app-misc/mosquitto:srv - Include SRV lookup support.
app-misc/muttprint:doc - Builds documentation
app-misc/note:general - Add support for ascii flatfile backend
app-misc/note:text - Add support for text backend
diff --git a/x11-misc/pathfinder/pathfinder-1.6.36.ebuild b/x11-misc/pathfinder/pathfinder-1.6.36.ebuild
index 61802fde79cd..7e5945b05518 100644
--- a/x11-misc/pathfinder/pathfinder-1.6.36.ebuild
+++ b/x11-misc/pathfinder/pathfinder-1.6.36.ebuild
@@ -21,6 +21,8 @@ DEPEND="
RDEPEND="${DEPEND}"
-FOXCONF="$(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable tiff)"
+src_configure() {
+ FOXCONF="$(use_enable jpeg) \
+ $(use_enable png) \
+ $(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/shutterbug/shutterbug-1.6.36.ebuild b/x11-misc/shutterbug/shutterbug-1.6.36.ebuild
index 89d7e038acf3..0afa601a3b8c 100644
--- a/x11-misc/shutterbug/shutterbug-1.6.36.ebuild
+++ b/x11-misc/shutterbug/shutterbug-1.6.36.ebuild
@@ -21,6 +21,8 @@ DEPEND="
RDEPEND="${DEPEND}"
-FOXCONF="$(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable tiff)"
+src_configure() {
+ FOXCONF="$(use_enable jpeg) \
+ $(use_enable png) \
+ $(use_enable tiff)" fox_src_configure
+}