gentoo resync : 20.02.2019

17 files changed, 23 insertions, 445 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 661677f4953d..8898f69da7d6 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
index 31a0cdea9151..abf3d4072e7b 100644
--- a/app-crypt/bcwipe/Manifest
+++ b/app-crypt/bcwipe/Manifest
@@ -2,5 +2,5 @@ AUX bcwipe-1.9.7-fix_warnings.patch 415 BLAKE2B ae41040cbc9343e06eaee372b8bdb656
 AUX bcwipe-1.9.8-fix-flags.patch 603 BLAKE2B 094af104ff114c4fce3907215ab06db51af2fad2f000f9bfc391dd056432a2c6c5a988561d7c462f6fc99411fc26c9445f81a250db29899f76ee1c0672b9e602 SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87
 DIST BCWipe-1.9-13.tar.gz 141092 BLAKE2B 0d7e8f5841b388bb9e200ae533f8706d951e017923a69314173d44fcbec2ac2f3ab8c0c97de9054e12f1560f075e5af0e32ddac855df8f9bc28fb1bb637edbc6 SHA512 801b6d3c55d82915da14b3136c9ddba7fc947b40c07ba135c410e1e2703f74735d32ebb043d44325f615005631930ce48b4075885f1a928cf8f4a2d4c67ca5cc
 DIST BCWipe.doc.tgz 21218 BLAKE2B 02ce8b5c767ed9d45615fa26b5c0172c5431209cbd7ca94bfed4345206b401db50e02a163eef14359a01d16cc4a1b26b121081611cc7854833e7cbd917ae947c SHA512 5aa402669ded46b6dc680293f18aea4ab20a7d6b7d9d7bf8e63003e557b953e8f8019431ea69d96d2236121e754bc456b3700a0895f4fff0573d2e9bac2e2ee3
-EBUILD bcwipe-1.9.13.ebuild 973 BLAKE2B cf61111bcf49bd6c7738c3a881589b15040ddeb3d95a514cab78374b80827c159d6b01f397cde5cb0a015b37823c839433e7e55cd48f6fd947988ab69d6f32de SHA512 8ccc969eed629626717202a8ea7ce98a236b73bc3e2b0bb130b59e8f7b3d5c911d601e80459e1d74d8c5135ac4f32e3cd427727972d87baf63efa3937c9fed07
+EBUILD bcwipe-1.9.13.ebuild 972 BLAKE2B a72c34677465a8c565d0f2455372fbead0a0458e9082df7307b0ab74014afec5d6933a7c74dcb991d0bb421b088986b0dce5e4c3961772f2248f5b221d1804af SHA512 5ca70a61123de7cf74d5e34dc48c98d753759b64022dad5cd40aa37b5c8b812f0947807db5ab03188deaf80d4e36ffeac5a43b1403b364137f86ed151d3d8956
 MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
index c879aa885721..2b76c45f52b2 100644
--- a/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,9 +6,9 @@ EAPI=7
 MY_PV="$(ver_rs 2- -)"
 
 DESCRIPTION="Secure file removal utility"
-HOMEPAGE="http://www.jetico.com/"
+HOMEPAGE="https://www.jetico.com/"
 SRC_URI="https://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
