Sync with portage [Tue Apr 14 17:28:31 MSK 2015].

app-accessibility/festival/festival-2.1-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.6 2015/03/02 09:26:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.7 2015/04/13 09:37:01 ago Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -24,7 +24,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="~app-accessibility/speech-tools-2.1

app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.8 2015/03/02 09:26:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.9 2015/04/13 09:36:44 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
 
 RDEPEND="

app-admin/eselect/eselect-1.4.4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.4.ebuild,v 1.10 2015/04/13 08:24:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.4.4.ebuild,v 1.11 2015/04/14 10:50:51 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed

app-admin/localepurge/Manifest

@@ -1,3 +1 @@
-DIST localepurge-0.5.2.tbz2 4729 SHA256 c58083aabbd0892594d74b464b4ac063857d14a5c3173f45b1debb77980f31bc SHA512 e0c98b3498d5a5972a6b72c8cf619e70a3ca150ad77c6147800ef821212e432db9792de252a251e0977c43f001159f93875c7cbbe8e5821763a09abf53c9d1ba WHIRLPOOL a16aff3e2bdc340cfed1efc6a2a03c0987c2d93d170c70e1fd03075aa231721ff0a2b01dad9fa7fe98e24db5cfb746ff0c0ecea7c8486408f1a3f8e437da4c73
-DIST localepurge-0.5.3.3.tbz2 4925 SHA256 55ea160eaea257a45200aa236680204bfc6eeb77235985fc6d0a1fb11392eb4d SHA512 1314503276956e404cab0224d3e5c15b60fd8722a063281459ca149da46c6704757763c1647ff7a28a964cf0f3c80fe633f969712ce85faecf41963d5b0cc03c WHIRLPOOL bdd12825dcea7d184a67a1feb4fe7ee2ffad29c816d82ebe76e5dd9c35e120c42a4cc4d1164137e458b478d9e52b8bebe69826da6b6e7b98190f041e950c2063
 DIST localepurge-0.5.4.tbz2 5038 SHA256 7aca13f6b44af74480c611c0dd63b6fe05c6084bfd3f08bfd347e7914af2ffaa SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e WHIRLPOOL d1da9a6a4d5fca92e7353e6ed0e6b916b8529ad7f003a0af02b2403ceb33bdd71769b3bd1a3c37095167a0e8b3811a5b6774a089f96eedd76edb4ebf46a992d4

app-admin/localepurge/files/localepurge-0.5.3.3-prefix.patch

@@ -1,58 +0,0 @@
---- localepurge
-+++ localepurge
-@@ -1,14 +1,14 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- 
- # Deleting all locale files on system
- # *not* listed in /etc/locale.nopurge
- 
- set -e
- 
--LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale"
--MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
--LOCALELIST="/var/cache/localepurge/localelist"
--CONFIGFILE="/etc/locale.nopurge"
-+LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale"
-+MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
-+LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
-+CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
- VERSION="0.5.3.2"
- 
- LOCALETOTAL=0
-@@ -22,7 +22,7 @@
- BRACKET=$'\e[34;01m'
- BOLD=$'\e[1m'
- 
--ACTION="/bin/rm -vf"
-+ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
- 
- eerror () {
-     echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
-@@ -42,7 +42,7 @@
- print() {
-     for x in $@; do
-         if [ "${x}" = "" ]; then return 0
--	else /bin/echo $x
-+	else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
- 	fi
-     done
- }
-@@ -165,7 +165,7 @@
-             einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
-         fi
- 
--        for LOCALE in `/bin/ls ${LOCALEDIR}`; do
-+        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
-     	    if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
- 	        if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
-                     if [ "${LIST}" = "enabled" ]; then 
-@@ -203,7 +203,7 @@
-             einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
-         fi
- 
--        for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
-+        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
-             if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
-                 if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
-                     if [ "${LIST}" = "enabled" ]; then 

app-admin/localepurge/localepurge-0.5.2.ebuild

@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.2.ebuild,v 1.12 2014/08/10 01:37:39 patrick Exp $
-
-DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages"
-HOMEPAGE="http://www.josealberto.org/blog/index.php?s=localepurge"
-SRC_URI="mirror://gentoo/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:#!/bin/sh:#!/bin/bash:' "${S}/localepurge"
-}
-
-src_install() {
-	insinto /var/cache/localepurge
-	doins defaultlist
-	dosym defaultlist /var/cache/localepurge/localelist
-	insinto /etc
-	doins locale.nopurge
-	dobin localepurge || die
-	doman localepurge.8
-}

app-admin/localepurge/localepurge-0.5.3.3-r1.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.3.3-r1.ebuild,v 1.2 2014/08/10 01:37:39 patrick Exp $
-
-EAPI=4
-
-inherit eutils prefix
-
-DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages"
-HOMEPAGE="http://gentoo.org"
-SRC_URI="mirror://gentoo/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify localepurge
-	sed -i -e 's/0.5.3.2/0.5.3.3/' localepurge || die
-}
-
-src_install() {
-	insinto /var/cache/localepurge
-	doins defaultlist
-	dosym defaultlist /var/cache/localepurge/localelist
-	insinto /etc
-	doins locale.nopurge
-	dobin localepurge
-	doman localepurge.8
-}

