11 files changed, 78 insertions, 2 deletions
diff --git a/net-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
new file mode 100644
index 00000000..b6e4f9c3
--- /dev/null
+++ b/net-misc/keychain/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for net-misc/keychain
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*keychain-2.7.1-r2 (21 Mar 2015)
+
+  21 Mar 2013; Martin Väth <martin@mvath.de>:
+  Bump from tree to make code POSIX compatible. Remove previous history.
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
new file mode 100644
index 00000000..5f2f36e8
--- /dev/null
+++ b/net-misc/keychain/Manifest
@@ -0,0 +1 @@
+DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f
diff --git a/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
new file mode 100644
index 00000000..399aa854
--- /dev/null
+++ b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch
@@ -0,0 +1,14 @@
+--- keychain
++++ keychain
+@@ -671,6 +673,11 @@ extract_fingerprints() {
+                 #   1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
+                 echo "$ef_line" | cut -f2 -d' '
+                 ;;
++            *\ SHA256:[0-9a-zA-Z\+\/=]*|*\ MD5:[0-9a-zA-Z\+\/=]*)
++                # The new OpenSSH 6.8+ format,
++                # 1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA)
++                echo "$ef_line" | cut -f2 -d' '
++                ;;
+             *)
+                 # Fall back to filename.  Note that commercial ssh is handled
+                 # explicitly in ssh_l and ssh_f, so hopefully this rule will
diff --git a/net-misc/keychain/keychain-2.7.1-r2.ebuild b/net-misc/keychain/keychain-2.7.1-r2.ebuild
new file mode 100644
index 00000000..936db83a
--- /dev/null
+++ b/net-misc/keychain/keychain-2.7.1-r2.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/net-misc/keychain/keychain-2.7.1-r2.ebuild,v 1.1 2015/03/20 09:24:36 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add"
+HOMEPAGE="http://www.funtoo.org/wiki/Keychain"
+SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	virtual/ssh"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-openssh-6.8.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README.rst
+}
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
new file mode 100644
index 00000000..925860e5
--- /dev/null
+++ b/net-misc/keychain/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>drobbins@funtoo.org</email>
+	<name>Daniel Robbins</name>
+	<description>Upstream contact, please CC on bugs</description>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/schedule/ChangeLog b/sys-apps/schedule/ChangeLog
index 274a2239..efa6f290 100644
--- a/sys-apps/schedule/ChangeLog
+++ b/sys-apps/schedule/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*starter-7.0.4 (21 Mar 2015)
+
+  21 Mar 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Fix openrc init
+
 *starter-7.0.3 (17 Mar 2015)
 
   17 Mar 2015; Martin Väth <martin@mvath.de>:
diff --git a/sys-apps/schedule/Manifest b/sys-apps/schedule/Manifest
index c1a33d43..5cab99b8 100644
--- a/sys-apps/schedule/Manifest
+++ b/sys-apps/schedule/Manifest
@@ -1 +1 @@
-DIST schedule-v7.0.3.tar.gz 46163 SHA256 07c1f03458baaf591c2cd987c3d307c0d64b9f6cc97b50c4e5645d1bef6e6d17 SHA512 aa6ba788ec420364d79a6c757fcd131c0fb74c64e38ffac9ccebf523de8d9bf4334efdfb1418da0cbdfc10d2263a6f3ca73543cdb6280f557e04a436dda81e17 WHIRLPOOL 8e00d942d57e8ce25bcecc1c21e9a85b7abda11b642d6f386b03f406cd466efef4ddd4f1bb749e0b34129fea8dff087dbd7ccdecdf10886de5380308cce80e46
+DIST schedule-v7.0.4.tar.gz 46197 SHA256 86091241838f1f2aec77487275ded85f37c9b4eb6b53cdd96f7e769545991491 SHA512 268ea4f505f988b787e3ce0beb1c97521da966e899981f6660570a3be87d0e460d4a0370c29f10137ea0603d280e119f1548da598eab03aeb898dd66fa2fc7f8 WHIRLPOOL 9ed435a4d5a6950c1621cb01e70a7d9a2262246add4b7fafa90ecaf85661ec8b4635c449e68b7dc6544c084c7bdcd21676b464236917d4e93035d4b3a60e496d
diff --git a/sys-apps/schedule/schedule-7.0.3.ebuild b/sys-apps/schedule/schedule-7.0.4.ebuild
index eae817c2..eae817c2 100644
--- a/sys-apps/schedule/schedule-7.0.3.ebuild
+++ b/sys-apps/schedule/schedule-7.0.4.ebuild
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 5aedf5dd..38c5142c 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*noscript-2.6.9.19 (21 Mar 2015)
+
+  21 Mar 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *noscript-2.6.9.18 (15 Mar 2015)
 
   15 Mar 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index a05cc6d9..d4a4c57b 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.9.18.xpi 546339 SHA256 3adc5f5796678fba58f0688e07254b4aa933980e68498cc21b2aabcd1a2d4e90 SHA512 3448c3ff7b2854c0531e4ef67343a31a63b689ded9f531708e96922275ebe33f886ae731544d4fbacd92fb1d92721a4254e8fd03d4c3506761cea0d9b97bb786 WHIRLPOOL 6562dfccfeaade740d375734c8ceb6b42a1629de6322654a22d5639b093251bbb0d81a3521a423d7add53291654aa652dc7eac4c49d7e101a1e7c45b72b47d83
+DIST noscript-2.6.9.19.xpi 546589 SHA256 2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad SHA512 415aa6c378e9b6e2f558ab624bcfc95990ace4368b484afba90fe8a122d204e67bd09944ab0cd39600dcb7dff3c96730813c65e3df08f731e2cd9d14250bc7ec WHIRLPOOL 9fc004d69f2d3ef92f41fe48cd0e04a9f7d257ac10a305a4c4105cd276880bb88c06becdab685de0e6faae3961c5cbf65a3459c863569a365b7ddfc3d3c2a739
diff --git a/www-plugins/noscript/noscript-2.6.9.18.ebuild b/www-plugins/noscript/noscript-2.6.9.19.ebuild
index 82dc8b3b..82dc8b3b 100644
--- a/www-plugins/noscript/noscript-2.6.9.18.ebuild
+++ b/www-plugins/noscript/noscript-2.6.9.19.ebuild