Sync with portage [Wed Aug 10 11:30:31 MSK 2016].

8 years ago · f77a756c44
parent 195f46ad19
commit f77a756c44
35 changed files with 253 additions and 195 deletions
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@ -1,3 +1,4 @@
 DIST sshguard-1.5.tar.bz2 303767 SHA256 b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19 SHA512 6d17abccd94af9e7fb04a54477ff5686caa64dc36e2f2cbc4a8cd7bc293923daf2fee87fa7f2e247eba1b310abe68549e652ab3224c2d19822d2e8a0306e49e6 WHIRLPOOL 7d579f5c9a03d79f7cc7b51b537b91b053faa56653ba7c5182550ddab41c0fbcd12a6cd7a6dfb2d1e2323905ef3e35aaef9ca8175d97e26cb953d57403f46562
 DIST sshguard-1.6.2.tar.xz 405092 SHA256 57f56724f475e81bbe5fc75dfcb573213bf7e446d7dd039dcf5ba8fa5bc2cb2b SHA512 2819ef9270474c8b3f1d4c997818cf654aaf06089f3112a24a840df7708822a3d66189f5c7a4e4dba06d7c25bf011c43377f3f9aa97de4f9e664fe97464a5c57 WHIRLPOOL b25ae60deadb771623a6d09a75844fb42815dcdeba239a65c565942bd70586ea661428b38e76e413ff1305aa39387c0117c4d205a8b4a8694575a811cab23799
 DIST sshguard-1.6.4.tar.gz 546934 SHA256 654d5412ed010e500e2715ddeebfda57ab23c47a2bd30dfdc1e68c4f04c912a9 SHA512 ac8eeb7c303757cfd8ebfa69425afa1a1c6f07998cbb49ee91649c23ff2693f66f315ca6cd04b2011a4d1951f10d69be0db9bbc05b8814d85376eeb3a3f294ee WHIRLPOOL bc4e678d1f2a9d153d105308bd70bd5801560ada691596601c6358145cd1684ff4403913a63af023a62c590b4a9bdde6bc2afe547d93e58dcc1e43ae347e26b6