app-admin/localepurge/localepurge-0.5.4-r1.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4-r1.ebuild,v 1.12 2014/08/10 01:37:39 patrick Exp $
-
-EAPI=4
-
-inherit eutils prefix
-
-DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages"
-HOMEPAGE="http://gentoo.org
-http://git.overlays.gentoo.org/gitweb/?p=proj/localepurge.git;a=summary"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	# 164544
-	epatch "${FILESDIR}"/${P}-directorysum.patch
-	# 445910
-	epatch "${FILESDIR}"/${P}-parentdir.patch
-	eprefixify ${PN}
-}
-
-src_install() {
-	insinto /var/cache/${PN}
-	doins defaultlist
-	dosym defaultlist /var/cache/${PN}/localelist
-	insinto /etc
-	doins locale.nopurge
-	dobin ${PN}
-	doman ${PN}.8
-}

app-admin/logrotate/logrotate-3.8.9.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.6 2015/04/13 08:30:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9.ebuild,v 1.7 2015/04/14 12:13:43 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl selinux"
 
 CDEPEND="

app-admin/logstash-bin/Manifest

@@ -0,0 +1 @@
+DIST logstash-1.4.2.tar.gz 85619205 SHA256 d5be171af8d4ca966a0c731fc34f5deeee9d7631319e3660d1df99e43c5f8069 SHA512 6bf0527446b51582fa996ae03566487f7d3de2262cf2b88c62ba2549b00027c4cd820547afb01678def235f0c49597c2b36daf69b5f3c5eb155933ca6c2b3b7b WHIRLPOOL 2b533895d85b725733d5468eb450fcc8b98d339c35f6e834a34386898b86cc19bacd2b3eff08f489651553488cf81e02f8a1e1cbaf3f9a355d544fc8e93861de

app-admin/logstash-bin/files/agent.conf.sample

@@ -0,0 +1,21 @@
+input {
+    stdin {
+        type => "stdin"
+    }
+
+    file {
+        type => "syslog"
+        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+    }
+}
+
+output {
+    stdout {
+        codec => rubydebug
+    }
+  
+    elasticsearch {
+        host => localhost
+        cluster => elasticsearch
+    }
+}

app-admin/logstash-bin/files/logstash.confd

@@ -0,0 +1,2 @@
+#LOGSTASH_USER=""
+#LOGSTASH_GROUP=""

app-admin/logstash-bin/files/logstash.initd