-	doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )"
+	doc? ( https://www.jetico.com/linux/BCWipe.doc.tgz )"
 
 LICENSE="bestcrypt"
 SLOT="0"
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index d62dd8c960dc..b2f235b77dc6 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,8 +1,5 @@
 AUX bcrypt3 3197 BLAKE2B 5e9d721a5b4213fcc0e5eb4325c009685dee5bd8dd61f8b47ee1ca29e52faa12b3c6f3c9ab1bc283d7944f4f4178dc831a95348971bde439a7ae77f213df20dc SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b
 AUX bestcrypt-2.0.14-build.patch 16326 BLAKE2B 233e2f896feb159807de1be4e07fad6e97889198709010c5256b93044f1a13559b0a64e59d712c3ddd632f90ea34cf6631c257eac48409c7e0323e5e14a7ad63 SHA512 3ff5d6b69844562f16c1024bb7b409fdcd6f9889e6ea5b58a4ba5f43d04174fa5c60bd73f20eddf2687fea18a01ce06672880602b4b2604e6f014344a3da2911
-AUX bestcrypt-2.0.6-build.patch 10878 BLAKE2B e7ab526bb514a7a28415cb8e7f109d224ddddc10bd09e9539a2f289b5933abb3fc90378c0a10275113b47d90f18578b8285aacfeb087a5052afd34c9407a6180 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530
-DIST BestCrypt-2.0.11.tar.gz 2191182 BLAKE2B 5fe6d18b0c89273491fbcdb9bf7c73332342fca77cdf457c83f106f5cca693532eea6668e04f7c93828b3d5dc4419872066eda22fb10c780a838ddd78cf79255 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2
 DIST BestCrypt-2.0.14.tar.gz 2211286 BLAKE2B 1ff777a72528ec22ca168492c335ec54be924b653323670619049cc9dfbcd144c28702bf857517c5189c937f3712e749c47ef14006a8883c63419b866b8f48f9 SHA512 1e542f00886413f1519ca5667bb297cce25a46fb5ec90a7e1a61934df3cd34e0d680f32e0b111727865459ef7d89d2761b379b4a557ada6d7ee3e47e32bf762c
-EBUILD bestcrypt-2.0.11.ebuild 1791 BLAKE2B 8ddd87293287ca899a4748973f470edb9fd887b2025cd5eacc93a456fd51750035d8c12909c100c0f0369da04d47155e4350a31ac5404c7cd2c9fb0f27ab818f SHA512 7178e4aee4eb74702220e2d1bb77515b2eb42a1aa6473a9adad7fd7c002013db1f6b3d9f0b018d11e3cfd9cb4a83427df7e950da6c1269bf6be195260e06571e
-EBUILD bestcrypt-2.0.14.ebuild 1878 BLAKE2B ce354ff4068356c5a7f2bbef78c280089e857b4da4fb06df3b03bb6cd2b0937c09cbc99a67bfc294333cd81a4cad9e1a7c469f89150030f369ffa68b15ba7b92 SHA512 71ca81618c583d86526429cb059b896ffa507a9ba644da1489cc8453a26463f717e3bab56dc26a4c517b50299af7db6859dcf986882df71d47874f12cacdb61c
+EBUILD bestcrypt-2.0.14.ebuild 1877 BLAKE2B caf7fe954625a0c9988e28ef26e776b9a259f1ae0bd615b7eaaa8002a6dfe25d687f0221af4e7a20253370a3caaa3cfb5f32ab5b6775388a8966220a3844f567 SHA512 abe67ad0fc1e22ab49a7e87aa5caca094a6bf932c228de3e550a724c2185f2fecd372da6a28a26e313c77693727f0136299bbc6f3b765145382b5cdd2eba81c3
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
deleted file mode 100644
index 86e153ad106c..000000000000
--- a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-mod toolchain-funcs versionator
-
-MY_PN="BestCrypt"
-DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="bestcrypt"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/linux-sources
-	app-shells/bash"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=(
-	HIDDEN_PART README
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.6-build.patch"
-)
-
-pkg_setup() {
-	CONFIG_CHECK="MODULES"
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="bestcrypt(block::kernel/kmod)
-		bc_3des(crypto::kernel/kmod/crypto/algs/3des)
-		bc_bf128(crypto::kernel/kmod/crypto/algs/bf128)
-		bc_bf448(crypto::kernel/kmod/crypto/algs/bf448)
-		bc_blowfish(crypto::kernel/kmod/crypto/algs/blowfish)
-		bc_cast(crypto::kernel/kmod/crypto/algs/cast)
-		bc_des(crypto::kernel/kmod/crypto/algs/des)
-		bc_gost(crypto::kernel/kmod/crypto/algs/gost)
-		bc_idea(crypto::kernel/kmod/crypto/algs/idea)
-		bc_rijn(crypto::kernel/kmod/crypto/algs/rijn)"
-	BUILD_TARGETS="module"
-	BUILD_PARAMS=" \
-		BC_KERNEL_DIR=\"${KERNEL_DIR}\""
-}
-
-src_compile() {
-	MAKEOPTS="-j1" linux-mod_src_compile \
-		CXX="$(tc-getCXX)"
-	MAKEOPTS="-j1" emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	emake install PREFIX="${ED}" install
-
-	newinitd "${FILESDIR}/bcrypt3" bcrypt
-	sed -e '/\(bc_rc6\|bc_serpent\|bc_twofish\)/d' -i "${D}etc/init.d/bcrypt"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The BestCrypt drivers are not free - Please purchace a license from "
-	ewarn "http://www.jetico.com/"
-	ewarn
-
-	linux-mod_pkg_postinst
-}
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
index 73ee43d0d035..d78350c9d4c1 100644
--- a/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ inherit linux-mod toolchain-funcs
 
 MY_PN="BestCrypt"
 DESCRIPTION="commercially licensed transparent filesystem encryption"
