gentoo resync : 30.09.2018

4 files changed, 151 insertions, 0 deletions

diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 085e7f2af5d7..afa0d0a5db0a 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -2,6 +2,8 @@ AUX beecrypt-4.2.1-build-system.patch 3796 BLAKE2B 2b89dcd9c8c06420100d9c59e75c0
 AUX beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch 734 BLAKE2B a0997dde4da38d681fc8cb2858eaf40e8e4ce6b90aafb0c53fb2b268cad41eefb8a0fce5d708bdd5509357ca77d52cec0dbbf2455f3498a08743db7ea37b53a9 SHA512 b6963a089587ecb495f097a890b57375f4580308f935424883ec0e694bf88848cded2e8108edc01f0887b6a8151437c94b7a2cd5bbdc48df151e16ea4755d2e4
 AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f5af4bbec8db5c87f7faefa381e8d973159f2b1a5e74189511eb43d200b7617cafd5cec18e23eaa69c99b68113fcf5998f SHA512 d344979022ea1e7ed2b7894bf9015996488cb5ec7c458aaad93a639ce457a1b790ba9e51b5369318566eb9ffc0df12d0b4108fd2997aa21c886dc079b836e973
 AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad156654dd79a2e380a0aaf48cd895d1308964a4dbc0ebcbbed978f78c066e4e480e193eeeb9b0e941828301256b0cabb SHA512 908d688ae29f23a3f67cb1ddf8d2f5277853abbf6fe291e371fa8595b8c6c5e4293c1c15b80171270639b9d4f092b4602bbd5144448c4f19ff958d5522edbc77
+AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af65863eaf5112f89be8f834dd60629bfe8ff05852016ba710f4ccd16c2db5341a7120cd570669ea21d9560cf361873b SHA512 f84a078f8263eb8613a3114875926d4a12c0e2e5bb6dde823849686ae2e7ae1e27fc0b7d8dc9467322b815a09b63f91658b65250cd64809d14a8f85661205349
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
 EBUILD beecrypt-4.2.1-r4.ebuild 2227 BLAKE2B f66a1cb5bea84db49c4bfb3928526e6d7927ac57ce04a0a525e8d75c8b49989d03e96e7e8be7c272af07adf8595635c142d4210fc1ec9f7e4f93e643b6c8d872 SHA512 bc49a21bada431dbfcd5be9233602d7c0feda3585c8a10887dfffcca99f781a5b6a1749b583b479360022ce20838282c47932643ba1816d0308c3de5698ca78f
+EBUILD beecrypt-4.2.1-r5.ebuild 2265 BLAKE2B c4d39a019a88c31a9022cbc5fbe390943025d0edcc532192cc75732df868bfbbe7ed7228b2f378ba6cc4cea385aa8817bd41c7ef7c51c4feb011f643e6883f17 SHA512 205c634304704bf0317a82493a26aa132049cb4f73f23d4fb0498d0c9657cf491235948122cbd6a93bd9bff68ce5e90a409af6bf182e0b29656bbd413443f499
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
new file mode 100644
index 000000000000..564e81f57995
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="General-purpose cryptography library"
+HOMEPAGE="https://sourceforge.net/projects/beecrypt/"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+threads java cxx python static-libs doc"
+REQUIRED_USE="cxx? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="!<app-arch/rpm-4.2.1
+	cxx? ( >=dev-libs/icu-6.1:= )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	doc? ( app-doc/doxygen
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+	)"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+DOCS=( BUGS README BENCHMARKS NEWS )
+PATCHES=(
+	"${FILESDIR}"/${P}-build-system.patch
+	"${FILESDIR}"/${P}-gcc-4.7.patch
+
+	# Fixes bug 596904
+	"${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch
+	"${FILESDIR}"/${P}-cast-uchar.patch #618676
+
+	"${FILESDIR}"/${P}-icu-61.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# ICU needs char16_t support now
+	# bug 649548
+	append-cxxflags -std=c++14
+
+	# cplusplus needs threads support
+	ac_cv_java_include=$(use java && java-pkg_get-jni-cflags) \
+	econf \
+		--disable-expert-mode \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_with python python "${PYTHON}") \
+		$(use_with cxx cplusplus) \
+		$(use_with java)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		pushd include/beecrypt >/dev/null || die
+		doxygen || die "doxygen failed"
+		popd >/dev/null || die
+		HTML_DOCS=( docs/html/*.{css,html,js,png} )
+	fi
+}
+
+src_test() {
+	export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
+	echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" || die
+	emake check bench
+}
+
+src_install() {
+	default
+
+	if use python; then
+		rm -f "${D%/}$(python_get_sitedir)"/_bc.*a || die
+	fi
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch
index 0cb291d8ff15..0cb291d8ff15 100755..100644
--- a/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-icu-61.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-icu-61.patch
new file mode 100644
index 000000000000..68845f612d9b
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-icu-61.patch
@@ -0,0 +1,51 @@
+On icu-61 built failures look like:
+  include/beecrypt/c++/lang/String.h:76:17:
+    error: ‘UnicodeString’ does not name a type
+
+ICU-61 moved all names into icu:: space.
+
+The fix is to add 'using icu::<symbol>'.
+
+Reported-by: Juergen Rose
+Bug: https://bugs.gentoo.org/666542
+--- a/c++/beeyond/DHIESParameterSpec.cxx
++++ b/c++/beeyond/DHIESParameterSpec.cxx
+@@ -36,2 +36,4 @@ using std::auto_ptr;
+ #include <unicode/numfmt.h>
++using icu::RegexPattern;
++using icu::RegexMatcher;
+ 
+--- a/c++/crypto/Cipher.cxx
++++ b/c++/crypto/Cipher.cxx
+@@ -30,2 +30,4 @@ using beecrypt::security::Security;
+ #include <unicode/ustream.h>
++using icu::RegexMatcher;
++using icu::RegexPattern;
+ 
+--- a/c++/lang/Integer.cxx
++++ b/c++/lang/Integer.cxx
+@@ -29,2 +29,5 @@ using beecrypt::lang::String;
+ #include <unicode/numfmt.h>
++using icu::Formattable;
++using icu::NumberFormat;
++
+ 
+--- a/c++/lang/Long.cxx
++++ b/c++/lang/Long.cxx
+@@ -29,2 +29,4 @@ using beecrypt::lang::String;
+ #include <unicode/numfmt.h>
++using icu::Formattable;
++using icu::NumberFormat;
+ 
+--- a/c++/util/Date.cxx
++++ b/c++/util/Date.cxx
+@@ -28,2 +28,3 @@
+ #include <unicode/datefmt.h>
++using icu::DateFormat;
+ 
+--- a/include/beecrypt/c++/lang/String.h
++++ b/include/beecrypt/c++/lang/String.h
+@@ -41,2 +41,3 @@ using beecrypt::bytearray;
+ #include <unicode/unistr.h>
++using icu::UnicodeString;
+