+DIST sshguard-1.7.0.tar.gz 769779 SHA256 5ce784bc25dc9801fbfadc4117669ee02397526c420170ae1145ada96df8cd59 SHA512 876789ee0a457b656f9d9488043f0d4f59cb2ba5a6fc3243f6f05e64995c6cf719bffa01bea7f96897b7092946e441507f2ced4f372fb475dfd7ec0cd70bda55 WHIRLPOOL 7ade8de747f398c7552b17bc3b6ce8c9400e169757072cd10147b2f0ca2e67c427a09e4761a63d9bcc24caca499464301388b4d8b709a4f8cc4325e57dbb312d
--- a/app-admin/sshguard/sshguard-1.7.0.ebuild
+++ b/app-admin/sshguard/sshguard-1.7.0.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="ipfilter kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+	kernel_linux? ( net-firewall/iptables )
+	kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/flex
+"
+RDEPEND="
+	${CDEPEND}
+	sys-apps/openrc
+	virtual/logger
+"
+
+DOCS=(
+	CHANGELOG.rst
+	README.rst
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+
+src_prepare() {
+	default
+
+	sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
+}
+
+src_configure() {
+	# Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
+	append-cppflags -D_DEFAULT_SOURCE
+
+	local myconf
+	if use kernel_linux; then
+		myconf="--with-firewall=iptables"
+	elif use kernel_FreeBSD; then
+		if use ipfilter; then
+			myconf="--with-firewall=ipfw"
+		else
+			myconf="--with-firewall=pf"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
--- a/app-arch/lzop/files/lzop-1.03-x32.patch
+++ b/app-arch/lzop/files/lzop-1.03-x32.patch
@ -0,0 +1,38 @@
+https://bugs.gentoo.org/575450
+
+Fix get of FLAGS register in x32 ABI,
+
+x32 ABI requires to have 64-bit variable to store FLAGS register
+instead of size_t that is 32-bit variable, this fix operand
+type mismatch when try to pop previous pushf value.
+
+Upstream-status: Submitted
+
+Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
+
+Index: lzop-1.03/src/miniacc.h
+===================================================================
+--- lzop-1.03.orig/src/miniacc.h
+++ lzop-1.03/src/miniacc.h
+@@ -754,6 +754,9 @@
+ #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
+ #  define ACC_ARCH_AMD64            1
+ #  define ACC_INFO_ARCH             "amd64"
+#  if defined(__ILP32__)
+#    define ACC_ARCH_AMD64_X32      1
+#  endif
+ #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
+ #  define ACC_ARCH_ARM              1
+ #  define ACC_ARCH_ARM_THUMB        1
+@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n
+ ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
+ {
+ #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
+#  if defined(ACC_ARCH_AMD64_X32)
+    unsigned long long r;
+#  else
+     size_t r;
+#  endif
+     __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
+     return (int)(r >> 18) & 1;
+ #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
--- a/app-arch/lzop/lzop-1.03.ebuild
+++ b/app-arch/lzop/lzop-1.03.ebuild
@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

-EAPI=2
+EAPI="6"

 DESCRIPTION="Utility for fast (even real-time) compression/decompression"
 HOMEPAGE="http://www.lzop.org/"
@ -16,6 +15,10 @@ IUSE=""
 RDEPEND=">=dev-libs/lzo-2"
 DEPEND="${RDEPEND}"

+PATCHES=(
+	"${FILESDIR}"/${P}-x32.patch #575450
+)
+
 src_test() {
 	einfo "compressing config.status to test"
 	src/lzop config.status || die 'compression failed'
@ -25,8 +28,7 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	default
 	dodoc doc/lzop.{txt,ps}
 	dohtml doc/*.html
 }
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -1,6 +1,5 @@
 DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
 DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
 DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40671475e13252a71a53a01f80d172ef SHA512 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428 WHIRLPOOL 522833f6dc47693885238caac1da80141d909a2c7c89bc5f302e064f5ebded132329000a223f9a11b412adea25c412ff4a99c0f5de9cf25582e62dca02a3bae6
-DIST xapian-omega-1.3.6.tar.xz 486352 SHA256 ffa5a151b827e8227d47cadacbdb18854e6d339bf6595892cc304f9a4e3d8abb SHA512 78e607880343d056cac777d0e1b59f89a405fd190c16554322e2e289ffdde0a537238e013ded2fe7c10b6cabfed86360fe0c022c185d896822eb968945886000 WHIRLPOOL b0035a987df4bfc34abc68c658c01a804327d6c1ea87e687a20675f03cb208dec421775e124b55d4a1cd624d82432ad89b3a45c5e77eaed3e8d67cd909420217
 DIST xapian-omega-1.3.7.tar.xz 490156 SHA256 3d3064289dc891c774a6be8b6e2f0f21691b88ab57ec7a5d16141179027c7453 SHA512 87aea7e59a612b6757d6c826b328542f5696d544906e85009063b8a7206a9cbf50457f7a03e3d2c25ebfd95d37e3c2a75ee70d2da7c3e1bd021e6c15092a1755 WHIRLPOOL 5da58ff0e30c0341b7f653b30be12770fea82d3f6e6041d8fd82be1ca75b3e058336854a4a651d430c71dbacfebb91b9b0eb4b95ced99ba983bddcd690acb92b
 DIST xapian-omega-1.4.0.tar.xz 490224 SHA256 10fc0635b5009bbe726461a62867abf6761bd8cfb812c2ead9646a166a20431f SHA512 973c456e6d6f5b0818ec6ae1fe8e2ad221ddb5f497a0e51ea552b3e634414f0110311de848276904cff9712dcde7f6468f7152e802a912477e087a17d254d65e WHIRLPOOL 94d3d8bf591dd1cba33b6ab5c09159d596d422a822537890a04106feabd2604c19986f2c5a40800d656090c76e224b25a061b61f84c219b457ea19c350d9bd97
--- a/app-text/xapian-omega/xapian-omega-1.3.6.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.3.6.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.3.7
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@ -1,6 +1,5 @@
 DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb
 DIST xapian-core-1.2.22.tar.xz 3204096 SHA256 269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f SHA512 cb6bd565eb307f9bc8f801fc9cda0cc6ad5d7cb8bf0af2ab6e42d48ca4ea4169f08621db810ab87d15957d0f873bcb0336e16b12fdb6026375d9c0192781e0d6 WHIRLPOOL 580c16889a6c3e99a00f8bb791f878a08ff3522c3dffb18ace18d54575247332f0fff8866f46475513dde7544205fe08971cbd284ec3714ce0d6b9b445e8746e
 DIST xapian-core-1.2.23.tar.xz 3206452 SHA256 9783aeae4e1a6d06e5636b270db4b458a7d0804a31da158269f57fa5dc86347d SHA512 df3fa71150575faf982d6b90f2364962d61012dd45ed7ef4945a0623ed7056c32ea3cbc423f2016415a80779251ecb5080b6a34c5b66b823cf8d92fe6b5b3d30 WHIRLPOOL a5498117b060218455946948c119e52ed0639a2c2d5f1fd60e416ab06ad2cd483814039801d1fa29e097a994927d482a2bd10ab18bca28a413198ea1adb4187b
-DIST xapian-core-1.3.6.tar.xz 2605652 SHA256 e952795a6619366e1de7d2bebf0e636c34123170fd41316878e28d693819da82 SHA512 a4a4c800d6b4708ba7793da7e413d91777ab30076526022ca12f2c497ab9b68dbf17b08abd4282c32f66778a4c7ad00cce37925fea36384960874a0327637ac1 WHIRLPOOL 2c6858f1b6dece7aacf2397beab3312681750c18559125771ef00a1768d2ae26eadcdc7aaac24f5121aeb634a36984e95b635965509f0e494d8c0d06971155d7
 DIST xapian-core-1.3.7.tar.xz 2607044 SHA256 cfbbd8d42512690bc9867ed88a6a80723fe4193b6c4b97597f8fdf49026b94e7 SHA512 c12714fa77afd524fea084758006a00d2ff74ca23925cff3f4313024f7e103e12e2fd525480c1f9ec707c3282ee4de85c45cd38d5cc8244bf2a60f7d6e703069 WHIRLPOOL 4425d1e9ac9b73b255e1abdcf7d69f5fd70f547519fa448a4876f953e330ebb2abb7ad08b16da360ca7ced50c6d60e6ea2bec127d788f44f0725ac84bb41f3f6
 DIST xapian-core-1.4.0.tar.xz 2613272 SHA256 10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477 SHA512 e37868e80187718995fd5b0f92a47c801b76c7bef129e01928d1de925b5f655ffe7c6907218809469ad4b89bf81c67ce9c9b5cc0646f2b8d629d6afd629a621e WHIRLPOOL 8d25bfbc4f872bed8e3512c85db568ab9a53166bc82a40874d61bad4599b6a4c23bbc16897c674669413a52c329bc718c00298392f19e1c99130b931c5d0b6ef
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@ -25,6 +25,7 @@
 	<use>
 		<flag name="brass">Enabled brass backend db support</flag>
 		<flag name="chert">Enabled chert backend db support</flag>
+		<flag name="glass">Enabled glass backend db support</flag>
 		<flag name="inmemory">Enabled inmemory backend db support</flag>
 	</use>
 </pkgmetadata>
--- a/dev-libs/xapian/xapian-1.3.6.ebuild
+++ b/dev-libs/xapian/xapian-1.3.6.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1.3.7" # ABI version of libxapian-1.3.so, prefixed with 1.3.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf=""
-
-	ewarn
-	if use cpu_flags_x86_sse2; then
-		ewarn "Using sse2"
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			ewarn "Using sse"
-			myconf="${myconf} --enable-sse=sse"
-		else
-			ewarn "Disabling sse and sse2"
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-	ewarn
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
-	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die
-	use doc || rm -rf "${D}usr/share/doc/${PF}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	emake check VALGRIND=
-}
--- a/dev-libs/xapian/xapian-1.3.7.ebuild
+++ b/dev-libs/xapian/xapian-1.3.7.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/1.3.8" # ABI version of libxapian-1.3.so, prefixed with 1.3.
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"

 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@ -44,7 +44,7 @@ src_configure() {

 	myconf="${myconf} $(use_enable static-libs static)"

-	use brass || myconf="${myconf} --disable-backend-brass"
+	use glass || myconf="${myconf} --disable-backend-glass"
 	use chert || myconf="${myconf} --disable-backend-chert"
 	use inmemory || myconf="${myconf} --disable-backend-inmemory"

--- a/dev-libs/xapian/xapian-1.4.0.ebuild
+++ b/dev-libs/xapian/xapian-1.4.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"

 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
@ -44,7 +44,7 @@ src_configure() {

 	myconf="${myconf} $(use_enable static-libs static)"

-	use brass || myconf="${myconf} --disable-backend-brass"
+	use glass || myconf="${myconf} --disable-backend-glass"
 	use chert || myconf="${myconf} --disable-backend-chert"
 	use inmemory || myconf="${myconf} --disable-backend-inmemory"

--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 10 Aug 2016 06:40:36 +0000
+Wed, 10 Aug 2016 07:40:36 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 10 Aug 2016 06:40:36 +0000
+Wed, 10 Aug 2016 07:40:36 +0000
--- a/metadata/md5-cache/app-admin/sshguard-1.7.0
+++ b/metadata/md5-cache/app-admin/sshguard-1.7.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-devel/flex
+DESCRIPTION=protects hosts from brute force attacks against ssh
+EAPI=6
+HOMEPAGE=http://sshguard.sourceforge.net/
+IUSE=ipfilter kernel_FreeBSD kernel_linux
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-apps/openrc virtual/logger
+SLOT=0
+SRC_URI=mirror://sourceforge/sshguard/sshguard-1.7.0.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=7497533df364ca743f01ec0d44a9e28b
--- a/metadata/md5-cache/app-arch/lzop-1.03
+++ b/metadata/md5-cache/app-arch/lzop-1.03
@ -1,11 +1,11 @@
 DEFINED_PHASES=install test
 DEPEND=>=dev-libs/lzo-2
 DESCRIPTION=Utility for fast (even real-time) compression/decompression
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.lzop.org/
 KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-2
 SLOT=0
 SRC_URI=http://www.lzop.org/download/lzop-1.03.tar.gz
-_md5_=0868c8a1f938058050055c2cbae82359
+_md5_=c71988b05398c020d5d0460c3847a7c2
--- a/metadata/md5-cache/app-text/xapian-omega-1.3.6
+++ b/metadata/md5-cache/app-text/xapian-omega-1.3.6
@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/1.3.7 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=5
-HOMEPAGE=http://www.xapian.org/
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/1.3.7 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.3.6/xapian-omega-1.3.6.tar.xz
-_md5_=3d20a1df8cd56dad8c0c0a844f31b31b
--- a/metadata/md5-cache/dev-libs/xapian-1.3.6
+++ b/metadata/md5-cache/dev-libs/xapian-1.3.6
@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=sys-libs/zlib
-DESCRIPTION=Xapian Probabilistic Information Retrieval library
-EAPI=5
-HOMEPAGE=http://www.xapian.org/
-IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-REQUIRED_USE=inmemory? ( chert )
-SLOT=0/1.3.7
-SRC_URI=http://oligarchy.co.uk/xapian/1.3.6/xapian-core-1.3.6.tar.xz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=92f5a7ce3fca33ca928c1a7304598cf5
--- a/metadata/md5-cache/dev-libs/xapian-1.3.7
+++ b/metadata/md5-cache/dev-libs/xapian-1.3.7
@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
+IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
@ -11,4 +11,4 @@ REQUIRED_USE=inmemory? ( chert )
 SLOT=0/1.3.8
 SRC_URI=http://oligarchy.co.uk/xapian/1.3.7/xapian-core-1.3.7.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=786fe8dfacd18e10b423319386da1395
+_md5_=5aadb1db7ecc159cb85c57f1928638dc
--- a/metadata/md5-cache/dev-libs/xapian-1.4.0
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.0
@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib
 DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
+IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
@ -11,4 +11,4 @@ REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.0/xapian-core-1.4.0.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=83940bb37db9268c50b4d189cbaa9a2d
+_md5_=dd6f3ae4d10a131bfad864ee4746df81
--- a/metadata/md5-cache/net-proxy/haproxy-1.5.18
+++ b/metadata/md5-cache/net-proxy/haproxy-1.5.18
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=5
 HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib
+IUSE=+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib )
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.5/src/haproxy-1.5.18.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7affc0c1105303553a7c9005738fa25c
+_md5_=e1332d06f68d3a8f45e287ae9d141b06
--- a/metadata/md5-cache/net-proxy/haproxy-1.6.7
+++ b/metadata/md5-cache/net-proxy/haproxy-1.6.7
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=5
 HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib
+IUSE=+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib )
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.7.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3fa1b1e55942247ea7644b0ea9076030
+_md5_=aa72e59b44d63984485361d258e4b433
--- a/metadata/md5-cache/net-proxy/haproxy-9999
+++ b/metadata/md5-cache/net-proxy/haproxy-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib ) dev-vcs/git virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib ) dev-vcs/git virtual/pkgconfig
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=5
 HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib
+IUSE=+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( dev-libs/openssl:0[zlib?] ) zlib? ( sys-libs/zlib )
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-2	7af5d170bfc02983b4bcd3167dc5edd4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=de91e124be9c5c8aa46897473f60410f
+_md5_=014c1ab785c5fb50d51aa0b10a077681
--- a/metadata/md5-cache/sys-apps/qdirstat-1.0
+++ b/metadata/md5-cache/sys-apps/qdirstat-1.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=Qt app to show where your disk space has gone and to help you clean it up
+EAPI=6
+HOMEPAGE=https://github.com/shundhammer/qdirstat
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/shundhammer/qdirstat/archive/1.0.tar.gz -> qdirstat-1.0.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=8c0b913af131256daf9d765b19db61a5
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 10 Aug 2016 06:40:36 +0000
+Wed, 10 Aug 2016 07:40:36 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Aug 10 06:39:41 UTC 2016
+Wed Aug 10 07:39:42 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 10 Aug 2016 07:00:01 +0000
+Wed, 10 Aug 2016 08:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1470811201 Wed 10 Aug 2016 06:40:01 AM UTC
+1470814801 Wed 10 Aug 2016 07:40:01 AM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Wed, 10 Aug 2016 06:40:36 +0000
+Wed, 10 Aug 2016 07:40:36 +0000
--- a/net-proxy/haproxy/haproxy-1.5.18.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.18.ebuild
@ -15,12 +15,17 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
-				pcre-jit? ( dev-libs/libpcre[jit] )
-				)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"

--- a/net-proxy/haproxy/haproxy-1.6.7.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.7.ebuild
@ -15,12 +15,17 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt doc examples net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua

-DEPEND="pcre? ( dev-libs/libpcre
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
 		pcre-jit? ( dev-libs/libpcre[jit] )
 	)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 # lua? ( dev-lang/lua:5.3 )
 RDEPEND="${DEPEND}"
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -15,12 +15,17 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
-				pcre-jit? ( dev-libs/libpcre[jit] )
-				)
-	ssl? ( dev-libs/openssl:0[zlib?] )
+IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"

--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -2145,6 +2145,7 @@ dev-libs/wlc:X - Enable X11 backend and XWayland support.
 dev-libs/wlc:systemd - Enable support for systemd-logind.
 dev-libs/xapian:brass - Enabled brass backend db support
 dev-libs/xapian:chert - Enabled chert backend db support
+dev-libs/xapian:glass - Enabled glass backend db support
 dev-libs/xapian:inmemory - Enabled inmemory backend db support
 dev-libs/xerces-c:iconv - Use iconv (virtual/libiconv) as message loader and transcoder (in general it would be possible to use iconv only as message loader and something else like icu or the native method as transcoder and vice-versa, but this is a less common case and hard to handle)
 dev-libs/xerces-c:threads - Enable threading support through pthread (or other libraries on AIX, IRIX, HPUX, Solars). Highly recommended
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@ -0,0 +1 @@
+DIST qdirstat-1.0.tar.gz 805110 SHA256 b8404af004606a9d0e7f3a35bb28f6629a8c84620549fcab8898a551cc07b3a4 SHA512 9e98ea690fd84b435f1b4078c79350a7c0ee6b48560dc500fc9410633a650539c2db16f0526e181700580de0ee8b3044d1219eafc9870cd7e421511159b6d11d WHIRLPOOL 222945223109e9fc6bc2ae1dedeb5e55da4833be688abc14fc884bdd7ed566446d328142b770cebb0438aef52bcc1b48609f45790fc8efdbe36d96b609f9db29
--- a/sys-apps/qdirstat/metadata.xml
+++ b/sys-apps/qdirstat/metadata.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>j.scruggs@gmail.com</email>
+		<name>Jonathan Scruggs</name>
+        </maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Qt-based directory statistics: KDirStat without any KDE -- from
+		the author of the original KDirStat.
+
+		QDirStat is a graphical application to show where your disk space
+		has gone and to help you to clean it up.
+
+		This is a Qt-only port of the old Qt3/KDE3-based KDirStat, now
+		based on the latest Qt 5. It does not need any KDE libs or
+		infrastructure. It runs on every X11-based desktop on Linux, BSD
+		and other Unix-like systems.
+	</longdescription>
+</pkgmetadata>
--- a/sys-apps/qdirstat/qdirstat-1.0.ebuild
+++ b/sys-apps/qdirstat/qdirstat-1.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt app to show where your disk space has gone and to help you clean it up"
+HOMEPAGE="https://github.com/shundhammer/qdirstat"
+SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
				`@ -0,0 +1 @@`
				`DIST qdirstat-1.0.tar.gz 805110 SHA256 b8404af004606a9d0e7f3a35bb28f6629a8c84620549fcab8898a551cc07b3a4 SHA512 9e98ea690fd84b435f1b4078c79350a7c0ee6b48560dc500fc9410633a650539c2db16f0526e181700580de0ee8b3044d1219eafc9870cd7e421511159b6d11d WHIRLPOOL 222945223109e9fc6bc2ae1dedeb5e55da4833be688abc14fc884bdd7ed566446d328142b770cebb0438aef52bcc1b48609f45790fc8efdbe36d96b609f9db29`