old

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 6 insertions, 330 deletions

diff --git a/app-admin/eselect-pinentry/ChangeLog b/app-admin/eselect-pinentry/ChangeLog
index d4c3cee53b01..19895e41eb48 100644
--- a/app-admin/eselect-pinentry/ChangeLog
+++ b/app-admin/eselect-pinentry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-pinentry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/ChangeLog,v 1.4 2012/05/09 16:44:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/ChangeLog,v 1.5 2012/06/17 15:28:42 ssuominen Exp $
+
+  17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -eselect-pinentry-0.1.ebuild, -eselect-pinentry-0.2.ebuild,
+  -files/eselect-pinentry-0.1, -files/eselect-pinentry-0.2:
+  old
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org>
   eselect-pinentry-0.3.ebuild:
diff --git a/app-admin/eselect-pinentry/eselect-pinentry-0.1.ebuild b/app-admin/eselect-pinentry/eselect-pinentry-0.1.ebuild
deleted file mode 100644
index 06ef479d1d3b..000000000000
--- a/app-admin/eselect-pinentry/eselect-pinentry-0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/eselect-pinentry-0.1.ebuild,v 1.2 2010/09/30 13:57:41 ssuominen Exp $
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect
-	!<app-crypt/pinentry-0.8.0-r1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/${P} pinentry.eselect || die
-}
diff --git a/app-admin/eselect-pinentry/eselect-pinentry-0.2.ebuild b/app-admin/eselect-pinentry/eselect-pinentry-0.2.ebuild
deleted file mode 100644
index a87387d859b5..000000000000
--- a/app-admin/eselect-pinentry/eselect-pinentry-0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/eselect-pinentry-0.2.ebuild,v 1.1 2010/09/30 19:54:41 ssuominen Exp $
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect
-	!<app-crypt/pinentry-0.8.0-r1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/${P} pinentry.eselect || die
-}
diff --git a/app-admin/eselect-pinentry/files/eselect-pinentry-0.1 b/app-admin/eselect-pinentry/files/eselect-pinentry-0.1
deleted file mode 100644
index 7657ef0d2f0e..000000000000
--- a/app-admin/eselect-pinentry/files/eselect-pinentry-0.1
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: eselect-pinentry-0.1,v 1.2 2010/09/30 14:08:50 ssuominen Exp $
-
-# Based on eselect-sh by Michał Górny
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.1"
-
-## Functions ##
-
-# find a list of pinentry symlink targets, best first
-find_targets() {
-	local t
-	for t in \
-			pinentry-qt \
-			pinentry-gtk-2 \
-			pinentry-qt4 \
-			pinentry-curses \
-		; do
-		if [[ -x ${ROOT}/usr/bin/${t} ]]; then
-			echo ${t}
-		fi
-	done
-}
-
-# set the pinentry symlink
-set_symlinks() {
-	local target="${1}" targets
-
-	[[ ! -L ${ROOT}/usr/bin/pinentry && -e ${ROOT}/usr/bin/pinentry ]] && \
-		die -q "/usr/bin/pinentry is not a symlink!"
-
-	if is_number "${target}" && [[ ${target} -ge 1 ]]; then
-		targets=( $(find_targets) )
-		target=${targets[target-1]}
-	fi
-
-	if [[ -x ${ROOT}/usr/bin/${target} ]]; then
-		local tmpf="${ROOT}"/usr/bin/pinentry.new
-		# we could use 'ln -f' to directly replace the symlink
-		# but 'mv' is an atomic operation so it should be more fault-proof
-
-		ln -s "${target}" "${tmpf}" || \
-			die -q "Unable to create temporary symlink"
-		if ! mv "${tmpf}" "${ROOT}"/usr/bin/pinentry; then
-			rm -f "${tmpf}" # cleanup
-			die -q "Unable to replace /usr/bin/pinentry symlink with ${target}"
-		fi
-	else
-		die -q "Target '${target}' doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current pinentry implementation"
-}
-
-do_show() {
-	[[ -z ${@} ]] || die -q "Too many parameters"
-
-	write_list_start "Current pinentry implementation:"
-	if [[ -L ${ROOT}/usr/bin/pinentry ]]; then
-		write_kv_list_entry "$(basename $(readlink ${ROOT}/usr/bin/pinentry))" ""
-	elif [[ -e ${ROOT}/usr/bin/pinentry ]]; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available pinentry implementations"
-}
-
-do_list() {
-	[[ -z ${@} ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )) ; do
-			[[ ${targets[${i}]} == $(basename $(readlink ${ROOT}/usr/bin/pinentry)) ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-		done
-		write_list_start "Available pinentry implementations:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new pinentry implementation"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z ${1} ]]; then
-		die -q "Not enough parameters"
-	elif [[ -n ${2} ]]; then
-		die -q "Too many parameters"
-	else
-		set_symlinks "${1}"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the pinentry implementation"
-}
-
-describe_update_options() {
-	echo "ifunset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z ${1} || ( -z ${2} && ( ${1} == ifunset || ${1} == '--if-unset' ) ) ]] || \
-		die -q "Usage error"
-
-	[[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -L ${ROOT}/usr/bin/pinentry && -x ${ROOT}/usr/bin/pinentry ]] && \
-		return
-
-	set_symlinks 1
-}
diff --git a/app-admin/eselect-pinentry/files/eselect-pinentry-0.2 b/app-admin/eselect-pinentry/files/eselect-pinentry-0.2
deleted file mode 100644
index d57caa8dd5b9..000000000000
--- a/app-admin/eselect-pinentry/files/eselect-pinentry-0.2
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: eselect-pinentry-0.2,v 1.2 2010/09/30 20:09:22 ssuominen Exp $
-
-# Based on eselect-sh by Michał Górny
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.2"
-
-## Functions ##
-
-# find a list of pinentry symlink targets, best first
-find_targets() {
-	local t
-	for t in \
-			pinentry-qt \
-			pinentry-gtk-2 \
-			pinentry-qt4 \
-			pinentry-curses \
-		; do
-		if [[ -x ${ROOT}/usr/bin/${t} ]]; then
-			echo ${t}
-		fi
-	done
-}
-
-# set the pinentry symlink
-set_symlinks() {
-	local target="${1}" targets
-
-	[[ ! -L ${ROOT}/usr/bin/pinentry && -e ${ROOT}/usr/bin/pinentry ]] && \
-		die -q "/usr/bin/pinentry is not a symlink!"
-
-	if is_number "${target}" && [[ ${target} -ge 1 ]]; then
-		targets=( $(find_targets) )
-
-		# If no targets are found, remove the symlink and exit
-		if [[ -L ${ROOT}/usr/bin/pinentry && -z ${targets} ]]; then
-			rm -f "${ROOT}"/usr/bin/pinentry
-			return
-		fi
-
-		target=${targets[target-1]}
-	fi
-
-	if [[ -x ${ROOT}/usr/bin/${target} ]]; then
-		local tmpf="${ROOT}"/usr/bin/pinentry.new
-		# we could use 'ln -f' to directly replace the symlink
-		# but 'mv' is an atomic operation so it should be more fault-proof
-
-		ln -s "${target}" "${tmpf}" || \
-			die -q "Unable to create temporary symlink"
-		if ! mv "${tmpf}" "${ROOT}"/usr/bin/pinentry; then
-			rm -f "${tmpf}" # cleanup
-			die -q "Unable to replace /usr/bin/pinentry symlink with ${target}"
-		fi
-	else
-		die -q "Target '${target}' doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current pinentry implementation"
-}
-
-do_show() {
-	[[ -z ${@} ]] || die -q "Too many parameters"
-
-	write_list_start "Current pinentry implementation:"
-	if [[ -L ${ROOT}/usr/bin/pinentry ]]; then
-		write_kv_list_entry "$(basename $(readlink ${ROOT}/usr/bin/pinentry))" ""
-	elif [[ -e ${ROOT}/usr/bin/pinentry ]]; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available pinentry implementations"
-}
-
-do_list() {
-	[[ -z ${@} ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )) ; do
-			[[ ${targets[${i}]} == $(basename $(readlink ${ROOT}/usr/bin/pinentry)) ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-		done
-		write_list_start "Available pinentry implementations:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new pinentry implementation"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z ${1} ]]; then
-		die -q "Not enough parameters"
-	elif [[ -n ${2} ]]; then
-		die -q "Too many parameters"
-	else
-		set_symlinks "${1}"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the pinentry implementation"
-}
-
-describe_update_options() {
-	echo "ifunset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z ${1} || ( -z ${2} && ( ${1} == ifunset || ${1} == '--if-unset' ) ) ]] || \
-		die -q "Usage error"
-
-	[[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -L ${ROOT}/usr/bin/pinentry && -x ${ROOT}/usr/bin/pinentry ]] && \
-		return
-
-	set_symlinks 1
-}