diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 161aec2be1cc..424d6d2ef7f0 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1 +1 @@
-DIST zstd-1.0.0.tar.gz 593430 SHA256 197e6ef74da878cbf72844f38461bb18129d144fd5221b3598e973ecda6f5963 SHA512 ba7b1c993656fa220dd8d4c8cd6b7999b0d7b59b4290d7767063f6c4bfbb81e04b9d9890dea4d223d48082ab253159209d6187dc7b42cafc28ebc738bfa17ace WHIRLPOOL 129bd4fb25eddcb63054ce171cc1051feffcae914661ef7c96f0147edfcaf489f4affbd7940e72aa3d742bd89068cb5074e61634d3480f8c178838d4fb4bf46d
+DIST zstd-1.1.0.tar.gz 716327 SHA256 61cbbd28ff78f658f0564c2ccc206ac1ac6abe7f2c65c9afdca74584a104ea51 SHA512 9fe72081d333b58d5c8f27f13bd01ab0d729984215b75690282770aa769aab6879b88177aa2b45d8ce2869bf1b360f3a828ca00aa3646a7cc57285a4e167d71f WHIRLPOOL f7e4eab8e7dada2dd0d3ab8eeba4f2b3f165476c4cacf1a609269cb8ed9bccd12c498f50e2aaf365d6c0167c0f2db2b6b6902a786ba98f169e4f0ea0b7ceacfe
diff --git a/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch b/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
new file mode 100644
index 000000000000..75531c409974
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.1.0-fix_build_system.patch
@@ -0,0 +1,79 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 4fb8ed9..ec5436d 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -63,17 +63,17 @@ all: clean libzstd
+
+ libzstd: $(ZSTD_FILES)
+ @echo compiling static library
+- @$(CC) $(FLAGS) -c $^
+- @$(AR) rcs $@.a *.o
++ $(CC) $(FLAGS) -c $^
++ $(AR) rcs $@.a *.o
+ @echo compiling dynamic library $(LIBVER)
+- @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
++ $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ @echo creating versioned links
+- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
+- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
++ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
++ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
+
+ clean:
+- @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+- @rm -f decompress/*.o
++ rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
++ rm -f decompress/*.o
+ @echo Cleaning library completed
+
+ #------------------------------------------------------------------------
+@@ -83,22 +83,22 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly
+ libzstd.pc:
+ libzstd.pc: libzstd.pc.in
+ @echo creating pkgconfig
+- @sed -e 's|@PREFIX@|$(PREFIX)|' \
++ sed -e 's|@PREFIX@|$(PREFIX)|' \
+ -e 's|@LIBDIR@|$(LIBDIR)|' \
+ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
+ -e 's|@VERSION@|$(VERSION)|' \
+ $< >$@
+
+-install: libzstd libzstd.pc
+- @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
+- @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+- @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
+- @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
+- @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+- @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
+- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
+- @install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+- @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++install: libzstd.pc
++ install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
++ install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++ cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
++ cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
++ cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++ install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
++ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
++ install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
++ install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+ @echo zstd static and shared library installed
+
+ uninstall:
+diff --git a/programs/Makefile b/programs/Makefile
+index 6e78d0e..993d138 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -21,11 +21,7 @@ MANDIR = $(PREFIX)/share/man/man1
+
+ ZSTDDIR = ../lib
+
+-ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version "), 1)
+-ALIGN_LOOP = -falign-loops=32
+-else
+ ALIGN_LOOP =
+-endif
+
+ CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
+ CFLAGS ?= -O3
diff --git a/app-arch/zstd/zstd-1.0.0-r1.ebuild b/app-arch/zstd/zstd-1.0.0-r1.ebuild
deleted file mode 100644
index e1979156b186..000000000000
--- a/app-arch/zstd/zstd-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="http://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-src_compile() {
- emake PREFIX="/usr" zstd
- cd lib && emake PREFIX="/usr" libzstd
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/app-arch/zstd/zstd-1.1.0.ebuild b/app-arch/zstd/zstd-1.1.0.ebuild
new file mode 100644
index 000000000000..bcfe360e065a
--- /dev/null
+++ b/app-arch/zstd/zstd-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="http://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" )
+
+src_compile() {
+ emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" zstd
+ cd lib &&
+ emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" libzstd
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" install
+
+ ! use static-libs &&
+ rm -f $ "${ED}usr/$(get_libdir)/libzstd.a"
+}
diff --git a/app-crypt/bcrypt/Manifest b/app-crypt/bcrypt/Manifest
deleted file mode 100644
index 2e9b9ad082e3..000000000000
--- a/app-crypt/bcrypt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bcrypt-1.1.tar.gz 36781 SHA256 b9c1a7c0996a305465135b90123b0c63adbb5fa7c47a24b3f347deb2696d417d SHA512 4cc939e997b125b48a66c20469d9743ec227dbee080d89b1ab2515a3c41749c6e8fb6d2d4276cd23eaf6bed0614989431f1f87c23220a94ad595024f8985d68b WHIRLPOOL 9ff061cb2aba0e7cca7ba131ee2789b4136b9251a6704f3713eb897a549a6619e38b9efcced9647d17aa4eb9baea80cb477af53cbfdc9e21cc96079127412a94
diff --git a/app-crypt/bcrypt/bcrypt-1.1.ebuild b/app-crypt/bcrypt/bcrypt-1.1.ebuild
deleted file mode 100644
index 07266aa2a6a8..000000000000
--- a/app-crypt/bcrypt/bcrypt-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A file encryption utility using Paul Kocher's implementation of the blowfish algorithm"
-HOMEPAGE="http://bcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bcrypt/${P}.tar.gz"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-Makefile.patch
-}
-
-src_compile() {
- tc-export CC
- emake || die
-}
-
-src_install() {
- dobin bcrypt || die
- dodoc README || die
- doman bcrypt.1 || die
-}
diff --git a/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch b/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
deleted file mode 100644
index 1b210392427e..000000000000
--- a/app-crypt/bcrypt/files/bcrypt-1.1-Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.old 2006-11-23 13:58:19.000000000 +0100
-+++ Makefile 2006-11-23 13:59:52.000000000 +0100
-@@ -1,13 +1,12 @@
- DEFAULTS = Makefile includes.h blowfish.h functions.h config.h
--CC = gcc
--CFLAGS = -O2 -Wall
-+CFLAGS += -Wall
- COMPILE = ${CC} ${CFLAGS}
- OBJS = main.o blowfish.o rwfile.o keys.o wrapbf.o endian.o wrapzl.o
--LDFLAGS = -L/usr/local/lib -lz
-+LIBS = -lz
- PREFIX = /usr/local
-
- bcrypt: ${OBJS} Makefile
-- ${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}
-+ ${COMPILE} ${LDFLAGS} -o bcrypt ${OBJS} ${LIBS}
-
- install: bcrypt Makefile
- mkdir -p ${PREFIX}/bin;\
diff --git a/app-crypt/bcrypt/metadata.xml b/app-crypt/bcrypt/metadata.xml
deleted file mode 100644
index 71c61515eae3..000000000000
--- a/app-crypt/bcrypt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- crypto@gentoo.org
- Crypto
-
-
- bcrypt
-
-
diff --git a/app-crypt/scl011-bin/Manifest b/app-crypt/scl011-bin/Manifest
deleted file mode 100644
index 8b876fb98259..000000000000
--- a/app-crypt/scl011-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST scl011_2.06_linux_32bit.tar.gz 603947 SHA256 136be4d6871320f8fe38e8a8c854f4246c00042fed3951fc776a32541cbaf24d SHA512 97604c874f4c0edeb6045aa0c131285d6aaa253b07dc6e9fffcc20a3001957ae35d72a38f1901b19ae872df0857248b58f28b23af584fe699a22b1f4448a3d24 WHIRLPOOL cd0140efddb35ba5e39834b876a0ade32062d099f598e02c56f66346adf5a2bf5a37774e87aeeb81c54071a073f3f6b4b3ef6ca0b7851137c2ddd5c24499fb49
-DIST scl011_2.06_linux_64bit.tar.gz 604105 SHA256 45e81a507ee0d5dfdb8df4bb20341398aaad2d1c8b52765367dd04661dac92f6 SHA512 2c9b261cb40c1e578938bddc1a927bad8affc1e4481ad85624c00d8d75b85d74f88295db7e8bb165a29dd2b9037c242a223ee0685a6b30b1425af0a73c686ced WHIRLPOOL 11f97f62dc0a5b72e2bfe5244ffd7999c5011807ea2f81b1c584ccfc6603074e711c499b59222292598bb31bdfff4efc8283755003b5bdf09065261f6d19914c
diff --git a/app-crypt/scl011-bin/files/92_pcscd_scl011-bin.rules b/app-crypt/scl011-bin/files/92_pcscd_scl011-bin.rules
deleted file mode 100644
index dda4dc2afdbf..000000000000
--- a/app-crypt/scl011-bin/files/92_pcscd_scl011-bin.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# If not adding the device, go away
-ACTION!="add", GOTO="pcscd_scl011-bin_rules_end"
-SUBSYSTEM!="usb", GOTO="pcscd_scl011-bin_rules_end"
-ENV{DEVTYPE}!="usb_device", GOTO="pcscd_scl011-bin_rules_end"
-
-# Tested on scl011
-ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5292", ENV{PCSCD}="1"
-
-# All done
-LABEL="pcscd_scl011-bin_rules_end"
diff --git a/app-crypt/scl011-bin/metadata.xml b/app-crypt/scl011-bin/metadata.xml
deleted file mode 100644
index c621eb0adc49..000000000000
--- a/app-crypt/scl011-bin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- egore@gmx.de
- Proxied maintainer, assign bugs to him
-
-
- crypto@gentoo.org
- Crypto
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
diff --git a/app-crypt/scl011-bin/scl011-bin-2.06.ebuild b/app-crypt/scl011-bin/scl011-bin-2.06.ebuild
deleted file mode 100644
index 9fc3761fb9f1..000000000000
--- a/app-crypt/scl011-bin/scl011-bin-2.06.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit multilib toolchain-funcs udev
-
-DESCRIPTION="pcsc-lite driver for the German identification card (nPA)"
-HOMEPAGE="http://www.scmmicro.com/de/products-services/chipkartenleser-terminals/kontaktlos-dual-interface/it-sicherheitskit-basisleser/treiber.html"
-SRC_URI="x86? ( http://www.scmmicro.com/npa/files/scl011_${PV}_linux_32bit.tar.gz )
- amd64? ( http://www.scmmicro.com/npa/files/scl011_${PV}_linux_64bit.tar.gz )"
-
-LICENSE="SCM-MICRO"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-RESTRICT="mirror bindist"
-
-QA_PREBUILT="*/libSCL011.so.2.06"
-
-src_install() {
- local INSTALL_DIR=`$(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir`
- local BASEPATH
- case $(tc-arch) in
- amd64) BASEPATH="${S}/scl011_${PV}_linux_64bit" ;;
- x86) BASEPATH="${S}/scl011_${PV}_linux_32bit" ;;
- esac
-
- insinto "${INSTALL_DIR}"/SCL011.bundle/Contents
- doins "${BASEPATH}"/proprietary/SCL011.bundle/Contents/Info.plist
- exeinto "${INSTALL_DIR}"/SCL011.bundle/Contents/Linux
- doexe "${BASEPATH}"/proprietary/SCL011.bundle/Contents/Linux/libSCL011.so.${PV}
-
- udev_dorules "${FILESDIR}"/92_pcscd_scl011-bin.rules
-}
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index 3aec0820c359..dde00f8b0b57 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1 +1,2 @@
DIST f-0.18.2.tar.gz 18485 SHA256 e5791b653128f6508244a64096526439fcff6b40011b56c07fba552f20d446a4 SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346 WHIRLPOOL ef30dda229dba4da6432f5383f0e842132211da9472ab0625933d4421b74d9fa1adbb92654f2a3aacc9797ca312c4aa20b3b9572c7e11fa750ef34a011e1c099
+DIST f-0.19.0.tar.gz 19477 SHA256 3abf449393f5b26a68520a7ebaa7823995868dfaedd83e3d4646710f902d2914 SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56 WHIRLPOOL 533548fc95f2cc39feb18e225547cffc49ce9aa18c8a61219ca92b84bed202a2183d5cdedbf26f95dd2c34adcfdd1e2ebd8d574c2e061879221e929470b63c64
diff --git a/app-emacs/f/f-0.19.0.ebuild b/app-emacs/f/f-0.19.0.ebuild
new file mode 100644
index 000000000000..47d668ffccab
--- /dev/null
+++ b/app-emacs/f/f-0.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Modern API for working with files and directories in Emacs"
+HOMEPAGE="https://github.com/rejeep/f.el"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/dash app-emacs/s"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/f.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 99d98b2943b3..b4ba1ca4296b 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,2 @@
-DIST lxd-2.0.3.tar.bz2 2349842 SHA256 fb8a56e08da776f5210970a12e61b2e7b751328b5628e6fbebde231952b907a9 SHA512 62ac76bee0ff151343d0686da9376ff16965af5de19b50055bad86461dc2dd8e06544ee39640537f8352ec03b584ed32cf70cce9c7c961285d9ea567c617330e WHIRLPOOL 60204498c0a104310ddb28e42ea8889830c2f0e8c830c683b51d5cdbc92380de7c7964961fc7a34b32c7cb4dccaa4222f017b0d8948f54d5044770c066141319
-DIST lxd-2.1.tar.bz2 2260663 SHA256 6513d0576c8579668e480c4a663ffda9c3788b7d72338dbd443567a2da0d52d2 SHA512 4da46c256035253a7c0447cfc3f6887116b99f7bb4757b2b54dba436107a56dbab5973c654ea5c39760fac6b590ee9eb99ecc81b357b37a212990b25b9fa9ee9 WHIRLPOOL 90256881584a8b1d8ebe6d774a3d5614a634be06bbc0e0a51284ea842e590a21b8fc9b1eb228cca65b45306ed9750e10c81847663d2b6676ba192870aa8569a7
DIST lxd-2.2.tar.bz2 2234844 SHA256 c76b8698a9266afa5e4aec3ccaa283226cc52232e10ad376f02c4bcd000126b7 SHA512 272cd02f8533a18a51739fd2698f239cd57ae852fbf828d3dc53ed1253629808984720bde9173ae7df1f9e94389ab929b53893e7b57c2d0f6571744365c1c93a WHIRLPOOL d76c5ed9bedde8d51403a452bfc1f33bcb19d71fca79439c63f2b70bd58544ff0c05f4008f2603935dd1c63c4d0ea5c733775c723330de692fc5f6cd471d1529
+DIST lxd-2.3.tar.bz2 2248758 SHA256 cd746b3f9682e50b7973e6175a5b48b999748face9e4b515491773ade9d754c4 SHA512 746ea9c2e9266a8482a62fc9e9fdb83f0713b0094e1b52957c5bf2fbd00f4bf1d7a0978086ab123d60ac02bd0dd1f00d46801959ced3b01308170dd7911c7bdc WHIRLPOOL f899e78bd3082ddd46dab5d09d83fe23a23aabbee09488f48ef2ff4a9f3bc41878ecb50b4223235c12962b01468c7b0124c0ae54e60d452f224824cbc89d144e
diff --git a/app-emulation/lxd/files/lxd-2.1-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.1-dont-go-get.patch
deleted file mode 100644
index 9402de57735a..000000000000
--- a/app-emulation/lxd/files/lxd-2.1-dont-go-get.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /Makefile.orig 2016-07-11 23:34:40.299664675 +0000
-+++ /Makefile 2016-07-11 23:37:00.816018727 +0000
-@@ -12,19 +12,11 @@
-
- .PHONY: default
- default:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./...
- @echo "LXD built successfully"
-
- .PHONY: client
- client:
-- # Must a few times due to go get race
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
-- -go get -t -v -d ./...
- go install -v $(DEBUG) ./lxc
- @echo "LXD client built successfully"
-
diff --git a/app-emulation/lxd/files/lxd-2.1.confd b/app-emulation/lxd/files/lxd-2.1.confd
deleted file mode 100644
index 3d553276a5e3..000000000000
--- a/app-emulation/lxd/files/lxd-2.1.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Group which owns the shared socket
-LXD_OPTIONS+=" --group lxd"
-
-
-
-# Enable cpu profiling into the specified file
-#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-
-
-# Enables debug mode
-#LXD_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#LXD_OPTIONS+=" --print-goroutines-every 5"
-
-# Enables verbose mode
-#LXD_OPTIONS+=" -v"
-
-# Logfile to log to
-#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
-
-# Enables syslog logging
-#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-2.1.initd b/app-emulation/lxd/files/lxd-2.1.initd
deleted file mode 100644
index c1aef377ab6f..000000000000
--- a/app-emulation/lxd/files/lxd-2.1.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-extra_commands="stopall"
-
-depend() {
- need net
- use lxcfs
-
- # remove with 2.0 release
- need cgmanager
-}
-
-start() {
- ebegin "Starting lxd server"
-
- start-stop-daemon --start \
- --pidfile ${PIDFILE} \
- --exec ${DAEMON} \
- --background \
- --make-pidfile \
- -- \
- ${LXD_OPTIONS}
-
- eend $?
-}
-
-stop() {
- if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- stopall
- else
- ebegin "Stopping lxd service (but not containers)"
- start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
- eend $?
- fi
-}
-
-stopall() {
- ebegin "Stopping lxd service and containers"
- if "${DAEMON}" shutdown; then
- /etc/init.d/lxd zap
- rm -f ${PIDFILE}
- fi
- eend $?
-}
diff --git a/app-emulation/lxd/files/lxd-2.0.3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.3-dont-go-get.patch
similarity index 100%
rename from app-emulation/lxd/files/lxd-2.0.3-dont-go-get.patch
rename to app-emulation/lxd/files/lxd-2.3-dont-go-get.patch
diff --git a/app-emulation/lxd/files/lxd-2.0.3.confd b/app-emulation/lxd/files/lxd-2.3.confd
similarity index 100%
rename from app-emulation/lxd/files/lxd-2.0.3.confd
rename to app-emulation/lxd/files/lxd-2.3.confd
diff --git a/app-emulation/lxd/files/lxd-2.0.3.initd b/app-emulation/lxd/files/lxd-2.3.initd
similarity index 100%
rename from app-emulation/lxd/files/lxd-2.0.3.initd
rename to app-emulation/lxd/files/lxd-2.3.initd
diff --git a/app-emulation/lxd/lxd-2.1.ebuild b/app-emulation/lxd/lxd-2.1.ebuild
deleted file mode 100644
index b5754f19fb59..000000000000
--- a/app-emulation/lxd/lxd-2.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# The source is repackaged using a script at:
-# https://dev.gentoo.org/~stasibear/lxd_repackage.py
-# This is necessary because go's native package management assumes
-# that a build starts with checking out many git repositories, often
-# from HEAD. This provides no way to build the same code repeatably,
-# and anyway portage requires that fetching is only done from SRC_URI.
-# The only sane alternative I've seen is in the consul ebuild, which
-# is more transparent but raises other questions.
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-PLOCALES="de fr ja"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n systemd user vcs-snapshot
-
-DEPEND="
- dev-go/go-crypto
- dev-libs/protobuf
- nls? ( sys-devel/gettext )
- test? (
- app-misc/jq
- dev-db/sqlite
- net-misc/curl
- sys-devel/gettext
- )
-"
-
-RDEPEND="
- daemon? (
- app-admin/cgmanager
- app-arch/xz-utils
- app-emulation/lxc[cgmanager,seccomp]
- net-misc/rsync[xattr]
- sys-apps/iproute2
- sys-fs/squashfs-tools
- virtual/acl
- )
-"
-
-PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
-
-# KNOWN ISSUES:
-# - Translations may not work. I've been unsuccessful in forcing
-# localized output. Anyway, upstream (Canonical) doesn't install the
-# message files.
-
-src_prepare() {
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- default_src_prepare
-
- tmpgoroot="${T}/goroot"
- mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
- cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
-
- # Warn on unhandled locale changes
- l10n_find_plocales_changes po "" .po
-}
-
-src_compile() {
- golang-build_src_compile
-
- cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
- tmpgoroot="${T}/goroot"
- if use daemon; then
- # Build binaries
- GOPATH="${S}:${tmpgoroot}" emake
- else
- # build client tool
- GOPATH="${S}:${tmpgoroot}" emake client
- fi
-
- use nls && emake build-mo
-}
-
-src_test() {
- if use daemon; then
- # Go native tests should succeed
- golang-build_src_test
- fi
-}
-
-src_install() {
- # Installs all src,pkg to /usr/lib/go-gentoo
- golang-build_src_install
-
- cd "${S}"
- dobin bin/lxc
- use daemon && dosbin bin/lxd
-
- cd "src/${EGO_PN}"
-
- if use nls; then
- for lingua in ${PLOCALES}; do
- if use linguas_${lingua}; then
- domo po/${lingua}.mo
- fi
- done
- fi
-
- if use daemon; then
- newinitd "${FILESDIR}"/${P}.initd lxd
- newconfd "${FILESDIR}"/${P}.confd lxd
-
- systemd_dounit "${FILESDIR}"/lxd.service
- fi
-
- newbashcomp config/bash/lxd-client lxc
-
- dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
- einfo
- einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- einfo "including a Quick Start."
-
- # The messaging below only applies to daemon installs
- use daemon || return 0
-
- # The control socket will be owned by (and writeable by) this group.
- enewgroup lxd
-
- # Ubuntu also defines an lxd user but it appears unused (the daemon
- # must run as root)
-
- einfo
- einfo "Though not strictly required, some features are enabled at run-time"
- einfo "when the relevant helper programs are detected:"
- einfo "- sys-apps/apparmor"
- einfo "- sys-fs/btrfs-progs"
- einfo "- sys-fs/lvm2"
- einfo "- sys-fs/lxcfs"
- einfo "- sys-fs/zfs"
- einfo "- sys-process/criu"
- einfo
- einfo "Since these features can't be disabled at build-time they are"
- einfo "not USE-conditional."
-}
diff --git a/app-emulation/lxd/lxd-2.0.3-r1.ebuild b/app-emulation/lxd/lxd-2.3.ebuild
similarity index 72%
rename from app-emulation/lxd/lxd-2.0.3-r1.ebuild
rename to app-emulation/lxd/lxd-2.3.ebuild
index b5754f19fb59..46d66307e958 100644
--- a/app-emulation/lxd/lxd-2.0.3-r1.ebuild
+++ b/app-emulation/lxd/lxd-2.3.ebuild
@@ -27,9 +27,10 @@ PLOCALES="de fr ja"
IUSE="+daemon nls test"
# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n systemd user vcs-snapshot
+inherit bash-completion-r1 golang-build l10n linux-info systemd user vcs-snapshot
DEPEND="
+ >=dev-lang/go-1.7.1
dev-go/go-crypto
dev-libs/protobuf
nls? ( sys-devel/gettext )
@@ -46,13 +47,48 @@ RDEPEND="
app-admin/cgmanager
app-arch/xz-utils
app-emulation/lxc[cgmanager,seccomp]
+ net-dns/dnsmasq[dhcp,ipv6]
net-misc/rsync[xattr]
- sys-apps/iproute2
+ sys-apps/iproute2[ipv6]
sys-fs/squashfs-tools
virtual/acl
)
"
+CONFIG_CHECK="
+ ~BRIDGE
+ ~DUMMY
+ ~IP6_NF_NAT
+ ~IP6_NF_TARGET_MASQUERADE
+ ~IPV6
+ ~IP_NF_NAT
+ ~IP_NF_TARGET_MASQUERADE
+ ~MACVLAN
+ ~NETFILTER_XT_MATCH_COMMENT
+ ~NET_IPGRE
+ ~NET_IPGRE_DEMUX
+ ~NET_IPIP
+ ~NF_NAT_MASQUERADE_IPV4
+ ~NF_NAT_MASQUERADE_IPV6
+ ~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
# KNOWN ISSUES:
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index dfd907ca44eb..ac28a090aef2 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1 +1,2 @@
DIST cryptopp562.zip 1137964 SHA256 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 SHA512 016ca7ebad1091d67ad0bc5ccb7549d96d4af6b563d9d5a612cae27b3d1a3514c41b954e319fed91c820e8c701e3aa43da186e0864bf959ce4afd1539248ebbe WHIRLPOOL e31203da48a31b09e6ea48a75aa64fe5fd27fd370a1a609c4387526f09daab7582716563b688c0c81a8c3b200b8ffa7bdb2b981e5911640e5f1c172d6027f6ac
+DIST cryptopp564.zip 4214797 SHA256 be430377b05c15971d5ccb6e44b4d95470f561024ed6d701fe3da3a188c84ad7 SHA512 d9f0ce92f5f95794b5a43d5ae865bfe7bae555f1565210dd4fd9fa9d44b2f801d947e216042099f7d40dd83e3d385a6346343b05431f05bf04276ba85b7ff63f WHIRLPOOL 344354e2b4a822eb1f431137678067f6a042e710c13ab70e53dca2523f29b8bcf2227e6973f67e69079ddde789f1af764c0913a0e73808e784cec195ef722ce4
diff --git a/dev-libs/crypto++/crypto++-5.6.4.ebuild b/dev-libs/crypto++/crypto++-5.6.4.ebuild
new file mode 100644
index 000000000000..c632e0003cfb
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.4.ebuild
@@ -0,0 +1,69 @@
+# 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
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="Boost-1.0"
+SLOT="0/5.6" # subslot is so version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="static-libs"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_configure() {
+ cp config.recommend config.h || die
+}
+
+src_compile() {
+ # higher optimizations cause problems
+ replace-flags -O3 -O2
+ # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+ [[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM
+
+ CXX="$(tc-getCXX)" \
+ emake -f GNUmakefile \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ PREFIX="${EPREFIX}/usr" \
+ all shared
+}
+
+src_test() {
+ # ensure that all test vectors have Unix line endings
+ local file
+ for file in TestVectors/* ; do
+ edos2unix "${file}"
+ done
+
+ if ! CXX="$(tc-getCXX)" emake test ; then
+ eerror "Crypto++ self-tests failed."
+ eerror "Try to remove some optimization flags and reemerge Crypto++."
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ emake \
+ DESTDIR="${ED}" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ install
+
+ # remove leftovers as build system sucks
+ rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp
+ use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+
+ # compatibility
+ dosym cryptopp "${EPREFIX}"/usr/include/crypto++
+ for f in "${ED}${EPREFIX}"/usr/$(get_libdir)/*; do
+ ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die
+ done
+}
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
new file mode 100644
index 000000000000..98f6f54536e8
--- /dev/null
+++ b/dev-python/aodhclient/Manifest
@@ -0,0 +1 @@
+DIST aodhclient-0.6.0.tar.gz 40827 SHA256 eb33dd5b215a137d052cdbf12d9c7a2ab3d1fe52702ffd2323e57d2fa759363d SHA512 daa3f568cc2c59a010024beecf2917bf7e3ee64a0a18851e19c92dba159fcd2f36e64dd418ac4a36ee93b0a06c8c00b1f222aebfa915e9bddeaca074a12568bc WHIRLPOOL 2e71b890b392f6c00abe2c5fb45dfdf98215403612de2d50f19c4c9a82cde91c5cd7691fe51c3838ab6a7009824dfa01ca1430b95c86a9ac41fdea005758e915
diff --git a/dev-python/aodhclient/aodhclient-0.6.0.ebuild b/dev-python/aodhclient/aodhclient-0.6.0.ebuild
new file mode 100644
index 000000000000..a52e007cbde0
--- /dev/null
+++ b/dev-python/aodhclient/aodhclient-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Aodh API"
+HOMEPAGE="https://github.com/openstack/python-aodhclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+ !~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+ >=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.3.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ # built in...
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aodhclient/metadata.xml b/dev-python/aodhclient/metadata.xml
new file mode 100644
index 000000000000..b28e1b0716b5
--- /dev/null
+++ b/dev-python/aodhclient/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
+
+ openstack@gentoo.org
+ Openstack
+
+
+ This is a client for the OpenStack Aodh API.
+
+
+ python-aodhclient
+ openstack/python-aodhclient
+
+
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
index 9a29a65fb708..0c2dfcba9a3c 100644
--- a/dev-python/python-ceilometerclient/Manifest
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -1 +1,2 @@
DIST python-ceilometerclient-1.1.1.tar.gz 87597 SHA256 f48e2d9ecef25ab784510fa0b299d0d73aa8f41652abf9f28393a93612416a29 SHA512 ce4768e67c6a5871ec52de433292c6328d387d94860f808f63ab9102f96ba3ca2397116792a5b907d9037290a31c2780149481f1f12581e0a9dd585f4e8d0909 WHIRLPOOL 6ec0fba808036620729e984ce66ae90a9a45a4a1167ad25dc11e2da549406cfea12758e80574a7cbcb0dc56c99138918c834eb57ad486821c050a6812e425e03
+DIST python-ceilometerclient-2.6.1.tar.gz 94237 SHA256 5e3f77c8028324e427d5058bff0cd314164f5f43fcf5c76c5b78a699f801766a SHA512 5d56def259015f96a05b0aa345a0d48ba79314e8c35964efbf60f5f62e2178d2e06d66e478dd92bb65449a6f398ee8e1599065c34850d17df0ce38a12343d1fe WHIRLPOOL 62f21939a9cf84660b8cc050ab5f47d9efac1553ae833866859523fd4b542e66a6a186701cf7417f629f9b6893c9d60d0ac07445730e2d771ac0009a92fa8c3e
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.1.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.1.ebuild
new file mode 100644
index 000000000000..fae8f4ce393b
--- /dev/null
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client library for Ceilometer built on the Ceilometer API"
+HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ =dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+ =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.1.0
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ =dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ testr init
+ testr run || die "tests failed under python2.7"
+ flake8 ceilometerclient/tests/ || die "run over tests folder by flake8 yielded error"
+}
diff --git a/dev-python/python-senlinclient/Manifest b/dev-python/python-senlinclient/Manifest
new file mode 100644
index 000000000000..4cfb494a25e2
--- /dev/null
+++ b/dev-python/python-senlinclient/Manifest
@@ -0,0 +1 @@
+DIST python-senlinclient-1.0.0.tar.gz 101396 SHA256 eb4fe96425cfc2c8137b97f2ab9071ebea1a2862b334ab1882513379fed12876 SHA512 3e98cc9a238250ca4069289343011d27d9bf6b35e0c8709bbf209b7774ff7b84151533104795fcc21403202cf6c834503685a9994d320a48aa690a854e1570f9 WHIRLPOOL 559b26f5be8ef0e99c63474f79b22e7baa05ca38b804c309fde4459668dbceba022175d8db156fc283af66bb87322ffe31e58cdd39c022d25f1af2e1ae00d497
diff --git a/dev-python/python-senlinclient/metadata.xml b/dev-python/python-senlinclient/metadata.xml
new file mode 100644
index 000000000000..77fd7478baeb
--- /dev/null
+++ b/dev-python/python-senlinclient/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
+
+ openstack@gentoo.org
+ Openstack
+
+
+ This is a client for the OpenStack Senlin API.
+
+
+ python-senlinclient
+ openstack/python-senlinclient
+
+
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
new file mode 100644
index 000000000000..a35f0398d248
--- /dev/null
+++ b/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Senlin API"
+HOMEPAGE="https://github.com/openstack/python-senlinclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ =dev-python/openstacksdk-0.9.4
+ >=dev-python/osc-lib-1.0.2
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/python-heatclient-1.4.0
+ >=dev-python/pyyaml-3.1.0
+ >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ # built in...
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index de90926dfb59..ae3839a0f7e1 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1 +1,2 @@
DIST python-troveclient-1.3.0.tar.gz 130542 SHA256 abb0a5bf2442bd396322c65ea7b386d043e3fcffdaeed6a61d63d8be1a8452f2 SHA512 aa26b587d8e2bd15bb65ff760b89354638f6a77a4e73ec5f37ab6dc3c374d6b8c238391c09347e7fc897138fc0bdc375f69ab479f57e14f21d0882b74cc7c978 WHIRLPOOL 02490089bfea489b51e07f4da5b3ea5bbe2e839c2751c5e98ae384195465fca861a7d156e5ea179a6879d3b44c318e30f560314619705a3d8a3ac7b0f0606752
+DIST python-troveclient-2.5.0.tar.gz 149926 SHA256 03fc7cf8d47f910bc64274f7c24808b6ef79a9a1f34be5b94bea7070c9e00e5b SHA512 83e7cafec8ce4d65a55d8854bc2e2fbc657d567e4dc2b42a64c527c656ba5f253839511582c5ca2dda970bebb4555390b895a882b87a2eacb86ccbfac9c09a97 WHIRLPOOL d0a8057b54725cf102743e6f6cedc39be59bab003c5fa83c0c1244b3f30fc59b02fa96d374393116350e9ad5817067b199f59d950fe2546c98423ece5256d216
diff --git a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
index 31deb70b087b..fe4e9fa6dc78 100644
--- a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
+++ b/dev-python/python-troveclient/python-troveclient-1.3.0.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$
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
inherit distutils-r1
-DESCRIPTION="This is a client for the OpenStack Trove API, a scalable relational database service"
+DESCRIPTION="A client for the OpenStack Trove API, a scalable relational database service"
HOMEPAGE="https://github.com/openstack/python-troveclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
new file mode 100644
index 000000000000..30041e2117d3
--- /dev/null
+++ b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Trove API, a scalable relational database service"
+HOMEPAGE="https://github.com/openstack/python-troveclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+ =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+ =dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ testr init
+ testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index 0adfd81e1eb6..8c1505a27075 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -1,2 +1,3 @@
DIST rex-powershell-0.1.1.gem 25088 SHA256 ebaa8c7a8d46417e928db290f4eae41f0126aa58dd588e368621b9a8dab1bb69 SHA512 f259acda2012da8f2d5e990786818997326c6cfdec2c388a340aa34cc0ca0233ba18e88a6efefd4ff735d5986011a12b06374ebee5324d0f89b2407a18574908 WHIRLPOOL 1adc711358ff6f6de71bf300fc942e99ab9c68195b64dd9a9c2143b7e33aea8df2cff02eb065b0b9f3a244955692070cbd8e2a08ee91781cffc91bef60c2a81d
DIST rex-powershell-0.1.64.gem 25088 SHA256 90e3a2f31f530d180c1d87c5cc1b7bad0de0523c9e48c24b701ceff30a996100 SHA512 669095c77637254dee109c0451bf547b3d3fca878c5b89c8eb7e6cd5ec6d43a8d842544ae9e5f9fec2af0aa1dba9ad20d059898a9457fdc34171a1d2e3d16cd1 WHIRLPOOL dddc8cb551170d556ab0706644c3a75343753846a3a5b65cdc1662b2d00514b2ce05e900b24f49123ad18131e501052c6d3e4cb875f3c448e27fe21e0bedd7cf
+DIST rex-powershell-0.1.65.gem 27136 SHA256 25b26e137e41fd1fbc2cdfb2d84aaeb9a9d8310ba2d3d274377c3f1727054c49 SHA512 7760137e074f319d0ccca827824a481b00f5a2b945f60638956f16d1b8a74f92479b7ac7fb5595cf297a3a394905bd7a8af62b9480b1835949843b2cf122dda6 WHIRLPOOL e6ea2b5e915ec44eaea1edbe179f65ed9ad7a705011796366c556812bab2e8810df9ed0d5d90c2da3e50d7a1d9c2dbe3389707bd63a2f1294c9658586c7b9de5
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.65.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.65.ebuild
new file mode 100644
index 000000000000..a6551edd426a
--- /dev/null
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.65.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
+HOMEPAGE="https://rubygems.org/gems/rex-powershell"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# Specs are not packaged in the gem and source is not tagged upstream.
+RESTRICT="test"
+
+ruby_add_bdepend "dev-ruby/rex-random_identifier
+ dev-ruby/rex-text"
diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
index 52e7db6db968..da59c4da4fa0 100644
--- a/games-sports/torcs/files/torcs-1.3.6-format.patch
+++ b/games-sports/torcs/files/torcs-1.3.6-format.patch
@@ -1,5 +1,5 @@
---- src/tools/texmapper/maintexmapper.cpp.old 2015-12-23 20:55:24.874102363 +0100
-+++ src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100
+--- a/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:24.874102363 +0100
++++ b/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100
@@ -103,7 +103,7 @@
{
int i, j;
@@ -9,8 +9,8 @@
for (j = 0; j < 4; j ++){
for (i = 0; i < 4; i ++) {
printf("%.6f ", m[i][j]);
---- src/tools/trackgen/objects.cpp.old 2015-12-23 20:59:49.671287196 +0100
-+++ src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100
+--- a/src/tools/trackgen/objects.cpp 2015-12-23 20:59:49.671287196 +0100
++++ b/src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100
@@ -234,9 +234,9 @@
ssgLeaf *vt = (ssgLeaf *)ent;
diff --git a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
index 6f4a2e406223..f87fb750d199 100644
--- a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
+++ b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
@@ -1,5 +1,5 @@
---- configure.in.old
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -116,12 +116,8 @@
AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
dnl Replace `main' with a function in -lSM:
diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..16b587c8b8ad
--- /dev/null
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils multilib
+
+DESCRIPTION="The Open Racing Car Simulator"
+HOMEPAGE="http://torcs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
+
+LICENSE="GPL-2 FreeArt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freealut
+ media-libs/freeglut
+ media-libs/libpng:0
+ media-libs/libvorbis:=
+ media-libs/openal
+ >=media-libs/plib-1.8.5
+ sys-libs/zlib:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-automake.patch
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-format.patch
+ "${FILESDIR}"/${P}-noXmuXt.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+ ecvs_clean
+}
+
+src_configure() {
+ addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
+ [[ -e /dev/dsp ]] && addpredict /dev/dsp
+ econf \
+ --datadir=/usr/share \
+ --x-libraries=/usr/$(get_libdir) \
+ --enable-xrandr
+}
+
+src_compile() {
+ # So ugly... patches welcome.
+ emake -j1
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install datainstall
+ newicon Ticon.png ${PN}.png
+ make_desktop_entry ${PN} TORCS
+ dodoc README doc/history/history.txt
+ doman doc/man/*.6
+ dodoc -r doc/faq/faq.html doc/tutorials doc/userman
+}
diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..95b34922f515
--- /dev/null
+++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+MY_PN=${PN}-rally
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Free OpenGL rally car racing game"
+HOMEPAGE="http://www.positro.net/trigger/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-games/physfs
+ media-libs/freealut
+ media-libs/libsdl
+ media-libs/openal
+ media-libs/sdl-image[jpeg,png]
+ media-libs/sdl-mixer
+ virtual/glu
+ virtual/opengl"
+DEPEND="${RDEPEND}
+ dev-util/ftjam"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ # Otherwise build fails with:
+ # ...skipped trigger for lack of libpengine.a...
+ tc-export AR
+}
+
+src_configure() {
+ econf --datadir=/usr/share/games/${PN}
+}
+
+src_compile() {
+ AR="${AR} cru" jam -dx -qa || die
+
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/games/${PN}
+ doins -r data/*
+ newicon data/textures/life_helmet.png ${PN}.png
+ make_desktop_entry ${PN} Trigger
+ dodoc doc/*.txt
+}
+
+pkg_postinst() {
+ elog "After running ${PN} for the first time, a config file is"
+ elog "available in ~/.trigger/trigger.config"
+}
diff --git a/games-sports/trophy/trophy-2.0.3-r1.ebuild b/games-sports/trophy/trophy-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..1ee42788ceec
--- /dev/null
+++ b/games-sports/trophy/trophy-2.0.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="2D Racing Game"
+HOMEPAGE="http://trophy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-games/clanlib:0.8[opengl]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch
index 0ce375c1a86c..f323bce22aa5 100644
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch
+++ b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch
@@ -4,8 +4,8 @@ Subject: fix compilation on gcc-4.7
https://bugs.gentoo.org/show_bug.cgi?id=426612
---- simulation/metaserver.cpp
-+++ simulation/metaserver.cpp
+--- a/simulation/metaserver.cpp
++++ b/simulation/metaserver.cpp
@@ -16,6 +16,7 @@
***************************************************************************/
#include
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..e6f0860ba6b9
--- /dev/null
+++ b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic versionator
+
+MY_P=${PN}-srcdata-$(replace_all_version_separators)1
+DESCRIPTION="Remake of the famous Stunts game"
+HOMEPAGE="http://www.ultimatestunts.nl/"
+SRC_URI="mirror://sourceforge/ultimatestunts/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ media-libs/freealut
+ media-libs/libsdl[joystick,opengl,video]
+ media-libs/libvorbis
+ >=media-libs/openal-1
+ media-libs/sdl-image
+ virtual/opengl
+ virtual/glu
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-paths.patch
+ "${FILESDIR}"/${P}-gcc-4.7.patch
+)
+
+src_prepare() {
+ default
+
+ esvn_clean
+ append-cppflags $(sdl-config --cflags)
+}
+
+src_configure() {
+ econf \
+ --with-openal \
+ $(use_enable nls)
+}
+
+src_compile() {
+ emake -C trackedit libtrackedit.a
+ emake
+}
+
+src_install() {
+ default
+
+ newicon data/cars/diablo/steer.png ${PN}.png
+ make_desktop_entry ustunts "Ultimate Stunts"
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 1100e015451d..1923e5203918 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,2 +1,3 @@
DIST Image-ExifTool-10.25.tar.gz 4161833 SHA256 edc2de5848375f7ccb88cd7d0260c98c4c581ffd509c4c249949f0cd1f522dd0 SHA512 6f3c9e432198a0be00efed1dc6044ea1be330099ec3d47bab8e761230c8fadc48bc26571202aea16e82890a9315ea752f25e06a2c7e5fd6d7690387e681870c7 WHIRLPOOL 49f11b61ada48c3d4d3d36d79f110a248c535bb8eb8625cdd7f5c4ef714c94676369b765abe63076589ea05b7c5cbf7ee5401c1c93e344cf704e26a091c5d464
DIST Image-ExifTool-10.27.tar.gz 4176031 SHA256 344f201a37f61a9f02ed7831cd86c89ccb14ea163ea77e129f094dc92e4b8852 SHA512 2f90c36afb7d870e4ea39e598afd15ab6183645b53d760cd2b1c883e424df22e1e50d4e2851abe8bf54a4e04a015597ca947053f9d1597f0709e6c0ff342f1c2 WHIRLPOOL fee344bc2354f16cb303a24f7f6b530d28fc4b4823b9cf11adbc2215c18c2a2e5c2608cfeeb5732e420b64f8cefbc35fb4c49a714a0da87a0e8313729c4291d2
+DIST Image-ExifTool-10.28.tar.gz 4252944 SHA256 18cee8c0fb9331f63b883a5e5e42f5b40f5e30696289c00f1fe9e5e536f90bef SHA512 8fa37bdb5b52ea657dcdd86468cbce4ad113ef3afe7c52ca30b9ace6368d0dfe4bead69cd799bd403fd3d3dd8f7fdb24f8015eee19fec6d852bf8186b66f9b99 WHIRLPOOL c38fa5b29a4d82a74477acd593b968f8986098b02c5114093b497711f8669140a51040c358cf2c4665ce78f57609e67670fc8a3699eb31c15a58e5ba445ec9d3
diff --git a/media-libs/exiftool/exiftool-10.28.ebuild b/media-libs/exiftool/exiftool-10.28.ebuild
new file mode 100644
index 000000000000..e1513a94b78d
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.28.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+ perl-module_src_install
+ use doc && dodoc -r html/
+}
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 95c134f3cd9b..a0ee3a6a8b16 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -3,3 +3,4 @@ DIST libmediainfo_0.7.85.tar.xz 1537360 SHA256 b6202d5a9b1725b0976b051085625ae59
DIST libmediainfo_0.7.86.tar.xz 1545368 SHA256 c0771a1405c8de3d90623ebb7d2686dd59c33c5917894e5462f4d591da63a792 SHA512 14ebffac03bf9b61d50ad6a3faeae649d4b24661152103eaf329e5e1ddb2230cd96001166a1217d796c463d5ec74fb103f07f45f3bdd6d048791d25923bf18bf WHIRLPOOL 2601f1f4e9268b71d8215ee96ba4a8b4d7a2d0f7ae3da319058b01e0eafed351a97f0b5ff71b964eb7129464fb960380deca21ef1e871dd9354ada1d6e70a3dd
DIST libmediainfo_0.7.87.tar.xz 1544212 SHA256 4923dc108cf0e9fd6df36fc97e52a0955b69188491099331bb30d70410db72bf SHA512 595c3f6e6322dff7490e481e6705f0a8884c94150bf1c3679356b4ca0b37fd4e18a8d8e4d872c0398189b4d3328afa721586f7915293f6ebc9371ac4c6ccf93a WHIRLPOOL fcfdc6fec025c2c11d9420e019ef7afe5406658b9d18894532648689e11a1a45c74ec1ab831429fe44218ea988c75992f84497f87d1352b98756c98e77778b07
DIST libmediainfo_0.7.88.tar.xz 1560488 SHA256 01de70bc67f2da4b6d2cde5aac0bf38b2e9ab834279b90c89cc3a3d1d47b14ec SHA512 9ddec4102bc4b28f5ff92fe13301c2cd1aad409680705d571a7b5a809aa831bfcec5f9cad28f49c78dd093c441b652140b1691762d81d3c69fbb3ea1b1922165 WHIRLPOOL 0dec5ff1bcc039ce66f67db586f68b6bb09b8c78787e96cc004dc3309ad4fbebc1daf197fa3b6ae5b5a754847b58b0a8769159222e2fe1acb2c36db2b3cef18c
+DIST libmediainfo_0.7.89.tar.xz 1566172 SHA256 2cd3da0cc3e23bbfddea545898df6ebc1c81e086a1d707ac6d2068fe659ea74a SHA512 0289a4d9a6b27bc6fce1b1aebbc64495ef220bdbdb36c851b4ca345ac7b5dfc8d06b03c1cfb36ee7a736ff4a1d9e2da53d5f2d3559c5297e1c41f8a98f04737a WHIRLPOOL cc986916e6a877c512320bf59bdfb0073f2dae8bc8d6ccffc2080305530e233bff60cbbade8333bc62827c636185e0b3433746639e22887cd8b0b52a5976b8bb
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.89.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.89.ebuild
new file mode 100644
index 000000000000..725eef257db3
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.89.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+ dev-libs/tinyxml2:=
+ >=media-libs/libzen-0.4.28[static-libs=]
+ curl? ( net-misc/curl )
+ mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+ eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+ eapply_user
+
+ sed -i 's:-O2::' configure.ac || die
+ append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --with-libtinyxml2 \
+ $(use_with curl libcurl) \
+ $(use_with mms libmms) \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+ doxygen Doxyfile || die
+ fi
+}
+
+src_install() {
+ if use doc; then
+ local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+ fi
+
+ default
+
+ edos2unix ${PN}.pc #414545
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+ insinto /usr/include/${MY_PN}/${x}
+ doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+ done
+
+ insinto /usr/include/${MY_PN}DLL
+ doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+ dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+ prune_libtool_files
+}
diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
index c84830cac6cc..6d5680f602af 100644
--- a/media-sound/adplay/adplay-1.7.ebuild
+++ b/media-sound/adplay/adplay-1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
DESCRIPTION="A console player for AdLib music"
HOMEPAGE="http://adplug.sourceforge.net"
@@ -20,14 +20,13 @@ RDEPEND=">=media-libs/adplug-2.2.1
sdl? ( media-libs/libsdl )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=( "${FILESDIR}/${PN}-1.7-fix-c++14.patch" )
src_configure() {
econf \
+ --disable-output-esound \
$(use_enable alsa output-alsa) \
$(use_enable ao output-ao) \
- --disable-output-esound \
$(use_enable oss output-oss) \
$(use_enable sdl output-sdl)
}
diff --git a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
new file mode 100644
index 000000000000..aedbbc0ab1c5
--- /dev/null
+++ b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
@@ -0,0 +1,22 @@
+From 48dcaa87ff91369eb41998abd72e226fe138b528 Mon Sep 17 00:00:00 2001
+From: Adam Nielsen
+Date: Sun, 22 May 2016 08:49:47 +1000
+Subject: [PATCH] Cast -1 to unsigned int to prevent compiler error
+
+---
+ src/adplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/adplay.cc b/src/adplay.cc
+index d73ec25..da00730 100644
+--- a/src/adplay.cc
++++ b/src/adplay.cc
+@@ -90,7 +90,7 @@ static struct {
+ 1, 16, 0, // Else default to mono (until stereo w/ single OPL is fixed)
+ #endif
+ MSG_NOTE,
+- -1,
++ (unsigned int)-1,
+ NULL,
+ NULL,
+ true, false, false, false,
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index ecc1db07357a..950c62bfd47a 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -3,3 +3,4 @@ DIST mediainfo_0.7.85.tar.xz 1299044 SHA256 ba441b9c94d56e6fd0867c7d6504963ef34b
DIST mediainfo_0.7.86.tar.xz 1296520 SHA256 65edb2c1d3f7ea052b5cd6bf300267a007c8c01871c5965bef3a9bb9caa98697 SHA512 ea7a2dc0132b6910f361cc6f822ed5b3b5fbf76f9a0415aef3ce1298de8831175045800e8adcfecc9cc865874c6e97e271ec5796fa5937e2105bfb2cc884eb4b WHIRLPOOL ef99cde1e12afeb8c684a6767eb42a1cb7b3402df7c427559363a807e809b3c6c03e54f3160d7661593de818dc61a7a2806bf81d8283bed3cf2b7636bbd970b8
DIST mediainfo_0.7.87.tar.xz 1304456 SHA256 fb86d2d8775ce6b23fe9416d006b0f62f8c2d71a1ee105ba820909ce9c8744f3 SHA512 2261d97aa0a62dadc1db3fe4985c3a105c4ce9d35c05fd0c222ef7f3055aa35d0faada717944bb264438ead5abaf427e1da41192b58f1768e3868098a017694f WHIRLPOOL d7c008182136b03c426e7b6fe2a7e12270f9b2b4cac1b6d3518cfeb1a96cb6e65d83a9f9f18236aaccd954fe892bdb3dae73741511d55117e5ede04202ac2d7b
DIST mediainfo_0.7.88.tar.xz 1316320 SHA256 853839f0dce758f97ab950069c73a2ea7b601f6712bbcee36d0bc2ee9f58f373 SHA512 4467ffb8c9534ca4d53df12d6e0c6550d72446464b2e1e78c6768a1f5ce49cda5d501359d0d72b29c75ee00220998e9f5623a0b9afb506960a2ec95e1e423f72 WHIRLPOOL a3126841b89a05374fa0bc58881f119b8a0dd2a39d4f7f7cdf18c93f476e02d7caadadf1efb11eb0cd16db7a594617634a8a98915613f30b70740fd491f05d1b
+DIST mediainfo_0.7.89.tar.xz 1305720 SHA256 651e5e7588eccddb6eb1a3269b358e04357ea20ad217434b15e1a261f6bb177d SHA512 121f193352503546bc63674bf40e33e12c92e63afa4318b5b03c2bdb6d54f56c7702dd83b0cd7443c0ce6c4138a5b46c37298fe13a642f4d71ad52b4c340d787 WHIRLPOOL 1700f3b2d4e86654eb72361ebad3aeedcb989c3ef8de1fb44ec2e726130efa5aed7fc86f0feebee5954a7e1e7c9d73a7521ef1fbcb301b4204a1dacef7393479
diff --git a/media-video/mediainfo/mediainfo-0.7.89.ebuild b/media-video/mediainfo/mediainfo-0.7.89.ebuild
new file mode 100644
index 000000000000..9ea2422d1c89
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-0.7.89.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+ media-libs/libzen
+ ~media-libs/lib${P}[curl=,mms=]
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+ TARGETS="CLI"
+ use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+ eapply_user
+
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ sed -i -e "s:-O2::" configure.ac
+ eautoreconf
+ done
+}
+
+src_configure() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ local args=""
+ [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+ econf ${args}
+ done
+}
+
+src_compile() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ default
+ done
+}
+src_install() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ default
+ dodoc "${S}"/History_${target}.txt
+ if [[ ${target} == "GUI" ]]; then
+ newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+ make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+ fi
+ done
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index efa7c5f2f329..3a07c95a785e 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,3 +1,2 @@
-DIST obs-studio-0.14.2.tar.gz 3406086 SHA256 b4076f1b92e9566f9f3c3c4cfb5e123210e149bb3cec3f9fb5d6cd6394b268b1 SHA512 17548841d81073595282cbe4f2f217a67b5a3050e5660b43affa1501cb88bfb8d2728d610e758ebc217733f7a50945b9078d28285a76fbc5fe0c104570faba32 WHIRLPOOL cc6a0e93274f8abc06af4ac802cbbf8f5195848b805642399f4daa503562ec747ce7f1791fc30cf316f2fd80d4576ab05b7c89da98f2adda971fa62ae9c1ff86
-DIST obs-studio-0.15.1.tar.gz 3457064 SHA256 4ff360c04cf18720bdabdbd64b83262651bb809685a5d578425148dacf63dea1 SHA512 0a7f366dbb63b1200fc96ceb3ea756d3b165a7ead2d1227d578c96e68d7d3c3d540557264c064715f8b89f68fdacc5e4363cbee297e7e280fcf670efaefc0e9f WHIRLPOOL c820843b1cdc5b474ba8b56b88324d221ee4dc3a8e54987ca0fb08b9137f13348af7a215c83b0ccbaee43a4760157d083edc83ce8e34508deadfbe2db1f6beeb
DIST obs-studio-0.15.3.tar.gz 4868410 SHA256 ba9ff4259408583aa1bb7ac2315865c1ef6331b0a240c2061460bc093011514b SHA512 165fcc9ab9fa498654cffa972f5cf728e7cf73e131b077c4f1a75994505d6e4b0149ab9a1b6034422cf5483f5f8ddc2d288a2700093eca0d77404a75068c8b81 WHIRLPOOL f09f105a369332db7a4f95624d09c8ad120984322ae6508a714cbd0de26bb36370ad00b9806ec2587bfbfdd7f708953a076e79e6b3e62e4d5156f524b1f617b2
+DIST obs-studio-0.16.2.tar.gz 4979287 SHA256 f5b1a5a4e3900a2b2df4ec6f4a51e0816db1ceed432849ed58301da77ccf4f5c SHA512 ef74b20aa3927134d0deb9513af67abe5dc99199626245a93011bd69d41b811695bc1f071dcd6ed826c2bd5f35247906975f74638c9cd0a39b9415ac88aac425 WHIRLPOOL 5576c4da240ea65d84e195decb655b8774b1540bcde7d01060a38b47e1c561b485c24b88b2771a10b94fe8a0d6d77c05d25ee65313278879609474ff451b2628
diff --git a/media-video/obs-studio/obs-studio-0.14.2.ebuild b/media-video/obs-studio/obs-studio-0.14.2.ebuild
deleted file mode 100644
index 738501dcba0a..000000000000
--- a/media-video/obs-studio/obs-studio-0.14.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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/jp9000/obs-studio.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-DEPEND="
- >=dev-libs/jansson-2.5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-libs/x264:=
- media-video/ffmpeg:=
- x11-libs/libXcomposite
- x11-libs/libXinerama
- x11-libs/libXrandr
- alsa? ( media-libs/alsa-lib )
- fdk? ( media-libs/fdk-aac:= )
- imagemagick? ( media-gfx/imagemagick:= )
- jack? ( virtual/jack )
- pulseaudio? ( media-sound/pulseaudio )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- CMAKE_REMOVE_MODULES_LIST=(FindFreetype)
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local libdir="$(get_libdir)"
- local mycmakeargs=(
- -DDISABLE_ALSA="$(usex !alsa)"
- -DDISABLE_FREETYPE="$(usex !truetype)"
- -DDISABLE_JACK="$(usex !jack)"
- -DDISABLE_LIBFDK="$(usex !fdk)"
- -DDISABLE_PULSEAUDIO="$(usex !pulseaudio)"
- -DDISABLE_V4L2="$(usex !v4l)"
- -DLIBOBS_PREFER_IMAGEMAGICK="$(usex imagemagick)"
- -DOBS_MULTIARCH_SUFFIX="${libdir#lib}"
- -DUNIX_STRUCTURE=1
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if ! use alsa && ! use pulseaudio; then
- elog "To be able to use the audio capture features, either the"
- elog "'alsa' or the 'pulseaudio' USE-flag needs to be enabled."
- fi
-}
diff --git a/media-video/obs-studio/obs-studio-0.15.1.ebuild b/media-video/obs-studio/obs-studio-0.16.2.ebuild
similarity index 71%
rename from media-video/obs-studio/obs-studio-0.15.1.ebuild
rename to media-video/obs-studio/obs-studio-0.16.2.ebuild
index ecaa3bcff40c..678d13dc8d77 100644
--- a/media-video/obs-studio/obs-studio-0.15.1.ebuild
+++ b/media-video/obs-studio/obs-studio-0.16.2.ebuild
@@ -35,6 +35,7 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
media-video/ffmpeg:=[x264]
+ net-misc/curl
x11-libs/libXcomposite
x11-libs/libXinerama
x11-libs/libXrandr
@@ -55,8 +56,6 @@ src_prepare() {
CMAKE_REMOVE_MODULES_LIST=(FindFreetype)
cmake-utils_src_prepare
-
- default
}
src_configure() {
@@ -78,7 +77,28 @@ src_configure() {
pkg_postinst() {
if ! use alsa && ! use pulseaudio; then
- elog "To be able to use the audio capture features, either the"
- elog "'alsa' or the 'pulseaudio' USE-flag needs to be enabled."
+ elog
+ elog "For the audio capture features to be available,"
+ elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+ elog "be enabled."
+ elog
+ fi
+
+ if ! has_version "sys-apps/dbus"; then
+ elog
+ elog "The 'sys-apps/dbus' package is not installed, but"
+ elog "could be used for disabling hibernating, screensaving,"
+ elog "and sleeping. Where it is not installed,"
+ elog "'xdg-screensaver reset' is used instead"
+ elog "(if 'x11-misc/xdg-utils' is installed)."
+ elog
+ fi
+
+ if ! has_version "media-libs/speex"; then
+ elog
+ elog "For the speexdsp-based noise suppression filter"
+ elog "to be available, the 'media-libs/speex' package needs"
+ elog "to be installed."
+ elog
fi
}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 738501dcba0a..678d13dc8d77 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -34,8 +34,8 @@ DEPEND="
dev-qt/qttest:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
- media-libs/x264:=
- media-video/ffmpeg:=
+ media-video/ffmpeg:=[x264]
+ net-misc/curl
x11-libs/libXcomposite
x11-libs/libXinerama
x11-libs/libXrandr
@@ -77,7 +77,28 @@ src_configure() {
pkg_postinst() {
if ! use alsa && ! use pulseaudio; then
- elog "To be able to use the audio capture features, either the"
- elog "'alsa' or the 'pulseaudio' USE-flag needs to be enabled."
+ elog
+ elog "For the audio capture features to be available,"
+ elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+ elog "be enabled."
+ elog
+ fi
+
+ if ! has_version "sys-apps/dbus"; then
+ elog
+ elog "The 'sys-apps/dbus' package is not installed, but"
+ elog "could be used for disabling hibernating, screensaving,"
+ elog "and sleeping. Where it is not installed,"
+ elog "'xdg-screensaver reset' is used instead"
+ elog "(if 'x11-misc/xdg-utils' is installed)."
+ elog
+ fi
+
+ if ! has_version "media-libs/speex"; then
+ elog
+ elog "For the speexdsp-based noise suppression filter"
+ elog "to be available, the 'media-libs/speex' package needs"
+ elog "to be installed."
+ elog
fi
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index abe703dbb8a9..8e4216e6d776 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Oct 2016 19:10:39 +0000
+Tue, 04 Oct 2016 06:10:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index abe703dbb8a9..8e4216e6d776 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Oct 2016 19:10:39 +0000
+Tue, 04 Oct 2016 06:10:38 +0000
diff --git a/metadata/md5-cache/app-arch/zstd-1.0.0-r1 b/metadata/md5-cache/app-arch/zstd-1.0.0-r1
deleted file mode 100644
index 8af4d9c1abc7..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.0.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=zstd fast compression library
-EAPI=6
-HOMEPAGE=http://facebook.github.io/zstd/
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/facebook/zstd/archive/v1.0.0.tar.gz -> zstd-1.0.0.tar.gz
-_md5_=3bd158e35fe14b1bf21a5eb91bb0708f
diff --git a/metadata/md5-cache/app-arch/zstd-1.1.0 b/metadata/md5-cache/app-arch/zstd-1.1.0
new file mode 100644
index 000000000000..46dac7dbffa3
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=zstd fast compression library
+EAPI=6
+HOMEPAGE=http://facebook.github.io/zstd/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/facebook/zstd/archive/v1.1.0.tar.gz -> zstd-1.1.0.tar.gz
+_md5_=8c95663753c05dd3c73e56fc19ee466c
diff --git a/metadata/md5-cache/app-crypt/bcrypt-1.1 b/metadata/md5-cache/app-crypt/bcrypt-1.1
deleted file mode 100644
index 69de06e0605b..000000000000
--- a/metadata/md5-cache/app-crypt/bcrypt-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/zlib
-DESCRIPTION=A file encryption utility using Paul Kocher's implementation of the blowfish algorithm
-EAPI=0
-HOMEPAGE=http://bcrypt.sourceforge.net/
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/bcrypt/bcrypt-1.1.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=6805637add6a0673e1d7ec4f79efec59
diff --git a/metadata/md5-cache/app-crypt/scl011-bin-2.06 b/metadata/md5-cache/app-crypt/scl011-bin-2.06
deleted file mode 100644
index 6c3af7e75039..000000000000
--- a/metadata/md5-cache/app-crypt/scl011-bin-2.06
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-apps/pcsc-lite virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=pcsc-lite driver for the German identification card (nPA)
-EAPI=4
-HOMEPAGE=http://www.scmmicro.com/de/products-services/chipkartenleser-terminals/kontaktlos-dual-interface/it-sicherheitskit-basisleser/treiber.html
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=SCM-MICRO
-RDEPEND=sys-apps/pcsc-lite
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=x86? ( http://www.scmmicro.com/npa/files/scl011_2.06_linux_32bit.tar.gz ) amd64? ( http://www.scmmicro.com/npa/files/scl011_2.06_linux_64bit.tar.gz )
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 udev 73058269b3e70e34e084fa3981282338
-_md5_=78308e05e503f6a432347191f1088077
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
new file mode 100644
index 000000000000..8f15cf1cf126
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/f-0.19.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
+DESCRIPTION=Modern API for working with files and directories in Emacs
+EAPI=6
+HOMEPAGE=https://github.com/rejeep/f.el
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
+_eclasses_=elisp 7e36316fe822639d5a29fa10d5529eb9 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=4ca62e31e76adc32cfb32081959218e8
diff --git a/metadata/md5-cache/app-emulation/lxd-2.0.3-r1 b/metadata/md5-cache/app-emulation/lxd-2.0.3-r1
deleted file mode 100644
index aeae8d46584d..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=dev-go/go-crypto dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) >=dev-lang/go-1.4.2:= virtual/pkgconfig
-DESCRIPTION=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon nls test linguas_de linguas_fr linguas_ja
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=daemon? ( app-admin/cgmanager app-arch/xz-utils app-emulation/lxc[cgmanager,seccomp] net-misc/rsync[xattr] sys-apps/iproute2 sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~stasibear/distfiles/lxd-2.0.3.tar.bz2
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=3164b7b134562da4316f5ce4c6db1fee
diff --git a/metadata/md5-cache/app-emulation/lxd-2.1 b/metadata/md5-cache/app-emulation/lxd-2.1
deleted file mode 100644
index 0929f9693026..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=dev-go/go-crypto dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) >=dev-lang/go-1.4.2:= virtual/pkgconfig
-DESCRIPTION=Fast, dense and secure container management
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon nls test linguas_de linguas_fr linguas_ja
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=daemon? ( app-admin/cgmanager app-arch/xz-utils app-emulation/lxc[cgmanager,seccomp] net-misc/rsync[xattr] sys-apps/iproute2 sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~stasibear/distfiles/lxd-2.1.tar.bz2
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=3164b7b134562da4316f5ce4c6db1fee
diff --git a/metadata/md5-cache/app-emulation/lxd-2.3 b/metadata/md5-cache/app-emulation/lxd-2.3
new file mode 100644
index 000000000000..6f7cc0a57e3d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.7.1 dev-go/go-crypto dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq dev-db/sqlite net-misc/curl sys-devel/gettext ) >=dev-lang/go-1.4.2:= virtual/pkgconfig
+DESCRIPTION=Fast, dense and secure container management
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
+IUSE=+daemon nls test linguas_de linguas_fr linguas_ja
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=daemon? ( app-admin/cgmanager app-arch/xz-utils app-emulation/lxc[cgmanager,seccomp] net-dns/dnsmasq[dhcp,ipv6] net-misc/rsync[xattr] sys-apps/iproute2[ipv6] sys-fs/squashfs-tools virtual/acl )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~stasibear/distfiles/lxd-2.3.tar.bz2
+_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec l10n e26ea0642846685782f1813642e7ff0f linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c970da872a5dd802d2083339eaf0eeb9
diff --git a/metadata/md5-cache/dev-libs/crypto++-5.6.4 b/metadata/md5-cache/dev-libs/crypto++-5.6.4
new file mode 100644
index 000000000000..b8f5b628ddf1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/crypto++-5.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=app-arch/unzip
+DESCRIPTION=C++ class library of cryptographic schemes
+EAPI=6
+HOMEPAGE=http://cryptopp.com
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=Boost-1.0
+SLOT=0/5.6
+SRC_URI=mirror://sourceforge/cryptopp/cryptopp564.zip
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=482e44c14dcca700342191407f6953ab
diff --git a/metadata/md5-cache/dev-python/aodhclient-0.6.0 b/metadata/md5-cache/dev-python/aodhclient-0.6.0
new file mode 100644
index 000000000000..c6df6d1f39f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aodhclient-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A client for the OpenStack Aodh API
+EAPI=6
+HOMEPAGE=https://github.com/openstack/python-aodhclient
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cliff-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cliff-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aodhclient/aodhclient-0.6.0.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=215575dc2490fd8caedb05498727b5d8
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.1 b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.1
new file mode 100644
index 000000000000..d2d6c577372a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=This is a client library for Ceilometer built on the Ceilometer API
+EAPI=6
+HOMEPAGE=https://github.com/openstack/python-ceilometerclient
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.1.0 >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-2.6.1.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=c61f006aa5afb2bfb086fef5cef031f0
diff --git a/metadata/md5-cache/dev-python/python-senlinclient-1.0.0 b/metadata/md5-cache/dev-python/python-senlinclient-1.0.0
new file mode 100644
index 000000000000..38eaf78497fb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-senlinclient-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A client for the OpenStack Senlin API
+EAPI=6
+HOMEPAGE=https://github.com/openstack/python-senlinclient
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/openstacksdk-0.9.4 >=dev-python/osc-lib-1.0.2 >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.4.0 >=dev-python/pyyaml-3.1.0 >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-senlinclient/python-senlinclient-1.0.0.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8556cbf4ed695d6f6f8c22c6e08012ed
diff --git a/metadata/md5-cache/dev-python/python-troveclient-1.3.0 b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
index 263b9c1d524b..daaf222f3ab4 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-1.3.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-1.3.0
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-mock-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] !~dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=This is a client for the OpenStack Trove API, a scalable relational database service
+DESCRIPTION=A client for the OpenStack Trove API, a scalable relational database service
EAPI=5
HOMEPAGE=https://github.com/openstack/python-troveclient
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
SLOT=0
SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-1.3.0.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=53a665afe2fce8a0dfcf6c049d141fc5
+_md5_=c49c134e7a9da3caab973e013d7edcec
diff --git a/metadata/md5-cache/dev-python/python-troveclient-2.5.0 b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
new file mode 100644
index 000000000000..635b5b88da75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A client for the OpenStack Trove API, a scalable relational database service
+EAPI=6
+HOMEPAGE=https://github.com/openstack/python-troveclient
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] =dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-2.5.0.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cacf41a4981a278be52fc3b9b4b073b9
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
new file mode 100644
index 000000000000..ebf9f1689747
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.65
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-ruby/rex-random_identifier[ruby_targets_ruby20] dev-ruby/rex-text[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rex-random_identifier[ruby_targets_ruby21] dev-ruby/rex-text[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rex-random_identifier[ruby_targets_ruby22] dev-ruby/rex-text[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts
+EAPI=5
+HOMEPAGE=https://rubygems.org/gems/rex-powershell
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://rubygems/rex-powershell-0.1.65.gem
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d6b8114bdfc64549ebbe6f7d00038ba1
diff --git a/metadata/md5-cache/games-sports/torcs-1.3.6-r1 b/metadata/md5-cache/games-sports/torcs-1.3.6-r1
new file mode 100644
index 000000000000..a8725318e2f4
--- /dev/null
+++ b/metadata/md5-cache/games-sports/torcs-1.3.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis:= media-libs/openal >=media-libs/plib-1.8.5 sys-libs/zlib:0= virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-proto/xf86vidmodeproto !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The Open Racing Car Simulator
+EAPI=6
+HOMEPAGE=http://torcs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FreeArt
+RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis:= media-libs/openal >=media-libs/plib-1.8.5 sys-libs/zlib:0= virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr
+SLOT=0
+SRC_URI=mirror://sourceforge/torcs/torcs-1.3.6.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=193bf6928249b506320435a26aa8358c
diff --git a/metadata/md5-cache/games-sports/trigger-0.6.1-r1 b/metadata/md5-cache/games-sports/trigger-0.6.1-r1
new file mode 100644
index 000000000000..5c27533b0b06
--- /dev/null
+++ b/metadata/md5-cache/games-sports/trigger-0.6.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=dev-games/physfs media-libs/freealut media-libs/libsdl media-libs/openal media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer virtual/glu virtual/opengl dev-util/ftjam
+DESCRIPTION=Free OpenGL rally car racing game
+EAPI=6
+HOMEPAGE=http://www.positro.net/trigger/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/freealut media-libs/libsdl media-libs/openal media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/trigger-rally/trigger-rally-0.6.1.tar.bz2
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=5d8dc367ce077721e5c966ba7210b002
diff --git a/metadata/md5-cache/games-sports/trophy-2.0.3-r1 b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
new file mode 100644
index 000000000000..cd8319adf501
--- /dev/null
+++ b/metadata/md5-cache/games-sports/trophy-2.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst
+DEPEND=dev-games/clanlib:0.8[opengl] virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=2D Racing Game
+EAPI=6
+HOMEPAGE=http://trophy.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/clanlib:0.8[opengl]
+SLOT=0
+SRC_URI=mirror://sourceforge/trophy/trophy-2.0.3.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a141c19876b9a1b77f60e37c0789ec87
diff --git a/metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1 b/metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
new file mode 100644
index 000000000000..ca4603869748
--- /dev/null
+++ b/metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/freealut media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis >=media-libs/openal-1 media-libs/sdl-image virtual/opengl virtual/glu nls? ( virtual/libintl ) sys-devel/gettext
+DESCRIPTION=Remake of the famous Stunts game
+EAPI=6
+HOMEPAGE=http://www.ultimatestunts.nl/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/freealut media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis >=media-libs/openal-1 media-libs/sdl-image virtual/opengl virtual/glu nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0771.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2c604ef472b8e4663ef82eb30ed12bd6
diff --git a/metadata/md5-cache/media-libs/exiftool-10.28 b/metadata/md5-cache/media-libs/exiftool-10.28
new file mode 100644
index 000000000000..22c204e94710
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-10.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.28.tar.gz
+_eclasses_=multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce
+_md5_=4601702180ec547ebbe0d32fbc7b8e29
diff --git a/metadata/md5-cache/media-libs/libmediainfo-0.7.89 b/metadata/md5-cache/media-libs/libmediainfo-0.7.89
new file mode 100644
index 000000000000..0797c7095488
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.89
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo libraries
+EAPI=6
+HOMEPAGE=http://mediaarea.net/mediainfo/
+IUSE=curl doc mms static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://mediaarea.net/download/source/libmediainfo/0.7.89/libmediainfo_0.7.89.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=686158f0b547f1adafcfde9fd6f9527e
diff --git a/metadata/md5-cache/media-sound/adplay-1.7 b/metadata/md5-cache/media-sound/adplay-1.7
index 0be1f2bdcbe5..2bed98004f7f 100644
--- a/metadata/md5-cache/media-sound/adplay-1.7
+++ b/metadata/md5-cache/media-sound/adplay-1.7
@@ -1,7 +1,7 @@
DEFINED_PHASES=configure
DEPEND=>=media-libs/adplug-2.2.1 dev-cpp/libbinio alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) sdl? ( media-libs/libsdl ) virtual/pkgconfig
DESCRIPTION=A console player for AdLib music
-EAPI=4
+EAPI=6
HOMEPAGE=http://adplug.sourceforge.net
IUSE=alsa ao oss sdl
KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
RDEPEND=>=media-libs/adplug-2.2.1 dev-cpp/libbinio alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) sdl? ( media-libs/libsdl )
SLOT=0
SRC_URI=mirror://sourceforge/adplug/adplay-1.7.tar.bz2
-_md5_=9535db030e051dc12208ea9b95782503
+_md5_=58a47c3fab5fb4254a6ad288564709dd
diff --git a/metadata/md5-cache/media-video/mediainfo-0.7.89 b/metadata/md5-cache/media-video/mediainfo-0.7.89
new file mode 100644
index 000000000000..a99462f79e29
--- /dev/null
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.89
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.89[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo supplies technical and tag information about media files
+EAPI=6
+HOMEPAGE=http://mediaarea.net/mediainfo/
+IUSE=curl mms wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.89[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+SLOT=0
+SRC_URI=http://mediaarea.net/download/source/mediainfo/0.7.89/mediainfo_0.7.89.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 wxwidgets 9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=5b55da613893b888274e893b29b9c93a
diff --git a/metadata/md5-cache/media-video/obs-studio-0.14.2 b/metadata/md5-cache/media-video/obs-studio-0.14.2
deleted file mode 100644
index 79f901b8bedd..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-0.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/x264:= media-video/ffmpeg:= x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/x264:= media-video/ffmpeg:= x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/0.14.2.tar.gz -> obs-studio-0.14.2.tar.gz
-_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b26b3426bd6fd106e22d0ac4bb4b6da
diff --git a/metadata/md5-cache/media-video/obs-studio-0.15.1 b/metadata/md5-cache/media-video/obs-studio-0.15.1
deleted file mode 100644
index 3d16401ff4d7..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-0.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/0.15.1.tar.gz -> obs-studio-0.15.1.tar.gz
-_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2de46f7fff5b705c64390c254bf6cd8c
diff --git a/metadata/md5-cache/media-video/obs-studio-0.16.2 b/metadata/md5-cache/media-video/obs-studio-0.16.2
new file mode 100644
index 000000000000..3c5c30b5e203
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-0.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=6
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+SLOT=0
+SRC_URI=https://github.com/jp9000/obs-studio/archive/0.16.2.tar.gz -> obs-studio-0.16.2.tar.gz
+_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bc1ea007c8e3b1041cd918595db34c59
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 691e554b18bb..0fa68c3a0e38 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/x264:= media-video/ffmpeg:= x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Software for Recording and Streaming Live Video Content
EAPI=6
HOMEPAGE=https://obsproject.com
IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/x264:= media-video/ffmpeg:= x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
SLOT=0
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b26b3426bd6fd106e22d0ac4bb4b6da
+_md5_=bc1ea007c8e3b1041cd918595db34c59
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.0.10.1 b/metadata/md5-cache/net-firewall/shorewall-5.0.12
similarity index 65%
rename from metadata/md5-cache/net-firewall/shorewall-5.0.10.1
rename to metadata/md5-cache/net-firewall/shorewall-5.0.12
index 80bdb918b29b..39652e2575b6 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.0.10.1
+++ b/metadata/md5-cache/net-firewall/shorewall-5.0.12
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python? ( =dev-lang/python-2* )
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= || ( dev-libs/libltdl:0 =sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python? ( =dev-lang/python-2* )
DESCRIPTION=A useful collection of mail servers, clients, and filters
EAPI=5
HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet
KEYWORDS=amd64 arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:* sys-libs/readline:* || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A useful collection of mail servers, clients, and filters
EAPI=5
HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:* sys-libs/readline:* || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://gnu-alpha/mailutils/mailutils-2.99.98.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=0c84e858aff92cc89d6e72776cf0ac4d
+_md5_=1f4842c56d50fac9dac65ffb7206f966
diff --git a/metadata/md5-cache/net-mail/mailutils-2.99.99 b/metadata/md5-cache/net-mail/mailutils-2.99.99
index 3352239e7655..89ae12b6969d 100644
--- a/metadata/md5-cache/net-mail/mailutils-2.99.99
+++ b/metadata/md5-cache/net-mail/mailutils-2.99.99
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:0= sys-libs/readline:* || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A useful collection of mail servers, clients, and filters
EAPI=5
HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:0= sys-libs/readline:* || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= || ( dev-libs/libltdl:0 =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
SLOT=0
SRC_URI=mirror://gnu-alpha/mailutils/mailutils-2.99.99.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=a105a503463f77c890568f9e3a1862d5
+_md5_=39c6ff8c12fc635329ef8f772a5751b3
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc15 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc15
index 62b20ab3ffc8..0b7005011064 100644
--- a/metadata/md5-cache/net-misc/remmina-1.2.0_rc15
+++ b/metadata/md5-cache/net-misc/remmina-1.2.0_rc15
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31.18:2 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxk
SLOT=0
SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.15.tar.gz -> remmina-1.2.0_rc15.tar.gz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dcf1180d4f4bb54451e4b9b43c0d213e
+_md5_=c4de1a7bf9edaa08f290d48f162d7534
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2 b/metadata/md5-cache/net-nds/jxplorer-3.2
deleted file mode 100644
index 7a794b4b613d..000000000000
--- a/metadata/md5-cache/net-nds/jxplorer-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A fully functional ldap browser written in java
-EAPI=0
-HOMEPAGE=http://jxplorer.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=CAOSL
-RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8ef6e74bad7071eb75ea28afe4fdd0a1
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2-r2 b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
deleted file mode 100644
index bf0606125bd3..000000000000
--- a/metadata/md5-cache/net-nds/jxplorer-3.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A fully functional ldap browser written in java
-EAPI=4
-HOMEPAGE=http://jxplorer.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=CAOSL
-RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 prefix 99dcca42e6528d8fe3c214bf5731aaf2 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f126dc58131aeec93001fec4d5e2cbd9
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
new file mode 100644
index 000000000000..815ef8ee2fc9
--- /dev/null
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=dev-java/javahelp-2.0.02_p46:0 >=virtual/jdk-1.5 test? ( dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A fully functional ldap browser written in Java
+EAPI=5
+HOMEPAGE=http://jxplorer.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=CAOSL
+RDEPEND=>=dev-java/javahelp-2.0.02_p46:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.2-project.zip
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 prefix 99dcca42e6528d8fe3c214bf5731aaf2 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=9be77139025a3d37194a95555977816e
diff --git a/metadata/md5-cache/sci-biology/consed-19-r2 b/metadata/md5-cache/sci-biology/consed-19-r2
deleted file mode 100644
index 75df6b1b06f0..000000000000
--- a/metadata/md5-cache/sci-biology/consed-19-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0
-DESCRIPTION=A genome sequence finishing program
-EAPI=3
-HOMEPAGE=http://bozeman.mbt.washington.edu/consed/consed.html
-KEYWORDS=~amd64 ~x86
-LICENSE=phrap
-RDEPEND=>=x11-libs/motif-2.3:0 >=sci-biology/phred-000925 >=sci-biology/phrap-1.080721
-RESTRICT=fetch
-SLOT=0
-SRC_URI=consed-19-sources.tar.gz consed-19-linux.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=87bace678f02004b19b2ab3b4e392aad
diff --git a/metadata/md5-cache/sci-biology/consed-27 b/metadata/md5-cache/sci-biology/consed-27
deleted file mode 100644
index 930177620ec9..000000000000
--- a/metadata/md5-cache/sci-biology/consed-27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0
-DESCRIPTION=A genome sequence finishing program
-EAPI=5
-HOMEPAGE=http://bozeman.mbt.washington.edu/consed/consed.html
-KEYWORDS=~amd64 ~x86
-LICENSE=phrap
-RDEPEND=>=x11-libs/motif-2.3:0 sci-biology/samtools >=sci-biology/phred-000925 >=sci-biology/phrap-1.080721 dev-lang/perl
-RESTRICT=fetch
-SLOT=0
-SRC_URI=consed-27-sources.tar.gz consed-27-linux.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=aacf6ebdd167286a4e3ffcb214152b9b
diff --git a/metadata/md5-cache/sci-biology/consed-29 b/metadata/md5-cache/sci-biology/consed-29
new file mode 100644
index 000000000000..ff3ed191488c
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/consed-29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst prepare
+DEPEND=x11-libs/libX11 x11-libs/motif:0 sci-biology/samtools:0.1-legacy virtual/pkgconfig
+DESCRIPTION=A genome sequence finishing program
+EAPI=6
+HOMEPAGE=http://bozeman.mbt.washington.edu/consed/consed.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=phrap
+RDEPEND=x11-libs/libX11 x11-libs/motif:0 sci-biology/samtools:0.1-legacy dev-lang/perl >=sci-biology/phred-071220-r1 >=sci-biology/phrap-1.080812-r2
+RESTRICT=fetch
+SLOT=0
+SRC_URI=consed-29-sources.tar.gz consed-29-linux.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=60e6b248f16b3a00f6592dfb59b125b4
diff --git a/metadata/md5-cache/sci-biology/phrap-1.080812-r1 b/metadata/md5-cache/sci-biology/phrap-1.080812-r2
similarity index 53%
rename from metadata/md5-cache/sci-biology/phrap-1.080812-r1
rename to metadata/md5-cache/sci-biology/phrap-1.080812-r2
index f8d2d9b1d8c7..4222b83647dd 100644
--- a/metadata/md5-cache/sci-biology/phrap-1.080812-r1
+++ b/metadata/md5-cache/sci-biology/phrap-1.080812-r2
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install nofetch prepare
+DEFINED_PHASES=compile install nofetch
DESCRIPTION=Shotgun assembly and alignment utilities
-EAPI=5
+EAPI=6
HOMEPAGE=http://www.phrap.org/
KEYWORDS=~amd64 ~x86
LICENSE=phrap
@@ -8,4 +8,5 @@ RDEPEND=dev-lang/perl dev-perl/Tk
RESTRICT=fetch
SLOT=0
SRC_URI=phrap-1.080812-distrib.tar.gz
-_md5_=f826e1b40b9f0db523b295a5c6a899da
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=afb69d253c8b277d43dcb738ddb3e9c3
diff --git a/metadata/md5-cache/sci-biology/phred-071220 b/metadata/md5-cache/sci-biology/phred-071220-r1
similarity index 61%
rename from metadata/md5-cache/sci-biology/phred-071220
rename to metadata/md5-cache/sci-biology/phred-071220-r1
index ae4c42a59a37..1b42c293180e 100644
--- a/metadata/md5-cache/sci-biology/phred-071220
+++ b/metadata/md5-cache/sci-biology/phred-071220-r1
@@ -1,10 +1,11 @@
DEFINED_PHASES=compile install nofetch
DESCRIPTION=A base caller for Sanger DNA sequencing
-EAPI=0
+EAPI=6
HOMEPAGE=http://phrap.org/phredphrapconsed.html
KEYWORDS=~amd64 ~x86
LICENSE=phrap
RESTRICT=fetch
SLOT=0
SRC_URI=phred-dist-071220.b-acd.tar.gz
-_md5_=3fea319425324b49a3e8a1c1fc146efd
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=e611bf900b7a37ed847baa138fd96bb6
diff --git a/metadata/md5-cache/sci-biology/samtools-0.1.20-r2 b/metadata/md5-cache/sci-biology/samtools-0.1.20-r2
deleted file mode 100644
index 7cac065ea479..000000000000
--- a/metadata/md5-cache/sci-biology/samtools-0.1.20-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0= dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
-EAPI=6
-HOMEPAGE=http://samtools.sourceforge.net/
-IUSE=examples python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0= dev-lang/perl
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0.1-legacy
-SRC_URI=https://github.com/samtools/samtools/archive/0.1.20.tar.gz -> samtools-0.1.20.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=9e04100e7a9246f6b77261416f9c77c4
diff --git a/metadata/md5-cache/sci-biology/samtools-0.1.20-r3 b/metadata/md5-cache/sci-biology/samtools-0.1.20-r3
new file mode 100644
index 000000000000..ae2b8ce3af36
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/samtools-0.1.20-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=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(+)] sys-libs/ncurses:0= dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
+EAPI=6
+HOMEPAGE=http://samtools.sourceforge.net/
+IUSE=examples python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+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(+)] sys-libs/ncurses:0= dev-lang/perl
+REQUIRED_USE=python_targets_python2_7
+SLOT=0.1-legacy
+SRC_URI=https://github.com/samtools/samtools/archive/0.1.20.tar.gz -> samtools-0.1.20.tar.gz
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=1e7dbcbc9661826d1b34cbe736e9f360
diff --git a/metadata/md5-cache/sci-biology/tophat-2.1.1-r2 b/metadata/md5-cache/sci-biology/tophat-2.1.1-r3
similarity index 97%
rename from metadata/md5-cache/sci-biology/tophat-2.1.1-r2
rename to metadata/md5-cache/sci-biology/tophat-2.1.1-r3
index 78cadf4fa628..cd56b917fc78 100644
--- a/metadata/md5-cache/sci-biology/tophat-2.1.1-r2
+++ b/metadata/md5-cache/sci-biology/tophat-2.1.1-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=https://ccb.jhu.edu/software/tophat/downloads/tophat-2.1.1.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=e30eb78415bdf9071486e8f952e66b85
+_md5_=0182a9a0e1edc7fff427a466a0747e4e
diff --git a/metadata/md5-cache/sys-cluster/cinder-2016.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
index 12ac9250f0d3..0f0b4ad74eaa 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=https://launchpad.net/cinder
IUSE=+api +scheduler +volume infiniband iscsi lio lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4
LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( tgt? ( sys-block/tgt ) lio? ( sys-block/targetcli sys-block/lio-utils ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( tgt? ( sys-block/tgt ) lio? ( sys-block/targetcli sys-block/lio-utils ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( || ( tgt lio ) ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 git-r3 00f60a84fc7b499c99edfe99caea9f95 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=92c6f7e98f9649048922159a0a0c3753
+_md5_=6a8822d4a169674d1f522c384ba51ea2
diff --git a/metadata/md5-cache/sys-cluster/heat-2016.2.9999 b/metadata/md5-cache/sys-cluster/heat-2016.2.9999
new file mode 100644
index 000000000000..52d1cf7a022e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-2016.2.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+EAPI=6
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0 >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] =dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 git-r3 00f60a84fc7b499c99edfe99caea9f95 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e87139ff3037c788cca468e74c8dc2b7
diff --git a/metadata/md5-cache/sys-cluster/openstack-meta-2016.2.9999 b/metadata/md5-cache/sys-cluster/openstack-meta-2016.2.9999
index 767bbd1dc019..733c51e0ea11 100644
--- a/metadata/md5-cache/sys-cluster/openstack-meta-2016.2.9999
+++ b/metadata/md5-cache/sys-cluster/openstack-meta-2016.2.9999
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=A openstack meta-package for installing the various openstack pieces
EAPI=6
HOMEPAGE=https://openstack.org
-IUSE=keystone swift neutron glance cinder nova
+IUSE=cinder glance heat keystone neutron nova swift
LICENSE=Apache-2.0
-RDEPEND=keystone? ( ~sys-auth/keystone-2016.2.9999 ) swift? ( || ( ~sys-cluster/swift-2.9.0 ~sys-cluster/swift-2.10.0 ) ) neutron? ( ~sys-cluster/neutron-2016.2.9999 ) glance? ( ~app-admin/glance-2016.2.9999 ) cinder? ( ~sys-cluster/cinder-2016.2.9999 ) nova? ( ~sys-cluster/nova-2016.2.9999 )
+RDEPEND=keystone? ( ~sys-auth/keystone-2016.2.9999 ) swift? ( || ( ~sys-cluster/swift-2.9.0 ~sys-cluster/swift-2.10.0 ) ) neutron? ( ~sys-cluster/neutron-2016.2.9999 ) glance? ( ~app-admin/glance-2016.2.9999 ) cinder? ( ~sys-cluster/cinder-2016.2.9999 ) nova? ( ~sys-cluster/nova-2016.2.9999 ) heat? ( ~sys-cluster/heat-2016.2.9999 )
SLOT=0
-_md5_=773cd2135fe09f950d199e2cfc98f8a0
+_md5_=abff296e9ad2ceb7fb30fcaef08a2816
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1 b/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
similarity index 98%
rename from metadata/md5-cache/sys-libs/libsemanage-2.6_rc1
rename to metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
index 77de03bab52e..9c856683c4e6 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/libsemanage-2.6-rc1.tar.gz
_eclasses_=multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=9424eeb0d294612176aed71416b54769
+_md5_=d8a05e865c1ceeb8c45e2b739cf8b91a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index abe703dbb8a9..8e4216e6d776 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Oct 2016 19:10:39 +0000
+Tue, 04 Oct 2016 06:10:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dbca99fc65a6..cf4d08d15ee0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Oct 3 19:09:44 UTC 2016
+Tue Oct 4 06:09:43 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1300464dcba3..4564f955eea2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Oct 2016 19:30:01 +0000
+Tue, 04 Oct 2016 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c11b958de7c8..81db9cb531d6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1475521801 Mon 03 Oct 2016 07:10:01 PM UTC
+1475561401 Tue 04 Oct 2016 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index abe703dbb8a9..8e4216e6d776 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Oct 2016 19:10:39 +0000
+Tue, 04 Oct 2016 06:10:38 +0000
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 14bdf3174752..9ce020bec83d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,21 +1,21 @@
-DIST shorewall-5.0.10.1.tar.bz2 503114 SHA256 138d86968e99d079a6268ca05e00b22874448b29e5a9698cccba295b35c457cd SHA512 478792c0605174c85821ecddf3665b3ff0559074ee71a085c81035286f57987959619c40f5a6138fc832ed3cb3045f7e54b1a3242e0b7fa420661159d1238743 WHIRLPOOL a326ee33e060b02c0936135f701cd0f08b85d2bc3eb2cf9380ad764be280571c27b87ce7cafd51384a5e370f98cdf96caabb85d7cee6859d30a432a5874b7829
DIST shorewall-5.0.11.tar.bz2 504955 SHA256 b8a836d443c9d94c489dbd8e9672c0c42a4be0ca9a95e4762a64b615d96c8228 SHA512 6240e00fe9a381a35acc6c2307d73fd69a37345a653ee003d0c94a0fd6078e29afbb2237ad2be6ddf952d463e5af4f23cc24426aa7aaebfbb5ed4f3ee9aaa0b5 WHIRLPOOL e3e3b9b19e129f471d60e7a77dbf9bb49232137ad25a192d34fdcba1b44a8275caefffe23e6b2b76b76d685333848d331ea1ebaa4fc8900d651f7df728babe91
+DIST shorewall-5.0.12.tar.bz2 507676 SHA256 235f5a81c77f6f1d08f846c28b34ebe1f769d8d6015198962b2695aad4598f7f SHA512 c72adb081d5a7a7d2a43e48c18ee497f3c107e4687b80bb94be555d22c1d312dc2dc7f948ab0bad77ebcf51c3c98d24254001baf951dab274dfd7beb79ce5d81 WHIRLPOOL c521bac6cd6a1a814919d55f133117e56014ae1055e9d0ef4d2df2b1d7ffbf280b74cdcb61980eb424fd476c6642651f4be992022f57ccca518e5ae905ed4c83
DIST shorewall-5.0.7.2.tar.bz2 488554 SHA256 f88746e8fbce315e333855120c9c7bc0390ddd170696a8059bfe0a7c94887c50 SHA512 31fc0c2c1498eb67a311dd181340bdabb90170e16240a9cf4fb85d08773bbb33f6f857e9229133d98100d39e7c1a1b9c39118749094f65382698155d897ec7f1 WHIRLPOOL af78482e9b9909eda84b4dfc831a13219073c38db4d324d32a593b7be5829f7be8eba733db42dfdb6d5e86d638c8462c2b755bc5ba2f210c1ccd0cedfe369918
-DIST shorewall-core-5.0.10.1.tar.bz2 59308 SHA256 c048afa488da0ec3cf4d140fb105de45c984c6c1f71d88ce39a99bda4ba0ffe8 SHA512 a9a529f5c4c7d414d4cd3179378694fa25261159563425c64630b33e1ffe39594ca7eab171091b2412dd7c995bd113a08b0689eadf501e711b09b861fc1c295f WHIRLPOOL fca720a4ea18334d1d383f121a2424d6e726eed7cd47fbda7595f06c0e608aae413fa0d394c305052a8a457e4ffb2cafcb2081560882c7f77abac52a203168b6
DIST shorewall-core-5.0.11.tar.bz2 59845 SHA256 203122ee213bb31e464a25cf4e947800bea595914888cc496dafdd2e202b65ba SHA512 f210d2bbf3ff078a45d76334933d28d03a7a5ed27c1f7c599527f282c3215bcfda95359712e2bb2823e6416fd278cd099fd1fd188d1e21b1c2291802de28fa7b WHIRLPOOL 976660011903e9f688252be7fbc6ce648468156fe8c99c5b20b64fe9e385969f460ba764dce5fd26f99f1ddd527aabea57b896a6db12f8feed1f439a6c10b109
+DIST shorewall-core-5.0.12.tar.bz2 61097 SHA256 82f156ff653871cf3b02241884f4400a899469c536f2fe17443f7494ddc88a01 SHA512 6bbc163ddc323c56d5b3bf98885652b96c10f933026e3aa837870bfd5b9759d092fb9b0dc177669877df5642e4b90d7dd9571c544b5139db86ef451e57fa7c84 WHIRLPOOL 3aa6144aee78d939df00b807ef13fb1c54a196b4c57b27535ee75d1a89cab65eba5da061419c3a20f2701dd401bad89350fa433e1b3d7937a69f2288be907928
DIST shorewall-core-5.0.7.2.tar.bz2 53796 SHA256 97f984261ca24e11e0ce4ab8c6ee2bb7f877dad9ed5b3df292bc6a6336e50b4c SHA512 7d76fede69e1cd218e574087cdf609b8fce6997a0f904151f2f514558d1664008a5e7516e1d97a912fe028c95a4d313c3db8e180745c99b5e15b28d25a67ccf6 WHIRLPOOL 0be39a6b9db6c561d5d2bd5e192b77d81a59c9236dcd3595a2d9b03af00e7df06b8f9e7aeedc03f9226714c987b1e812fb053e472099649bc0f1295943ac1459
-DIST shorewall-docs-html-5.0.10.1.tar.bz2 4270330 SHA256 7dadc4996bd725b9391e4acc4a939337c37de5738a2dea5594d399b1e2a91995 SHA512 c575abbdd8d31f2cceee40b78f596bd7223d4bb1087dcb5b54d1edb2eff91b56e03e4a31f243c587b6357a185be5908cff5681dfc438ecd4224f04e309933327 WHIRLPOOL 3ee758b6c601e6eedb857d09d5f707ed7067be4e87afd22024c2212846ec13ca8b8052c9cc1ccbf484c849c852ca881c5c9c730cb672bc954e201e76dfc63a54
DIST shorewall-docs-html-5.0.11.tar.bz2 4270762 SHA256 744d85f5549ecec66007d0e2079aca0b10e78dd10cba806ceedb237c9396dbe7 SHA512 46840e849d3c51c67168b08bd81f5ffb257cd26f0febf26d94fc126ef23da78f996614ea71acec9cceeb280a29bb1250f370a5807bdc5a12a86375f7d41bb1ff WHIRLPOOL 491963832ad539e555dd28c343e1c1362f5581d386221e3f0d66a6735f4d1286b0ac4a100eebafaa564382a55662f12ad43d2223a08f8247c3c40e03246b7d45
+DIST shorewall-docs-html-5.0.12.tar.bz2 4271255 SHA256 b21a7c89a37e6188c397832ad3034183e7f2b9a601234d5ceafddd1c48e9d796 SHA512 640e2867dd99c679f0fb9dff7498784229d7de0e209bb203bf0c07b07f7977be397c7ce35303a25b6b2b425a7799707c83925c8c5e3d1fd9bc73dad7ae606f91 WHIRLPOOL ee93b1657b20f5b3e8298e08877b432cb21a80ddc6084ad6123017acdb4aa52ea17a228e268f4df3aa1ab47df374913516dcae6dafec9c7ac28593a8612b282a
DIST shorewall-docs-html-5.0.7.2.tar.bz2 4269013 SHA256 cf25f6f3db125ccdb45a27252f9896c338078b4d7c5dc2c73fda1edb5887c103 SHA512 11239c5d271b6e71aaa15880a1ed56566c1ce30b100c00a25e49279d0a9d07bd86484a43a4810a0904b84264a44c3cc65f0b12ec579ab0c953db26af3d8ed152 WHIRLPOOL 34f579be4799e8b5c17edc4b4b7a245bc7e6519a03226156fdc56f73abb6912d9a2b71c404b36ffd2458d4ab37a7a5ad1cc1622d3d2cc139204a3279c6a5b503
-DIST shorewall-init-5.0.10.1.tar.bz2 37413 SHA256 4066ef23bcb2702db5651705a086190663026856f94096800cff46438db9d97f SHA512 703b2f755c7e0d691e69b9508484551a1b331c85080b86b4aaa7c9513e4f0be55a25bf38bdf769b12be37b3bc48d8d34b6ac514c372605dd9bfbe11e17378e82 WHIRLPOOL 0097d09302e677afc39b4fbc722f179ba56370bae8070c75ad0594cb9e2dc7fd4d6ac5abc2bdb204dd30355b640f42894996a50ec61b940b2e86fa14e65a3401
DIST shorewall-init-5.0.11.tar.bz2 37931 SHA256 0ebb766872d86ac57055fff7be9c5f6044a0a062554dd936d4b9cdf7f6b0ef9d SHA512 e7c3446b753148ad446b354072b8b6421a691670584e99532bfba043352151f87136984691788344d5c4c2aaeb4c36f23e0d3423524cd55488723b2907e03cce WHIRLPOOL 5825fe40fc2f36feb4a78b9c232e784f7bfbed9ce0635c692d80294ac8eb675a5018a5c0570e0d7d431922aa0bfe9aa0da885565b49bf8df0fd26e4d58e2fd61
+DIST shorewall-init-5.0.12.tar.bz2 39311 SHA256 9217bae6709ae945133f84ef59b74fe27830db9b4783ef827b3b521fc8aa9128 SHA512 c1c961d9840d3e3015066d9dd11336ce97938487696f1ded7305d47bed9be8d49139d45b921664c293b009f9b184860e5a84ea6fdc2215e515a2985060de7e2e WHIRLPOOL cde1127c7741d3e3aa9c6f670abd15d9014ae6c1ed592cab5a9bc633d4e68ad34949c1427d83e5836c56996fb6d9ce2224322f8681e02227f4ce3a87b0970c59
DIST shorewall-init-5.0.7.2.tar.bz2 32525 SHA256 82b56c01e427e4806c4590b854adfe71feff4bed33185ec7be0310d8e8ae4991 SHA512 6ea2e2379d9baaca0730797f4d7f896f7350965cb203b8c322edc9e47bf0ce8966fd0d0ae5a01f50e5acc3a2578089bfe262e5567428aa13923e68cededda4b9 WHIRLPOOL de074623c93a43ca586a87f5ddae184ec2ce41a3a225f88aa0c92d0311e20cfd4c4b0c5a152bf8c9ca1daa0b159a306aeb321b960082000e99552704c34f9d1b
-DIST shorewall-lite-5.0.10.1.tar.bz2 53625 SHA256 82d79f2f918a763c20340276dd0bc3741920960425beafa8c21a4d314b1977de SHA512 729766d994b4286731a362af5b1316bfbe2a9607b97b662a69ae6f93971874d0707cf648e9b31728deb3533e7ccf0e83e1ad7d7d18d4b26c66e2a365bf8a7e3e WHIRLPOOL b95a224f590ec3b5baa884288d020b9bf25cdd771844cd0c5745d7dca03edf413d90645a743e17e22b2ae8265ee42c0ca977d8f7720de84de8b9674f6defe6c6
DIST shorewall-lite-5.0.11.tar.bz2 54188 SHA256 3ba77271a7203bdb1fd46bbe7adfefe0b78a5c6d4120aa567586c815c669b3c9 SHA512 d59da77e2ee69e9efdcbdd199159e5b749e03650dbe1e46d3df87c50ef739f2515b363d5aa313dfa8543d9255a46ce9dd8fecebb01e98666cea6b16dc185b52f WHIRLPOOL 8983fcdda937f6df29e91e6dc428c9eb5574a12dfaa4768b4816f18fb51cc1e0ba8aff2b6b8cb0a70f141d268a605aa3d9bdeb1d8e1707185fc382ff11c172e9
+DIST shorewall-lite-5.0.12.tar.bz2 55485 SHA256 206c34172b5566f0267269d759bd631109951b9bb8fec233cae508108d20ca01 SHA512 d6fab7803556f033583f067ae41a7d30499e8135c36218c2cfa1b9c208b00771e4bc66e189cd386fe96d262003eb779942c0527b71282cb52e95ba8657698b35 WHIRLPOOL 2b01c431b6687d00bf27fc27d977514b808813bb619aa7cb1437e2830c6d0eff0e6d705a25eeff024366a080f9aa94b83ff1b8baa0552a6020dd3f96ede382fb
DIST shorewall-lite-5.0.7.2.tar.bz2 48465 SHA256 7511a2f721c10e42628fe4dab1d8ce0c4499a76ad1ecb071a59575513f6b3d74 SHA512 d49fe0419da71ac492f2b48e142e353a09de746c5b842cf9f90added2e9e7578b1542d71c1f99251cbfd469bda73cd6fe151d45d71b38055365d5d36e67a806d WHIRLPOOL 8a0ff4aa17a2ab635488456f9bbd50d32a714dea56370b8cefe8938a5d12c16f906c24e0de8680251e5827038ea45f2c1bef1b477b1ffec76e2d4ff9c3703cc4
-DIST shorewall6-5.0.10.1.tar.bz2 228468 SHA256 045f75b895c5c4d23dac760e532984ab8108dcbd6b0610d021902028e1d62910 SHA512 019df4f8a3f873ca50dd88b8b069fa4b2ed7d3dd1579d368e0133475b05d09cd8e8642f2b1f384de7b650dc90f483972884ce0a064040ed70d7087fcaaa73319 WHIRLPOOL 0670de112b2b323c2edccd945c8dd697b25d356c73eb15ccc8dbbd28dbaed8250b73d81d5216339714e2c4da66369d051cc83ffb491b2afe10877e45efaccfe0
DIST shorewall6-5.0.11.tar.bz2 229065 SHA256 a52386b3fe384dbf57e62334fbd2df707ca801a7a420cd87cef1065187769059 SHA512 70a07d5f9b76f0cd0e032ccd158076f96eba871b0d0d832379449b98d91de4a9d4e461bb12bcd880d186d51b4dee79544eaa6e453fbe9f85606a59c8543dce1c WHIRLPOOL 870ebee755c9bfd12d2f29f5ff563245d4cd2a563ab6c5fc7a4febc0864af6712825a0375466a5cc2b23ebbdd1b1c653924699743d8a5010e388a7ed552a1ec3
+DIST shorewall6-5.0.12.tar.bz2 231289 SHA256 ec4d916834ba7dae9b5ccb5af33b4b45993821045e485f4d3e4e8d307fabf11a SHA512 4a9ede1c73454f065cd2ffeb542986138cca21dbe570dca20056a0f50364cb5c0d7560390ea273b49ca55501a1818a7c3ae03185ea5ff5171889e72677ba4a14 WHIRLPOOL ce3ed3941082f5d041f7a2f0aab390409c07167f2b69f3a636d3e17f283f5d750bde087d3031bc147ebc5de1e0c2b2b44dbc32fc63088e077f75f4fe51821744
DIST shorewall6-5.0.7.2.tar.bz2 222450 SHA256 cf78fb9c75e65315502a56b963baf81afec0563d5e2e7bf5e7461c0a0772a29a SHA512 d052185ef2edcf0c4c81de41c52ff4db5b31649ae14847791b87a99e644b9a0a3026aeaa09bdd7d90687eeca5e86938af400574c31e6f44255fdf045b6716505 WHIRLPOOL 4b0779d7870700a62f614deb7a359add26520d6d989dfbe9c6feb0f027073d53752f0bc604008a2e9dfc5d719521fb25bef1967eea1b92d88efb151bb6b574f4
-DIST shorewall6-lite-5.0.10.1.tar.bz2 53078 SHA256 36287800a3eb240e9206bc427835c97d22f8ab309eb01f718e33b3d58f43b8a8 SHA512 cca1c02a832b66bcb03d6314266e38c10ed5419ab7a2726b105e6cb3fa3d3d7823d7407a37990379687a17bbf9640505b0542406d80d69d07c6a92b70ea8d8d0 WHIRLPOOL b05fa3bfb2bb7e7f3efa7033ed1bf61fdc29e3f0b943c04f438c91be58157f046436ce7716d1007843e59d8be5452b8cd59832960dd6d3e1160f75375b17f935
DIST shorewall6-lite-5.0.11.tar.bz2 53608 SHA256 3e31469b0d5bdb6fcceba1cf0004e6c36b7ce5814c68f42a66b5aafcbd727120 SHA512 fe46d2feb20d8c5d98a2c3f4ca5210313e40202c20cfa3f1f1e26c20a80f0a6412848ea98a909ac0994ff833423e22df2eb6e63c411b5cf3f5e4403e53c493cf WHIRLPOOL 71f860eb00c969fa2f56ba2f7fc5648e9646abb7e09b09009a8e6c8b2c98fd5dd0a3590649a87f8efbc215436435c52f1f84a2fbc00abed450b7e1a4d5d04fe4
+DIST shorewall6-lite-5.0.12.tar.bz2 54944 SHA256 8c00841ff085f8887217979529f75583d3774e94b146532e9b700c02ce297b76 SHA512 558215761ec2a5bdf809efde1089cbd9e08ccbe691b34cb2fba974be7b7f70c1a097721dedb8838a7fdf2cc326b3f111926cace275d10c32dbdbbef09bbf1947 WHIRLPOOL ca9485cb854719f34e7365eea0e1b32973fc25e249137790e47b5d3a26031161512cdfd23c8a9630f1533c592e5612eb8dd20727295aa88d1e45f3b89b1782bf
DIST shorewall6-lite-5.0.7.2.tar.bz2 47869 SHA256 3351ec654e7c65c5f0e6865b604d04f8fd164ff10af892aa0e586282dbd8def1 SHA512 75003fba3d2dc6e3b4eea27b21574c893d1759de2db1b008fff2de233d90159c4221cc1018a693745f7786702049cfe21636d12e80c02aedd2cdc904599bda5b WHIRLPOOL 1129bcae9878fe0f2b34944fd0b10f117160c617be79d837da056c0fd50f6f5f1b0855707b014618a7a8db41a6ab59e30707e468dfed9ff6f1ca9437dce05833
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r2 b/net-firewall/shorewall/files/shorewall-lite.initd-r2
new file mode 100644
index 000000000000..689f94b38463
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-lite.initd-r2
@@ -0,0 +1,89 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+if [[ "${RC_SVCNAME}" == "shorewall6-lite" ]]; then
+ PRODUCT_NAME="Shorewall6-Lite"
+ command="/usr/sbin/shorewall6-lite"
+else
+ PRODUCT_NAME="Shorewall-Lite"
+ command="/usr/sbin/shorewall-lite"
+fi
+
+description="The Shoreline Firewall Lite, more commonly known as \"${PRODUCT_NAME}\", is"
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="clear"
+extra_started_commands="reload reset"
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is"
+description_clear="${description_clear} then wide open and unprotected."
+
+description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
+description_reload="${description_reload} that the firewall is already started."
+description_reload="${description_reload} Existing connections are maintained."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+ provide firewall
+ after ulogd
+}
+
+clear() {
+ ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
+ ${command} ${OPTIONS} clear 1>/dev/null
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
+ eend $?
+}
+
+reset() {
+ ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
+ ${command} ${OPTIONS} reset 1>/dev/null
+ eend $?
+}
+
+restart() {
+ ebegin "Restarting ${RC_SVCNAME}"
+ ${command} status 1>/dev/null
+ if [ $? != 0 ] ; then
+ svc_start
+ else
+ ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+ fi
+ eend $?
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+ ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+ eend $?
+}
+
+status() {
+ local _retval
+ ${command} status 1>/dev/null
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
+ einfo 'status: started'
+ mark_service_started "${SVCNAME}"
+ return 0
+ else
+ einfo 'status: stopped'
+ mark_service_stopped "${SVCNAME}"
+ return 3
+ fi
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+ ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+ eend $?
+}
diff --git a/net-firewall/shorewall/files/shorewall.initd-r2 b/net-firewall/shorewall/files/shorewall.initd-r2
new file mode 100644
index 000000000000..c23bfb75c586
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall.initd-r2
@@ -0,0 +1,106 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+if [[ "${RC_SVCNAME}" == "shorewall6" ]]; then
+ PRODUCT_NAME="Shorewall6"
+ command="/usr/sbin/shorewall6"
+else
+ PRODUCT_NAME="Shorewall"
+ command="/usr/sbin/shorewall"
+fi
+
+description="The Shoreline Firewall, more commonly known as \"${PRODUCT_NAME}\", is"
+description="${description} a high-level tool for configuring Netfilter."
+
+extra_commands="check clear"
+extra_started_commands="refresh reload reset"
+
+description_check="Checks if the configuration will compile or not."
+
+description_clear="Clear will remove all rules and chains installed by"
+description_clear="${description_clear} ${PRODUCT_NAME}. The firewall is then"
+description_clear="${description_clear} wide open and unprotected."
+
+description_refresh="The mangle table will be refreshed along with the"
+description_refresh="${description_refresh} blacklist chain (if any)."
+
+description_reload="Reload is similar to \"${RC_SERVICE} start\" except that it assumes"
+description_reload="${description_reload} that the firewall is already started."
+description_reload="${description_reload} Existing connections are maintained."
+
+description_reset="All the packet and byte counters in the firewall are reset."
+
+depend() {
+ provide firewall
+ after ulogd
+}
+
+check() {
+ ebegin "Checking ${RC_SVCNAME} configuration"
+ ${command} ${OPTIONS} check 1>/dev/null
+ eend $?
+}
+
+clear() {
+ ebegin "Clearing all ${RC_SVCNAME} rules and setting policy to ACCEPT"
+ ${command} ${OPTIONS} clear 1>/dev/null
+ eend $?
+}
+
+refresh() {
+ ebegin "Refreshing ${RC_SVCNAME} rules"
+ ${command} ${OPTIONS} refresh 1>/dev/null
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ ${command} ${OPTIONS} reload ${RELOADOPTIONS} 1>/dev/null
+ eend $?
+}
+
+reset() {
+ ebegin "Resetting the packet and byte counters in ${RC_SVCNAME}"
+ ${command} ${OPTIONS} reset 1>/dev/null
+ eend $?
+}
+
+restart() {
+ ebegin "Restarting ${RC_SVCNAME}"
+ ${command} status 1>/dev/null
+ if [ $? != 0 ] ; then
+ svc_start
+ else
+ ${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
+ fi
+ eend $?
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+ ${command} ${OPTIONS} start ${STARTOPTIONS} 1>/dev/null
+ eend $?
+}
+
+status() {
+ local _retval
+ ${command} status 1>/dev/null
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
+ einfo 'status: started'
+ mark_service_started "${SVCNAME}"
+ return 0
+ else
+ einfo 'status: stopped'
+ mark_service_stopped "${SVCNAME}"
+ return 3
+ fi
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+ ${command} ${OPTIONS} stop ${STOPOPTIONS} 1>/dev/null
+ eend $?
+}
diff --git a/net-firewall/shorewall/shorewall-5.0.10.1.ebuild b/net-firewall/shorewall/shorewall-5.0.12.ebuild
similarity index 96%
rename from net-firewall/shorewall/shorewall-5.0.10.1.ebuild
rename to net-firewall/shorewall/shorewall-5.0.12.ebuild
index 011c75dde90e..1fa1d9ec1bdb 100644
--- a/net-firewall/shorewall/shorewall-5.0.10.1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.12.ebuild
@@ -171,7 +171,7 @@ src_prepare() {
ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
- cp "${FILESDIR}"/shorewall.initd-r1 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r1 failed"
cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
eend 0
fi
@@ -181,8 +181,8 @@ src_prepare() {
mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
- cp "${FILESDIR}"/shorewall6.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
- cp "${FILESDIR}"/shorewall6.initd-r1 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd-r1 failed"
+ cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd-r1 failed"
cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
eend 0
fi
@@ -193,7 +193,7 @@ src_prepare() {
ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
- cp "${FILESDIR}"/shorewall-lite.initd-r1 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r1 failed"
cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
eend 0
fi
@@ -203,8 +203,8 @@ src_prepare() {
mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
- cp "${FILESDIR}"/shorewall6-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
- cp "${FILESDIR}"/shorewall6-lite.initd-r1 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
+ cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd-r1 failed"
+ cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd-r1 failed"
cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
eend 0
fi
diff --git a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
index 167c47f0b513..01eac2cf8859 100644
--- a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.98-r1.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$
@@ -23,23 +23,23 @@ RDEPEND="!mail-client/nmh
!mail-filter/libsieve
!mail-client/mailx
!mail-client/nail
- sys-libs/ncurses:*
- sys-libs/readline:*
+ sys-libs/ncurses:=
+ sys-libs/readline:=
|| ( dev-libs/libltdl:0 (06 Sep 2016)
# Breaks samba's nmbd process (bug #592502)
=sys-libs/tevent-0.9.30
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9f0c43ca199b..128e9bb2e8c9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7423,6 +7423,7 @@ sys-cluster/glusterfs:qemu-block - Transparently create files as QCow2/QED image
sys-cluster/glusterfs:rsyslog - Install configuration snippet for app-admin/rsyslog
sys-cluster/glusterfs:systemtap - Enable support for dev-util/systemtap
sys-cluster/glusterfs:tiering - Enable support for data classification/tiering (requires dev-db/sqlite SLOT 3)
+sys-cluster/heat:memcached - Installs the memcached server
sys-cluster/hpx:jemalloc - Use dev-libs/jemalloc for memory allocation
sys-cluster/hpx:papi - Use dev-libs/papi for NaCl
sys-cluster/hpx:perftools - Use dev-util/google-perftools for memory allocation
@@ -7465,6 +7466,7 @@ sys-cluster/openmpi:romio - Build the ROMIO MPI-IO component
sys-cluster/openmpi:vt - Enable bundled VampirTrace support
sys-cluster/openstack-meta:cinder - Installs Openstack Cinder
sys-cluster/openstack-meta:glance - Installs Openstack Glance
+sys-cluster/openstack-meta:heat - Installs Openstack Heat
sys-cluster/openstack-meta:keystone - Installs Openstack Keystone
sys-cluster/openstack-meta:neutron - Installs Openstack Neutron
sys-cluster/openstack-meta:nova - Installs Openstack Nova
@@ -7746,7 +7748,7 @@ sys-libs/libcxxrt:libunwind - Use libunwind instead of libgcc_s for unwinding. T
sys-libs/libhugetlbfs:perl - Install the cpupcstat tool and some perl modules
sys-libs/libomp:hwloc - Enable CPU affinity support via hwloc
sys-libs/libomp:ompt - Enable OpenMP Tools Interface support
-sys-libs/libselinux:pcre2 - Use sys-libs/pcre2 for fcontext regexes
+sys-libs/libselinux:pcre2 - Use dev-libs/libpcre2 for fcontext regexes
sys-libs/libunwind:debug-frame - Adds support for DWARF .debug_frame section: Use the information from this section if available
sys-libs/libunwind:libatomic - Use libatomic instead of builtin atomic operations
sys-libs/musl-nscd:minimal - Only installs the header files
diff --git a/sci-biology/consed/Manifest b/sci-biology/consed/Manifest
index e9cd6b128266..f1a492de74cc 100644
--- a/sci-biology/consed/Manifest
+++ b/sci-biology/consed/Manifest
@@ -1,4 +1,2 @@
-DIST consed-19-linux.tar.gz 29835559 SHA256 27501d714e4cd7ea04def6a7f985b674bc454ed8bd7d1e86b41b0283e2b9e089
-DIST consed-19-sources.tar.gz 6867357 SHA256 1db37b17608e49470926dae261c76d400cf3f9eb5feea52cd732e0bfa4cadee3
-DIST consed-27-linux.tar.gz 1604 SHA256 d7baafcbcdbf1b25262578511da8a51758f48d97d9109b334978acd150461855 SHA512 dbafb8c8f40dbed82a0000314549452c372e447467ccd8ec1004f44946dd09fcffa065c36bcca4f3c0fd55a137e570c135f4f79820e3e6d98626f92413b2731b WHIRLPOOL ae319734572558dd0047dad085c9f907386be6f7f0041bac0df9e1ce5b7558c750d92ea747cc3e74c594c83bed4cd73f4b37b4d6b9e39fd7caa2a733d67d6e21
-DIST consed-27-sources.tar.gz 1604 SHA256 d7baafcbcdbf1b25262578511da8a51758f48d97d9109b334978acd150461855 SHA512 dbafb8c8f40dbed82a0000314549452c372e447467ccd8ec1004f44946dd09fcffa065c36bcca4f3c0fd55a137e570c135f4f79820e3e6d98626f92413b2731b WHIRLPOOL ae319734572558dd0047dad085c9f907386be6f7f0041bac0df9e1ce5b7558c750d92ea747cc3e74c594c83bed4cd73f4b37b4d6b9e39fd7caa2a733d67d6e21
+DIST consed-29-linux.tar.gz 36172715 SHA256 98354e2507ef9026b82c89db199ff1de7e4ec3686fccd691d215acdcde34ce39 SHA512 63a95d84cb58009045a9d898c8b1a94f98516bed9189f624a5930338cc8f51562504257f309d945fafcc07e0811ffeea122b640789f75fbd6c94535178dab4dd WHIRLPOOL 26ebc1ee7114b0c609fd36c2c46b71c399bacb61f7db285ab36f296902964c14518c058e814a166b20a36c2d320280aeed0ca18b7104c6b503324bf27d4b57af
+DIST consed-29-sources.tar.gz 3258845 SHA256 e7d3c2bf60e0bb22025e0416d16cf9864fec8091811ec285a39db4cb46bc3fc6 SHA512 fd711a65a02ef1238cca12b90fe7fa9b67da6c37d43cd105f38c7b6475fbc073c1f4d7f99703dec9d3a0a7a2a9317cb14999a114bb6f52589cb9b6e34700eb93 WHIRLPOOL 5ac363f049b6b40554112f830e812e7ab7d334a0f6707ea4da981ed1e468109f3bd7669382aa77e93cf12c78cc95fb1085711dcc972c7ff22ffe6b73056bb2c2
diff --git a/sci-biology/consed/consed-19-r2.ebuild b/sci-biology/consed/consed-19-r2.ebuild
deleted file mode 100644
index 3ce704e8792f..000000000000
--- a/sci-biology/consed/consed-19-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="A genome sequence finishing program"
-HOMEPAGE="http://bozeman.mbt.washington.edu/consed/consed.html"
-SRC_URI="${P}-sources.tar.gz
- ${P}-linux.tar.gz"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0"
-RDEPEND="${DEPEND}
- >=sci-biology/phred-000925
- >=sci-biology/phrap-1.080721"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE} and obtain the file"
- einfo "\"sources.tar.gz\", then rename it to \"${P}-sources.tar.gz\""
- einfo "and place it in ${DISTDIR},"
- einfo "obtain the file"
- einfo "\"consed_linux.tar.gz\", then rename it to \"${P}-linux.tar.gz\""
- einfo "and place it in ${DISTDIR}"
-}
-
-src_prepare() {
- sed -i '/#include/ s///' "${S}/main.cpp" || die
- sed -i \
- -e '/CLIBS=/ s/$/ -lXm -lXt -lSM -lICE -lXext -lXmu -lXp -lm/' \
- -e 's/ARCHIVES=/ARCHIVES=\n_ARCHIVES=/' \
- -e 's/CFLGS=/CFLGS= ${CFLAGS} /' "${S}/makefile" || die
- sed -i -e 's/CFLAGS=/CFLAGS += /' "${S}"/misc/*/Makefile || die
- sed -i 's!\($szPhredParameterFile =\).*!\1 $ENV{PHRED_PARAMETER_FILE} || "'${EPREFIX}'/usr/share/phred/phredpar.dat";!' "${S}/scripts/"* || die
-}
-
-src_compile() {
- emake || die
- emake -C misc/mktrace || die
- emake -C misc/phd2fasta || die
- (cd misc/454; $(tc-getCC) ${CFLAGS} sff2scf.c -o sff2scf) || die
-}
-
-src_install() {
- dobin consed misc/{mktrace/mktrace,phd2fasta/phd2fasta,454/sff2scf} || die
- dobin scripts/* contributions/* || die
- insinto /usr/lib/screenLibs
- doins misc/*.{fa*,seq} || die
- insinto /usr/share/${PN}/examples
- doins -r standard polyphred autofinish assembly_view 454_newbler \
- align454reads align454reads_answer solexa_example \
- solexa_example_answer selectRegions selectRegionsAnswer || die
- echo 'CONSED_HOME='${EPREFIX}'/usr' > "${S}/99consed"
- doenvd "${S}/99consed" || die
- dodoc README.txt *_announcement.txt || die
-}
-
-pkg_postinst() {
- einfo "Package documentation is available at"
- einfo "http://www.phrap.org/consed/distributions/README.${PV}.0.txt"
-}
diff --git a/sci-biology/consed/consed-27.ebuild b/sci-biology/consed/consed-27.ebuild
deleted file mode 100644
index 0bf33a7278cf..000000000000
--- a/sci-biology/consed/consed-27.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A genome sequence finishing program"
-HOMEPAGE="http://bozeman.mbt.washington.edu/consed/consed.html"
-SRC_URI="
- ${P}-sources.tar.gz
- ${P}-linux.tar.gz"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0"
-RDEPEND="${DEPEND}
- sci-biology/samtools
- >=sci-biology/phred-000925
- >=sci-biology/phrap-1.080721
- dev-lang/perl"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE} and obtain the file"
- einfo "\"sources.tar.gz\", then rename it to \"${P}-sources.tar.gz\""
- einfo "and place it in ${DISTDIR},"
- einfo "obtain the file"
- einfo "\"consed_linux.tar.gz\", then rename it to \"${P}-linux.tar.gz\""
- einfo "and place it in ${DISTDIR}"
-}
-
-src_prepare() {
- sed -i '/#include/ s///' "${S}/main.cpp" || die
- sed -i \
- -e '/CLIBS=/ s/$/ -lXm -lXt -lSM -lICE -lXext -lXmu -lXp -lm -lbam -lz/' \
- -e 's/ARCHIVES=/ARCHIVES=\n_ARCHIVES=/' \
- -e 's/CFLGS=/CFLGS= ${CFLAGS} /' \
- -e 's#/me1/gordon/samtools/samtools-0.1.18#/usr/include/bam/#' "${S}/makefile" || die
- sed -i -e 's/CFLAGS=/CFLAGS += /' "${S}"/misc/*/Makefile || die
- sed \
- -e 's!\($szPhredParameterFile =\).*!\1 $ENV{PHRED_PARAMETER_FILE} || "'${EPREFIX}'/usr/share/phred/phredpar.dat";!' \
- -i "${S}"/scripts/* || die
-}
-
-src_compile() {
- emake
- emake -C misc/mktrace
- emake -C misc/phd2fasta
- (cd misc/454; $(tc-getCC) ${CFLAGS} ${LDFLAGS} sff2scf.c -o sff2scf) || die
-}
-
-src_install() {
- dobin consed misc/{mktrace/mktrace,phd2fasta/phd2fasta,454/sff2scf}
- dobin scripts/* contributions/*
- insinto /usr/lib/screenLibs
- doins misc/*.{fa*,seq}
- insinto /usr/share/${PN}/examples
- doins -r \
- standard polyphred autofinish assembly_view 454_newbler \
- align454reads align454reads_answer solexa_example \
- solexa_example_answer selectRegions selectRegionsAnswer
- echo 'CONSED_HOME="${EPREFIX}/usr"' > "${S}"/99consed || die
- echo 'CONSED_PARAMETERS="${EPREFIX}/etc/consedrc"' >> "${S}"/99consed || die
- mkdir -p "${ED}"/etc/consedrc || die
- touch "${ED}"/etc/consedrc || die
- doenvd "${S}/99consed" || die
- sed \
- -e "s#/usr/local/genome#${EPREFIX}/usr#" \
- -i "${ED}"/usr/bin/{*.perl,phredPhrap,phredPhrapWithPhdBalls} || die
- sed \
- -e 's#niceExe = "/bin/nice"#niceExe = "/usr/bin/nice"#' \
- -i "${ED}"/usr/bin/phredPhrap || die
- sed \
- -e 's#/wt1/gordon/genome#/usr/bin#' \
- -i "${ED}"/usr/bin/fastq2Phrap.perl || die
- dodoc README.txt *_announcement.txt || die
-}
-
-pkg_postinst() {
- einfo "Package documentation is available at"
- einfo "http://www.phrap.org/consed/distributions/README.${PV}.0.txt"
-}
diff --git a/sci-biology/consed/consed-29.ebuild b/sci-biology/consed/consed-29.ebuild
new file mode 100644
index 000000000000..159e10768847
--- /dev/null
+++ b/sci-biology/consed/consed-29.ebuild
@@ -0,0 +1,111 @@
+# 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
+
+DESCRIPTION="A genome sequence finishing program"
+HOMEPAGE="http://bozeman.mbt.washington.edu/consed/consed.html"
+SRC_URI="
+ ${P}-sources.tar.gz
+ ${P}-linux.tar.gz"
+
+LICENSE="phrap"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+COMMON_DEPEND="
+ x11-libs/libX11
+ x11-libs/motif:0
+ sci-biology/samtools:0.1-legacy
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-lang/perl
+ >=sci-biology/phred-071220-r1
+ >=sci-biology/phrap-1.080812-r2
+"
+
+S="${WORKDIR}"
+
+RESTRICT="fetch"
+PATCHES=(
+ "${FILESDIR}/${PN}-29-fix-build-system.patch"
+ "${FILESDIR}/${PN}-29-fix-c++14.patch"
+ "${FILESDIR}/${PN}-29-fix-qa.patch"
+ "${FILESDIR}/${PN}-29-fix-perl-shebang.patch"
+)
+
+pkg_nofetch() {
+ einfo "Please visit ${HOMEPAGE} and obtain the file"
+ einfo "\"sources.tar.gz\", then rename it to \"${P}-sources.tar.gz\""
+ einfo "and place it in ${DISTDIR},"
+ einfo "obtain the file"
+ einfo "\"consed_linux.tar.gz\", then rename it to \"${P}-linux.tar.gz\""
+ einfo "and place it in ${DISTDIR}"
+}
+
+src_prepare() {
+ default
+
+ sed \
+ -e "s!\$szPhredParameterFile = .*!\$szPhredParameterFile = \$ENV{'PHRED_PARAMETER_FILE'} || \'"${EPREFIX}"/usr/share/phred/phredpar.dat\';!" \
+ -e "s:/usr/local/genome:${EPREFIX}/usr:" \
+ -e "s:niceExe = \"/bin/nice\":niceExe = \"${EPREFIX}/usr/bin/nice\":" \
+ -e "s:/wt1/gordon/genome:${EPREFIX}/usr/bin:" \
+ -i scripts/* contributions/* || die
+}
+
+src_configure() {
+ append-cflags -std=gnu99
+ append-lfs-flags
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ SAMTOOLS_CPPFLAGS="-I${EPREFIX}/usr/include/bam-0.1-legacy" \
+ LIBS="-L${EPREFIX}/usr/$(get_libdir)" \
+ X11_LIBS="$($(tc-getPKG_CONFIG) --libs x11)" \
+ SAMTOOLS_LIBS="-lbam-0.1-legacy"
+}
+
+src_install() {
+ dobin consed misc/{mktrace/mktrace,phd2fasta/phd2fasta,454/sff2scf} scripts/* contributions/*
+
+ insinto /usr/lib/screenLibs
+ doins misc/*.{fa*,seq}
+
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins -r \
+ standard polyphred autofinish assembly_view 454_newbler \
+ align454reads align454reads_answer solexa_example \
+ solexa_example_answer selectRegions selectRegionsAnswer
+ fi
+
+ cat > 99consed <<-_EOF_ || die
+ CONSED_HOME=${EPREFIX}/usr
+ CONSED_PARAMETERS=${EPREFIX}/etc/consedrc
+ _EOF_
+ doenvd 99consed
+
+ dodoc README.txt *_announcement.txt
+}
+
+pkg_postinst() {
+ einfo "Package documentation is available at"
+ einfo "http://www.phrap.org/consed/distributions/README.${PV}.0.txt"
+}
diff --git a/sci-biology/consed/files/consed-29-fix-build-system.patch b/sci-biology/consed/files/consed-29-fix-build-system.patch
new file mode 100644
index 000000000000..27c9c552fe3f
--- /dev/null
+++ b/sci-biology/consed/files/consed-29-fix-build-system.patch
@@ -0,0 +1,197 @@
+Make build system semi-sane:
+* Respect CC, CXX, CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS and LIBS
+* Remove default optimisation flags
+* Remove -fpermissive from DEFS (as source builds fine now)
+* Add large file support (LFS) via CPPFLAGS and not in Makefile
+
+--- a/makefile
++++ b/makefile
+@@ -47,23 +47,20 @@
+ #
+ # compilation
+ #
+-CXX= g++
+-KRCC= gcc
+-CC=gcc
++CXX ?= g++
++CC ?= gcc
+
+ #
+ #
+-CFLGS= -w -DINLINE_RWTPTRORDEREDVECTOR -DINLINE_RWTVALORDEREDVECTOR -DINLINE_MBTVALVECTOR -DLINUX_COMPILE -DSOCKLEN_T_DEFINED -D__BOOL_DEFINED -DANSI_C -DOFSTREAM_OPEN_WITHOUT_PERMISSIONS -fpermissive -DNO_POUND_POUND_MACROS -DUSE_USING_IN_PUBLIC_TEMPLATE_CLASSES -DINT_CHAR_OPERATOR -D_FILE_OFFSET_BITS=64 -DSAMTOOLS_AVAILABLE
++DEFS = -DINLINE_RWTPTRORDEREDVECTOR -DINLINE_RWTVALORDEREDVECTOR -DINLINE_MBTVALVECTOR -DLINUX_COMPILE -DSOCKLEN_T_DEFINED -D__BOOL_DEFINED -DANSI_C -DOFSTREAM_OPEN_WITHOUT_PERMISSIONS -DNO_POUND_POUND_MACROS -DUSE_USING_IN_PUBLIC_TEMPLATE_CLASSES -DINT_CHAR_OPERATOR -DSAMTOOLS_AVAILABLE
+
+-OPT= -O
+ #
+ # Include directory for template classes must be included
+ # in both compilation & link lines, even if .h file is
+ # found in default path. C front, gotta love it.
+ #
+-INC= -I/usr/X11R6/include -I/me1/gordon/samtools/samtools-0.1.18
++INCLUDES = $(SAMTOOLS_CPPFLAGS)
+
+-DEPENDENCIES=
+ #
+ #
+ # Linking
+@@ -80,12 +77,9 @@
+ # /lib/ld-linux.so.2 (0x003ee000)
+ #
+ # To fix cut/paste bug, I've made X11 always dynamic.
+-CLIBS= -lX11
+-LPATH= -L/usr/X11R6/lib
+-ARCHIVES= /usr/X11R6/lib/libXm.a \
+-/usr/X11R6/lib/libXt.a /usr/X11R6/lib/libSM.a \
+-/usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libXmu.a \
+-/usr/X11R6/lib/libXp.a /usr/lib/libm.a /me1/gordon/samtools/samtools-0.1.18/libbam.a /me1/gordon/samtools/samtools-0.1.18/bcftools/libbcf.a /me1/gordon/zlib/zlib-1.2.5/libz.a
++
++MOTIF_LIBS ?= -lXt -lXm
++ALL_LIBS = $(LIBS) $(MOTIF_LIBS) $(X11_LIBS) $(SAMTOOLS_LIBS)
+
+
+
+@@ -94,7 +88,6 @@
+ #
+ #LDFLGS= -g
+ # static linking
+-LDFLGS= -g -rdynamic
+
+ #
+ # the subdirectory used by cfront compilers gets cleaned
+@@ -112,10 +105,10 @@
+ # general compilation rules for .cpp, .cxx, .c files
+ #
+ .cpp.o:
+- $(CXX) $(CFLGS) $(OPT) $(INC) -c $<
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c $<
+
+ .c.o:
+- $(CXX) $(CFLGS) $(OPT) $(INC) -c $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c $<
+
+ #
+ # targets file included in generated makefile
+@@ -593,17 +586,23 @@
+ writeToRewriteReferenceFile.o \
+ xsynchronize.o
+
++SUBDIRS := misc/454 misc/mktrace misc/phd2fasta
++
++all: consed $(SUBDIRS)
++
++$(SUBDIRS):
++ $(MAKE) -C $@
++
++.PHONY: all $(SUBDIRS)
++
+ consed: $(CONSED_OBJS) makefile checkLicenseKeyStub.o
+- $(CXX) $(INC) $(LDFLGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o \
+- $(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o $(ALL_LIBS)
+
+ trial_consed: $(CONSED_OBJS) makefile checkLicenseKey.o
+- $(CXX) $(INC) $(LDFLGS) -o trial_consed $(CONSED_OBJS) checkLicenseKey.o \
+- $(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o trial_consed $(CONSED_OBJS) checkLicenseKey.o $(ALL_LIBS)
+
+ pure: $(CONSED_OBJS) makefile checkLicenseKeyStub.o
+- $(PURIFY) $(CXX) $(INC) $(LDFLGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o \
+- $(ARCHIVES) $(LPATH) $(WARNINGS) $(CLIBS) $(XLIBS)
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) -o consed $(CONSED_OBJS) checkLicenseKeyStub.o $(ALL_LIBS)
+
+ clean:
+ rm -rf *.o core $(TEMPLATE_DIR)
+@@ -613,15 +612,15 @@
+ # the Solaris 5.x compiler cannot optimize the following
+
+ consedResources.o:
+- $(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c consedResources.cpp
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c consedResources.cpp
+
+ consedResources2.o:
+- $(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c consedResources2.cpp
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c consedResources2.cpp
+
+ # tlingit cannot optimize the following:
+
+ guiEditResources.o:
+- $(CXX) $(WARNINGS) $(CFLGS) $(INC) $(DEPENDENCIES) -c guiEditResources.cpp
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -c guiEditResources.cpp
+
+ guiEditResources.o : \
+ assemblyViewTagTypeAndLine.h assert.h bIsNumericDouble.h \
+--- a/misc/454/Makefile
++++ b/misc/454/Makefile
+@@ -0,0 +1,16 @@
++CC ?= cc
++LIBM = -lm
++
++DEFS = -DANSI_C
++
++OBJS= sff2scf.c
++
++sff2scf: $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
++
++.c.o:
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
++
++clean:
++ rm -f $(OBJS) sff2scf
++
+--- a/misc/mktrace/Makefile
++++ b/misc/mktrace/Makefile
+@@ -1,13 +1,17 @@
+-CC= cc
+-CFLAGS= -g
+-CLIB= -lm
++CC ?= cc
++LIBM = -lm
++
++DEFS = -DANSI_C
+
+ OBJS= mktrace.o readFASTA.o writeSCF.o synTrace.o \
+ freeTrace.o rwUtil.o writePhd.o getTime.o \
+ readQUAL.o
+
+ mktrace: $(OBJS)
+- $(CC) $(CFLAGS) -o mktrace $(OBJS) $(CLIB)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
++
++.c.o:
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
+
+ clean:
+ rm -f $(OBJS) mktrace
+--- a/misc/phd2fasta/Makefile
++++ b/misc/phd2fasta/Makefile
+@@ -1,8 +1,9 @@
+-CC=cc
+-CFLAGS=-O -w
+-CLIB=-lm
++CC ?= cc
++LIBM = -lm
+
+-OBJ= phd2fasta.o \
++DEFS = -DANSI_C
++
++OBJS= phd2fasta.o \
+ readParam.o initParam.o checkParam.o \
+ freeParam.o helpParam.o \
+ readFOF.o readDIR.o readFOX.o \
+@@ -15,10 +16,11 @@
+
+ INC= phd2fasta.h
+
+-SRC = $(OBJ:.o=.c)
+-
+-phd2fasta: $(OBJ)
+- $(CC) $(CFLAGS) -o phd2fasta $(OBJ) $(CLIB)
++phd2fasta: $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBM)
++
++.c.o:
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
+
+ clean:
+ rm -f $(OBJ) phd2fasta
diff --git a/sci-biology/consed/files/consed-29-fix-c++14.patch b/sci-biology/consed/files/consed-29-fix-c++14.patch
new file mode 100644
index 000000000000..212b8d63d1e3
--- /dev/null
+++ b/sci-biology/consed/files/consed-29-fix-c++14.patch
@@ -0,0 +1,376 @@
+Fix building with C++14:
+* Add 'noexcept(false)' to throwing destructors in C++11 mode
+* Properly guard C declarations with extern "C" scopes
+* Avoid erroneous overloaded suffix operator errors, due to missing spaces
+* Add explicit casts to avoid -Wnarrowing errors
+* Add 'this->' for dependent identifiers in derived class templates,
+ previously required -fpermissive
+
+--- a/bvAlignedReads.cpp
++++ b/bvAlignedReads.cpp
+@@ -126,7 +126,11 @@
+ }
+
+
+-bvAlignedReads :: ~bvAlignedReads() {
++bvAlignedReads :: ~bvAlignedReads()
++#if __cplusplus >= 201103L
++ noexcept(false)
++#endif
++{
+
+
+ assert( pBamView_->aBVAlignedReads_.remove( this ) );
+--- a/bvAlignedReads.h
++++ b/bvAlignedReads.h
+@@ -81,7 +81,11 @@
+ const FileName& filReferenceSequenceFile,
+ bamView* pBamView );
+
+- ~bvAlignedReads();
++ ~bvAlignedReads()
++#if __cplusplus >= 201103L
++ noexcept(false)
++#endif
++ ;
+
+ bool operator==( const bvAlignedReads& myBVAlignedReads ) const {
+ return( this == &myBVAlignedReads );
+--- a/chromatData.h
++++ b/chromatData.h
+@@ -58,6 +58,9 @@
+ #ifndef CHROMATDATA_DEFINED
+ #define CHROMATDATA_DEFINED
+
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ #ifndef FLOAT
+ #define FLOAT double
+@@ -131,4 +134,8 @@
+ int freeChromatData();
+ #endif
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/compareContigs.cpp
++++ b/compareContigs.cpp
+@@ -126,6 +126,9 @@
+
+
+ compareContigs :: ~compareContigs()
++#if __cplusplus >= 201103L
++ noexcept(false)
++#endif
+ {
+
+ if ( !bCalledFromMakeJoins_ ) {
+--- a/compareContigs.h
++++ b/compareContigs.h
+@@ -137,7 +137,11 @@
+ compareContigs( ContigWin* pContigWin, const int nConsPos1);
+ compareContigs(); // for assemblyView
+
+- ~compareContigs();
++ ~compareContigs()
++#if __cplusplus >= 201103L
++ noexcept(false)
++#endif
++ ;
+
+ // this makes RWTPtrOrderedVector in ConsEd happy
+ bool operator==( const compareContigs& compC ) const {
+
+--- a/filePopupAndGetAceFilename.cpp
++++ b/filePopupAndGetAceFilename.cpp
+@@ -317,7 +317,7 @@
+ struct tm* pTM = localtime( &( pAceFile->stat_.st_mtime ) );
+
+ strftime( szDateTime, nDateTimeSize,
+- quote(%H)":"quote(%M)":"quote(%S)" %e-%h-%Y",
++ quote(%H) ":" quote(%M) ":" quote(%S) " %e-%h-%Y",
+ pTM );
+
+ RWCString soDescription = RWCString( szDateTime ) + " " + (*pAceFile);
+@@ -620,7 +620,7 @@
+ struct tm* pTM = localtime( &( pAceFile->stat_.st_mtime ) );
+
+ strftime( szDateTime, nDateTimeSize,
+- quote(%H)":"quote(%M)":"quote(%S)" %e-%h-%Y",
++ quote(%H) ":" quote(%M) ":" quote(%S) " %e-%h-%Y",
+ pTM );
+
+ RWCString soDescription = RWCString( szDateTime ) + " " + (*pAceFile);
+--- a/findTraceExtrema.h
++++ b/findTraceExtrema.h
+@@ -44,8 +44,15 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ int findTraceExtrema( ChromatData *chromatData );
+
++#ifdef __cplusplus
++}
++#endif
+
+ #endif
+
+--- a/makeUpper.h
++++ b/makeUpper.h
+@@ -42,6 +42,14 @@
+ #ifndef MAKEUPPER_INCLUDED
+ #define MAKEUPPER_INCLUDED
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void makeUpper( char* szStringOfMixedCase );
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/nextPhredPipeline.cpp
++++ b/nextPhredPipeline.cpp
+@@ -476,7 +476,7 @@
+ void nextPhredPipeline :: openAndLockControlFile() {
+
+
+- nFDControlFile_ = open( filControlFile_.data(), O_CREAT |O_RDWR );
++ nFDControlFile_ = open( filControlFile_.data(), O_CREAT |O_RDWR, 0600);
+ if ( nFDControlFile_ == -1 ) {
+ THROW_FILE_ERROR( filControlFile_ );
+ }
+--- a/readABI.h
++++ b/readABI.h
+@@ -56,10 +56,18 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #ifdef ANSI_C
+ ChromatData *readABI( char *fn, int *status );
+ #else
+ ChromatData *readABI();
+ #endif
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/readData.h
++++ b/readData.h
+@@ -44,6 +44,14 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ ChromatData *readData( char *filename, int* status );
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/readESD.h
++++ b/readESD.h
+@@ -53,6 +53,10 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ typedef unsigned int4 DWORD;
+ typedef unsigned char TCHAR;
+ typedef char BYTE;
+@@ -187,5 +191,7 @@
+ ChromatData *readESD();
+ #endif
+
+-
++#ifdef __cplusplus
++}
++#endif
+
+--- a/readSCF.h
++++ b/readSCF.h
+@@ -56,6 +56,10 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* ---- Constants ---- */
+ #define SCF_MAGIC (((((int4)'.'<<8)+(int4)'s'<<8)+(int4)'c'<<8)+(int4)'f')
+ #define scale(V,OLDMAX,NEWMAX) (int2)( (FLOAT) V * (FLOAT) NEWMAX / (FLOAT) OLDMAX )
+@@ -144,4 +148,8 @@
+ int readSCF3();
+ #endif
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/readsense_bitmaps.h
++++ b/readsense_bitmaps.h
+@@ -56,10 +56,10 @@
+ static const int forward_bitmap_height = 19;
+ static char forward_bitmap_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+- 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00,
+- 0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0x07,
+- 0xf8, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x07, 0xf8, 0xff, 0x1f, 0x00,
+- 0xf8, 0xff, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00,
++ (char)0xf8, (char)0xff, 0x00, 0x00, (char)0xf8, (char)0xff, 0x3f, 0x00, (char)0xf8, (char)0xff, (char)0xff, 0x07,
++ (char)0xf8, (char)0xff, (char)0xff, 0x0f, (char)0xf8, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, 0x1f, 0x00,
++ (char)0xf8, (char)0xff, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00};
+
+@@ -67,10 +67,10 @@
+ static const int reverse_bitmap_height = 19;
+ static char reverse_bitmap_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0xf8, 0x07,
+- 0x00, 0xc0, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07,
+- 0xfc, 0xff, 0xff, 0x07, 0xf8, 0xff, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x07,
+- 0x00, 0xc0, 0xff, 0x07, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x07,
++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, (char)0xf8, 0x07,
++ 0x00, (char)0xc0, (char)0xff, 0x07, 0x00, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, (char)0xff, 0x07,
++ (char)0xfc, (char)0xff, (char)0xff, 0x07, (char)0xf8, (char)0xff, (char)0xff, 0x07, 0x00, (char)0xfe, (char)0xff, 0x07,
++ 0x00, (char)0xc0, (char)0xff, 0x07, 0x00, 0x00, (char)0xf8, 0x07, 0x00, 0x00, 0x00, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00};
+
+--- a/readType.h
++++ b/readType.h
+@@ -56,11 +56,19 @@
+
+ #include "chromatData.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #ifdef ANSI_C
+ int readType( char *filename );
+ #else
+ int readType();
+ #endif
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+
+--- a/rwtptrsortedvector.h
++++ b/rwtptrsortedvector.h
+@@ -57,7 +57,6 @@
+ #ifdef USE_USING_IN_PUBLIC_TEMPLATE_CLASSES
+ using RWTPtrOrderedVector::nCurrentLength_;
+ using RWTPtrOrderedVector::isEmpty;
+- using RWTPtrOrderedVector::nCurrentLength_;
+ using RWTPtrOrderedVector::length;
+ using RWTPtrOrderedVector::ppArray_;
+ using RWTPtrOrderedVector::data;
+@@ -84,7 +83,7 @@
+ if ( nInsertBeforeIndex == RW_NPOS )
+ nInsertBeforeIndex = nCurrentLength_;
+
+- insertAt( nInsertBeforeIndex, pVal );
++ this->insertAt( nInsertBeforeIndex, pVal );
+ }
+
+ // don't copy this. copy mbtValOrderedVectorOfRWCString's method instead
+--- a/rwtvalsortedvector.h
++++ b/rwtvalsortedvector.h
+@@ -74,7 +74,7 @@
+ if ( nPos == RW_NPOS )
+ nPos = nCurrentLength_;
+
+- insertAt( nPos, val );
++ this->insertAt( nPos, val );
+ }
+
+
+--- a/rwUtil.h
++++ b/rwUtil.h
+@@ -51,6 +51,10 @@
+ *|***************************************************************************|*
+ */
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #ifdef ANSI_C
+ int2 inSwpSint2( char *ptr );
+ int4 inSwpSint4( char *ptr );
+@@ -97,3 +101,6 @@
+ int writeUint4();
+ #endif
+
++#ifdef __cplusplus
++}
++#endif
+--- a/soGetDateTime.cpp
++++ b/soGetDateTime.cpp
+@@ -62,13 +62,13 @@
+ else if ( nFormat == nDotInMiddle ) {
+ strftime( szDateTime,
+ nDateTimeSize,
+- "%y%m%d."quote(%H)quote(%M)quote(%S),
++ "%y%m%d." quote(%H)quote(%M)quote(%S),
+ localtime( &timee ) );
+ }
+ else {
+ strftime( szDateTime,
+ nDateTimeSize,
+- "%y%m%d:"quote(%H)quote(%M)quote(%S),
++ "%y%m%d:" quote(%H)quote(%M)quote(%S),
+ localtime( &timee ) );
+ }
+
+--- a/szGetTime.h
++++ b/szGetTime.h
+@@ -42,9 +42,15 @@
+ #ifndef szGetTime_included
+ #define szGetTime_included
+
+-char *szGetTime();
++#ifdef __cplusplus
++extern "C" {
++#endif
+
++char *szGetTime();
+
++#ifdef __cplusplus
++}
++#endif
+
+ #endif
+
diff --git a/sci-biology/consed/files/consed-29-fix-perl-shebang.patch b/sci-biology/consed/files/consed-29-fix-perl-shebang.patch
new file mode 100644
index 000000000000..a27a3537a8d1
--- /dev/null
+++ b/sci-biology/consed/files/consed-29-fix-perl-shebang.patch
@@ -0,0 +1,701 @@
+Make perl shebangs portable, such that the scripts can also be used on Gentoo Prefix.
+Rationale: https://blogs.gentoo.org/mgorny/2016/02/08/a-quick-note-on-portable-shebangs/
+
+--- a/contributions/ace2fof
++++ b/contributions/ace2fof
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # .-----------------------------------------------------------------------------------.
+ # | |
+@@ -107,6 +107,7 @@
+ # | |
+ # `-----------------------------------------------------------------------------------'
+ #Fixed this file for taking Aracne's Ace file by syang 05152002
++use warnings;
+ use strict;
+ use POSIX qw(fmod);
+
+--- a/contributions/ace2OligosWithComments.perl
++++ b/contributions/ace2OligosWithComments.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # ace2Oligos.perl
+ #
+@@ -18,6 +18,8 @@
+ # Rev: 020528 to print comments in oligo tags upon request (Peter Kos)
+ #
+
++use warnings;
++
+ $szUsage = "\nUsage: $0 (name of ace file) (name of oligo file) [Print|Comment|PrintComment]\n";
+
+ die "$szUsage" if (( $#ARGV != 1 ) && ( $#ARGV != 2 ));
+--- a/contributions/aceContigs2Phds.perl
++++ b/contributions/aceContigs2Phds.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # aceContigs2Phd.perl
+ #
+@@ -13,6 +13,8 @@
+ # Acknowledgements: Borrowed as much as I could from determineReadTypes.Perl
+ # and fasta2Phd.perl
+
++use warnings;
++
+ $szUsage = "Usage: aceContigs2Phds.perl [-s minimum-contig-size] ";
+ $nContigLimit = 2000;
+
+--- a/contributions/acestatus.pl
++++ b/contributions/acestatus.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # acestatus.pl
+ # author: Cliff Wollam
+@@ -14,6 +14,7 @@
+ # USAGE FROM THE COMMAND LINE:
+ # acestatus.pl ace_filename
+
++use warnings;
+ use strict;
+
+ if($#ARGV >= 0) {
+--- a/contributions/cons.perl
++++ b/contributions/cons.perl
+@@ -1,5 +1,6 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+
++use warnings;
+ use strict;
+ use Cwd;
+
+--- a/contributions/mergeAces.perl
++++ b/contributions/mergeAces.perl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl -w
++#!/usr/bin/env perl
+
+ # Bugs and complaints to Bill Gilliland, billg@ucdavis.edu.
+ # mergeAces.perl v. 0.2 5/22/01
+@@ -9,6 +9,7 @@
+ # project directory (if it doesn't already exist) with all the cgrams
+ # and phd files of the original projects.
+
++use warnings;
+ use Getopt::Long;
+ use File::Copy;
+ $pathRoot = $ENV{"PWD"};
+--- a/contributions/phredPhrapWithPhdBalls
++++ b/contributions/phredPhrapWithPhdBalls
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # phredPhrapWithPhdBalls
+ # modified from phredPhrap by Ben Allen at LANL
+@@ -73,6 +73,7 @@
+ # Rev: 120312 to not duplicate consensus tags during miniassembly
+ # Rev: 120717 Ben Allen (LANL) to use reads from phdballs as well as phd_dir
+
++use warnings;
+
+ $szVersion = "120312";
+
+--- a/contributions/recover_consensus_tags
++++ b/contributions/recover_consensus_tags
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # Purpose: Transfers all consensus tags from a set of old assemblies to
+ # a new assembly.
+@@ -14,6 +14,7 @@
+ # rct ace_filename
+ # You must be in the edit_dir where the ace file is located
+
++use warnings;
+ use strict;
+
+
+--- a/contributions/revert_fof
++++ b/contributions/revert_fof
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # PURPOSE: If the user really screws up a read, to back out all changes.
+ # You must reassemble after using this.
+@@ -19,6 +19,8 @@
+ # phd extensions.
+ # revert_fof use file of files to give reads to revert 3/14/01 SL
+
++use warnings;
++
+ $szUsage = "Enter a file of files name, please!";
+
+ die $szUsage if ( $#ARGV != 0 );
+--- a/contributions/sff2phd.perl
++++ b/contributions/sff2phd.perl
+@@ -1,4 +1,5 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
++use warnings;
+ use strict;
+ # SFF to PHD files converter, with 454 paired reads and MID support
+ # Version 0.15 - 111229
+--- a/contributions/sff2phd_Samborskyy
++++ b/contributions/sff2phd_Samborskyy
+@@ -1,4 +1,5 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
++use warnings;
+ use strict;
+ # SFF to PHD files converter, with 454 paired reads and MID support
+ # Version 0.10 - 101110
+--- a/scripts/ace2Fasta.perl
++++ b/scripts/ace2Fasta.perl
+@@ -1,7 +1,9 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # Purpose: makes a contigs file out of an ace file
+
++use warnings;
++
+ $szUsage = "Usage: ace2Contigs.perl (ace file)";
+
+
+--- a/scripts/ace2Oligos.perl
++++ b/scripts/ace2Oligos.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # ace2Oligos.perl
+ #
+@@ -16,6 +16,8 @@
+ # Rev: 000330 to handle comments in oligo tags
+ #
+
++use warnings;
++
+ $szUsage = "Usage: ace2Oligos.perl (name of ace file) (name of oligo file)";
+
+ if ( $ARGV[0] eq "-V" || $ARGV[0] eq "-v" ) {
+--- a/scripts/add454Reads.perl
++++ b/scripts/add454Reads.perl
+@@ -1,11 +1,11 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # add454Reads.perl
+ # part of Consed package
+ #
+ # DG with help from Hao Wang to screen vector
+
+-
++use warnings;
+ use File::Basename;
+
+
+--- a/scripts/addReads2Consed.perl
++++ b/scripts/addReads2Consed.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # Purpose: called by consed in order to add new reads to an
+ # existing assembly without reassemblying
+@@ -29,6 +29,7 @@
+ # Rev: 080320 (David Gordon) to use discrep_lists instead of alignments
+ # Rev: 130828 (David Gordon) to handle slashes (/) in read names
+
++use warnings;
+
+ $szVersion = "130828";
+ if ( $#ARGV >= 0 ) {
+--- a/scripts/addSangerReads.perl
++++ b/scripts/addSangerReads.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # addSangerReads.perl
+
+@@ -32,7 +32,7 @@
+ # added is printed in a report ending with ".log". The name of this
+ # file is listed in auto.fof
+
+-
++use warnings;
+
+
+ $szVersion = "120717";
+--- a/scripts/addSolexaReads.perl
++++ b/scripts/addSolexaReads.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # addSolexaReads.perl
+
+@@ -54,7 +54,7 @@
+
+ $szUsage = "addSolexaReads.perl -ace (ace file) -fastqfof (solexa files) -fasta (fasta file) -readsList (file of list of desired reads) where -readsList is optional";
+
+-
++use warnings;
+ use Getopt::Long;
+
+ GetOptions( "ace=s" => \$szAceFile,
+--- a/scripts/alignRNA2Genomic.perl
++++ b/scripts/alignRNA2Genomic.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # alignRNA2Genomic.perl
+
+@@ -6,6 +6,8 @@
+ # consed-ready ace and phd ball with the RNA aligned against the
+ # genomic with introns being represented by large gaps
+
++use warnings;
++
+ $szVersion = "120717";
+
+ if ( $#ARGV == 0 ) {
+--- a/scripts/alignSolexaReads2Refs.perl
++++ b/scripts/alignSolexaReads2Refs.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # Input: a file where each line looks like this:
+ # (solexa seq file) (read prefix)
+@@ -10,6 +10,7 @@
+
+ # Output: a list of alignment files
+
++use warnings;
+
+ defined( $szConsedHome = $ENV{'CONSED_HOME'} ) ||
+ ( $szConsedHome = "/usr/local/genome" );
+--- a/scripts/amplifyTranscripts.perl
++++ b/scripts/amplifyTranscripts.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # PURPOSE: runs consed -autoPCRAmplify in order to pick pcr primers
+ # for a large group of regions
+@@ -40,7 +40,7 @@
+ # That is, the left primers are given in top strand orientation, and
+ # the right primers are given in bottom strand orientation.
+
+-
++use warnings;
+
+ defined( $szConsedHome = $ENV{'CONSED_HOME'} ) ||
+ ( $szConsedHome = "/usr/local/genome" );
+--- a/scripts/autoPrimers.perl
++++ b/scripts/autoPrimers.perl
+@@ -1,5 +1,6 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
++use warnings;
+
+ $szUsage = "autoPrimers.perl (fasta file of targets)";
+ $szVersion = "141226";
+--- a/scripts/bam2Ace.perl
++++ b/scripts/bam2Ace.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+
+ # Purpose: runs:
+@@ -6,6 +6,7 @@
+ # 2) consed -renameDuplicates
+ # 3) consed -removeColumnsOfPads
+
++use warnings;
+
+ $szUsage = "usage: bam2Ace.perl -bamFile (bam file) -regionsFile (regions file) (see README.txt for format of the regions file) -exec (consed executable name) -newAceFile (new ace file name) where the -exec (exec) is optional";
+
+--- a/scripts/convertBedToBamScape.perl
++++ b/scripts/convertBedToBamScape.perl
+@@ -1,4 +1,6 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
++
++use warnings;
+
+ $szUsage = "usage: convertBedToBamScape.perl (Bed file) (BamScape file) (fasta file of all sequences) (conversion of reference names--optional)";
+
+--- a/scripts/countEditedBases.perl
++++ b/scripts/countEditedBases.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # countEditedBases.perl
+ #
+@@ -11,6 +11,8 @@
+ #
+ #
+
++use warnings;
++
+ while(<>) {
+ if ( /^CO / ) {
+ @aWords = split;
+--- a/scripts/determineReadTypes.perl
++++ b/scripts/determineReadTypes.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ # determineReadTypes.perl
+ #
+ # Purpose: to write into the phd file information about the template
+@@ -173,6 +173,7 @@
+ #
+ ###############################################################
+
++use warnings;
+
+ # you can remove or comment out this line when you are satisfied with
+ # your customized version of this file.
+--- a/scripts/fasta2Ace.perl
++++ b/scripts/fasta2Ace.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # manyFasta2Ace.perl
+ #
+@@ -13,6 +13,7 @@
+ #
+ # NOTE: you must run this in edit_dir
+
++use warnings;
+ use Getopt::Long;
+
+ $szRevision = "141212";
+--- a/scripts/fasta2PhdBall.perl
++++ b/scripts/fasta2PhdBall.perl
+@@ -1,4 +1,6 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
++
++use warnings;
+
+ $nQuality = 20;
+
+--- a/scripts/fasta2Phd.perl
++++ b/scripts/fasta2Phd.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # fasta2Phd.perl
+ #
+@@ -20,6 +20,7 @@
+ # June 2002, Bill Gilliland to allow the user to specify
+ # the quality value
+
++use warnings;
+ use Getopt::Long;
+ GetOptions( "quality=i" => \$qualityValue);
+
+--- a/scripts/fastq2Phrap.perl
++++ b/scripts/fastq2Phrap.perl
+@@ -1,4 +1,6 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
++
++use warnings;
+
+ $szUsage = "fastq2Phrap.perl (fastq) or for paired reads fastq2Phrap.perl (fastq1) (fastq2) where fastq1 and fastq2 have corresponding mate pairs--e.g., the 5th read in fastq1 is the mate of the 5th read in fastq2--these fastq files are assumed to be in ../solexa_dir--not the current directory\n";
+
+--- a/scripts/filter454Reads.perl
++++ b/scripts/filter454Reads.perl
+@@ -1,6 +1,6 @@
+-#!/usr/bin/perl -w
+-
++#!/usr/bin/env perl
+
++use warnings;
+ use File::Basename;
+
+
+--- a/scripts/findSequenceMatchesForConsed.perl
++++ b/scripts/findSequenceMatchesForConsed.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # findSequenceMatchesForConsed.perl
+
+@@ -16,6 +16,8 @@
+ # REVISIONS: 021127 (DG) to write (project).(date).(time).fasta instead of
+ # (project).fasta.screen.ace.1.(date).(time).fasta
+
++use warnings;
++
+ $szVersion = "021127";
+
+ $szUsage = "Usage: findSequenceMatchesForConsed.perl (ace file) (crossmatch parameters, if any)";
+--- a/scripts/fixContigEnd.perl
++++ b/scripts/fixContigEnd.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # fixContigEnd.perl
+
+@@ -7,6 +7,7 @@
+ # consed -ace (acefile) -fixContigEnds
+ #
+
++use warnings;
+
+ $szUsage = "fixContigEnd.perl (fasta file of reads for input) (fof for ace file, output)";
+
+--- a/scripts/lib2Phd.perl
++++ b/scripts/lib2Phd.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # lib2Phd.perl
+ #
+@@ -23,6 +23,8 @@
+ # accept fasta library files as input. The output file is named
+ # according to the first, non-space block of text on each fasta defline.
+
++use warnings;
++
+ $nQuality = 20;
+
+ $szUsage = "Usage: lib2Phd.perl ";
+--- a/scripts/makePhdBall.perl
++++ b/scripts/makePhdBall.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # PURPOSE: concatenate all phd file into a single phd.ball
+ # for the purpose of fast startup of consed
+@@ -9,6 +9,7 @@
+ #
+ # February 2008, David Gordon
+
++use warnings;
+
+ if ( $#ARGV >= 0 ) {
+ if ( $ARGV[0] eq "-v" || $ARGV[0] eq "-V" ) {
+--- a/scripts/makeRegionsFile.perl
++++ b/scripts/makeRegionsFile.perl
+@@ -1,10 +1,12 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # makeRegionsFile.perl
+ # To be used with consed -bam2Ace
+ # Takes a fasta file of sequences and makes a regions file that
+ # specifies the entire length of each sequence.
+
++use warnings;
++
+ $szUsage = "makeRegionsFile.perl (name of fasta file)";
+
+ $szVersion = "110914";
+--- a/scripts/orderPrimerPairs.perl
++++ b/scripts/orderPrimerPairs.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # PURPOSE: puts the primers in 96 well format for ordering.
+ # creates a file that can be emailed to
+@@ -13,6 +13,8 @@
+ # 2) a file of primer pairs, sorted by product size
+ # 3) a fasta file of the primers, for your convenience for analysis
+
++use warnings;
++
+ $| = 1;
+
+ $szUsage = "orderPrimerPairs.perl";
+--- a/scripts/phd2Ace.perl
++++ b/scripts/phd2Ace.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # phd2Ace.perl
+ #
+@@ -13,6 +13,8 @@
+ # REV: 981002 (David Gordon) for new ace format
+ # 981210 (DG) to eliminate warning message
+
++use warnings;
++
+ $szPhdDirPath = "../phd_dir";
+
+ $szUsage = "Usage: phd2Ace.perl \nThe phd file is assumed to reside in $szPhdDirPath";
+--- a/scripts/phredPhrap
++++ b/scripts/phredPhrap
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # phredPhrap
+ #
+@@ -70,6 +70,8 @@
+ # Rev: 110609 to allow masking of vector sequence when doing miniassemblies
+ # Rev: 120312 to not duplicate consensus tags during miniassembly
+
++use warnings;
++
+ $szVersion = "120312";
+
+
+--- a/scripts/picard2Regions.perl
++++ b/scripts/picard2Regions.perl
+@@ -1,10 +1,12 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # PURPOSE: takes a file of locations in the format for bamScape custom
+ # navigation (Picard IntervalList format), adds 2000 bases of context
+ # to each side of each location, and prints a region file in format to
+ # be used by bam2Ace
+
++use warnings;
++
+ $szRevision = "140903"; # David Gordon
+
+ if ( defined( $ARGV[0] ) &&
+--- a/scripts/removeReads
++++ b/scripts/removeReads
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # PURPOSE: removes a list of chromats from an assembly. After running this,
+ # you must reassemble to create an ace file without the given phd files.
+@@ -16,6 +16,8 @@
+ # removeReads (name of fof's)
+ #
+
++use warnings;
++
+ $szUsage = "Usage: removeReads listOfReads.fof";
+
+ die "$szUsage" if ( $#ARGV != 0 );
+--- a/scripts/revertToUneditedRead
++++ b/scripts/revertToUneditedRead
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # PURPOSE: If the user really screws up a read, to back out all changes.
+ # You must reassemble after using this.
+@@ -16,6 +16,7 @@
+ # REV: 7/24/98 (DG)
+ # REV: 8/28/2013 (DG) to handle readnames with slashes (/)
+
++use warnings;
+
+ $szUsage = "Usage: revertToUneditedRead (read name without any .phd.# extension)";
+
+--- a/scripts/selectOneRegion.perl
++++ b/scripts/selectOneRegion.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # selectOneRegion.perl
+ #
+@@ -11,6 +11,7 @@
+ # and you will create an ace file chr15_51000000.ace or chr15_51000000.ace.1
+ # (or higher extension)
+
++use warnings;
+ use Getopt::Long;
+
+
+--- a/scripts/selectRegions.perl
++++ b/scripts/selectRegions.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ # selectRegions.perl
+ #
+@@ -43,7 +43,7 @@
+ # my_new_ace.ace says what the ace file should be called (the
+ # extension may not start at 1 if there is already a .1
+
+-
++use warnings;
+
+ $SIG{__WARN__} = dieWhenGetWarning;
+ sub dieWhenGetWarning {
+--- a/scripts/tagRepeats.perl
++++ b/scripts/tagRepeats.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # PROGRAM: tagRepeats.perl
+ # PURPOSE: to put consensus tags on any found ALU or any other
+@@ -10,6 +10,7 @@
+ # INPUTS: The ace file. You must also provide a fasta file of the
+ # ALU or any other sequence you want to tag
+
++use warnings;
+
+ $szVersion = "090209";
+ if ( $#ARGV >= 0 ) {
+--- a/scripts/testSocket.perl
++++ b/scripts/testSocket.perl
+@@ -1,7 +1,8 @@
+-#! /usr/local/bin/perl -w
++#!/usr/bin/env perl
+
+ # open a socket to consed
+-
++
++use warnings;
+ use IO::Socket;
+
+ # Consed makes a file which has nothing but the port number.
+--- a/scripts/transferConsensusTags.perl
++++ b/scripts/transferConsensusTags.perl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #
+ # Purpose: Transfers consensus tags from an old assembly to
+ # a new assembly.
+@@ -44,6 +44,8 @@
+ # Nov 2001, DG to handle cloneEnd tags which have orientation
+ # Mar 2012, DG to prevent duplicating tags after miniassembly
+
++use warnings;
++
+ $szUsage = "Usage: transferConsensusTags.perl (old ace file) (new ace file) (file of list of old contigs with consensus tags to be transferred)";
+
+ if ( $ARGV[0] eq "-V" || $ARGV[0] eq "-v" ) {
diff --git a/sci-biology/consed/files/consed-29-fix-qa.patch b/sci-biology/consed/files/consed-29-fix-qa.patch
new file mode 100644
index 000000000000..5bdf0264d25b
--- /dev/null
+++ b/sci-biology/consed/files/consed-29-fix-qa.patch
@@ -0,0 +1,275 @@
+Fix various QA violations, due to
+* implicit declarations
+* incorrect printf() format specifiers
+* incorrect function prototypes
+* remove unsafe gets() fucntion
+
+--- a/misc/454/sff2scf.c
++++ b/misc/454/sff2scf.c
+@@ -39,6 +39,7 @@
+ void writeScfFile(char *filearg, char *outfile);
+ void writeScfCommand(char *filearg, char *outfile);
+
++int sffinfo(int argc, char *argv[], FILE* pTempFile );
+
+ int main(int argc, char *argv[])
+ {
+--- a/misc/mktrace/mktrace.c
++++ b/misc/mktrace/mktrace.c
+@@ -70,9 +70,9 @@
+ else
+ {
+ printf( "enter FASTA filename: " );
+- gets( ifnm );
++ fgets( ifnm, sizeof(ifnm), stdin );
+ printf( "enter output filename: " );
+- gets( ofnm );
++ fgets( ofnm, sizeof(ofnm), stdin );
+ }
+
+ /*
+@@ -192,7 +192,7 @@
+ /*
+ ** Write phd file.
+ */
+- if( writePhd( ofnm, numBase, seq, qual, pos, numPoint, trace ) == ERROR )
++ if( writePhd( ofnm, numBase, seq, qual, pos, numPoint ) == ERROR )
+ {
+ fprintf( stderr, "mktrace: error: bad status: writePhd\n" );
+ free( seq );
+--- a/misc/mktrace/mktrace.h
++++ b/misc/mktrace/mktrace.h
+@@ -37,8 +37,8 @@
+ int writeSCF( char *filename, int numBase, char *seq, int numPoint, float **trace );
+ int freeTrace( float **trace );
+ char *readFASTA( char *filename, char *entryName, char *comments, int *len );
+-int writePhd( char *ofnm, int numBase, char *seq, int *pos, int numPoint );
+ int *readQUAL( char *filename, char *entryName, char *comments, int *len );
++char *getTime( void );
+ #else
+ int writePhd();
+ float **synTrace();
+--- a/misc/phd2fasta/phd2fasta.h
++++ b/misc/phd2fasta/phd2fasta.h
+@@ -276,6 +276,10 @@
+ Comments *comments, Seq *seq, TagList *tagList, char *emsg );
+ int checkIntString( char *string );
+ int delimiterTest( char *string, unsigned int mask );
++int checkParam( Option *option );
++char* getVersion( void );
++int showDoc( void );
++char* getTime( void );
+ #else
+ Option *getOption();
+ struct Tag *allocTag();
+--- a/misc/phd2fasta/readStdTag.c
++++ b/misc/phd2fasta/readStdTag.c
+@@ -699,11 +699,11 @@
+ if( fstat )
+ {
+ fprintf( stderr,
+- "readStdTag: %s: line: %d: unexpected delimiter %s\n",
++ "readStdTag: %s: line: %p: unexpected delimiter %s\n",
+ filename,
+ nline,
+ line );
+- sprintf( emsg, "%s: line: %d: unexpected delimiter %s\n",
++ sprintf( emsg, "%s: line: %p: unexpected delimiter %s\n",
+ filename,
+ nline,
+ line );
+--- a/misc/phd2fasta/readWholeReadTag.c
++++ b/misc/phd2fasta/readWholeReadTag.c
+@@ -393,11 +393,11 @@
+ if( fstat )
+ {
+ fprintf( stderr,
+- "readWholeReadTag: %s: line: %d: unexpected delimiter %s\n",
++ "readWholeReadTag: %s: line: %p: unexpected delimiter %s\n",
+ filename,
+ nline,
+ line );
+- sprintf( emsg, "%s: line: %d: unexpected delimiter %s\n",
++ sprintf( emsg, "%s: line: %p: unexpected delimiter %s\n",
+ filename,
+ nline,
+ line );
+--- a/misc/phd2fasta/writeFasta.c
++++ b/misc/phd2fasta/writeFasta.c
+@@ -39,7 +39,7 @@
+ #include "phd2fasta.h"
+
+ #ifdef ANSI_C
+-writeFasta( FILE *sfp, FILE *qfp, FILE *bfp,
++int writeFasta( FILE *sfp, FILE *qfp, FILE *bfp,
+ int outBasePosOption,
+ Comments *comments, Seq *seq, TagList *tagList, char *emsg )
+ #else
+--- a/motifutils.cpp
++++ b/motifutils.cpp
+@@ -202,13 +202,13 @@
+ void printButtonEvent( XButtonEvent* pEvent ) {
+
+ printf( "type = %d\n", pEvent->type );
+- printf( "serial = %d\n", pEvent->serial );
++ printf( "serial = %lu\n", pEvent->serial );
+ printf( "send_event = %s\n", szPrintBool( pEvent->send_event ) );
+- printf( "*display = %x\n", pEvent->display );
+- printf( "window = %x\n", pEvent->window );
+- printf( "root = %x\n", pEvent->root );
+- printf( "subwindow = %x\n", pEvent->subwindow );
+- printf( "time = %d\n", pEvent->time );
++ printf( "*display = %p\n", pEvent->display );
++ printf( "window = %lu\n", pEvent->window );
++ printf( "root = %lu\n", pEvent->root );
++ printf( "subwindow = %lu\n", pEvent->subwindow );
++ printf( "time = %lu\n", pEvent->time );
+ printf( "x = %d\n", pEvent->x );
+ printf( "y = %d\n", pEvent->y );
+ printf( "x_root = %d\n", pEvent->x_root );
+--- a/phaster2PhdBall.cpp
++++ b/phaster2PhdBall.cpp
+@@ -547,7 +547,7 @@
+
+ int nTokens =
+ sscanf( soLine_.data(),
+- "%s %*s %d %d %lld %s %s %*s %d %d %lld %s %s\n",
++ "%s %*s %d %d %ld %s %s %*s %d %d %ld %s %s\n",
+ soReadName_.data(),
+ &nRead1Left_,
+ &nRead1Right_,
+--- a/printAutoFinishMiscInfo.cpp
++++ b/printAutoFinishMiscInfo.cpp
+@@ -80,7 +80,7 @@
+ int nError = stat( (char*) soAceFileFullPathname.data(), &statBuffer );
+
+ if (nError == 0 ) {
+- fprintf( pAO,"size: %d date: %s\n",
++ fprintf( pAO,"size: %ld date: %s\n",
+ (long) statBuffer.st_size,
+ ctime( &( statBuffer.st_mtime )) );
+
+--- a/printAutoFinishParameters.cpp
++++ b/printAutoFinishParameters.cpp
+@@ -206,7 +206,7 @@
+ pCP->nInexactSearchForStringMaxPerCentMismatch_ );
+
+ fprintf( pAO, "! when using the inexact search for string, allow up to this\n");
+- fprintf( pAO, "! % mismatch: the sum of the insertion, deletion, and substitution\n");
++ fprintf( pAO, "! %% mismatch: the sum of the insertion, deletion, and substitution\n");
+ fprintf( pAO, "! differences divided by the length of the query string\n");
+ fprintf( pAO, "! (YES)\n");
+ fprintf( pAO, "consed.onlyAllowOneReadWriteConsedAtATime: %s\n",
+@@ -825,7 +825,7 @@
+ fprintf( pAO, "! template will be 1500 bases from the forward read. But if this template\n");
+ fprintf( pAO, "! has an insert that is shorter than average, the walk may walk into vector.\n");
+ fprintf( pAO, "! To be conservative, we may want to assume that the insert is somewhat \n");
+- fprintf( pAO, "! shorter than average. By default, we assume that it is 90% as large as \n");
++ fprintf( pAO, "! shorter than average. By default, we assume that it is 90%% as large as \n");
+ fprintf( pAO, "! the average. This parameter gives that percentage. This parameter\n");
+ fprintf( pAO, "! is used both by Consed and Autofinish.\n");
+ fprintf( pAO, "! (OK)\n");
+@@ -1249,9 +1249,9 @@
+ pCP->nAutoFinishConfidenceThatReadWillCoverSingleSubcloneRegion_ );
+
+ fprintf( pAO, "! Autofinish computes the per cent of existing reads are aligned at\n");
+- fprintf( pAO, "! each base position. Typically, this number starts at around 0% at\n");
+- fprintf( pAO, "! base position 1, rises to close to 100% at around base position 300,\n");
+- fprintf( pAO, "! and then drops again to 0% at base position 800 or so. This number\n");
++ fprintf( pAO, "! each base position. Typically, this number starts at around 0%% at\n");
++ fprintf( pAO, "! base position 1, rises to close to 100%% at around base position 300,\n");
++ fprintf( pAO, "! and then drops again to 0%% at base position 800 or so. This number\n");
+ fprintf( pAO, "! specifies how high the number must be for Autofinish to consider an\n");
+ fprintf( pAO, "! Autofinish read to cover a single subclone region.\n");
+ fprintf( pAO, "! (OK)\n");
+@@ -1295,7 +1295,7 @@
+ ( ( pCP->bCheckIfTooManyWalks_ ) ? "true" : "false" ) );
+
+ fprintf( pAO, "! this just checks if the number of walks, pcr ends, and unknown reads\n");
+- fprintf( pAO, "! exceeds 20% of the total number of reads. If this is exceeded, then \n");
++ fprintf( pAO, "! exceeds 20%% of the total number of reads. If this is exceeded, then \n");
+ fprintf( pAO, "! a warning message is given. Typically, such a warning indicates\n");
+ fprintf( pAO, "! that you have incorrectly customized determineReadTypes.perl\n");
+ fprintf( pAO, "! (OK)\n");
+@@ -1446,7 +1446,7 @@
+ ( ( pCP->bProcessMatePairsAtStartup_ ) ? "true" : "false" ) );
+
+ fprintf( pAO, "! This is necessary to show the mate pair flags, but it does add\n");
+- fprintf( pAO, "! around 15% to startup time.\n");
++ fprintf( pAO, "! around 15%% to startup time.\n");
+ fprintf( pAO, "! (OK)\n");
+ fprintf( pAO, "consed.maximumNumberOfTracesShown: %d\n",
+ pCP->nMaximumNumberOfTracesShown_ );
+@@ -1796,7 +1796,7 @@
+ (char*)pCP->soStoreTracePeakPositions_.data() );
+
+ fprintf( pAO, "! never, always or whenChromatAvailable\n");
+- fprintf( pAO, "! changing this to \"always\" increases memory usage by close to 100%,\n");
++ fprintf( pAO, "! changing this to \"always\" increases memory usage by close to 100%%,\n");
+ fprintf( pAO, "! especially if the assembler is Newbler. always means it will store\n");
+ fprintf( pAO, "! the positions if they are present in the phd file/ball.\n");
+ fprintf( pAO, "! \"whenChromatAvailable\" means it will store trace peak positions for\n");
+--- a/readPrimerScreenSequences.cpp
++++ b/readPrimerScreenSequences.cpp
+@@ -167,7 +167,7 @@
+ ++nSequenceNumber ) {
+ if ( pnLengthOfSequence[ nSequenceNumber ] !=
+ strlen( pszSequence[ nSequenceNumber ] ) ) {
+- sprintf( szErrorMessage, "inconsistency between pnLengthOfSequence %d and pszSequence %d for sequence number %d",
++ sprintf( szErrorMessage, "inconsistency between pnLengthOfSequence %d and pszSequence %zu for sequence number %d",
+ pnLengthOfSequence[ nSequenceNumber ],
+ strlen( pszSequence[ nSequenceNumber ] ),
+ nSequenceNumber );
+--- a/rwcstring.cpp
++++ b/rwcstring.cpp
+@@ -235,7 +235,7 @@
+
+ nMaxLength_ = nDefaultLengthForConversions;
+
+- nCurrentLength_ = sprintf( sz_, "%d", lNumberToConvert );
++ nCurrentLength_ = sprintf( sz_, "%ld", lNumberToConvert );
+
+ if ( nCurrentLength_ > nMaxLength_ ) {
+ // big trouble--might not even make it here--might segmentation fault
+--- a/someOtherProgramSentACommandToConsed.cpp
++++ b/someOtherProgramSentACommandToConsed.cpp
+@@ -89,7 +89,7 @@
+
+ char szLine2[ nMaxLine ];
+
+- sprintf( szLine2, "# of chars = %d %s", strlen( szLine ), szLine );
++ sprintf( szLine2, "# of chars = %zu %s", strlen( szLine ), szLine );
+
+ cout << szLine2 << endl;
+
+--- a/tag.cpp
++++ b/tag.cpp
+@@ -466,7 +466,7 @@
+ fprintf( pPhdFile, "DATE: %s\n", soDate_.data() );
+
+ if ( lID_ != nUndefinedTagID ) {
+- fprintf( pPhdFile, "ID: %d\n", lID_ );
++ fprintf( pPhdFile, "ID: %ld\n", lID_ );
+ }
+
+
+--- a/userDefinedTagField.cpp
++++ b/userDefinedTagField.cpp
+@@ -64,7 +64,7 @@
+
+ void userDefinedIntegerTagField :: writeThyselfToAceFileOrPhdBall( FILE* pFile ) {
+
+- fprintf( pFile, "%s %d\n",
++ fprintf( pFile, "%s %ld\n",
+ pUserDefinedTagFieldType_->soFieldName_.data(),
+ l_ );
+ }
+@@ -119,7 +119,7 @@
+
+ void userDefinedPointerTagField :: writeThyselfToAceFileOrPhdBall( FILE* pFile ) {
+
+- fprintf( pFile, "%s %d\n",
++ fprintf( pFile, "%s %ld\n",
+ pUserDefinedTagFieldType_->soFieldName_.data(),
+ lID_ );
+
diff --git a/sci-biology/phrap/Manifest b/sci-biology/phrap/Manifest
index 1275fda8b314..c3bf6b3d1fb5 100644
--- a/sci-biology/phrap/Manifest
+++ b/sci-biology/phrap/Manifest
@@ -1 +1 @@
-DIST phrap-1.080812-distrib.tar.gz 317350 SHA256 7025f3cb30e5a3305a13d150f39a85580ade0bbf8169b25db65cbe396e201052
+DIST phrap-1.080812-distrib.tar.gz 317350 SHA256 7025f3cb30e5a3305a13d150f39a85580ade0bbf8169b25db65cbe396e201052 SHA512 6b125b9a99b6180eb5de16bccfe068abefdb59237fd3295924c418749f2f2d6e39cdbcecc6786e42738846975334c4d8a645eae8fd0fcbda6b0e99241deb15ca WHIRLPOOL e516561804620ba8c96ed0e5c5d791f3fe1e7984e08f646e6fd7c30042f2550f5d1c9b2f800e8a853e42b049b92418ed9d0121e77bf4e9aa895974bce5e73717
diff --git a/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch b/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch
new file mode 100644
index 000000000000..6d30c2ce326a
--- /dev/null
+++ b/sci-biology/phrap/files/phrap-1.080812-fix-build-system.patch
@@ -0,0 +1,100 @@
+* Fix perl shebang to be portable
+* Make build system honour LDFLAGS
+
+--- a/makefile
++++ b/makefile
+@@ -25,9 +25,8 @@
+ # Makefile for swat, phrap, cross_match, phrapview; also swprobs (currently inactivated)
+ #CC= icc
+ #CFLAGS= -O2 -wd266,880
+-CC= cc
+-CFLAGS= -O2
+-LFLAGS= -lm
++CC ?= cc
++LIBS = -lm
+
+ SWATOBJS= swat.o weibull.o
+
+@@ -96,46 +95,46 @@
+ chmod a+x phrapview
+
+ swat: makefile $(SWATOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ $(SWATOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(SWATOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r swat
+
+ alpha_swat: makefile $(ALPHOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ $(ALPHOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(ALPHOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r alpha_swat
+
+ swat_counts: makefile $(COUNOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ $(COUNOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(COUNOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r swat_counts
+
+ swprobs: makefile $(PROBOBJS)
+- $(CC) $(CFLAGS) -o $@ $(PROBOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(PROBOBJS) $(LIBS)
+
+ phrap: makefile phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ phrap.o call_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r phrap
+
+ gcphrap: makefile gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS)
+- $(CC) $(CFLAGS) -o $@ gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ gcphrap.o gccall_subs.o $(PHOBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LIBS)
+ chmod o-r gcphrap
+
+ cross_match: makefile cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ cross_match.o call_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r cross_match
+
+ gccross_match: makefile gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS)
+- $(CC) $(CFLAGS) -o $@ gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ gccross_match.o gccall_subs.o $(CROBJS) $(SCANOBJS) $(SWOBJS) $(JKBSWOBJS) $(LIBS)
+ chmod o-r gccross_match
+
+ cluster: makefile $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(CLOBJS) call_subs.o $(SCANOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r cluster
+
+ loco: makefile $(LOCOOBJS) $(SWOBJS)
+- $(CC) $(CFLAGS) -o $@ $(LOCOOBJS) $(SWOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(LOCOOBJS) $(SWOBJS) $(LIBS)
+ chmod o-r loco
+
+ erf_test: $(ERFOBJS)
+- $(CC) $(CFLAGS) -o $@ $(ERFOBJS) $(LFLAGS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(ERFOBJS) $(LIBS)
+
+ loco.o: swat.h
+
+@@ -228,7 +227,7 @@
+ anomalies.o: swat.h
+
+ fast_smith_wat.s: fast_smith_wat.c
+- cc -S -machine_code -source_listing -O3 fast_smith_wat.c
++ $(CC) $(CFLAGS) -S -machine_code -source_listing fast_smith_wat.c
+ #N.B. fast_smith_wat.s MUST BE EDITTED BEFORE USE!!!
+
+ tig_node.o: swat.h
+--- a/phrapview
++++ b/phrapview
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/env perl
+
+
+ #/*****************************************************************************
+@@ -25,6 +25,7 @@
+ #
+ #*****************************************************************************/
+
++use warnings;
+ use strict;
+ use Tk;
+ #phrapview version 0.960731
diff --git a/sci-biology/phrap/phrap-1.080812-r1.ebuild b/sci-biology/phrap/phrap-1.080812-r2.ebuild
similarity index 75%
rename from sci-biology/phrap/phrap-1.080812-r1.ebuild
rename to sci-biology/phrap/phrap-1.080812-r2.ebuild
index e3a3f9ebf591..3ae24453e453 100644
--- a/sci-biology/phrap/phrap-1.080812-r1.ebuild
+++ b/sci-biology/phrap/phrap-1.080812-r2.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
+
+inherit toolchain-funcs
DESCRIPTION="Shotgun assembly and alignment utilities"
HOMEPAGE="http://www.phrap.org/"
@@ -21,6 +23,7 @@ RDEPEND="
S="${WORKDIR}"
RESTRICT="fetch"
+PATCHES=( "${FILESDIR}/${PN}-1.080812-fix-build-system.patch" )
pkg_nofetch() {
einfo "Please visit http://www.phrap.org/phredphrapconsed.html and obtain the file"
@@ -28,15 +31,18 @@ pkg_nofetch() {
einfo "and put it in ${DISTDIR}"
}
-src_prepare() {
- sed -i 's/CFLAGS=/#CFLAGS=/' makefile || die
- sed -i 's|#!/usr/local/bin/perl|#!/usr/bin/env perl|' phrapview || die
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
}
src_install() {
dobin cross_match loco phrap phrapview swat
newbin cluster cluster_phrap
- for i in {general,phrap,swat}.doc ; do
+
+ local i
+ for i in {general,phrap,swat}.doc; do
newdoc ${i} ${i}.txt
done
}
diff --git a/sci-biology/phred/Manifest b/sci-biology/phred/Manifest
index 92cfe6ce81b8..c326374708c9 100644
--- a/sci-biology/phred/Manifest
+++ b/sci-biology/phred/Manifest
@@ -1 +1 @@
-DIST phred-dist-071220.b-acd.tar.gz 357767 SHA256 364b0b54c29717ba4c8acc48a128eaf25ba1d7f06acab7565975f6879764a975
+DIST phred-dist-071220.b-acd.tar.gz 357767 SHA256 364b0b54c29717ba4c8acc48a128eaf25ba1d7f06acab7565975f6879764a975 SHA512 0a6b0a733e6dcc0495eaab720b75f8e5815df494d0a773b8b8336d5208321c2ba475921084835a769367ec51aed156585ab97346a510100d4337e3215ec75276 WHIRLPOOL 9b14cfb1ca970a14ef613ca17efb82955c0ecec414dfad8835c883650f306b3a79846b7a410a9359cbd9ca953d890673366b6f865a2a357e81213d34b3327d3e
diff --git a/sci-biology/phred/files/phred-071220-fix-build-system.patch b/sci-biology/phred/files/phred-071220-fix-build-system.patch
new file mode 100644
index 000000000000..997f39941a07
--- /dev/null
+++ b/sci-biology/phred/files/phred-071220-fix-build-system.patch
@@ -0,0 +1,82 @@
+* Fix build system to honour CC, CFLAGS, CPPFLAGS and LDFLAGS
+* Specify a default target, in order to keep the ebuild slim
+
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,9 @@
+
+ # UNIX specific definitions (default)
+ #
+-CC= cc
+-CFLAGS= -O -DANSI_C $(LXFLAGS)
+-CLIB= -lm
++CC ?= cc
++CPPFLAGS += -DANSI_C $(LXFLAGS)
++LIBS += -lm
+
+ # Windows 'nmake' specific definitions
+ #
+@@ -133,9 +133,6 @@
+ $(objdir)writeSDF.o \
+ $(objdir)writeSeq.o
+
+-SRCS = $(OBJS:.o=.c)
+-WOBJ = $(OBJS:.o=.obj)
+-
+ INCS = \
+ $(incdir)chromatData.h \
+ $(incdir)freeChromatData.h \
+@@ -179,48 +176,18 @@
+ # UNIX make specific phred target
+ # note: a horizontal tab character must precede `$(CC)'
+ #
+-phred: $(OBJS)
+- $(CC) $(CFLAGS) -o phred $(OBJS) $(CLIB)
+
+
+-# Windows nmake specific phred target
+-#
+-forwindows: $(WOBJ)
+- $(CC) $(CFLAGS) /Fephred $(WOBJ)
+-# $(CC) $(CFLAGS) /Fedaev daev.c
++.PHONY: all
++all: phred daev
+
+
+-# test CC: refuse to compile if
+-#
+-# o SunOS
+-#
+-# AND
+-#
+-# o using /usr/ucb/cc compiler
+-#
+-# NOTE: this compiler causes problems: see PHRED.DOC
+-#
+-test_cc:
+- @if [ `uname` = SunOS ] ; \
+- then \
+- if [ `which $(CC)` = "/usr/ucb/cc" ] ; \
+- then \
+- echo ""; \
+- echo "============================================================"; \
+- echo "| |"; \
+- echo "| This SUN C compiler produces a bad phred executable. |"; \
+- echo "| |"; \
+- echo "| Please see the PHRED.DOC file for more information. |"; \
+- echo "| |"; \
+- echo "============================================================"; \
+- echo ""; \
+- exit 1; \
+- fi \
+- fi
++phred: $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o phred $^ $(LIBS)
+
+
+ daev: daev.o
+- $(CC) $(CFLAGS) -o daev daev.o -lm
++ $(CC) $(LDFLAGS) $(CFLAGS) -o daev $^ $(LIBS)
+
+
+ clean:
diff --git a/sci-biology/phred/files/phred-071220-fix-qa.patch b/sci-biology/phred/files/phred-071220-fix-qa.patch
new file mode 100644
index 000000000000..ab4d2ea023f6
--- /dev/null
+++ b/sci-biology/phred/files/phred-071220-fix-qa.patch
@@ -0,0 +1,36 @@
+Fix implicit declarations:
+* daev.c: In function ‘processParameters’:
+* daev.c:849:14: warning: implicit declaration of function ‘isdigit’ [-Wimplicit-function-declaration]
+* if( !isdigit( argv[iarg][0] ) )
+
+--- a/autoPhred.c
++++ b/autoPhred.c
+@@ -57,6 +57,7 @@
+ static int xstrcmp();
+ #endif
+
++int freeMBRData( MBRData *mbrData );
+ #ifdef ANSI_C
+ int autoPhred( Option *option )
+ #else
+--- a/daev.c
++++ b/daev.c
+@@ -58,6 +58,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifndef _WIN32
+ #include
+--- a/mergedBaseRead.c
++++ b/mergedBaseRead.c
+@@ -63,7 +63,7 @@
+ Peak *peak;
+ Observed_peak *obs_peak;
+
+- static initFlag = 0;
++ static int initFlag = 0;
+ static char mchar[256][256];
+
+ if( initFlag == 0 )
diff --git a/sci-biology/phred/phred-071220-r1.ebuild b/sci-biology/phred/phred-071220-r1.ebuild
new file mode 100644
index 000000000000..acaf74e7d430
--- /dev/null
+++ b/sci-biology/phred/phred-071220-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A base caller for Sanger DNA sequencing"
+HOMEPAGE="http://phrap.org/phredphrapconsed.html"
+SRC_URI="phred-dist-071220.b-acd.tar.gz"
+
+LICENSE="phrap"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+RESTRICT="fetch"
+PATCHES=(
+ "${FILESDIR}/${PN}-071220-fix-build-system.patch"
+ "${FILESDIR}/${PN}-071220-fix-qa.patch"
+)
+
+pkg_nofetch() {
+ einfo "Please visit ${HOMEPAGE} and obtain the file"
+ einfo "${SRC_URI}, then place it in ${DISTDIR}"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin phred daev
+
+ insinto /usr/share/${PN}
+ doins phredpar.dat
+
+ echo "PHRED_PARAMETER_FILE=${EPREFIX}/usr/share/${PN}/phredpar.dat" > 99phred || die
+ doenvd 99phred
+
+ newdoc DAEV.DOC DAEV.DOC.txt
+ newdoc PHRED.DOC PHRED.DOC.txt
+}
diff --git a/sci-biology/phred/phred-071220.ebuild b/sci-biology/phred/phred-071220.ebuild
deleted file mode 100644
index 22600ba92c50..000000000000
--- a/sci-biology/phred/phred-071220.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="A base caller for Sanger DNA sequencing"
-HOMEPAGE="http://phrap.org/phredphrapconsed.html"
-SRC_URI="phred-dist-071220.b-acd.tar.gz"
-
-LICENSE="phrap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
- elog "Please visit ${HOMEPAGE} and obtain the file"
- elog "${SRC_URI}, then place it in ${DISTDIR}"
-}
-
-src_compile() {
- sed -i -e 's/CFLAGS=/CFLAGS += /' Makefile
- emake daev || die
- emake || die
-}
-
-src_install() {
- dobin phred daev || die
- insinto /usr/share/${PN}
- doins phredpar.dat || die
- echo "PHRED_PARAMETER_FILE=/usr/share/${PN}/phredpar.dat" > 99phred
- doenvd 99phred || die
- newdoc DAEV.DOC DAEV.DOC.txt
- newdoc PHRED.DOC PHRED.DOC.txt
-}
diff --git a/sci-biology/samtools/samtools-0.1.20-r2.ebuild b/sci-biology/samtools/samtools-0.1.20-r3.ebuild
similarity index 60%
rename from sci-biology/samtools/samtools-0.1.20-r2.ebuild
rename to sci-biology/samtools/samtools-0.1.20-r3.ebuild
index e30ed26ca09f..787add896063 100644
--- a/sci-biology/samtools/samtools-0.1.20-r2.ebuild
+++ b/sci-biology/samtools/samtools-0.1.20-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs
DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
HOMEPAGE="http://samtools.sourceforge.net/"
@@ -16,10 +16,10 @@ LICENSE="MIT"
SLOT="0.1-legacy"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="examples"
-
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="${PYTHON_DEPS}
+ sys-libs/ncurses:0=
dev-lang/perl"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -30,7 +30,8 @@ PATCHES=(
src_prepare() {
default
- sed -i 's~/software/bin/python~/usr/bin/env python~' "${S}"/misc/varfilter.py || die
+ # required, otherwise python_fix_shebang errors out
+ sed -i 's~/software/bin/python~/usr/bin/env python~' misc/varfilter.py || die
tc-export CC AR
}
@@ -41,24 +42,24 @@ src_compile() {
}
src_install() {
- dobin samtools $(find bcftools misc -type f -executable)
- mv "${ED}"/usr/{bin,${PN}-${SLOT}} || die
- mkdir "${ED}"/usr/bin || die
- mv "${ED}"/usr/{${PN}-${SLOT},bin/} || die
+ # install executables and hide them away from sight
+ dobin samtools bcftools/{bcftools,vcfutils.pl} misc/{*.py,*.pl,wgsim,ace2sam} \
+ misc/{md5sum-lite,maq2sam-short,bamcheck,maq2sam-long,md5fa,plot-bamcheck}
+ mv "${ED%/}"/usr/{bin,${PN}-${SLOT}} || die
+ mkdir "${ED%/}"/usr/bin || die
+ mv "${ED%/}"/usr/{${PN}-${SLOT},bin/} || die
- mv "${ED}"/usr/bin/${PN}-${SLOT}/varfilter{,-${SLOT}}.py || die
- python_replicate_script "${ED}"/usr/bin/${PN}-${SLOT}/varfilter-${SLOT}.py
+ # ... do the same with the python script, but also fix the shebang
+ mv "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter{,-${SLOT}}.py || die
+ python_fix_shebang "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter-${SLOT}.py
# fix perl shebangs
- pushd "${ED}"usr/bin/"${PN}-${SLOT}"/ >> /dev/null
+ pushd "${ED%/}"/usr/bin/${PN}-${SLOT} >/dev/null || die
local i
for i in plot-bamcheck *.pl; do
sed -e '1s:.*:#!/usr/bin/env perl:' -i "${i}" || die
done
-
- # remove lua scripts
- rm -f r2plot.lua vcfutils.lua || die
- popd >> /dev/null
+ popd >/dev/null || die
dolib.so libbam-${SLOT}$(get_libname 1)
dosym libbam-${SLOT}$(get_libname 1) /usr/$(get_libdir)/libbam-${SLOT}$(get_libname)
@@ -68,9 +69,12 @@ src_install() {
mv ${PN}{,-${SLOT}}.1 || die
doman ${PN}-${SLOT}.1
- dodoc AUTHORS NEWS
+ einstalldocs
- use examples && dodoc -r examples
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
}
pkg_postinst() {
diff --git a/sci-biology/tophat/tophat-2.1.1-r2.ebuild b/sci-biology/tophat/tophat-2.1.1-r3.ebuild
similarity index 95%
rename from sci-biology/tophat/tophat-2.1.1-r2.ebuild
rename to sci-biology/tophat/tophat-2.1.1-r3.ebuild
index 52a75a6d5964..4d784fa9bfb9 100644
--- a/sci-biology/tophat/tophat-2.1.1-r2.ebuild
+++ b/sci-biology/tophat/tophat-2.1.1-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
DESCRIPTION="Python-based splice junction mapper for RNA-Seq reads using bowtie2"
HOMEPAGE="https://ccb.jhu.edu/software/tophat/"
@@ -70,7 +70,7 @@ src_install() {
local i
# install scripts properly
for i in bed_to_juncs contig_to_chr_coords sra_to_solid tophat tophat-fusion-post; do
- python_doscript "${ED%/}/usr/bin/${i}"
+ python_fix_shebang "${ED%/}/usr/bin/${i}"
done
# install python modules properly
diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
index d9580fd641d1..60d342ed4749 100644
--- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
@@ -90,12 +90,13 @@ RDEPEND="
=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
=dev-python/psycopg-2.5.0
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+
+# Defines the format string for %%(asctime)s in log records. Default:
+# %(default)s . This option is ignored if log_config_append is set. (string
+# value)
+#log_date_format = %Y-%m-%d %H:%M:%S
+
+# (Optional) Name of log file to send logging output to. If no default is set,
+# logging will go to stderr as defined by use_stderr. This option is ignored if
+# log_config_append is set. (string value)
+# Deprecated group/name - [DEFAULT]/logfile
+#log_file =
+
+# (Optional) The base directory used for relative log_file paths. This option
+# is ignored if log_config_append is set. (string value)
+# Deprecated group/name - [DEFAULT]/logdir
+#log_dir =
+
+# Uses logging handler designed to watch file system. When log file is moved or
+# removed this handler will open a new log file with specified path
+# instantaneously. It makes sense only if log_file option is specified and
+# Linux platform is used. This option is ignored if log_config_append is set.
+# (boolean value)
+#watch_log_file = false
+
+# Use syslog for logging. Existing syslog format is DEPRECATED and will be
+# changed later to honor RFC5424. This option is ignored if log_config_append
+# is set. (boolean value)
+#use_syslog = false
+
+# Syslog facility to receive log lines. This option is ignored if
+# log_config_append is set. (string value)
+#syslog_log_facility = LOG_USER
+
+# Log output to standard error. This option is ignored if log_config_append is
+# set. (boolean value)
+#use_stderr = true
+
+# Format string to use for log messages with context. (string value)
+#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
+
+# Format string to use for log messages when context is undefined. (string
+# value)
+#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
+
+# Additional data to append to log message when logging level for the message
+# is DEBUG. (string value)
+#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
+
+# Prefix each line of exception output with this format. (string value)
+#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
+
+# Defines the format string for %(user_identity)s that is used in
+# logging_context_format_string. (string value)
+#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
+
+# List of package logging levels in logger=LEVEL pairs. This option is ignored
+# if log_config_append is set. (list value)
+#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
+
+# Enables or disables publication of error events. (boolean value)
+#publish_errors = false
+
+# The format for an instance that is passed with the log message. (string
+# value)
+#instance_format = "[instance: %(uuid)s] "
+
+# The format for an instance UUID that is passed with the log message. (string
+# value)
+#instance_uuid_format = "[instance: %(uuid)s] "
+
+# Enables or disables fatal status of deprecations. (boolean value)
+#fatal_deprecations = false
+
+#
+# From oslo.messaging
+#
+
+# Size of RPC connection pool. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_conn_pool_size
+#rpc_conn_pool_size = 30
+
+# The pool size limit for connections expiration policy (integer value)
+#conn_pool_min_size = 2
+
+# The time-to-live in sec of idle connections in the pool (integer value)
+#conn_pool_ttl = 1200
+
+# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
+# The "host" option should point or resolve to this address. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_address
+#rpc_zmq_bind_address = *
+
+# MatchMaker driver. (string value)
+# Allowed values: redis, dummy
+# Deprecated group/name - [DEFAULT]/rpc_zmq_matchmaker
+#rpc_zmq_matchmaker = redis
+
+# Number of ZeroMQ contexts, defaults to 1. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_contexts
+#rpc_zmq_contexts = 1
+
+# Maximum number of ingress messages to locally buffer per topic. Default is
+# unlimited. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_topic_backlog
+#rpc_zmq_topic_backlog =
+
+# Directory for holding IPC sockets. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_ipc_dir
+#rpc_zmq_ipc_dir = /var/run/openstack
+
+# Name of this node. Must be a valid hostname, FQDN, or IP address. Must match
+# "host" option, if running Nova. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_host
+#rpc_zmq_host = localhost
+
+# Seconds to wait before a cast expires (TTL). The default value of -1
+# specifies an infinite linger period. The value of 0 specifies no linger
+# period. Pending messages shall be discarded immediately when the socket is
+# closed. Only supported by impl_zmq. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_cast_timeout
+#rpc_cast_timeout = -1
+
+# The default number of seconds that poll should wait. Poll raises timeout
+# exception when timeout expired. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_poll_timeout
+#rpc_poll_timeout = 1
+
+# Expiration timeout in seconds of a name service record about existing target
+# ( < 0 means no timeout). (integer value)
+# Deprecated group/name - [DEFAULT]/zmq_target_expire
+#zmq_target_expire = 300
+
+# Update period in seconds of a name service record about existing target.
+# (integer value)
+# Deprecated group/name - [DEFAULT]/zmq_target_update
+#zmq_target_update = 180
+
+# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. (boolean
+# value)
+# Deprecated group/name - [DEFAULT]/use_pub_sub
+#use_pub_sub = true
+
+# Use ROUTER remote proxy. (boolean value)
+# Deprecated group/name - [DEFAULT]/use_router_proxy
+#use_router_proxy = true
+
+# Minimal port number for random ports range. (port value)
+# Minimum value: 0
+# Maximum value: 65535
+# Deprecated group/name - [DEFAULT]/rpc_zmq_min_port
+#rpc_zmq_min_port = 49153
+
+# Maximal port number for random ports range. (integer value)
+# Minimum value: 1
+# Maximum value: 65536
+# Deprecated group/name - [DEFAULT]/rpc_zmq_max_port
+#rpc_zmq_max_port = 65536
+
+# Number of retries to find free port number before fail with ZMQBindError.
+# (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_port_retries
+#rpc_zmq_bind_port_retries = 100
+
+# Default serialization mechanism for serializing/deserializing
+# outgoing/incoming messages (string value)
+# Allowed values: json, msgpack
+# Deprecated group/name - [DEFAULT]/rpc_zmq_serialization
+#rpc_zmq_serialization = json
+
+# This option configures round-robin mode in zmq socket. True means not keeping
+# a queue when server side disconnects. False means to keep queue and messages
+# even if server is disconnected, when the server appears we send all
+# accumulated messages to it. (boolean value)
+#zmq_immediate = false
+
+# Size of executor thread pool. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_thread_pool_size
+#executor_thread_pool_size = 64
+
+# Seconds to wait for a response from a call. (integer value)
+#rpc_response_timeout = 60
+
+# A URL representing the messaging driver to use and its full configuration.
+# (string value)
+#transport_url =
+
+# DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers
+# include amqp and zmq. (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rpc_backend = rabbit
+
+# The default exchange under which topics are scoped. May be overridden by an
+# exchange name specified in the transport_url option. (string value)
+#control_exchange = openstack
+
+#
+# From oslo.service.periodic_task
+#
+
+# Some periodic tasks can be run in a separate process. Should we run them
+# here? (boolean value)
+#run_external_periodic_tasks = true
+
+#
+# From oslo.service.service
+#
+
+# Enable eventlet backdoor. Acceptable values are 0, , and
+# :, where 0 results in listening on a random tcp port number;
+# results in listening on the specified port number (and not enabling
+# backdoor if that port is in use); and : results in listening on
+# the smallest unused port number within the specified range of port numbers.
+# The chosen port is displayed in the service's log file. (string value)
+#backdoor_port =
+
+# Enable eventlet backdoor, using the provided path as a unix socket that can
+# receive connections. This option is mutually exclusive with 'backdoor_port'
+# in that only one should be provided. If both are provided then the existence
+# of this option overrides the usage of that option. (string value)
+#backdoor_socket =
+
+# Enables or disables logging values of all registered options when starting a
+# service (at DEBUG level). (boolean value)
+#log_options = true
+
+# Specify a timeout after which a gracefully shutdown server will exit. Zero
+# value means endless wait. (integer value)
+#graceful_shutdown_timeout = 60
+
+
+[cors]
+
+#
+# From oslo.middleware
+#
+
+# Indicate whether this resource may be shared with the domain received in the
+# requests "origin" header. Format: "://[:]", no trailing
+# slash. Example: https://horizon.example.com (list value)
+#allowed_origin =
+
+# Indicate that the actual request can include user credentials (boolean value)
+#allow_credentials = true
+
+# Indicate which headers are safe to expose to the API. Defaults to HTTP Simple
+# Headers. (list value)
+#expose_headers =
+
+# Maximum cache age of CORS preflight requests. (integer value)
+#max_age = 3600
+
+# Indicate which methods can be used during the actual request. (list value)
+#allow_methods = OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,PATCH
+
+# Indicate which header field names may be used during the actual request.
+# (list value)
+#allow_headers =
+
+
+[cors.subdomain]
+
+#
+# From oslo.middleware
+#
+
+# Indicate whether this resource may be shared with the domain received in the
+# requests "origin" header. Format: "://[:]", no trailing
+# slash. Example: https://horizon.example.com (list value)
+#allowed_origin =
+
+# Indicate that the actual request can include user credentials (boolean value)
+#allow_credentials = true
+
+# Indicate which headers are safe to expose to the API. Defaults to HTTP Simple
+# Headers. (list value)
+#expose_headers =
+
+# Maximum cache age of CORS preflight requests. (integer value)
+#max_age = 3600
+
+# Indicate which methods can be used during the actual request. (list value)
+#allow_methods = OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,PATCH
+
+# Indicate which header field names may be used during the actual request.
+# (list value)
+#allow_headers =
+
+
+[database]
+
+#
+# From oslo.db
+#
+
+# DEPRECATED: The file name to use with SQLite. (string value)
+# Deprecated group/name - [DEFAULT]/sqlite_db
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Should use config option connection or slave_connection to connect
+# the database.
+#sqlite_db = oslo.sqlite
+
+# If True, SQLite uses synchronous mode. (boolean value)
+# Deprecated group/name - [DEFAULT]/sqlite_synchronous
+#sqlite_synchronous = true
+
+# The back end to use for the database. (string value)
+# Deprecated group/name - [DEFAULT]/db_backend
+#backend = sqlalchemy
+
+# The SQLAlchemy connection string to use to connect to the database. (string
+# value)
+# Deprecated group/name - [DEFAULT]/sql_connection
+# Deprecated group/name - [DATABASE]/sql_connection
+# Deprecated group/name - [sql]/connection
+#connection =
+
+# The SQLAlchemy connection string to use to connect to the slave database.
+# (string value)
+#slave_connection =
+
+# The SQL mode to be used for MySQL sessions. This option, including the
+# default, overrides any server-set SQL mode. To use whatever SQL mode is set
+# by the server configuration, set this to no value. Example: mysql_sql_mode=
+# (string value)
+#mysql_sql_mode = TRADITIONAL
+
+# Timeout before idle SQL connections are reaped. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_idle_timeout
+# Deprecated group/name - [DATABASE]/sql_idle_timeout
+# Deprecated group/name - [sql]/idle_timeout
+#idle_timeout = 3600
+
+# Minimum number of SQL connections to keep open in a pool. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_min_pool_size
+# Deprecated group/name - [DATABASE]/sql_min_pool_size
+#min_pool_size = 1
+
+# Maximum number of SQL connections to keep open in a pool. Setting a value of
+# 0 indicates no limit. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_pool_size
+# Deprecated group/name - [DATABASE]/sql_max_pool_size
+#max_pool_size = 5
+
+# Maximum number of database connection retries during startup. Set to -1 to
+# specify an infinite retry count. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_retries
+# Deprecated group/name - [DATABASE]/sql_max_retries
+#max_retries = 10
+
+# Interval between retries of opening a SQL connection. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_retry_interval
+# Deprecated group/name - [DATABASE]/reconnect_interval
+#retry_interval = 10
+
+# If set, use this value for max_overflow with SQLAlchemy. (integer value)
+# Deprecated group/name - [DEFAULT]/sql_max_overflow
+# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
+#max_overflow = 50
+
+# Verbosity of SQL debugging information: 0=None, 100=Everything. (integer
+# value)
+# Minimum value: 0
+# Maximum value: 100
+# Deprecated group/name - [DEFAULT]/sql_connection_debug
+#connection_debug = 0
+
+# Add Python stack traces to SQL as comment strings. (boolean value)
+# Deprecated group/name - [DEFAULT]/sql_connection_trace
+#connection_trace = false
+
+# If set, use this value for pool_timeout with SQLAlchemy. (integer value)
+# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
+#pool_timeout =
+
+# Enable the experimental use of database reconnect on connection lost.
+# (boolean value)
+#use_db_reconnect = false
+
+# Seconds between retries of a database transaction. (integer value)
+#db_retry_interval = 1
+
+# If True, increases the interval between retries of a database operation up to
+# db_max_retry_interval. (boolean value)
+#db_inc_retry_interval = true
+
+# If db_inc_retry_interval is set, the maximum seconds between retries of a
+# database operation. (integer value)
+#db_max_retry_interval = 10
+
+# Maximum retries in case of connection error or deadlock error before error is
+# raised. Set to -1 to specify an infinite retry count. (integer value)
+#db_max_retries = 20
+
+
+[keystone_authtoken]
+
+#
+# From keystonemiddleware.auth_token
+#
+
+# Complete "public" Identity API endpoint. This endpoint should not be an
+# "admin" endpoint, as it should be accessible by all end users.
+# Unauthenticated clients are redirected to this endpoint to authenticate.
+# Although this endpoint should ideally be unversioned, client support in the
+# wild varies. If you're using a versioned v2 endpoint here, then this should
+# *not* be the same endpoint the service user utilizes for validating tokens,
+# because normal end users may not be able to reach that endpoint. (string
+# value)
+#auth_uri =
+
+# API version of the admin Identity API endpoint. (string value)
+#auth_version =
+
+# Do not handle authorization requests within the middleware, but delegate the
+# authorization decision to downstream WSGI components. (boolean value)
+#delay_auth_decision = false
+
+# Request timeout value for communicating with Identity API server. (integer
+# value)
+#http_connect_timeout =
+
+# How many times are we trying to reconnect when communicating with Identity
+# API Server. (integer value)
+#http_request_max_retries = 3
+
+# Request environment key where the Swift cache object is stored. When
+# auth_token middleware is deployed with a Swift cache, use this option to have
+# the middleware share a caching backend with swift. Otherwise, use the
+# ``memcached_servers`` option instead. (string value)
+#cache =
+
+# Required if identity server requires client certificate (string value)
+#certfile =
+
+# Required if identity server requires client certificate (string value)
+#keyfile =
+
+# A PEM encoded Certificate Authority to use when verifying HTTPs connections.
+# Defaults to system CAs. (string value)
+#cafile =
+
+# Verify HTTPS connections. (boolean value)
+#insecure = false
+
+# The region in which the identity server can be found. (string value)
+#region_name =
+
+# Directory used to cache files related to PKI tokens. (string value)
+#signing_dir =
+
+# Optionally specify a list of memcached server(s) to use for caching. If left
+# undefined, tokens will instead be cached in-process. (list value)
+# Deprecated group/name - [keystone_authtoken]/memcache_servers
+#memcached_servers =
+
+# In order to prevent excessive effort spent validating tokens, the middleware
+# caches previously-seen tokens for a configurable duration (in seconds). Set
+# to -1 to disable caching completely. (integer value)
+#token_cache_time = 300
+
+# Determines the frequency at which the list of revoked tokens is retrieved
+# from the Identity service (in seconds). A high number of revocation events
+# combined with a low cache duration may significantly reduce performance. Only
+# valid for PKI tokens. (integer value)
+#revocation_cache_time = 10
+
+# (Optional) If defined, indicate whether token data should be authenticated or
+# authenticated and encrypted. If MAC, token data is authenticated (with HMAC)
+# in the cache. If ENCRYPT, token data is encrypted and authenticated in the
+# cache. If the value is not one of these options or empty, auth_token will
+# raise an exception on initialization. (string value)
+# Allowed values: None, MAC, ENCRYPT
+#memcache_security_strategy = None
+
+# (Optional, mandatory if memcache_security_strategy is defined) This string is
+# used for key derivation. (string value)
+#memcache_secret_key =
+
+# (Optional) Number of seconds memcached server is considered dead before it is
+# tried again. (integer value)
+#memcache_pool_dead_retry = 300
+
+# (Optional) Maximum total number of open connections to every memcached
+# server. (integer value)
+#memcache_pool_maxsize = 10
+
+# (Optional) Socket timeout in seconds for communicating with a memcached
+# server. (integer value)
+#memcache_pool_socket_timeout = 3
+
+# (Optional) Number of seconds a connection to memcached is held unused in the
+# pool before it is closed. (integer value)
+#memcache_pool_unused_timeout = 60
+
+# (Optional) Number of seconds that an operation will wait to get a memcached
+# client connection from the pool. (integer value)
+#memcache_pool_conn_get_timeout = 10
+
+# (Optional) Use the advanced (eventlet safe) memcached client pool. The
+# advanced pool will only work under python 2.x. (boolean value)
+#memcache_use_advanced_pool = false
+
+# (Optional) Indicate whether to set the X-Service-Catalog header. If False,
+# middleware will not ask for service catalog on token validation and will not
+# set the X-Service-Catalog header. (boolean value)
+#include_service_catalog = true
+
+# Used to control the use and type of token binding. Can be set to: "disabled"
+# to not check token binding. "permissive" (default) to validate binding
+# information if the bind type is of a form known to the server and ignore it
+# if not. "strict" like "permissive" but if the bind type is unknown the token
+# will be rejected. "required" any form of token binding is needed to be
+# allowed. Finally the name of a binding method that must be present in tokens.
+# (string value)
+#enforce_token_bind = permissive
+
+# If true, the revocation list will be checked for cached tokens. This requires
+# that PKI tokens are configured on the identity server. (boolean value)
+#check_revocations_for_cached = false
+
+# Hash algorithms to use for hashing PKI tokens. This may be a single algorithm
+# or multiple. The algorithms are those supported by Python standard
+# hashlib.new(). The hashes will be tried in the order given, so put the
+# preferred one first for performance. The result of the first hash will be
+# stored in the cache. This will typically be set to multiple values only while
+# migrating from a less secure algorithm to a more secure one. Once all the old
+# tokens are expired this option should be set to a single value for better
+# performance. (list value)
+#hash_algorithms = md5
+
+# Authentication type to load (string value)
+# Deprecated group/name - [keystone_authtoken]/auth_plugin
+#auth_type =
+
+# Config Section from which to load plugin specific options (string value)
+#auth_section =
+
+
+[matchmaker_redis]
+
+#
+# From oslo.messaging
+#
+
+# DEPRECATED: Host to locate redis. (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#host = 127.0.0.1
+
+# DEPRECATED: Use this port to connect to redis host. (port value)
+# Minimum value: 0
+# Maximum value: 65535
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#port = 6379
+
+# DEPRECATED: Password for Redis server (optional). (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#password =
+
+# DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g.
+# [host:port, host1:port ... ] (list value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#sentinel_hosts =
+
+# Redis replica set name. (string value)
+#sentinel_group_name = oslo-messaging-zeromq
+
+# Time in ms to wait between connection attempts. (integer value)
+#wait_timeout = 2000
+
+# Time in ms to wait before the transaction is killed. (integer value)
+#check_timeout = 20000
+
+# Timeout in ms on blocking socket operations (integer value)
+#socket_timeout = 10000
+
+
+[oslo_messaging_amqp]
+
+#
+# From oslo.messaging
+#
+
+# Name for the AMQP container. must be globally unique. Defaults to a generated
+# UUID (string value)
+# Deprecated group/name - [amqp1]/container_name
+#container_name =
+
+# Timeout for inactive connections (in seconds) (integer value)
+# Deprecated group/name - [amqp1]/idle_timeout
+#idle_timeout = 0
+
+# Debug: dump AMQP frames to stdout (boolean value)
+# Deprecated group/name - [amqp1]/trace
+#trace = false
+
+# CA certificate PEM file to verify server certificate (string value)
+# Deprecated group/name - [amqp1]/ssl_ca_file
+#ssl_ca_file =
+
+# Identifying certificate PEM file to present to clients (string value)
+# Deprecated group/name - [amqp1]/ssl_cert_file
+#ssl_cert_file =
+
+# Private key PEM file used to sign cert_file certificate (string value)
+# Deprecated group/name - [amqp1]/ssl_key_file
+#ssl_key_file =
+
+# Password for decrypting ssl_key_file (if encrypted) (string value)
+# Deprecated group/name - [amqp1]/ssl_key_password
+#ssl_key_password =
+
+# Accept clients using either SSL or plain TCP (boolean value)
+# Deprecated group/name - [amqp1]/allow_insecure_clients
+#allow_insecure_clients = false
+
+# Space separated list of acceptable SASL mechanisms (string value)
+# Deprecated group/name - [amqp1]/sasl_mechanisms
+#sasl_mechanisms =
+
+# Path to directory that contains the SASL configuration (string value)
+# Deprecated group/name - [amqp1]/sasl_config_dir
+#sasl_config_dir =
+
+# Name of configuration file (without .conf suffix) (string value)
+# Deprecated group/name - [amqp1]/sasl_config_name
+#sasl_config_name =
+
+# User name for message broker authentication (string value)
+# Deprecated group/name - [amqp1]/username
+#username =
+
+# Password for message broker authentication (string value)
+# Deprecated group/name - [amqp1]/password
+#password =
+
+# Seconds to pause before attempting to re-connect. (integer value)
+# Minimum value: 1
+#connection_retry_interval = 1
+
+# Increase the connection_retry_interval by this many seconds after each
+# unsuccessful failover attempt. (integer value)
+# Minimum value: 0
+#connection_retry_backoff = 2
+
+# Maximum limit for connection_retry_interval + connection_retry_backoff
+# (integer value)
+# Minimum value: 1
+#connection_retry_interval_max = 30
+
+# Time to pause between re-connecting an AMQP 1.0 link that failed due to a
+# recoverable error. (integer value)
+# Minimum value: 1
+#link_retry_delay = 10
+
+# The deadline for an rpc reply message delivery. Only used when caller does
+# not provide a timeout expiry. (integer value)
+# Minimum value: 5
+#default_reply_timeout = 30
+
+# The deadline for an rpc cast or call message delivery. Only used when caller
+# does not provide a timeout expiry. (integer value)
+# Minimum value: 5
+#default_send_timeout = 30
+
+# The deadline for a sent notification message delivery. Only used when caller
+# does not provide a timeout expiry. (integer value)
+# Minimum value: 5
+#default_notify_timeout = 30
+
+# Indicates the addressing mode used by the driver.
+# Permitted values:
+# 'legacy' - use legacy non-routable addressing
+# 'routable' - use routable addresses
+# 'dynamic' - use legacy addresses if the message bus does not support routing
+# otherwise use routable addressing (string value)
+#addressing_mode = dynamic
+
+# address prefix used when sending to a specific server (string value)
+# Deprecated group/name - [amqp1]/server_request_prefix
+#server_request_prefix = exclusive
+
+# address prefix used when broadcasting to all servers (string value)
+# Deprecated group/name - [amqp1]/broadcast_prefix
+#broadcast_prefix = broadcast
+
+# address prefix when sending to any server in group (string value)
+# Deprecated group/name - [amqp1]/group_request_prefix
+#group_request_prefix = unicast
+
+# Address prefix for all generated RPC addresses (string value)
+#rpc_address_prefix = openstack.org/om/rpc
+
+# Address prefix for all generated Notification addresses (string value)
+#notify_address_prefix = openstack.org/om/notify
+
+# Appended to the address prefix when sending a fanout message. Used by the
+# message bus to identify fanout messages. (string value)
+#multicast_address = multicast
+
+# Appended to the address prefix when sending to a particular RPC/Notification
+# server. Used by the message bus to identify messages sent to a single
+# destination. (string value)
+#unicast_address = unicast
+
+# Appended to the address prefix when sending to a group of consumers. Used by
+# the message bus to identify messages that should be delivered in a round-
+# robin fashion across consumers. (string value)
+#anycast_address = anycast
+
+# Exchange name used in notification addresses.
+# Exchange name resolution precedence:
+# Target.exchange if set
+# else default_notification_exchange if set
+# else control_exchange if set
+# else 'notify' (string value)
+#default_notification_exchange =
+
+# Exchange name used in RPC addresses.
+# Exchange name resolution precedence:
+# Target.exchange if set
+# else default_rpc_exchange if set
+# else control_exchange if set
+# else 'rpc' (string value)
+#default_rpc_exchange =
+
+# Window size for incoming RPC Reply messages. (integer value)
+# Minimum value: 1
+#reply_link_credit = 200
+
+# Window size for incoming RPC Request messages (integer value)
+# Minimum value: 1
+#rpc_server_credit = 100
+
+# Window size for incoming Notification messages (integer value)
+# Minimum value: 1
+#notify_server_credit = 100
+
+
+[oslo_messaging_notifications]
+
+#
+# From oslo.messaging
+#
+
+# The Drivers(s) to handle sending notifications. Possible values are
+# messaging, messagingv2, routing, log, test, noop (multi valued)
+# Deprecated group/name - [DEFAULT]/notification_driver
+#driver =
+
+# A URL representing the messaging driver to use for notifications. If not set,
+# we fall back to the same configuration used for RPC. (string value)
+# Deprecated group/name - [DEFAULT]/notification_transport_url
+#transport_url =
+
+# AMQP topic used for OpenStack notifications. (list value)
+# Deprecated group/name - [rpc_notifier2]/topics
+# Deprecated group/name - [DEFAULT]/notification_topics
+#topics = notifications
+
+
+[oslo_messaging_rabbit]
+
+#
+# From oslo.messaging
+#
+
+# Use durable queues in AMQP. (boolean value)
+# Deprecated group/name - [DEFAULT]/amqp_durable_queues
+# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
+#amqp_durable_queues = false
+
+# Auto-delete queues in AMQP. (boolean value)
+# Deprecated group/name - [DEFAULT]/amqp_auto_delete
+#amqp_auto_delete = false
+
+# SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and
+# SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some
+# distributions. (string value)
+# Deprecated group/name - [DEFAULT]/kombu_ssl_version
+#kombu_ssl_version =
+
+# SSL key file (valid only if SSL enabled). (string value)
+# Deprecated group/name - [DEFAULT]/kombu_ssl_keyfile
+#kombu_ssl_keyfile =
+
+# SSL cert file (valid only if SSL enabled). (string value)
+# Deprecated group/name - [DEFAULT]/kombu_ssl_certfile
+#kombu_ssl_certfile =
+
+# SSL certification authority file (valid only if SSL enabled). (string value)
+# Deprecated group/name - [DEFAULT]/kombu_ssl_ca_certs
+#kombu_ssl_ca_certs =
+
+# How long to wait before reconnecting in response to an AMQP consumer cancel
+# notification. (floating point value)
+# Deprecated group/name - [DEFAULT]/kombu_reconnect_delay
+#kombu_reconnect_delay = 1.0
+
+# EXPERIMENTAL: Possible values are: gzip, bz2. If not set compression will not
+# be used. This option may not be available in future versions. (string value)
+#kombu_compression =
+
+# How long to wait a missing client before abandoning to send it its replies.
+# This value should not be longer than rpc_response_timeout. (integer value)
+# Deprecated group/name - [oslo_messaging_rabbit]/kombu_reconnect_timeout
+#kombu_missing_consumer_retry_timeout = 60
+
+# Determines how the next RabbitMQ node is chosen in case the one we are
+# currently connected to becomes unavailable. Takes effect only if more than
+# one RabbitMQ node is provided in config. (string value)
+# Allowed values: round-robin, shuffle
+#kombu_failover_strategy = round-robin
+
+# DEPRECATED: The RabbitMQ broker address where a single node is used. (string
+# value)
+# Deprecated group/name - [DEFAULT]/rabbit_host
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_host = localhost
+
+# DEPRECATED: The RabbitMQ broker port where a single node is used. (port
+# value)
+# Minimum value: 0
+# Maximum value: 65535
+# Deprecated group/name - [DEFAULT]/rabbit_port
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_port = 5672
+
+# DEPRECATED: RabbitMQ HA cluster host:port pairs. (list value)
+# Deprecated group/name - [DEFAULT]/rabbit_hosts
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_hosts = $rabbit_host:$rabbit_port
+
+# Connect over SSL for RabbitMQ. (boolean value)
+# Deprecated group/name - [DEFAULT]/rabbit_use_ssl
+#rabbit_use_ssl = false
+
+# DEPRECATED: The RabbitMQ userid. (string value)
+# Deprecated group/name - [DEFAULT]/rabbit_userid
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_userid = guest
+
+# DEPRECATED: The RabbitMQ password. (string value)
+# Deprecated group/name - [DEFAULT]/rabbit_password
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_password = guest
+
+# The RabbitMQ login method. (string value)
+# Deprecated group/name - [DEFAULT]/rabbit_login_method
+#rabbit_login_method = AMQPLAIN
+
+# DEPRECATED: The RabbitMQ virtual host. (string value)
+# Deprecated group/name - [DEFAULT]/rabbit_virtual_host
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Replaced by [DEFAULT]/transport_url
+#rabbit_virtual_host = /
+
+# How frequently to retry connecting with RabbitMQ. (integer value)
+#rabbit_retry_interval = 1
+
+# How long to backoff for between retries when connecting to RabbitMQ. (integer
+# value)
+# Deprecated group/name - [DEFAULT]/rabbit_retry_backoff
+#rabbit_retry_backoff = 2
+
+# Maximum interval of RabbitMQ connection retries. Default is 30 seconds.
+# (integer value)
+#rabbit_interval_max = 30
+
+# DEPRECATED: Maximum number of RabbitMQ connection retries. Default is 0
+# (infinite retry count). (integer value)
+# Deprecated group/name - [DEFAULT]/rabbit_max_retries
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+#rabbit_max_retries = 0
+
+# Try to use HA queues in RabbitMQ (x-ha-policy: all). If you change this
+# option, you must wipe the RabbitMQ database. In RabbitMQ 3.0, queue mirroring
+# is no longer controlled by the x-ha-policy argument when declaring a queue.
+# If you just want to make sure that all queues (except those with auto-
+# generated names) are mirrored across all nodes, run: "rabbitmqctl set_policy
+# HA '^(?!amq\.).*' '{"ha-mode": "all"}' " (boolean value)
+# Deprecated group/name - [DEFAULT]/rabbit_ha_queues
+#rabbit_ha_queues = false
+
+# Positive integer representing duration in seconds for queue TTL (x-expires).
+# Queues which are unused for the duration of the TTL are automatically
+# deleted. The parameter affects only reply and fanout queues. (integer value)
+# Minimum value: 1
+#rabbit_transient_queues_ttl = 1800
+
+# Specifies the number of messages to prefetch. Setting to zero allows
+# unlimited messages. (integer value)
+#rabbit_qos_prefetch_count = 0
+
+# Number of seconds after which the Rabbit broker is considered down if
+# heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL (integer
+# value)
+#heartbeat_timeout_threshold = 60
+
+# How often times during the heartbeat_timeout_threshold we check the
+# heartbeat. (integer value)
+#heartbeat_rate = 2
+
+# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value)
+# Deprecated group/name - [DEFAULT]/fake_rabbit
+#fake_rabbit = false
+
+# Maximum number of channels to allow (integer value)
+#channel_max =
+
+# The maximum byte size for an AMQP frame (integer value)
+#frame_max =
+
+# How often to send heartbeats for consumer's connections (integer value)
+#heartbeat_interval = 3
+
+# Enable SSL (boolean value)
+#ssl =
+
+# Arguments passed to ssl.wrap_socket (dict value)
+#ssl_options =
+
+# Set socket timeout in seconds for connection's socket (floating point value)
+#socket_timeout = 0.25
+
+# Set TCP_USER_TIMEOUT in seconds for connection's socket (floating point
+# value)
+#tcp_user_timeout = 0.25
+
+# Set delay for reconnection to some host which has connection error (floating
+# point value)
+#host_connection_reconnect_delay = 0.25
+
+# Connection factory implementation (string value)
+# Allowed values: new, single, read_write
+#connection_factory = single
+
+# Maximum number of connections to keep queued. (integer value)
+#pool_max_size = 30
+
+# Maximum number of connections to create above `pool_max_size`. (integer
+# value)
+#pool_max_overflow = 0
+
+# Default number of seconds to wait for a connections to available (integer
+# value)
+#pool_timeout = 30
+
+# Lifetime of a connection (since creation) in seconds or None for no
+# recycling. Expired connections are closed on acquire. (integer value)
+#pool_recycle = 600
+
+# Threshold at which inactive (since release) connections are considered stale
+# in seconds or None for no staleness. Stale connections are closed on acquire.
+# (integer value)
+#pool_stale = 60
+
+# Persist notification messages. (boolean value)
+#notification_persistence = false
+
+# Exchange name for sending notifications (string value)
+#default_notification_exchange = ${control_exchange}_notification
+
+# Max number of not acknowledged message which RabbitMQ can send to
+# notification listener. (integer value)
+#notification_listener_prefetch_count = 100
+
+# Reconnecting retry count in case of connectivity problem during sending
+# notification, -1 means infinite retry. (integer value)
+#default_notification_retry_attempts = -1
+
+# Reconnecting retry delay in case of connectivity problem during sending
+# notification message (floating point value)
+#notification_retry_delay = 0.25
+
+# Time to live for rpc queues without consumers in seconds. (integer value)
+#rpc_queue_expiration = 60
+
+# Exchange name for sending RPC messages (string value)
+#default_rpc_exchange = ${control_exchange}_rpc
+
+# Exchange name for receiving RPC replies (string value)
+#rpc_reply_exchange = ${control_exchange}_rpc_reply
+
+# Max number of not acknowledged message which RabbitMQ can send to rpc
+# listener. (integer value)
+#rpc_listener_prefetch_count = 100
+
+# Max number of not acknowledged message which RabbitMQ can send to rpc reply
+# listener. (integer value)
+#rpc_reply_listener_prefetch_count = 100
+
+# Reconnecting retry count in case of connectivity problem during sending
+# reply. -1 means infinite retry during rpc_timeout (integer value)
+#rpc_reply_retry_attempts = -1
+
+# Reconnecting retry delay in case of connectivity problem during sending
+# reply. (floating point value)
+#rpc_reply_retry_delay = 0.25
+
+# Reconnecting retry count in case of connectivity problem during sending RPC
+# message, -1 means infinite retry. If actual retry attempts in not 0 the rpc
+# request could be processed more then one time (integer value)
+#default_rpc_retry_attempts = -1
+
+# Reconnecting retry delay in case of connectivity problem during sending RPC
+# message (floating point value)
+#rpc_retry_delay = 0.25
+
+
+[oslo_messaging_zmq]
+
+#
+# From oslo.messaging
+#
+
+# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
+# The "host" option should point or resolve to this address. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_address
+#rpc_zmq_bind_address = *
+
+# MatchMaker driver. (string value)
+# Allowed values: redis, dummy
+# Deprecated group/name - [DEFAULT]/rpc_zmq_matchmaker
+#rpc_zmq_matchmaker = redis
+
+# Number of ZeroMQ contexts, defaults to 1. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_contexts
+#rpc_zmq_contexts = 1
+
+# Maximum number of ingress messages to locally buffer per topic. Default is
+# unlimited. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_topic_backlog
+#rpc_zmq_topic_backlog =
+
+# Directory for holding IPC sockets. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_ipc_dir
+#rpc_zmq_ipc_dir = /var/run/openstack
+
+# Name of this node. Must be a valid hostname, FQDN, or IP address. Must match
+# "host" option, if running Nova. (string value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_host
+#rpc_zmq_host = localhost
+
+# Seconds to wait before a cast expires (TTL). The default value of -1
+# specifies an infinite linger period. The value of 0 specifies no linger
+# period. Pending messages shall be discarded immediately when the socket is
+# closed. Only supported by impl_zmq. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_cast_timeout
+#rpc_cast_timeout = -1
+
+# The default number of seconds that poll should wait. Poll raises timeout
+# exception when timeout expired. (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_poll_timeout
+#rpc_poll_timeout = 1
+
+# Expiration timeout in seconds of a name service record about existing target
+# ( < 0 means no timeout). (integer value)
+# Deprecated group/name - [DEFAULT]/zmq_target_expire
+#zmq_target_expire = 300
+
+# Update period in seconds of a name service record about existing target.
+# (integer value)
+# Deprecated group/name - [DEFAULT]/zmq_target_update
+#zmq_target_update = 180
+
+# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses proxy. (boolean
+# value)
+# Deprecated group/name - [DEFAULT]/use_pub_sub
+#use_pub_sub = true
+
+# Use ROUTER remote proxy. (boolean value)
+# Deprecated group/name - [DEFAULT]/use_router_proxy
+#use_router_proxy = true
+
+# Minimal port number for random ports range. (port value)
+# Minimum value: 0
+# Maximum value: 65535
+# Deprecated group/name - [DEFAULT]/rpc_zmq_min_port
+#rpc_zmq_min_port = 49153
+
+# Maximal port number for random ports range. (integer value)
+# Minimum value: 1
+# Maximum value: 65536
+# Deprecated group/name - [DEFAULT]/rpc_zmq_max_port
+#rpc_zmq_max_port = 65536
+
+# Number of retries to find free port number before fail with ZMQBindError.
+# (integer value)
+# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_port_retries
+#rpc_zmq_bind_port_retries = 100
+
+# Default serialization mechanism for serializing/deserializing
+# outgoing/incoming messages (string value)
+# Allowed values: json, msgpack
+# Deprecated group/name - [DEFAULT]/rpc_zmq_serialization
+#rpc_zmq_serialization = json
+
+# This option configures round-robin mode in zmq socket. True means not keeping
+# a queue when server side disconnects. False means to keep queue and messages
+# even if server is disconnected, when the server appears we send all
+# accumulated messages to it. (boolean value)
+#zmq_immediate = false
+
+
+[oslo_middleware]
+
+#
+# From oslo.middleware
+#
+
+# The maximum body size for each request, in bytes. (integer value)
+# Deprecated group/name - [DEFAULT]/osapi_max_request_body_size
+# Deprecated group/name - [DEFAULT]/max_request_body_size
+#max_request_body_size = 114688
+
+# DEPRECATED: The HTTP Header that will be used to determine what the original
+# request protocol scheme was, even if it was hidden by a SSL termination
+# proxy. (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+#secure_proxy_ssl_header = X-Forwarded-Proto
+
+# Whether the application is behind a proxy or not. This determines if the
+# middleware should parse the headers or not. (boolean value)
+#enable_proxy_headers_parsing = false
+
+
+[oslo_policy]
+
+#
+# From oslo.policy
+#
+
+# The JSON file that defines policies. (string value)
+# Deprecated group/name - [DEFAULT]/policy_file
+#policy_file = policy.json
+
+# Default rule. Enforced when a requested rule is not found. (string value)
+# Deprecated group/name - [DEFAULT]/policy_default_rule
+#policy_default_rule = default
+
+# Directories where policy configuration files are stored. They can be relative
+# to any directory in the search path defined by the config_dir option, or
+# absolute paths. The file defined by policy_file must exist for these
+# directories to be searched. Missing or empty directories are ignored. (multi
+# valued)
+# Deprecated group/name - [DEFAULT]/policy_dirs
+#policy_dirs = policy.d
+
+
+[ssl]
+
+#
+# From oslo.service.sslutils
+#
+
+# CA certificate file to use to verify connecting clients. (string value)
+# Deprecated group/name - [DEFAULT]/ssl_ca_file
+#ca_file =
+
+# Certificate file to use when starting the server securely. (string value)
+# Deprecated group/name - [DEFAULT]/ssl_cert_file
+#cert_file =
+
+# Private key file to use when starting the server securely. (string value)
+# Deprecated group/name - [DEFAULT]/ssl_key_file
+#key_file =
+
+# SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and
+# SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some
+# distributions. (string value)
+#version =
+
+# Sets the list of available ciphers. value should be a string in the OpenSSL
+# cipher list format. (string value)
+#ciphers =
diff --git a/sys-cluster/heat/heat-2016.2.9999.ebuild b/sys-cluster/heat/heat-2016.2.9999.ebuild
new file mode 100644
index 000000000000..160e63a95d38
--- /dev/null
+++ b/sys-cluster/heat/heat-2016.2.9999.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils git-r3 linux-info user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+HOMEPAGE="https://launchpad.net/heat"
+EGIT_REPO_URI="https://github.com/openstack/heat.git"
+EGIT_BRANCH="stable/newton"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ app-admin/sudo"
+
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+ !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+ >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/aodhclient-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+ !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+ !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+ !~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/python-heatclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-manilaclient-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+ !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+ >=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-senlinclient-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ =dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ =dev-python/psycopg-2.5.0
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ =dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+ >=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup heat
+ enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /etc/heat
+ dodir /etc/heat/environment.d
+ dodir /etc/heat/templates
+
+ for svc in api api-cfn engine; do
+ newinitd "${FILESDIR}/heat.initd" heat-${svc}
+ done
+
+ insinto /etc/heat
+ insopts -m0640 -o heat -g heat
+ newins "${FILESDIR}/newton-heat.conf.sample" "heat.conf.sample"
+ doins "etc/heat/api-paste.ini"
+ doins "etc/heat/policy.json"
+ insinto /etc/heat/templates
+ doins "etc/heat/templates/"*
+ insinto /etc/heat/environment.d
+ doins "etc/heat/environment.d/default.yaml"
+
+ dodir /var/log/heat
+ fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/heat/metadata.xml b/sys-cluster/heat/metadata.xml
new file mode 100644
index 000000000000..ec3d4bbeba65
--- /dev/null
+++ b/sys-cluster/heat/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
+
+ Heat is a service to orchestrate multiple composite cloud applications using
+ templates, through both an OpenStack-native REST API and a
+ CloudFormation-compatible Query API.
+
+
+
+ heat
+
+
diff --git a/sys-cluster/openstack-meta/metadata.xml b/sys-cluster/openstack-meta/metadata.xml
index c3c5a63122f5..7b2e4d2b8f34 100644
--- a/sys-cluster/openstack-meta/metadata.xml
+++ b/sys-cluster/openstack-meta/metadata.xml
@@ -15,6 +15,7 @@
Installs Openstack Cinder
Installs Openstack Neutron
Installs Openstack Nova
+ Installs Openstack Heat
diff --git a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
index 12e6ba488b9b..4ad950486fc7 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://openstack.org"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="keystone swift neutron glance cinder nova"
+IUSE="cinder glance heat keystone neutron nova swift"
DEPEND=""
RDEPEND="
@@ -20,4 +20,5 @@ RDEPEND="
glance? ( ~app-admin/glance-${PV} )
cinder? ( ~sys-cluster/cinder-${PV} )
nova? ( ~sys-cluster/nova-${PV} )
+ heat? ( ~sys-cluster/heat-${PV} )
"
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 0f6264fc74a1..537e0aa97df3 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -11,7 +11,7 @@
decisions. Required for any applications that use the SELinux API.
SELinuxProject/selinux
diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch
new file mode 100644
index 000000000000..8f99b768efbd
--- /dev/null
+++ b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch
@@ -0,0 +1,98 @@
+From 9d25ca61603a2eed08d1b58b25c81f878c729474 Mon Sep 17 00:00:00 2001
+From: James Carter
+Date: Mon, 3 Oct 2016 14:15:40 -0400
+Subject: [PATCH] libsemanage: Fixes bug preventing the installation of base
+ modules
+
+Commit 7a728e46 changed module installation so that a module pp would
+be installed using its module name instead of its filename and a warning
+would be printed if they were different. With this change, base modules
+could no longer be installed because of the way error handling was done.
+
+This change fixes the error handling, so that when a base module is
+installed it will be installed using its filename (since it does not
+have a module name).
+
+Based on bug report by Jason Zaman
+
+Signed-off-by: James Carter
+---
+ libsemanage/src/direct_api.c | 39 ++++++++++++++-------------------------
+ 1 file changed, 14 insertions(+), 25 deletions(-)
+
+diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
+index 3719cb1..e5c72cd 100644
+--- libsemanage/src/direct_api.c
++++ libsemanage/src/direct_api.c
+@@ -368,7 +368,7 @@ static int semanage_direct_begintrans(semanage_handle_t * sh)
+ * 'version' to module's version. The caller is responsible for
+ * free()ing 'module_name', and 'version'; they will be
+ * set to NULL upon entering this function. Returns 0 on success, -1
+- * if out of memory, or -2 if data did not represent a module.
++ * if out of memory.
+ */
+ static int parse_module_headers(semanage_handle_t * sh, char *module_data,
+ size_t data_len, char **module_name,
+@@ -384,23 +384,10 @@ static int parse_module_headers(semanage_handle_t * sh, char *module_data,
+ }
+ sepol_policy_file_set_mem(pf, module_data, data_len);
+ sepol_policy_file_set_handle(pf, sh->sepolh);
+- if (module_data == NULL ||
+- data_len == 0 ||
++ if (module_data != NULL && data_len > 0)
+ sepol_module_package_info(pf, &file_type, module_name,
+- version) == -1) {
+- sepol_policy_file_free(pf);
+- ERR(sh, "Could not parse module data.");
+- return -2;
+- }
++ version);
+ sepol_policy_file_free(pf);
+- if (file_type != SEPOL_POLICY_MOD) {
+- if (file_type == SEPOL_POLICY_BASE)
+- ERR(sh,
+- "Received a base module, expected a non-base module.");
+- else
+- ERR(sh, "Data did not represent a module.");
+- return -2;
+- }
+
+ return 0;
+ }
+@@ -1608,22 +1595,24 @@ static int semanage_direct_install_file(semanage_handle_t * sh,
+ lang_ext = separator + 1;
+ }
+
+- if (strcmp(lang_ext, "pp") != 0) {
++ if (strcmp(lang_ext, "pp") == 0) {
++ retval = parse_module_headers(sh, data, data_len, &module_name, &version);
++ free(version);
++ if (retval != 0)
++ goto cleanup;
++ }
++
++ if (module_name == NULL) {
+ module_name = strdup(filename);
+ if (module_name == NULL) {
+ ERR(sh, "No memory available for module_name.\n");
+ retval = -1;
+ goto cleanup;
+ }
+- } else {
+- if ((retval = parse_module_headers(sh, data, data_len, &module_name, &version)) != 0)
+- goto cleanup;
+-
+- if (strcmp(module_name, filename) != 0)
+- fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename);
+-
+- free(version);
++ } else if (strcmp(module_name, filename) != 0) {
++ fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename);
+ }
++
+ retval = semanage_direct_install(sh, data, data_len, module_name, lang_ext);
+
+ cleanup:
+--
+2.7.3
+
diff --git a/sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild b/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
similarity index 98%
rename from sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild
rename to sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
index 76b2430f794d..daaa79f8b717 100644
--- a/sys-libs/libsemanage/libsemanage-2.6_rc1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
@@ -72,6 +72,7 @@ src_prepare() {
echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
echo "bzip-small=true" >> "${S}/src/semanage.conf"
+ eapply "${FILESDIR}/${PN}-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch"
eapply "${FILESDIR}"/${PN}-2.6-build-paths.patch
eapply_user