From 015253224ca1dbc171fb27693c8accfcd0a58a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Thu, 21 Dec 2017 15:11:32 +0100
Subject: [PATCH] Manifest updates, fix swiften and lmdb

---
 app-admin/ldapscripts/Manifest     |  2 +-
 dev-db/lmdb/lmdb-9999.ebuild       |  5 +++--
 dev-games/StormLib/Manifest        |  2 +-
 metadata/layout.conf               | 15 ++++++++++-----
 net-im/swiften/swiften-9999.ebuild |  3 +--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app-admin/ldapscripts/Manifest b/app-admin/ldapscripts/Manifest
index 35358d4..8a029ae 100644
--- a/app-admin/ldapscripts/Manifest
+++ b/app-admin/ldapscripts/Manifest
@@ -1 +1 @@
-DIST ldapscripts-2.0.7.tgz 37121 SHA256 ffaa4e31e706f240c61f770cc9da327fa4e07708aaea0456c44bedc4bd1804df SHA512 998d096a9e43bd90cf9bbd635b141f973545aa75545861be2ae7ab1010e2955b55b76356531c5e7b09483195796c97b3017c052ecb96637ebfea0a089dc3584b WHIRLPOOL 0c3387e988fed0958dd694897b53e8feae258504686ebb27c9cdf8181c988729f490f3a3bced5c49537ee91d29036a2947baaa9099db3401c97e09da47783657
+DIST ldapscripts-2.0.8.tgz 37575 BLAKE2B 27312d388addc98a6e383fd878ff47c40458fa4f35a29deec61ea2b68e0625798aa00c1cf81939ceebd5acafc436ebf271a3d907ce44b34f0d9d77333f5d5e99 SHA512 d2ce0114d66ab7c37a6b1029e94403bf15ce2721c1fa8f139247a08eac3b1b11291225388f0158222bdc1e259d399afe8f3a60d89efe42353cf4a65f3ab4f2d4
diff --git a/dev-db/lmdb/lmdb-9999.ebuild b/dev-db/lmdb/lmdb-9999.ebuild
index bebe471..1e99927 100644
--- a/dev-db/lmdb/lmdb-9999.ebuild
+++ b/dev-db/lmdb/lmdb-9999.ebuild
@@ -42,8 +42,9 @@ src_prepare() {
 }
 
 src_configure() {
-	# fdatasync lives in -lrt on Solaris 10
-	[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fdatasync lives in -lrt on Solaris 10
+		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
 	fi
 }
 
diff --git a/dev-games/StormLib/Manifest b/dev-games/StormLib/Manifest
index 99e27e5..e58dc3c 100644
--- a/dev-games/StormLib/Manifest
+++ b/dev-games/StormLib/Manifest
@@ -1 +1 @@
-DIST StormLib-9.20.tar.gz 776710 SHA256 fdfc7d0b444cd5d540c5732155a7c5011c573e90029947198f651aec93db4887 SHA512 e44501ab611128f56a2d0aff02e7ffaa4d6b473fb73176a52232e6cffdd6a29501274aca8ed5db287008058c0f5165e155ec8d5a0f7ed4f1774596cf63f5f4e8 WHIRLPOOL 29ca54e5fd93e10fc0b4611d0a333ee3b074bfa3bf177ec55f7a8dec529c1ce9e9195e4948396bdbe0b5440034079b47a6d961a5e35b611732a41d0e189f6d45
+DIST StormLib-9.21.tar.gz 594308 BLAKE2B 706b1bf61baf02d1f639aa5b51b05d350da4e6550a27d8d9cfc79732495e2566ed979700f9db86b4721ba8b7054271133e6b193452790221344120654b2c2f4d SHA512 f533836b6ed52eae02e3fc4a5dd6f05c38ba97b3b196355e6badae6c7eafeaf5e5048d9b14c5fffcd02fc603566d73e3551cd837685e64090b81d3bc39366b0f
diff --git a/metadata/layout.conf b/metadata/layout.conf
index ad2821e..447bae0 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For details on this file, see the layout.conf section of the
@@ -7,10 +7,15 @@
 # we inerhit eclasses from gentoo
 masters = gentoo
 
-# This went live Wednesday, July 4, 2012 at 10:00 UTC
-# https://archives.gentoo.org/gentoo-dev-announce/message/a15cbea85dd089c99302f949b4072c20
-# https://wiki.gentoo.org/wiki/GLEP:59
-manifest-hashes = SHA256 SHA512 WHIRLPOOL
+# manifest-hashes specify hashes used for new/updated entries
+# the current set went live on 2017-11-21, per 2017-11-12 Council meeting
+# https://archives.gentoo.org/gentoo-dev/message/ba2e5d9666ebd7e1bff1143485a37856
+manifest-hashes = BLAKE2B SHA512
+
+# The following hashes are required on all Manifest entries. If any
+# of them are missing, repoman will refetch and rehash old distfiles.
+# Otherwise, old distfiles will keep using their current hash set.
+manifest-required-hashes = SHA512
 
 # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
 # 2014-02-25 council meeting deprecated EAPIs 0 and 3.
diff --git a/net-im/swiften/swiften-9999.ebuild b/net-im/swiften/swiften-9999.ebuild
index d7ae185..b45ee44 100644
--- a/net-im/swiften/swiften-9999.ebuild
+++ b/net-im/swiften/swiften-9999.ebuild
@@ -27,14 +27,13 @@ IUSE="debug doc +expat gconf icu static-libs test upnp zeroconf"
 # LDNS / Unbound is bundled only...
 RDEPEND="dev-libs/boost:=
 	dev-libs/openssl:0
-	net-dns/libidn
 	sys-libs/zlib
 	zeroconf? ( net-dns/avahi )
 	expat? ( dev-libs/expat )
 	!expat? ( dev-libs/libxml2 )
 	gconf? ( gnome-base/gconf dev-libs/glib:2 )
 	icu? ( dev-libs/icu:= )
-	!icu? ( dev-libs/libidn:= )
+	!icu? ( net-dns/libidn:= )
 	upnp? ( net-libs/libnatpmp net-libs/miniupnpc:= )"
 DEPEND="${RDEPEND}
 	doc? (