-HOMEPAGE="http://www.jetico.com/"
-SRC_URI="http://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="https://www.jetico.com/"
+SRC_URI="https://www.jetico.com/linux/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="bestcrypt"
 SLOT="0"
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
deleted file mode 100644
index 966053072d32..000000000000
--- a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-From 4bce59bd9bc5a201caf5f2ff3e2080e7e5a01733 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 6 Jul 2014 21:34:21 +0300
-Subject: [PATCH 3/3] build: do not auto build/install module
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3cd36fd..a3fd59e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -98,5 +98,5 @@ TESTS_TARGET = $(TARGET_DIR)/tests/bctool-tests
- 
- # default target builds console tool with modules
--all: Makefile helpers module console
-+all: Makefile helpers console
- 	true
-  
-@@ -226,5 +226,5 @@ module-clean: force-look
-  
- # install for default target
--install: module-install console-install helpers-install
-+install: console-install helpers-install
- 	true
- 
--- 
-1.8.5.5
-
-From f7f71ec155385aea3dec495d46d07452943fe729 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 17 Mar 2015 21:05:22 +0200
-Subject: [PATCH] build: allow override programs
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile                            | 11 +++++++----
- certificate/CertificateLib/Makefile |  4 +++-
- disk/Makefile                       |  6 ++++--
- fslib/Makefile                      | 16 +++++++++-------
- kernel/Makefile                     |  5 +++--
- keygens/kgghost/Makefile            |  7 +++++--
- keygens/kgsha/Makefile              |  7 +++++--
- mount/Makefile                      |  9 +++++----
- spacemap/Makefile                   |  6 ++++--
- tests/Makefile                      | 12 ++++++------
- 10 files changed, 51 insertions(+), 32 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6af2319..359d022 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,6 +56,9 @@ KGSHA_LIB = $(KGSHA_BUILD_DIR)/lib$(KGSHA_LIB_NAME).a
- KGGHOST_LIB = $(KGGHOST_BUILD_DIR)/lib$(KGGHOST_LIB_NAME).a
- SPACEMAP_LIB = $(SPACEMAP_BUILD_DIR)/lib$(SPACEMAP_LIB_NAME).a
- 
-+CC = gcc
-+CXX = g++
-+
- BC_EXTRA_CFLAGS= $(CFLAGS) -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- BC_EXTRA_LDFLAGS = $(LDFLAGS)
- 
-@@ -125,7 +128,7 @@ helpers: create-dirs
- console: spacemap-lib certificate-lib fs-lib kernel-lib keygen-libs $(TARGET)
- 	true
- $(TARGET): $(BCTOOL_OBJS)
--	g++ $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
-+	$(CXX) $(BCTOOL_OBJS) $(BCTOOL_CFLAGS) $(BCTOOL_LDFLAGS) -o $(TARGET)
- 
- # GUI executable only (w/o console and helpers)
- panel: certificate-lib kernel-lib keygen-libs fs-lib
-@@ -339,10 +342,10 @@ module-uninstall:
- 	bash ./scripts/remove_mods
- 
- %.o:%.cpp
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.cc
--	g++ -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CXX) -c $(BCTOOL_CFLAGS) $< -o $@
- 
- %.o:%.c
--	gcc -c $(BCTOOL_CFLAGS) $< -o $@
-+	$(CC) -c $(BCTOOL_CFLAGS) $< -o $@
-diff --git a/certificate/CertificateLib/Makefile b/certificate/CertificateLib/Makefile
-index d28ccc7..810a30a 100644
---- a/certificate/CertificateLib/Makefile
-+++ b/certificate/CertificateLib/Makefile
-@@ -1,5 +1,7 @@
- 
--CP = cp
-+CC = gcc
-+CXX = g++
-+AR = ar
- CFLAGS += -Wall -fno-strict-aliasing -O3
- #-Werror
- 
-diff --git a/disk/Makefile b/disk/Makefile
-index e3915b0..1a9ff01 100644
---- a/disk/Makefile
-+++ b/disk/Makefile
-@@ -1,14 +1,16 @@
- DISKMON_OBJS = disk.o diskmon.o
-+
-+CXX = g++
- CFLAGS += -Wall -I. -I../ -p -gdwarf-2 #-DBC_DEBUG
- LDFLAGS += -ludev
- 
- all:diskmon Makefile
- 
- diskmon:$(DISKMON_OBJS)
--	g++ $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
-+	$(CXX) $(DISKMON_OBJS) $(LDFLAGS) -o diskmon
- 
- %.o:%.cc
--	g++ $(CFLAGS) -c $< -o $@
-+	$(CXX) $(CFLAGS) -c $< -o $@
- 
- clean:
- 	rm -rf diskmon *.o
-diff --git a/fslib/Makefile b/fslib/Makefile
-index a6f96f4..bbe6cae 100644
---- a/fslib/Makefile
-+++ b/fslib/Makefile
-@@ -1,3 +1,5 @@
-+CC = gcc
-+AR = ar
- 
- FSLIB_CFLAGS = $(CFLAGS) -Wall -O0 -DFSLIB_DEBUG -g  # -O3 
- FSLIB_CFLAGS += -I. -D_LARGE_FILES -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 #-fvisibility=hidden
-@@ -15,25 +17,25 @@ FSLIB_TOOLS = file_hfs test_hfs test_info test_free_space diskinfo
- all: Makefile $(FSLIB) $(FSLIB_TOOLS)
- 
- $(FSLIB): $(OBJS)
--	ar rcs $(FSLIB) $(OBJS)
-+	$(AR) rcs $(FSLIB) $(OBJS)
- 
- test_hfs: $(FSLIB) test/test_hfs.o
--	gcc test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
-+	$(CC) test/test_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o test_hfs
- 
- file_hfs: $(FSLIB) test/file_hfs.o
--	gcc test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
-+	$(CC) test/file_hfs.o $(OBJS) $(FSLIB_LDFLAGS) -o file_hfs
- 
- test_info: $(FSLIB) test/test_info.o
--	gcc test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
-+	$(CC) test/test_info.o $(OBJS) $(FSLIB_LDFLAGS) -o test_info
- 	
- test_free_space: $(FSLIB) test/test_free_space.o
--	gcc test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
-+	$(CC) test/test_free_space.o $(FSLIB_CFLAGS) $(OBJS) $(FSLIB_LDFLAGS) -o test_free_space
- 	
- diskinfo: $(FSLIB) test/diskinfo.o
--	gcc test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
-+	$(CC) test/diskinfo.o $(OBJS) $(FSLIB_LDFLAGS) -g  -o diskinfo
- 
- .c.o:
--	gcc $(FSLIB_CFLAGS) -c $< -o $@
-+	$(CC) $(FSLIB_CFLAGS) -c $< -o $@
- 	
- clean:
- 	rm -rf *~ *.o test/*.o $(OBJS) $(FSLIB) $(FSLIB_TOOLS)
-diff --git a/kernel/Makefile b/kernel/Makefile
-index 1a71617..4f9760d 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -3,6 +3,7 @@ OBJECTS = $(SOURCES:.cc=.o)
- TARGET_DIR = ./build/
- TARGET = $(TARGET_DIR)/libbckernel.a
- BC_CFLAGS = $(BC_EXTRA_CFLAGS) -fPIC -c -Wall -ludev -L../build/ -lspacemap -I../ -fvisibility=hidden #-fvisibility-inlines-hidden
-+CXX = g++
- 
- 
- ### Build ###
-@@ -21,12 +22,12 @@ module: create-dirs force_look
- 
- kernel-lib: create-dirs $(TARGET)
- $(TARGET): $(OBJECTS)
--	ar rcs $(TARGET) $(OBJECTS)
-+	$(AR) rcs $(TARGET) $(OBJECTS)
- 
- $(OBJECTS): Makefile $(SOURCES) BCKernel.h
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
-+		$(CXX) -c $(BC_CFLAGS) $$i -o $${i%.cc}.o; \
- 	done
- 
- create-dirs: $(TARGET_DIR)
-diff --git a/keygens/kgghost/Makefile b/keygens/kgghost/Makefile
-index 8f6cc59..fe59ac7 100644
---- a/keygens/kgghost/Makefile
-+++ b/keygens/kgghost/Makefile
-@@ -5,10 +5,13 @@ KGGHOST_OBJS = hash.o pbe.o keyblock.o datablock.o kgghost.o
- KGGHOST_CFLAGS = -Wall -p -ggdb -I. -I../../ -I../../certificate -DBC_LINUX
- KGGHOST_CFLAGS += $(BC_EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGGHOST) Makefile
- 
- $(KGGHOST):$(KGGHOST_OBJS) $(CERTIFICATE_LIB)
--	ar rcs $(KGGHOST) $(KGGHOST_OBJS)
-+	$(AR) rcs $(KGGHOST) $(KGGHOST_OBJS)
- 
- $(CERTIFICATE_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -17,7 +20,7 @@ $(KERNEL_LIB):
- 	make -C ../../kernel/build
- 
- %.o:%.cpp
--	g++ $(KGGHOST_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGGHOST_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGGHOST)
-diff --git a/keygens/kgsha/Makefile b/keygens/kgsha/Makefile
-index f1a89f9..57f55ca 100644
---- a/keygens/kgsha/Makefile
-+++ b/keygens/kgsha/Makefile
-@@ -10,10 +10,13 @@ KGSHA_OBJS = hash.o datablock.o kgsha.o
- KGSHA_CFLAGS = -Wall -p -gdwarf-2 -I. -I../../ -I../../certificate -DBC_LINUX
- KGSHA_CFLAGS += $(EXTRA_CFLAGS)
- 
-+CXX = g++
-+AR = ar
-+
- all: $(KGSHA) $(KGSHA_OBJS) Makefile hidden_sector.h defs.h datablock.h
- 
- $(KGSHA): $(KGSHA_OBJS) $(CERTIFICATE_LIB) $(KERN_LIB)
--	ar rcs $(KGSHA) $(KGSHA_OBJS)
-+	$(AR) rcs $(KGSHA) $(KGSHA_OBJS)
- 
- $(CERT_LIB):
- 	make -C ../../certificate/CertificateLib
-@@ -22,7 +25,7 @@ $(KERN_LIB):
- 	make -C ../../kernel/
- 
- %.o:%.cpp
--	g++ $(KGSHA_CFLAGS) -c -o $@ $<
-+	$(CXX) $(KGSHA_CFLAGS) -c -o $@ $<
- 
- clean:
- 	rm -f *.o *.ver *~ $(KGSHA)
-diff --git a/mount/Makefile b/mount/Makefile
-index 7a3d66b..0e60095 100644
---- a/mount/Makefile
-+++ b/mount/Makefile
-@@ -1,22 +1,23 @@
- 
- HELPERS = bcrrpart_helper bcmount_helper bcumount_helper
- 
-+CC = gcc
- OBJS = common.o
- CFLAGS += -Wall -O3
- 
- all: $(HELPERS) Makefile
- 
- bcrrpart_helper: $(OBJS) rrpart.o
--	gcc $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
-+	$(CC) $(OBJS) rrpart.o $(LDFLAGS) -o bcrrpart_helper
- 
- bcmount_helper: $(OBJS) mount.o
--	gcc $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
-+	$(CC) $(OBJS) mount.o $(LDFLAGS) -o bcmount_helper
- 
- bcumount_helper: $(OBJS) umount.o
--	gcc $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
-+	$(CC) $(OBJS) umount.o $(LDFLAGS) -o bcumount_helper
- 	
- %.o:%.c
--	gcc $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 	
- clean:
- 	rm -f *.o *.ver *~ $(HELPERS)
-diff --git a/spacemap/Makefile b/spacemap/Makefile
-index 6dff240..7dd2ad9 100644
---- a/spacemap/Makefile
-+++ b/spacemap/Makefile
-@@ -5,17 +5,19 @@ LIB_NAME = spacemap
- STATIC_TARGET = lib$(LIB_NAME).a
- OBJECT_CFLAGS = -fPIC -g -c -Wall -ludev -fvisibility=hidden #-fvisibility-inlines-hidden
- 
-+CXX = g++
-+AR = ar
- 
- all: static
- 	true
- 
- static: $(OBJECTS)
--	ar rcs $(STATIC_TARGET) $(OBJECTS)
-+	$(AR) rcs $(STATIC_TARGET) $(OBJECTS)
- 
- $(OBJECTS): $(SOURCES)
- 	set -e; \
- 	for i in $(SOURCES); do \
--		g++ $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
-+		$(CXX) $(OBJECT_CFLAGS) $$i -o $${i%.c}.o; \
- 	done
- 
- clean:
-diff --git a/tests/Makefile b/tests/Makefile
-index c6d78f0..419020b 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -2,8 +2,8 @@ TESTS_PWD = ../build/tests/
- TESTS_TARGET = $(TESTS_PWD)/bctool-tests
- TESTS_SOURCES = tests-main.c ../container/cipher.cc ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/linux/file.cpp
- TESTS_CFLAGS = -I../ -I../certificate/ -L../build/ -L../build/kernel/ -DBC_LINUX -ludev -g
--CP = gcc
--CPP = g++
-+CC = gcc
-+CXX = g++
- CERT_LIB_NAME = certificate
- KERN_LIB_NAME = bckernel
- SPACEMAP_LIB_NAME = spacemap
-@@ -15,11 +15,11 @@ all: $(TESTS_TARGET)
- 	cp insert-modules.sh remove-modules.sh bcmod-loaded.sh $(TESTS_PWD)
- 
- $(TESTS_TARGET): $(TESTS_SOURCES) Makefile
--	$(CPP) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
-+	$(CXX) -o $(TESTS_TARGET) $(TESTS_CFLAGS) $(TESTS_SOURCES) -l$(CERT_LIB_NAME) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME) -lcunit -ludev
- 	cp kernel/print-struct-size.c $(TESTS_PWD)
--	$(CP) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CPP) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
--	$(CP) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
-+	$(CC) -o $(TESTS_PWD)test-data-generator kernel/test-data-generator.c $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CXX) -o $(TESTS_PWD)kgsha-key-generator kgsha/kgsha-data-generator.cpp ../keygens/kgsha/datablock.cpp ../keygens/kgsha/hash.cpp ../container/cipher.cc  $(TESTS_CFLAGS) -l$(KERN_LIB_NAME) -l$(CERT_LIB_NAME) -l$(SPACEMAP_LIB_NAME)
-+	$(CC) -o $(TESTS_PWD)/bcdevchecker bcdevchecker.c
- 
- clean:
- 	rm -rf $(TESTS_PWD)
--- 
-2.0.5
-
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 527e0c264f3c..9a1c1ed78c97 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -4,5 +4,5 @@ DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a
 DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
 EBUILD easy-rsa-3.0.4.ebuild 848 BLAKE2B 9f2f6974e21b91114185a3859d83e6d1274d8b02803fcf9ec949e8e27db807f2efd592f774ceeb0aeb41523f94080420a81a0126f3fa688aaef5637a4a07145b SHA512 3410d194d52040259e599093380d2ba443bc51258a6785505eb53326ebada4981938d533b202e79da67d794836d83aa161298227daedc67eb55ecd4be296d56e
 EBUILD easy-rsa-3.0.5.ebuild 819 BLAKE2B fc974df53e777c3fd4ea955db397bbafffd59ca982cf0dcb74c49ed3601757ec0952ccbce667d01aa7fca855cd0233391cb2d6576d3121ffa5887e5dce05f3df SHA512 1e8f1d0e31e9922206381920128aa9a4eec1c8e9468b23991605cf3efccea128d95e2029864df8f86f0ae7dffa5ba96309d518d627f51bf966010f12fdc71f85
-EBUILD easy-rsa-3.0.6.ebuild 822 BLAKE2B 588b8a4069147bb3aafa608f66c0baf42d06f219f4614604944da8c5aeb7d8b68958b7f4094d81d68025b9ab9995bb7b23ac496b598487b8da044c923971ace6 SHA512 ddab34c9b4552c149f4230f342fe8126416561fdd9f8430f97b23d8b54fa7e601fc2d97fe0cbcf9f4e169c70bade9a8c6d9e515e099108e46853e4c9b715fc48
+EBUILD easy-rsa-3.0.6.ebuild 826 BLAKE2B ab7eaa17680e14af15cce6c307649be39994141976f6908013ef7f0164b959beefffb956ecd7aee85b370abcaba4c1b38e8b8f75c84ee8986963855ee5aa3da6 SHA512 b545bc65ca4a44bb4ddc801f2dd5de35f0959babf12a336b5e2d4a27b5f700557edfc51f28fa8150d1f94eab8b8080866936456ea612a63386d71c49418535f2
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index f827f0cc84ee..d977a8cc3464 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )"
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}
 	!<net-vpn/openvpn-2.3"
 
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 99e9b5f74101..fef01caaedcb 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,6 +2,6 @@ DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df4533
 DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 EBUILD gcr-3.20.0.ebuild 1851 BLAKE2B 532e60ee150d6886ea24abda75d29b90acc66f7e055e5941a8c53293dc5491e3850729bc68b8a9f7d5658e0a2b5dd97dc3c0e1a75418fdbf132e0c6b4dbbde29 SHA512 f0c952bff3d6f66c8d75a0671cd886ac0611bd60f7b8a3b29dc71798d545baee9f2e2842ac76a87e34acb05fb200a472fc3bf58d4c0201e5fbaf60bb96efcbbe
-EBUILD gcr-3.28.0.ebuild 1893 BLAKE2B 0a79b21a6797ec4b833b2892632a6597b98db2a6d003abcb98e49cf6c27fa82c7d428ec6c2f63dbcad00a16d4aad52032b8539088bd784e9da8012645d693528 SHA512 cd974cf395b549c1b80a727c9d240fceb75783232fbfc864c9a823be43ffa38339ca40d32473ab29e44b2c1f60859dd5df8bba1d0f51057ebff097e180a08747
+EBUILD gcr-3.28.0.ebuild 1892 BLAKE2B 4dbe4a19c0da7470fe68daa6191e1469fbc192dfd122dc2581340ab54e795289fe8d8ace674d159c851dd0da00fe544587a189c64ad7d50345f4a4b0245b4597 SHA512 c9d40cbf32c1570a9b152a26db32dcf1888945713fdefb3c0bc46add3c5e04d0bf7f4ac62a38e673265380d04b8a7428f511560390c0f756bab44abfaf989fb6
 EBUILD gcr-3.28.1.ebuild 1900 BLAKE2B f5e119e17247567b57eb2e9b3bb0bf0fb9a0124f4225aa436ed31002a312a89660617ccd5599ee11de19ff30d24a3411e69f10c3b6811461983b95435d5c65f6 SHA512 ea0175fb3452ed095125cecabcb77c2645365ae21a6abcefae74575b970af7fa977616327fa0e9e6fb579a64ce9a703e135d84d3c4ccb55766a8c86962959f2b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.0.ebuild b/app-crypt/gcr/gcr-3.28.0.ebuild
index 8e970c5578bf..31ae7001059f 100644
--- a/app-crypt/gcr/gcr-3.28.0.ebuild
+++ b/app-crypt/gcr/gcr-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 56bff44f48c2..2fda801ce1f1 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,5 +2,5 @@ DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af80
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
 EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
 EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 621 BLAKE2B 47fcc06907f5b5601115374e8761bba82f1605d7c9e712c96d4635348942913835a8ef6d260d0c53e8ec6a7d335d01dfedd95bf0ef409ac02602e0dd72e78e74 SHA512 c6afa2ab96213992852403df4fc42454d90d963b5b7fd010ee914de5caaf70725e3edd72efeab71041d12922088b0961e6533988ec908730f2057177d5bbfa3e
+EBUILD libmd-1.0.1.ebuild 626 BLAKE2B 10e97b86dc45c3d24b0f563d9db54e3010c7d45275e887256cb7b05edc1434020e78beada1bffbd24c1b59f1268155efea4b87c588899e0966b82d366be7f42b SHA512 075ad4f713b8d7e59edb5f9f126264318e0b1cbf230e71ad8ed54b36f3023ed1fe7e2d4952bfd69c8738970d5ce747781ee20e6adefbfb0afa08cbb0c6944c11
 MISC metadata.xml 217 BLAKE2B db2fea1f008893d22d3d43f938c7b7fc7c035cfe58b04e1652b74e3c6a6f35754cfee5351ab5cfbfe286f03ff558b83167764305186d6a15ff10dfa29639011e SHA512 d1543d516a9e55d1985a460e7b21735cb30b977ba2ee097a43bd220c1bdab573baba004968a2d027d99f1222d3fc06931154e70e47b60a61869da05137af20ce
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index 970d33672e93..a57275e5b43b 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f3f56eea7e29..9a783977fddb 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -21,5 +21,5 @@ DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3
 EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e65278132cca0757cc83804b71a61a55c6e6c226c2033eac323d237bcb804f674b033403c95caadd7fc35a8d6b5a57a7 SHA512 8c0d1dfb71cd9d5c08bbad176b1ed1b232f31da0e6dc09c1f239f6c90f55879774ef0b9b41b9a4ad5ab67896d1dbb2138bb13087152cb348bd52ea639de78a98
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
-EBUILD mit-krb5-1.16.3.ebuild 4295 BLAKE2B 6f2dc38c4b968839716e94fd35f22b89cd2027d4cc5fdf7fe74589c791432708bea98077d9f2013fea995493d4ff001369a8dc222b066873cf17f5863f11c779 SHA512 22d2e16c9baf75fe7fe81300e804a9d7285957249cfa65bf5ca08c30d3b40d8678529bf152181b61c2dfd739cd50e88e3e680fd621d41f0eb5c2a5e332336b4a
+EBUILD mit-krb5-1.16.3.ebuild 4298 BLAKE2B 1c34349a18af2a0172b64011bd45f5421f3f39b9c36817a10e99be32b212c337446ef55ae4544e8baad32e706d74942e59d9022aa20153aeb98d2cd27df0fdd8 SHA512 5e0534a45cc859ef7226c75817949f9c3b0d0cc336930ceeb2482016db022769e83015b7f9201879986fb3c6ae2fae1f64b45eca22802003fe39d567608b7794
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
index bfc097ea1972..4aeaa219ada8 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.3.ebuild
@@ -33,7 +33,7 @@ CDEPEND="
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	pkinit? (
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	)
 	xinetd? ( sys-apps/xinetd )
 	"
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index f91410656147..8f87e3ec9448 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,5 +5,5 @@ AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f6757
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
 AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
-EBUILD trousers-0.3.14-r1.ebuild 3009 BLAKE2B 1a6e8ab9861026691f248e24011ae64aefc793586315a4705bbf71fa3d74bf72954b67a22a265096afac67c81747d961b15a3db8dde8e75a7e50f8cc218a155d SHA512 c59b3001ada728eb43fd96768d5bcc6c922eab4709d3151a67bff90a7009a7708110e7a247f98e1ec63cdd429a62b777adaf6905c0dcb75c891136c2d3a2ef86
+EBUILD trousers-0.3.14-r1.ebuild 3010 BLAKE2B e04f2965f1fee4164392ec51ca339caade85520be9f75aeaeb8dfdd91bb80e4f8212fcd23c8b7fd7da8afc57388e8861c17271b89a2ca316697563560044c805 SHA512 42abf70b65abddacd79b688eafa2aaf80aaed609425ee5fedb2cc88959b3c04a5ac77073b080a2793eca5a9263292e77b521b5421b4e87dc2f1fb654a2f12901
 MISC metadata.xml 389 BLAKE2B ba31172c2d03711712dec442f87ef9af448357d14ea90f973284b7d142a052f83798e0ac48d76f35d94a2efce6f050b456b0401562a7fb9d05f055e2defa923e SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
index e852005fcd55..f876fe6973fe 100644
--- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ IUSE="doc libressl selinux" # gtk
 #	gtk? ( >=x11-libs/gtk+-2 )
 
 DEPEND=">=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0 )
-	libressl? ( dev-libs/libressl )"
+	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"