gentoo resync : 18.11.2018

3 files changed, 2 insertions, 99 deletions

diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 1cf072733544..0a20e2acdc88 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -4,7 +4,6 @@ AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f
 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 2259 BLAKE2B 0e7149000256b0d7a64ed5192c6dcc7bfbd9ea675d7547c68bdf013faf12ce02dadbc6125da1516aa94b43da20a9885e85ffc4d7bf59d65995ab7e679f83a8bb SHA512 79065b8d809de043f36e326657536df01bf39d239f8d9551706511324ecc337f59544ba98b1acb25fd7a9a4eeb632754f41e72c5049c1e23b3da8a63da8c30fc
+EBUILD beecrypt-4.2.1-r5.ebuild 2258 BLAKE2B fd98acad8db1f298fa58171e1ac39258497e20f0538eb0e316eda0f2d953a344ffb9eb5acd83970be32f9530b2f04dd65b5cafd09a1f9d5862705fa14734dae7 SHA512 fefca8cac89bac9f8e422cf42dd2911cf5f9ccd880ac50670bc26849124a29d24bb4277aa6d56bfcf7411ce5445095d91592e083e8a72276b4ff7e2a36583b0c
 EBUILD beecrypt-4.2.1-r6.ebuild 2468 BLAKE2B 63cb3711ef43f45554f3a74f87511e6bdd590bb780c168c1f1cdfb0268712287b9a055bceed2192b14e976c9ce8f5f29305339c29eef51da9fe0125edd42a473 SHA512 35675e39d39cd18bb11932e7c985ae5d8a40f29999f8ee4293e47560bb4d7d68a13962fe30eb4395cae30768f002bf97665ebf691dfde7deff9c157da4a0c1ff
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
deleted file mode 100644
index b0189d3c74ce..000000000000
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-2.8:= )
-	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
-)
-
-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/beecrypt-4.2.1-r5.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
index adb3ef1d9d94..438103184410 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
@@ -13,7 +13,7 @@ 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"
+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} )"