@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LOGSTASH_USER=${LOGSTASH_USER:-root}
+LOGSTASH_GROUP=${LOGSTASH_GROUP:-root}
+LOGFILE="/var/log/logstash/logstash.log"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config /etc/logstash/conf.d/*.conf --log ${LOGFILE}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--user=\"${LOGSTASH_USER}\""
+pidfile="/run/logstash/logstash.pid"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${LOGFILE}")"
+	checkpath -f -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m640 "${LOGFILE}"
+}

app-admin/logstash-bin/files/logstash.logrotate

@@ -0,0 +1,6 @@
+/var/log/logstash/*.log {
+        copytruncate
+        compress
+        missingok
+        notifempty
+}

app-admin/logstash-bin/logstash-bin-1.4.2.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logstash-bin/logstash-bin-1.4.2.ebuild,v 1.1 2015/04/14 11:21:06 idella4 Exp $
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="http://www.logstash.net"
+SRC_URI="https://download.elasticsearch.org/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/jre:*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	doins "${FILESDIR}/agent.conf.sample"
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}"
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}/${MY_PN}.logrotate"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  http://www.logstash.net/docs/${PV}/tutorials/getting-started-with-logstash"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}

app-admin/logstash-bin/metadata.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>idella4@gentoo.org</email>
+		<name>Ian Delaney</name>
+        </maintainer>
+        <maintainer>
+                <email>hydrapolic@gmail.com</email>
+                <name>Tomas Mozes</name>
+                <description>Proxy maintainer</description>
+        </maintainer>
+</pkgmetadata>

app-admin/puppet/puppet-3.7.3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.3.ebuild,v 1.5 2015/03/27 10:14:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.3.ebuild,v 1.6 2015/04/14 12:17:13 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~ppc sparc x86"
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 
 ruby_add_rdepend "

app-admin/r10k/Manifest

@@ -1,3 +1 @@
-DIST r10k-1.1.0.gem 23552 SHA256 3b6bb90fd0a767f0f3412b3f940781d3071804118baccacc618da39c4009247d SHA512 7bb33894c582e82c173d4f3e725663b2a6c30824795a1b188ced89719a3184d65c00a0f059e8558f07d97a6728ca293e2949ebc4ca6656b007dcd0b93b76324f WHIRLPOOL 5d517f08541298f2966315e16c3c673c014e9aa4c31c0a9a7488341f4e5e044f6bf08417a063a4985ad2421dfd09eadf4c3746d2bac1200b7b85743bbf432bfe
-DIST r10k-1.1.1.gem 24576 SHA256 ef10b1b3224c314bba02ecaaf368c5de4efbe91d4b5190accbc515da0f054bd8 SHA512 6fb587c94a3fad35a86c900c462e8a6cf56e9d03edefe5c7fc502cbebb2f4414a895d8478a7670072cbe613158f01aede116ce6bf83a22f844201ad0eae435fa WHIRLPOOL 5a684227f3647584a5c75ee886aec28d395cb49bd7cf5851f087ea275a2f7744c572546bafa66d8bfe7366dcb4ea755e5e90ae01796cb5db2237f540a827a2d6
 DIST r10k-1.1.3.gem 30720 SHA256 4b4732046a7478f28668dd3db08ce2527bb45c6da83ec0c604f16d09fce9b91a SHA512 9ddb06c3535c4d5f4f0d8156ddf7671f248283874ef7fab4a2e9d00534e6d165e1b7a32937ecef8043a7fb8ff1143a9dd7bc388f0d7c810de86bc369a22fb502 WHIRLPOOL ea9b3a291cc581c719c2852a0d5f268be2389ed783368a0b20c6dc81b047d5725c60956de3282a353dfefd034a4be2eadaceba1a79ee9c0c16b3afaca3be2ac8

app-admin/r10k/r10k-1.1.0.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.0.ebuild,v 1.3 2013/11/15 16:31:07 vikraman Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="http://github.com/adrienthebo/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+git"
-
-ruby_add_bdepend "test? ( =dev-ruby/rspec-2.14* )"
-
-ruby_add_rdepend "
-	>=dev-ruby/colored-1.2
-	=dev-ruby/cri-2.4*
-	>=dev-ruby/systemu-2.5.2
-	<dev-ruby/systemu-2.6.0
-	>=dev-ruby/log4r-1.1.10
-	dev-ruby/json"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' "${WORKDIR}/all/metadata" || die "metadata fix failed"
-}

app-admin/r10k/r10k-1.1.1.ebuild

@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.1.ebuild,v 1.1 2014/01/04 13:59:00 vikraman Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Puppet environment and module deployment"
-HOMEPAGE="http://github.com/adrienthebo/r10k"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+git"
-
-ruby_add_bdepend "test? ( =dev-ruby/rspec-2.14* )"
-
-ruby_add_rdepend "
-	>=dev-ruby/colored-1.2
-	=dev-ruby/cri-2.4*
-	>=dev-ruby/systemu-2.5.2
-	<dev-ruby/systemu-2.6.0
-	>=dev-ruby/log4r-1.1.10
-	dev-ruby/json"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' "${WORKDIR}/all/metadata" || die "metadata fix failed"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
-	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
-	ewarn
-	ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
-	ewarn "for environments to be prefixed with the source name so that multiple sources"
-	ewarn "installed into the same directory would not overwrite each other. However"
-	ewarn "prefixing was automatically enabled and would break existing setups where"
-	ewarn "multiple sources were cloned into different directories."
-	ewarn
-	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
-	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
-	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
-	ewarn "to enable prefixing on a per-source basis."
-	ewarn
-	ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
-	ewarn "information."
-}

app-admin/r10k/r10k-1.1.3.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3.ebuild,v 1.1 2014/02/05 02:03:28 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3.ebuild,v 1.2 2015/04/13 23:15:21 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""

app-admin/syslog-ng/syslog-ng-3.6.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.12 2015/04/13 08:27:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.13 2015/04/14 10:51:11 ago Exp $
 
 EAPI=5
 inherit eutils multilib systemd versionator
@@ -13,7 +13,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
 RESTRICT="test"
 

app-admin/sysstat/Manifest

@@ -1,3 +1,5 @@
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
 DIST sysstat-11.0.3.tar.xz 291344 SHA256 b59ea4bf1a46a248cc04b575c09dd194a7871cf4c9a8d914cf9f32de8455087c SHA512 db0ad6d67742d45f4d03fd43c213a14a681c546681cdef47a6a4abd261603146b00a6cb4af8f0fc5e3400470d2ab2fd78f977b9ef838b7ee6c4a4dcb88fb4250 WHIRLPOOL 1d0cff47d6631fd64f17e13c978279e64adcb5d5d93143f692eef6964e8e142ed1ba73d69ee4f778e52386dfdf341fb51773a162af88de38a00d19e0a38902b9
+DIST sysstat-11.0.4.tar.xz 293944 SHA256 9a721992e70883c1b9a09d9977501662587b909a014ac0eaa397d30a963acc53 SHA512 99d1015a2216c1a9a4867a2f4874381511f82a82b03b557ba9b32ba096cf1a62a2acfcffa2382ccc4f50be6d047f7fab77a49296875190b1145ceef653df0ef4 WHIRLPOOL 7f374437e5c4a3d9ddaddb3c80ab3641402e4873b4594cef158dc786b2777ce5bc92d7d1de7da677c6585bfbd28ad0f650c4b6847f15369aa054687478ce28c6
 DIST sysstat-11.1.3.tar.xz 304368 SHA256 ddbd07dfac47bcf0a6c2ae503bd80ad84dbed80c939d3dd333eb8453c38c337b SHA512 96581e31ebd2065ca8f767ec2d9ba362cba707996adda0e0d1f81ff5f77a4709f37f91ae6c4d4e480e9ec8ac63b613c2a2e9249b87df5b4c589e4ce9cf4cc1f8 WHIRLPOOL b303bec7ee9183be09c73badf8fa6a8ea604419da7516a2cccefed2853dbfe7b6cacdcbad90c4aa18ebdb4b3032454f380813542497308dd01111b7ef97199b0
+DIST sysstat-11.1.4.tar.xz 309656 SHA256 b5d160bacc57a2e89873dee2ea3382b8811f0036520bf2e5789443797c4be46f SHA512 85e48636d8fe766a19bddbef4735175c43de6e4304ef6b17eb70b11143f8757744c2d17c6c818a938db3c0e904367d9d3313f876ce13ae2bce314d4a18a82d61 WHIRLPOOL 95ce9891c608632b46cfd57c440bdf902ab87d953ea9923af916c40c566e74590458f0fb3ab5c3d9a7bf53364393f623c120de8c1a2d07a468a10473e5b154ee

app-admin/sysstat/sysstat-11.0.4.ebuild

@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.4.ebuild,v 1.1 2015/04/14 04:49:29 jer Exp $
+
+EAPI=5
+inherit eutils multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cron debug +doc isag nls lm_sensors selinux"
+
+CDEPEND="
+	cron? ( sys-process/cronbase )
+	isag? (
+		dev-lang/tk
+		dev-vcs/rcs
+		sci-visualization/gnuplot
+	)
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+src_configure() {
+	tc-export AR
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=Gentoo-does-not-use-rc.d \
+		econf \
+			--enable-copy-only \
+			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+			$(use_enable cron install-cron) \
+			$(use_enable debug debuginfo) \
+			$(use_enable doc documentation ) \
+			$(use_enable isag install-isag) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	use cron && dodir /etc/cron.d
+
+	emake \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		install
+
+	dodoc contrib/sargraph/sargraph
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}

app-admin/sysstat/sysstat-11.1.4.ebuild

@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.4.ebuild,v 1.1 2015/04/14 04:49:29 jer Exp $
+
+EAPI=5
+inherit eutils multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cron debug +doc isag nls lm_sensors selinux"
+
+CDEPEND="
+	cron? ( sys-process/cronbase )
+	isag? (
+		dev-lang/tk
+		dev-vcs/rcs
+		sci-visualization/gnuplot
+	)
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+src_configure() {
+	tc-export AR
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=Gentoo-does-not-use-rc.d \
+		econf \
+			--enable-copy-only \
+			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+			$(use_enable cron install-cron) \
+			$(use_enable debug debuginfo) \
+			$(use_enable doc documentation ) \
+			$(use_enable isag install-isag) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	use cron && dodir /etc/cron.d
+
+	emake \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		install
+
+	dodoc contrib/sargraph/sargraph
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}

app-arch/cabextract/cabextract-1.6.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.6.ebuild,v 1.5 2015/04/09 20:46:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.6.ebuild,v 1.7 2015/04/14 12:32:30 ago Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="extras"
 
 RDEPEND="extras? ( dev-lang/perl )"

app-arch/dpkg/dpkg-1.17.25.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.25.ebuild,v 1.2 2015/04/10 19:54:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.25.ebuild,v 1.4 2015/04/14 12:32:48 ago Exp $
 
 EAPI=5
 inherit eutils multilib autotools toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 
 RDEPEND="

app-arch/lz4/lz4-0_p120.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.9 2014/12/31 19:14:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.11 2015/04/14 12:37:32 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ else
 	MY_PV="r${PV##0_p}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 

app-arch/zip/zip-3.0-r3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-3.0-r3.ebuild,v 1.10 2015/04/13 08:18:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-3.0-r3.ebuild,v 1.11 2015/04/14 10:51:28 ago Exp $
 
 EAPI="4"
 inherit toolchain-funcs eutils flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )

app-crypt/gnupg/files/gnupg-2.1.3-dirmngr-no-ldap.patch

@@ -0,0 +1,246 @@
+From 5cde5bf37339cdeb0bd0a33d39477382eafebede Mon Sep 17 00:00:00 2001
+From: "Neal H. Walfield" <neal@g10code.com>
+Date: Mon, 13 Apr 2015 12:02:40 +0200
+Subject: [PATCH 1/1] dirmngr: If LDAP is not enable, don't build the LDAP
+ bits.
+
+* dirmngr/Makefile.am (dirmngr_SOURCES): Only include
+ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
+is TRUE.
+(module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
+* dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+TRUE.
+(ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
+TRUE.
+(ks_action_search): Likewise.
+(ks_action_get): Likewise.
+(ks_action_put): Likewise.
+* dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+TRUE.
+(cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
+TRUE.
+
+--
+Signed-off-by: Neal H. Walfield <neal@g10code.com>
+GnuPG-bug-id: 1949
+---
+ dirmngr/Makefile.am | 14 ++++++----
+ dirmngr/ks-action.c | 76 ++++++++++++++++++++++++++++++++++++++---------------
+ dirmngr/server.c    | 10 +++++--
+ 3 files changed, 72 insertions(+), 28 deletions(-)
+
+diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
+index a8b1c52..c5713a7 100644
+--- a/dirmngr/Makefile.am
++++ b/dirmngr/Makefile.am
+@@ -62,13 +62,12 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c	\
+ 	cdb.h cdblib.c misc.c dirmngr-err.h  \
+ 	ocsp.c ocsp.h validate.c validate.h  \
+ 	ks-action.c ks-action.h ks-engine.h \
+-        ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
+-	ks-engine-ldap.c \
+-	ldap-parse-uri.c ldap-parse-uri.h
++	ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c
+ 
+ if USE_LDAP
+ dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
+-                   ldap-wrapper.h $(ldap_url) $(extraldap_src)
++                   ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
++                   ks-engine-ldap.c $(ldap_url) $(extraldap_src)
+ ldaplibs = $(LDAPLIBS)
+ else
+ ldaplibs =
+@@ -114,7 +113,12 @@ t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \
+                  $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+                  $(DNSLIBS) $(LIBINTL) $(LIBICONV)
+ 
+-module_tests = t-ldap-parse-uri
++module_tests =
++
++if USE_LDAP
++module_tests += t-ldap-parse-uri
++endif
++
+ t_ldap_parse_uri_SOURCES = \
+ 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
+         $(ldap_url) $(t_common_src)
+diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
+index c76aaaa..dd4516a 100644
+--- a/dirmngr/ks-action.c
++++ b/dirmngr/ks-action.c
+@@ -30,7 +30,9 @@
+ #include "misc.h"
+ #include "ks-engine.h"
+ #include "ks-action.h"
+-#include "ldap-parse-uri.h"
++#if USE_LDAP
++# include "ldap-parse-uri.h"
++#endif
+ 
+ /* Called by the engine's help functions to print the actual help.  */
+ gpg_error_t
+@@ -73,10 +75,14 @@ ks_action_help (ctrl_t ctrl, const char *url)
+     }
+   else
+     {
++#if USE_LDAP
+       if (ldap_uri_p (url))
+ 	err = ldap_parse_uri (&parsed_uri, url);
+       else
+-	err = http_parse_uri (&parsed_uri, url, 1);
++#endif
++	{
++	  err = http_parse_uri (&parsed_uri, url, 1);
++	}
+ 
+       if (err)
+         return err;
+@@ -90,8 +96,10 @@ ks_action_help (ctrl_t ctrl, const char *url)
+     err = ks_finger_help (ctrl, parsed_uri);
+   if (!err)
+     err = ks_kdns_help (ctrl, parsed_uri);
++#if USE_LDAP
+   if (!err)
+     err = ks_ldap_help (ctrl, parsed_uri);
++#endif
+ 
+   if (!parsed_uri)
+     ks_print_help (ctrl,
+@@ -151,16 +159,23 @@ ks_action_search (ctrl_t ctrl, uri_item_t keyservers,
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+-	  if (is_http)
+-	    err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
+-	  else if (is_ldap)
++#if USE_LDAP
++	  if (is_ldap)
+ 	    err = ks_ldap_search (ctrl, uri->parsed_uri, patterns->d, &infp);
++	  else
++#endif
++	    {
++	      err = ks_hkp_search (ctrl, uri->parsed_uri, patterns->d, &infp);
++	    }
+ 
+           if (!err)
+             {
+@@ -203,18 +218,27 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
++
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+           for (sl = patterns; !err && sl; sl = sl->next)
+             {
+-	      if (is_http)
+-		err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
+-	      else
++#if USE_LDAP
++	      if (is_ldap)
+ 		err = ks_ldap_get (ctrl, uri->parsed_uri, sl->d, &infp);
++	      else
++#endif
++		{
++	          err = ks_hkp_get (ctrl, uri->parsed_uri, sl->d, &infp);
++	        }
+ 
+               if (err)
+                 {
+@@ -322,22 +346,32 @@ ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
+   int any_server = 0;
+   uri_item_t uri;
+ 
++  (void) info;
++  (void) infolen;
++
+   for (uri = keyservers; !err && uri; uri = uri->next)
+     {
+       int is_http = uri->parsed_uri->is_http;
+-      int is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
+-		     || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++      int is_ldap = 0;
++
++#if USE_LDAP
++      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
++		|| strcmp (uri->parsed_uri->scheme, "ldaps") == 0
++		|| strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
++#endif
+ 
+       if (is_http || is_ldap)
+         {
+           any_server = 1;
+-	  if (is_http)
+-	    err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
+-	  else
++#if USE_LDAP
++	  if (is_ldap)
+ 	    err = ks_ldap_put (ctrl, uri->parsed_uri, data, datalen,
+ 			       info, infolen);
+-
++	  else
++#endif
++	    {
++	      err = ks_hkp_put (ctrl, uri->parsed_uri, data, datalen);
++	    }
+           if (err)
+             {
+               first_err = err;
+diff --git a/dirmngr/server.c b/dirmngr/server.c
+index 506b137..3e6d99d 100644
+--- a/dirmngr/server.c
++++ b/dirmngr/server.c
+@@ -48,7 +48,9 @@
+ #endif
+ #include "ks-action.h"
+ #include "ks-engine.h"  /* (ks_hkp_print_hosttable) */
+-#include "ldap-parse-uri.h"
++#if USE_LDAP
++# include "ldap-parse-uri.h"
++#endif
+ 
+ /* To avoid DoS attacks we limit the size of a certificate to
+    something reasonable. */
+@@ -1530,10 +1532,14 @@ cmd_keyserver (assuan_context_t ctx, char *line)
+       item->parsed_uri = NULL;
+       strcpy (item->uri, line);
+ 
++#if USE_LDAP
+       if (ldap_uri_p (item->uri))
+ 	err = ldap_parse_uri (&item->parsed_uri, line);
+       else
+-	err = http_parse_uri (&item->parsed_uri, line, 1);
++#endif
++	{
++	  err = http_parse_uri (&item->parsed_uri, line, 1);
++	}
+       if (err)
+         {
+           xfree (item);
+-- 
+2.1.4
+

app-crypt/gnupg/files/gnupg-2.1.3-gpg-fix-null-segv.patch

@@ -0,0 +1,73 @@
+From 25fce93ba19d997e234a674d5cc98df82c5b5496 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Mon, 13 Apr 2015 11:44:10 +0200
+Subject: [PATCH] gpg: Fix NULL-segv due to invalid imported data.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+* g10/free-packet.c (my_mpi_copy): New.
+(copy_public_key, copy_signature): Use instead of mpi_copy.
+--
+
+Reported-by: Hanno Böck
+Signed-off-by: Werner Koch <wk@gnupg.org>
+---
+ g10/free-packet.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/g10/free-packet.c b/g10/free-packet.c
+index 99e7404..49d54f4 100644
+--- a/g10/free-packet.c
++++ b/g10/free-packet.c
+@@ -31,6 +31,20 @@
+ #include "options.h"
+ 
+ 
++/* This is mpi_copy with a fix for opaque MPIs which store a NULL
++   pointer.  This will also be fixed in Libggcrypt 1.7.0.  */
++static gcry_mpi_t
++my_mpi_copy (gcry_mpi_t a)
++{
++  if (a
++      && gcry_mpi_get_flag (a, GCRYMPI_FLAG_OPAQUE)
++      && !gcry_mpi_get_opaque (a, NULL))
++    return NULL;
++
++  return gcry_mpi_copy (a);
++}
++
++
+ void
+ free_symkey_enc( PKT_symkey_enc *enc )
+ {
+@@ -190,11 +204,11 @@ copy_public_key (PKT_public_key *d, PKT_public_key *s)
+   n = pubkey_get_npkey (s->pubkey_algo);
+   i = 0;
+   if (!n)
+-    d->pkey[i++] = mpi_copy (s->pkey[0]);
++    d->pkey[i++] = my_mpi_copy (s->pkey[0]);
+   else
+     {
+       for (; i < n; i++ )
+-        d->pkey[i] = mpi_copy( s->pkey[i] );
++        d->pkey[i] = my_mpi_copy (s->pkey[i]);
+     }
+   for (; i < PUBKEY_MAX_NSKEY; i++)
+     d->pkey[i] = NULL;
+@@ -237,10 +251,10 @@ copy_signature( PKT_signature *d, PKT_signature *s )
+     memcpy( d, s, sizeof *d );
+     n = pubkey_get_nsig( s->pubkey_algo );
+     if( !n )
+-	d->data[0] = mpi_copy(s->data[0]);
++	d->data[0] = my_mpi_copy(s->data[0]);
+     else {
+ 	for(i=0; i < n; i++ )
+-	    d->data[i] = mpi_copy( s->data[i] );
++	    d->data[i] = my_mpi_copy( s->data[i] );
+     }
+     d->pka_info = s->pka_info? cp_pka_info (s->pka_info) : NULL;
+     d->hashed = cp_subpktarea (s->hashed);
+-- 
+2.1.4
+

app-crypt/gnupg/gnupg-2.1.3.ebuild → app-crypt/gnupg/gnupg-2.1.3-r1.ebuild

@@ -1,19 +1,19 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3.ebuild,v 1.2 2015/04/12 14:50:03 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r1.ebuild,v 1.3 2015/04/14 12:23:52 zlogene Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="http://www.gnupg.org/"
 MY_P="${P/_/-}"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa"
 IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
@@ -61,7 +61,10 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
 	epatch "${FILESDIR}/${P}-dirmngr-Fix-segfault-in-ldap-engine.patch"
+	epatch "${FILESDIR}/${P}-dirmngr-no-ldap.patch"
+	epatch "${FILESDIR}/${P}-gpg-fix-null-segv.patch"
 	epatch_user
+	eautoreconf
 }
 
 src_configure() {

app-crypt/libu2f-host/Manifest

@@ -1,2 +1,2 @@
-DIST libu2f-host-0.0.1.tar.xz 444056 SHA256 ae126dce04ac9af048eb36770471f3bac26c3b31f07e25efc9a94627e0da0fb3 SHA512 3461d54460513ce3fba02d7789eeadd1c45ea9b2989552bf0b69dd4a3a9f01a08150eca74b84073e45200b340d6ad38064fa63dc91820ae5b1235212132383f6 WHIRLPOOL 6c1bc60f6ac4723a456e7b6ae8e8eb81dd50ce343dc45fe249b80b99c8a28192ab5ce69a4864b6aeb8d40373c395e37b720288ab97cb49acfee02734d77031df
 DIST libu2f-host-0.0.2.tar.xz 444176 SHA256 c9e5478f5d139c30603afe65ea7ef52b0b18c93df60103b1dafeb7f3d17acbd8 SHA512 1b10a5c8d3d071b0d5576a2247b2cc40327fe6fe7370a7680cede7ebda72bd7f0edfa1661b78074a85654a5d979f757c64c090360c69feddb9c3212dc0438deb WHIRLPOOL f8cc5d7524c8ed7943945af44e5b93b43463118b06b186460090df3c69871319e0a347c94a28467b782eb09e2653ef72ab98478d8acf720b86b807223b1ee0b1
+DIST libu2f-host-0.0.4.tar.xz 446604 SHA256 852231611bd5c526406b984ae3c92ce3423ffc7a0ef01f6a060a43b64725ead6 SHA512 09406f45bea4cbca2fd26a4ad546b2233f56e1df098976cbd24dcab08e27bf9131fdc52557b4c701b8ce27b0ece7b405e8cda889591a5e3dc9420611336d1060 WHIRLPOOL 84ac2c5e4170ff45ecb9595c73dabd6a34f79bdcf4ef9bf3ceb32c481febe0537e3ab129fcd7a63c73389b3dbc0742834574b739ed36c419b6bc84b5c01a4d5b

app-crypt/libu2f-host/libu2f-host-0.0.1-r2.ebuild → app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/libu2f-host-0.0.1-r2.ebuild,v 1.1 2014/11/10 17:01:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libu2f-host/libu2f-host-0.0.4.ebuild,v 1.1 2015/04/14 06:50:07 jlec Exp $
 
 EAPI=5
 
@@ -10,12 +10,13 @@ DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
 HOMEPAGE="https://developers.yubico.com/libu2f-host/"
 SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="kernel_linux static-libs systemd"
 
-RDEPEND="dev-libs/hidapi
+RDEPEND="
+	dev-libs/hidapi
 	dev-libs/json-c"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

app-crypt/libykneomgr/Manifest

@@ -1 +1,2 @@
 DIST libykneomgr-0.1.6.tar.gz 633881 SHA256 7c0ddf2b5397e2d335da5d727c55d0be6a9ab43263c60edcac1ffe45b526ca95 SHA512 deb8deafa3c748bb888309d9d2d62f3657cd6d9d103ceee738abbc47a8e4466535e9641f104f5628657ec8924306b8d9d0a90cd2485dd5ad46dd2d8ee932fab4 WHIRLPOOL 3c9f1c53e411633b74b56eb991155a3ffbe2453a336b10b00a3e69a55f4c30b4df4ddfb50a7252ea058a76211d0683d029428bb24c839586b0277bde7297c582
+DIST libykneomgr-0.1.7.tar.gz 625509 SHA256 dcce20274976e29b63380633928e1e75e05544430fca37082465c9075ea29f5a SHA512 b97d0de0050a4dea55963403a8710fe94dbef05041ec4fc42c4f2e7fc7ebd64b94aeb8d8c0231ad7828840efff28e6bd5b392b25d6bcafbeaab469a6e52e5163 WHIRLPOOL 6af69069963859580fa03fd41e794d01895aaaefae3b87ae8a60575dfb82648eea5efb5970ac95608112969a174dbd75a7a2c8dade4c8ebffbed866ca6506fb6

app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libykneomgr/libykneomgr-0.1.7.ebuild,v 1.1 2015/04/14 06:51:50 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils udev
+
+DESCRIPTION="YubiKey NEO CCID Manager C Library"
+HOMEPAGE="https://developers.yubico.com/libykneomgr/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux"
+
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/libzip"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.18[usb]"
+
+src_configure() {
+	local myeconfargs=(
+		--with-backend=pcsc
+		--disable-static
+	)
+
+	autotools-utils_src_configure
+}

app-crypt/yubikey-neo-manager/Manifest

@@ -1,3 +1,2 @@
-DIST yubikey-neo-manager-0.2.5.tar.gz 122736 SHA256 598de24ce832699c9ed271b7a118b43c3ab588620959c61ee317d74ad79c8840 SHA512 9ca271a97b661b48756bf3137f5b58fa45b83959b9e80e03b0e290b2f0f43ad76b30a8f501b44da61291a08350fea5c516faca9c703b480bf9c99478ba1c49f5 WHIRLPOOL 5af53d03b98a634d7c2fb6786634b9a7d07ca29fdc7f64100f9ca8e38ff262830d1d44b59d099e92b445c299fca0072e7ba2ce8e52791044212812d36f0ad92a
-DIST yubikey-neo-manager-1.0.0.tar.gz 118491 SHA256 1a3ef09d5023528ce1fd0634b5923397250869b752d8c98ee020b1a89dd9b749 SHA512 adfc1003665fb17056507a9f4dbba92e2d3330f622fb4f638d992730bc3ff57f974f75b07a3a52f3365df4467628c9339d4e07d1bd9a0b6910d05078dc49f28c WHIRLPOOL a238e97bbf031fe56a1962bdcac6d7fbd9388955a87bb35dd17fabdbf1c904d4bba00986bee1cca00a023c7298e7ef2cfa45b66180eada9b09d26aef199eb0b8
 DIST yubikey-neo-manager-1.1.0.tar.gz 119986 SHA256 eb8cc90bf4818feffe360d6330ebafa47452a1ce9c14900e13fcdd4cb921c837 SHA512 ee1bff88946be85cd3127a92deceb826b8bd35da76d3356993e1a369cb9119d6267a708a0023afeb185adcb1e4cdbaaa1c8983fd0cac32c51a4ece81840e8553 WHIRLPOOL a7123760c51333af30343b5dcff56398754aa4c214afdba75473d7555983aff9988d1ba0db5c12314170b0a810ed5d609cd3736258101198ab3b417133cd9957
+DIST yubikey-neo-manager-1.2.1.tar.gz 120802 SHA256 b09e59576dd6cb664966e4848854f728b8162ae74d35f87825d9a8bff07f018a SHA512 37b4807419803bb303b88b185293b49d5475c51d564614636ca1ead0c06efdb0ec867dac8de8b0030ab1ea85a726676bb63abdcc352428cb5a18068556a3b1b8 WHIRLPOOL e4a4e32d2d94dae0cf02abaff4bc9c2d281bc6bdf21d9dea76c2d6c05052a6a6bffc2955ee912bc5adb6ae070af3b10216691bfd9764b6895df7a3dedadb780b

app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5-r1.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-0.2.5-r1.ebuild,v 1.1 2014/11/10 17:47:10 flameeyes Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}

app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild,v 1.1 2014/12/26 13:26:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild,v 1.2 2015/04/14 07:05:05 jlec Exp $
 
 EAPI=5
 
@@ -34,6 +34,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( NEWS README )
 
+python_test() {
+	nosetests || die
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 

app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.0.0.ebuild → app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.0.0.ebuild,v 1.1 2014/11/20 07:38:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1.ebuild,v 1.1 2015/04/14 07:05:05 jlec Exp $
 
 EAPI=5
 
@@ -34,6 +34,10 @@ RDEPEND="${CDEPEND}"
 
 DOCS=( NEWS README )
 
+python_test() {
+	nosetests || die
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 

app-editors/emacs/emacs-23.4-r13.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r13.ebuild,v 1.9 2015/04/13 08:38:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r13.ebuild,v 1.10 2015/04/14 10:51:55 ago Exp $
 
 EAPI=5
 WANT_AUTOMAKE="none"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 

app-editors/emacs/emacs-24.4-r4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r4.ebuild,v 1.9 2015/04/13 08:38:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r4.ebuild,v 1.10 2015/04/14 10:51:55 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 

app-editors/mg/mg-20141127.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20141127.ebuild,v 1.6 2015/03/02 09:32:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20141127.ebuild,v 1.7 2015/04/13 09:40:50 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses

app-emacs/bison-mode/Manifest

@@ -0,0 +1 @@
+DIST bison-mode-0.3.tar.bz2 7541 SHA256 ad29b3f71d1d52a36a22271aa314eb986e3406706c34bfb5eca11161dd5adbee SHA512 b3b173152700562f813534d9352ed50cfac8ad131f037b1e2bf9d1370f0b56f109f14206cbfde82acac0c93a1bc0092da7f78c1b42fc3154248dfb1222a7f85b WHIRLPOOL 563b9def2187fdae93220a30d0e536eeb504b0f3706454a1c49074846ddb4c485c181ef0b3503e14d2c18c3553ef77b310b7fe5fcba3fdf860efc41f77e3f4f6

app-emacs/bison-mode/bison-mode-0.3.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bison-mode/bison-mode-0.3.ebuild,v 1.2 2015/04/13 19:32:43 nicolasbock Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for Bison, Yacc and Lex grammars"
+HOMEPAGE="https://github.com/Wilfred/bison-mode"
+SRC_URI="http://dev.gentoo.org/~nicolasbock/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"

app-emacs/bison-mode/files/50bison-mode-gentoo.el

@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bison-mode "bison-mode"
+  "Emacs major mode for Bison, Yacc and Lex grammars" t)

app-emacs/bison-mode/metadata.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>

app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.8 2015/04/13 08:38:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.9 2015/04/14 10:51:58 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"

app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild,v 1.9 2015/04/13 08:24:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild,v 1.10 2015/04/14 10:50:54 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"

app-emulation/lxc/lxc-1.1.1-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.1-r1.ebuild,v 1.2 2015/04/08 07:30:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.1-r1.ebuild,v 1.3 2015/04/14 10:15:37 dlan Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 LICENSE="LGPL-3"
 SLOT="0"

app-emulation/virt-manager/virt-manager-9999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.27 2015/04/13 07:46:19 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.28 2015/04/13 12:33:05 tamiko Exp $
 
 EAPI=5
 
@@ -40,6 +40,7 @@ RDEPEND="!app-emulation/virtinst
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+		net-misc/x11-ssh-askpass
 		x11-libs/vte:2.90[introspection]
 		gnome-keyring? ( dev-python/gnome-keyring-python )
 		policykit? ( sys-auth/polkit[introspection] )
@@ -52,6 +53,8 @@ DEPEND="${RDEPEND}
 DOCS=( README NEWS )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.0-optional_avahi.patch
+
 	distutils-r1_src_prepare
 }
 

app-misc/boxes/boxes-1.1.2-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.3 2015/04/13 08:55:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.2-r1.ebuild,v 1.4 2015/04/14 10:52:15 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="

app-misc/gentoo/gentoo-0.20.6.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.6.ebuild,v 1.2 2015/04/09 05:27:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.6.ebuild,v 1.4 2015/04/14 12:15:02 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
 RDEPEND="

app-office/lyx/lyx-2.1.3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.5 2015/04/13 08:33:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.6 2015/04/14 11:00:53 ago Exp $