reinit the tree, so we can have metadata

5 files changed, 538 insertions, 0 deletions

diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
new file mode 100644
index 000000000000..dafc28e1f53a
--- /dev/null
+++ b/app-crypt/bestcrypt/Manifest
@@ -0,0 +1,7 @@
+AUX bcrypt3 3197 SHA256 0e376838176e367d9932c630b5e2e3c46e79831080de89c95b1e8e44ecd26929 SHA512 370c28c7289d86a0fbf639c85cb755fef10780f86daa4c5ce6071f32d7e36dea8e21f496e09e145c8c091042a70f3666df068611258a16a05d217d5ed355290b WHIRLPOOL 63a87ea4b7014f71c9820dbcd753820c18647aeeee4506f87340e927472857cf78d5c413771ef42ba4b3f64c02b4a53f7fc08035ac9e2d97a8708faa06657510
+AUX bestcrypt-2.0.6-build.patch 10878 SHA256 8d9bced77a0be44d627900a23d72043bd99365f2e5f2488c9d5e7259f66653b9 SHA512 34e150087fadfcdba5c05c0a4e1d2bfadbc448fe3214663c86ef3a692ec924da011ba11da3fb8f26692c2a52a6ce8c5edd8f20549de42c8dedf965cf3b74d530 WHIRLPOOL dd4968ec04f10bb0c5ce45d1ccd4f77a8c1b6841e0e4682250c2569c956b8b587bd8977b00902945f67fa8ce1a35594fe0b31b8bb35e6d90f555f56bbaf1f586
+DIST BestCrypt-2.0.11.tar.gz 2191182 SHA256 f6aef665eb8ff5eb1ef0f15ce496d7ac62d13e7dbc3031d5d4555a0a5de22ad0 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 WHIRLPOOL 036e7e967a3ef963b481310aa7732cbb764e0647f05796038892fcdc7ab772c48e5d57476ea7ba293d44a877fb42a55858f92fe018d54729f9845ccfd4f41988
+EBUILD bestcrypt-2.0.11.ebuild 1791 SHA256 23e6b2b8ce0cd119bcc1bc0dfb2a32bcc6367a2c1bd9d142be99e1f600225202 SHA512 c15210495dccb9d40117d74b80a6e1d991f88916c7293207fcf1c16879b9379a6d486feeee8f6663d0be40026834521070a90d9c8433394a89d4a4cc20f25b98 WHIRLPOOL faf8aea9f33def8e73736f827fee2ee953d4f7c0c014ac415286770219c2559706094b8d9c612aced7fbc80f6567752005f0d46143163b5e405a5e7218813507
+MISC ChangeLog 3668 SHA256 7f25d3745df2b596707b3f1ffe43934821e716623590eca9c6d3384a1dde9920 SHA512 14a6e7ec871ccc53deb1f32982cabd050c41b2834e7a3ec14ebc7195ade228e527b5472dbf08cdc8202d54079b38d495e27fa684603963ad3f730b80023e8239 WHIRLPOOL 8056744b26c58723cfaf64dda90d96b23c525f71a025ad31e114726f547c740e2e8d937d8a961e520e62a4118f6ef7be54e29ea36c53945ba24fb3c16b8357b2
+MISC ChangeLog-2015 13847 SHA256 bbfb6c9c42995a16414f5f73449109358ba146eb0b5cb1a01672964b932dfa4e SHA512 79263905cbe32e97a299cfef7b76690a172c8db8ab3d13f201675d86089470d22b4a2f19ac9f5ef12d3ca66a21997b5178699d29f5f762f58164064adb4ae2fa WHIRLPOOL fa01dc3b0d56d1994dd41a9ffaec5f0da89984d360119382d741eea787b48bd947ab54b2a4b44d1915a2f5687077af053e379eb53d63a61c3813446fa00321c9
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
new file mode 100644
index 000000000000..4ab00f225f3f
--- /dev/null
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
new file mode 100644
index 000000000000..b1b6979e63e0
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bcrypt3
@@ -0,0 +1,104 @@
+#!/sbin/openrc-run
+#
+# bestcrypt         Encrypted File Systems.
+#
+# Version:      1.2
+#
+# Revision:    $Id$
+#
+# Author:       Jetico Inc. (support@jetico.com)
+#
+# Modified by Stefan Tittel (with thanks to steveb) to work around
+# the "xargs: environment too large for exec"-error occuring in
+# the gentoo 1.4 linux distribution.
+
+# chkconfig: 2345 85 98
+# description: BestCrypt init script
+
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+# See how we were called.
+
+KERNEL_VERSION=`uname -r|sed 's/\(.\..\).*/\1/'`
+
+start() {
+	ebegin "Initializing BestCrypt"
+	declare -i status=0
+	rm -rf /dev/bcrypt?* 2>/dev/null
+        if [ $KERNEL_VERSION = "2.2" ]; then
+         mknod -m 666 /dev/bcrypt0 b 7 128
+         mknod -m 666 /dev/bcrypt1 b 7 129
+         mknod -m 666 /dev/bcrypt2 b 7 130
+         mknod -m 666 /dev/bcrypt3 b 7 131
+         mknod -m 666 /dev/bcrypt4 b 7 132
+         mknod -m 666 /dev/bcrypt5 b 7 133
+         mknod -m 666 /dev/bcrypt6 b 7 134
+         mknod -m 666 /dev/bcrypt7 b 7 135
+         mknod -m 666 /dev/bcrypt8 b 7 136
+         mknod -m 666 /dev/bcrypt9 b 7 137
+         mknod -m 666 /dev/bcrypt10 b 7 138
+         mknod -m 666 /dev/bcrypt11 b 7 139
+         mknod -m 666 /dev/bcrypt12 b 7 140
+         mknod -m 666 /dev/bcrypt13 b 7 141
+         mknod -m 666 /dev/bcrypt14 b 7 142
+         mknod -m 666 /dev/bcrypt15 b 7 143
+        else
+	  if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+	  then
+            mknod -m 666 /dev/bcrypt0 b 188 0
+            mknod -m 666 /dev/bcrypt1 b 188 1
+            mknod -m 666 /dev/bcrypt2 b 188 2
+            mknod -m 666 /dev/bcrypt3 b 188 3
+            mknod -m 666 /dev/bcrypt4 b 188 4
+            mknod -m 666 /dev/bcrypt5 b 188 5
+            mknod -m 666 /dev/bcrypt6 b 188 6
+            mknod -m 666 /dev/bcrypt7 b 188 7
+            mknod -m 666 /dev/bcrypt8 b 188 8
+            mknod -m 666 /dev/bcrypt9 b 188 9
+            mknod -m 666 /dev/bcrypt10 b 188 10
+            mknod -m 666 /dev/bcrypt11 b 188 11
+            mknod -m 666 /dev/bcrypt12 b 188 12
+            mknod -m 666 /dev/bcrypt13 b 188 13
+            mknod -m 666 /dev/bcrypt14 b 188 14
+            mknod -m 666 /dev/bcrypt15 b 188 15
+          fi
+	fi
+	modprobe bc || status=1
+	modprobe bc_blowfish || status=1
+	modprobe bc_des || status=1
+	modprobe bc_gost || status=1
+	modprobe bc_twofish || status=1
+	modprobe bc_bf448 || status=1
+	modprobe bc_bf128 || status=1
+	modprobe bc_3des || status=1
+	modprobe bc_idea || status=1
+	modprobe bc_rijn || status=1
+	modprobe bc_cast || status=1
+	modprobe bc_rc6 || status=1
+	modprobe bc_serpent || status=1
+	eend ${status}
+}
+
+stop() {
+	ebegin "Unmounting encrypted filesystems"
+
+# The original line causing the "xargs: environment too large for exec error".	
+	# grep BestCrypt /etc/mtab |awk '{print $2}'|xargs -r -n 1 bctool umount
+
+# The line for which it work's fine now.
+	for i in $(grep BestCrypt /etc/mtab | awk '{print $2}') ; do bctool umount ${i} ; done
+
+	eend $?
+	ebegin "Shutting down BestCrypt modules"
+	for i in `lsmod |egrep "^bc_.*" |awk '{print $1}' `; do 
+		rmmod $i
+	done
+	if [ ! -c /dev/.devfsd ] && [ ! -e /dev/.udev ];
+	then
+		rm -f /dev/bcrypt?* 2>/dev/null
+	fi
+	rmmod bc
+	eend $?
+}
diff --git a/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
new file mode 100644
index 000000000000..966053072d32
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-2.0.6-build.patch
@@ -0,0 +1,341 @@
+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/bestcrypt/metadata.xml b/app-crypt/bestcrypt/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-crypt/bestcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>crypto@gentoo.org</email>
+	<name>Crypto</name>
+</maintainer>
+</pkgmetadata>