3 files changed, 7 insertions, 57 deletions
diff --git a/net-misc/ksshaskpass/ChangeLog b/net-misc/ksshaskpass/ChangeLog
index 993afd86eb6e..20ea8638dd2d 100644
--- a/net-misc/ksshaskpass/ChangeLog
+++ b/net-misc/ksshaskpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ksshaskpass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksshaskpass/ChangeLog,v 1.3 2014/03/21 21:34:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksshaskpass/ChangeLog,v 1.4 2014/04/25 21:18:46 johu Exp $
+
+  25 Apr 2014; Johannes Huber <johu@gentoo.org> -ksshaskpass-0.5.3.ebuild,
+  ksshaskpass-0.5.3-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *ksshaskpass-0.5.3-r1 (21 Mar 2014)
 
diff --git a/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild b/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild
index f65c16f93f7d..eaca68f40032 100644
--- a/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild
+++ b/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild,v 1.1 2014/03/21 21:34:45 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksshaskpass/ksshaskpass-0.5.3-r1.ebuild,v 1.2 2014/04/25 21:18:46 johu Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde-apps.org/content/show.php?content=50971&forumpage=0"
 SRC_URI="http://www.kde-apps.org/CONTENT/content-files/50971-${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild b/net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild
deleted file mode 100644
index 1ec804e19117..000000000000
--- a/net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild,v 1.2 2011/05/13 09:44:18 scarabeus Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration."
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=50971&forumpage=0"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/50971-${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug"
-
-RDEPEND="net-misc/openssh"
-
-CFG="ksshaskpass.sh"
-
-src_prepare() {
-	STARTUPDIR=/etc/kde/startup
-	SHUTDOWNDIR=/etc/kde/shutdown
-
-	kde4-base_src_prepare
-}
-
-src_install() {
-	kde4-base_src_install
-
-	cat <<-EOF > "${T}/${CFG}"
-export SSH_ASKPASS="${PREFIX}/bin/ksshaskpass"
-EOF
-	insinto "${STARTUPDIR}"
-	doins "${T}/${CFG}"
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	elog
-	elog "In order to have ksshagent start at kde startup,"
-	elog "edit ${STARTUPDIR}/agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in ${SHUTDOWNDIR}/agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${P} has been installed as your default askpass application in KDE4 session."
-	elog "If it's not desired, point the one you want to use in ${STARTUPDIR}/${CFG}"
-	elog
-}