[gentoo-commits] proj/eselect:master commit in: modules/, man/, /

[gentoo-commits] proj/eselect:master commit in: modules/, man/, /

[Ulrich Müller]

commit:     f02e79a6a472127604dcf9e71a8fd6599b775a82
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 08:22:01 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 08:22:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=f02e79a6

Remove binutils module.

* modules/binutils.eselect:
* man/binutils.eselect.5: Module removed. This has been converted
to a wrapper and moved to the binutils-config package, bug 507870.
* modules/Makefile.am (modules_DATA):
* man/Makefile.am (man_MANS): Update accordingly.

 AUTHORS                  |   2 +-
 ChangeLog                |   8 ++
 man/Makefile.am          |   1 -
 man/binutils.eselect.5   |  75 --------------
 modules/Makefile.am      |   1 -
 modules/binutils.eselect | 261 -----------------------------------------------
 6 files changed, 9 insertions(+), 339 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5246168..5eea181 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ Ciaran McCreesh <ciaranm@gentoo.org>
 
 Danny van Dyk <kugelfang@gentoo.org>
     Manpages
-    Modules:    binutils, env, rc
+    Modules:    env, rc
     Libraries:  config, multilib
 
 Aaron Walker <ka0ttic@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 9fa727f..4f43078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-13  Ulrich Müller  <ulm@gentoo.org>
+
+	* modules/binutils.eselect:
+	* man/binutils.eselect.5: Module removed. This has been converted
+	to a wrapper and moved to the binutils-config package, bug 507870.
+	* modules/Makefile.am (modules_DATA):
+	* man/Makefile.am (man_MANS): Update accordingly.
+
 2015-01-24  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.4.4.

diff --git a/man/Makefile.am b/man/Makefile.am
index c4bbdce..1bcce0a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
 man_MANS = \
 	eselect.1 \
-	binutils.eselect.5 \
 	editor.eselect.5 \
 	env.eselect.5 \
 	kernel.eselect.5 \

diff --git a/man/binutils.eselect.5 b/man/binutils.eselect.5
deleted file mode 100644
index e5c1f7b..0000000
--- a/man/binutils.eselect.5
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright 2005-2015 Gentoo Foundation
-.\" Distributed under the terms of the GNU GPL version 2 or later
-.\"
-.TH binutils.eselect 5 "April 2009" "Gentoo Linux" eselect
-.SH NAME
-binutils.eselect \- The binutils management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect binutils
-.RB [ help | usage | version ]
-.br
-.B eselect binutils list
-.br
-.B eselect binutils set
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect binutils list
-.RI [ patterns ]
-.br
-List all installed version of binutils.  If
-.I patterns
-are given, only versions that match the patterns will be listed.
-
-# eselect binutils list powerpc*
-.br
-Installed binutils for target powerpc\-unknown\-linux\-gnu
-  [1]   2.15.92.0.2 *
-.br
-# eselect binutils list
-.br
-Installed binutils for target powerpc\-unknown\-linux\-gnu
-  [1]   2.15.92.0.2 *
-.br
-Installed binutils for target x86_64\-pc\-linux\-gnu
-  [2]   2.15.92.0.2
-  [3]   2.16
-  [4]   2.16.1 *
-.SH ACTION: SET
-.B eselect binutils set
-.I selection
-.br
-Activate the selected version of binutils.
-.I selection
-can be either an identification number given by
-.B eselect binutils list
-or a pattern that uniquely describes one installed version.
-
-# eselect binutils set x86_64*2.16.1
-.br
-Switching to x86_64\-pc\-linux\-gnu\-2.16.1...
-.br
-Regenerating /etc/ld.so.cache...
-.br
-Please remember to run:
-
-  # source /etc/profile
-
-in order to let changes take effect!
-.SH ACTION: SHOW
-.B eselect binutils show
-.RI [ target ]
-.br
-Print the currently activated binutils version for the given target.
-If no target is supplied then the CHOST environment variable is used
-to evaluate the native target.
-
-# eselect binutils show
-.br
-x86_64\-pc\-linux\-gnu\-2.16.1
-.SH AUTHOR
-Danny van Dyk <kugelfang@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 73960c4..75ebe02 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,7 +1,6 @@
 modulesdir=$(datadir)/$(PACKAGE_NAME)/modules/
 
 modules_DATA = \
-	binutils.eselect \
 	editor.eselect \
 	env.eselect \
 	kernel.eselect \

diff --git a/modules/binutils.eselect b/modules/binutils.eselect
deleted file mode 100644
index 7821efa..0000000
--- a/modules/binutils.eselect
+++ /dev/null
@@ -1,261 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2015 Gentoo Foundation
-# Distributed under the terms of the GNU GPL version 2 or later
-
-inherit config package-manager
-
-DESCRIPTION="Manage installed versions of sys-devel/binutils"
-MAINTAINER="eselect@gentoo.org"
-
-BINUTILS_ENVFILE=${EROOT}/etc/env.d/05binutils
-
-# find_targets [patterns]
-# find all possible targets [that match one of ${@}]
-find_targets() {
-	local item file
-	local -a targets
-
-	[[ $# -eq 0 ]] && set -- "-*"
-	for item; do
-		item=${item%%-[1-9]*}
-		[[ ${item:0:1} == "-" ]] || item=-${item}
-		for file in "${EROOT}"/etc/env.d/binutils/config${item}; do
-			[[ -f ${file} ]] || continue
-			targets=("${targets[@]}" "${file##*/config-}")
-		done
-	done
-	echo "${targets[@]}"
-}
-
-# find_versions
-# find all installed version of installed binutils
-find_versions() {
-	local target file last_versions_count
-	local -a versions
-
-	for target in $(find_targets) ; do
-		last_version_count=${#versions[@]}
-		for file in "${EROOT}"/etc/env.d/binutils/${target}-* ; do
-			[[ -f ${file} ]] || continue
-			versions=(${versions[@]} "${file##*/}")
-		done
-		[[ ${last_version_count} == ${#versions[@]} ]] \
-			&& die -q "Please remove stray file: ${EROOT}/etc/env.d/binutils/config-${target}"
-	done
-	echo ${versions[@]}
-}
-
-# is_active $target $version
-# returns true if $version is currently used
-is_active() {
-	local current
-	[[ ${#@} -eq 2 ]] || die "Need exactly 2 arguments!"
-	current=$(load_config "${EROOT}/etc/env.d/binutils/config-${1}" CURRENT)
-	[[ ${current} == ${2} ]]
-}
-
-# is_valid $profile
-is_valid() {
-	[[ ${#@} -eq 1 && -e "${EROOT}/etc/env.d/binutils/${profile}" ]] \
-		|| die "Need exactly 1 argument!"
-}
-
-# swtich_profile $profile
-# switches binutils to $profile
-switch_profile() {
-	# set us up
-	[[ ${#@} -eq 1 ]] || die "Need exactly 1 argument!"
-	local profile=${1##*/}
-	local profile_file=${EROOT}/etc/env.d/binutils/${profile}
-	local target targets version binutilspath libpath chost
-	version=$(load_config ${profile_file} VER)
-	target=$(load_config ${profile_file} TARGET)
-	is_active ${target} ${version} \
-		&& die -q "Profile \"${profile}\" is already active!"
-	chost=$(envvar sys-devel/binutils CHOST)
-	libpath=$(load_config ${profile_file} LIBPATH)
-	libpath=${libpath:-${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
-	faketargets=( $(load_config ${profile_file} FAKE_TARGETS) )
-
-	# Generate binary symlinks
-	echo "Switching to ${profile}..."
-	[[ -d  "${EROOT}/usr/${target}/binutils-bin/${version}" ]] \
-		|| die -q "Can't cd ${EROOT}/usr/${target}/binutils-bin/${version}!"
-	mkdir -p "${EROOT}/usr/${target}/bin" \
-		|| die -q "Can't create ${EROOT}/usr/${target}/bin!"
-
-	binutilspath=${EPREFIX}/usr/${target}/binutils-bin/${version}
-	for app in "${ROOT}${binutilspath}"/* ; do
-		app=${app##*/}
-		ln -sf \
-			"${binutilspath}/${app}" \
-			"${EROOT}/usr/${target}/bin/${app}" \
-			|| die -q "Linking ${ROOT}/${binutilspath}/${app} failed!"
-		ln -sf \
-			../${target}/bin/${app} \
-			"${EROOT}/usr/bin/${target}-${app}" \
-			|| die -q "Linking ${EROOT}/usr/bin/${target}-${app} failed!"
-		for fake in ${faketargets} ; do
-			[[ -f ${EROOT}/etc/env.d/binutils/config-${fake} ]] \
-				&& continue
-			ln -sf ../${target}/bin/${app} "${EROOT}/usr/bin/${fake}-${app}"
-		done
-		[[ ${chost} == ${target} ]] || continue
-		ln -sf \
-			${target}-${app} \
-			"${EROOT}/usr/bin/${app}" \
-			|| die -q "Linking ${EROOT}/usr/bin/${app} failed!"
-	done
-
-	# Generate library and ldscripts symlinks
-	mkdir -p "${EROOT}/usr/${target}/lib"
-	rm -r "${EROOT}/usr/${target}/lib/ldscripts"
-	ln -sf "${libpath}/ldscripts" "${EROOT}/usr/${target}/lib/ldscripts"
-	[[ ${target} == ${chost} ]] \
-		&& dest="${EROOT}/usr/${chost}/lib" \
-		|| dest="${EROOT}/usr/${chost}/${target}/lib"
-	mkdir -p "${dest}"
-	for lib in "${ROOT}${libpath}"/lib* ; do
-		ln -sf "${libpath}/${lib##*/}" "${dest}/${lib##*/}"
-	done
-
-	# Generate include symlink
-	[[ ${target} == ${chost} ]] \
-		&& dest="${EROOT}/usr/include" \
-		|| dest="${EROOT}/usr/${target}/include"
-	mkdir -p "${dest}"
-	for inc in "${ROOT}${libpath}"/include/* ; do
-		ln -sf "${inc##${ROOT}}" "${dest}/${inc##*/}"
-	done
-
-	# Update the environment
-	if [[ ${target} == ${chost} ]] ; then
-		datapath=${EPREFIX}/usr/share/binutils-data/${target}/${version}
-		[[ -d ${datapath}/man ]] \
-			&& store_config ${BINUTILS_ENVFILE} MANPATH "${datapath}/man"
-		[[ -d ${datapath}/info ]] \
-			&& store_config ${BINUTILS_ENVFILE} INFOPATH "${datapath}/info"
-		store_config ${BINUTILS_ENVFILE} LDPATH "${EPREFIX}/usr/${target}/lib"
-	fi
-
-	store_config \
-		"${EROOT}/etc/env.d/binutils/config-${target}" \
-		CURRENT ${version}
-	if [[ ${ROOT:-/} == / ]] && [[ ${target} == ${chost} ]] ; then
-		do_action env update
-		echo "Please remember to run:"
-		echo
-		echo "  # source /etc/profile"
-		echo
-		echo "in order to let changes take effect!"
-	fi
-}
-
-### list action
-
-describe_list() {
-	echo "List all installed version of binutils"
-}
-
-do_list() {
-	local targets i=0 version files last_processed_count
-	local -a processed
-	targets=( $(find_targets ${@}) )
-
-	[[ -z ${targets[@]} ]] \
-		&& die -q "Pattern ${@} does not match any installed version of binutils!"
-
-	for target in $(find_targets) ; do
-		[[ ${targets[@]/${target}/} == ${targets[@]} ]] \
-			|| write_list_start "Installed binutils for target $(highlight ${target})"
-		last_processed_count=${#processed[@]}
-		for file in "${EROOT}"/etc/env.d/binutils/${@:-*} ; do
-			[[ -f ${file} ]] || continue
-			version=${file##*/${target}-}
-			[[ ${version} == ${file} ]] && continue
-			[[ ${processed[@]/${file}/} == ${processed[@]} ]] || continue
-			processed=(${processed[@]} "${file}")
-			i=$(( i + 1 ))
-			[[ ${targets[@]/${target}/} == ${targets[@]} ]] && continue
-			is_active ${target} ${version} \
-				&& version=$(highlight_marker "${version}")
-			write_numbered_list_entry $i "${version}"
-		done
-		[[ ${last_processed_count} == ${#processed[@]} ]] \
-			&& die -q "Please remove stray file: ${EROOT}/etc/env.d/binutils/config-${target}"
-	done
-}
-
-### set action
-
-describe_set() {
-	echo "Activate one of the installed binutils"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-		[[ ${#@} == 1 ]] \
-			|| die -q "Please specify exactly one version to activate!"
-		local versions file fail=0
-		versions=( $(find_versions) )
-
-		for item in ${@} ; do
-			if is_number ${item} ; then
-				if [[ ${item} -ge 1 ]] && [[ ${item} -le $(( ${#versions[@]} + 2)) ]] ; then
-					switch_profile ${versions[$(( ${item} -1 ))]}
-				else
-					fail=1
-					echo "Item not in range 1-$((${#versions[@]} + 1)): ${item}"
-					continue
-				fi
-			else
-				file=( "${EROOT}"/etc/env.d/binutils/${item} )
-				if [[ ${#file[@]} -gt 1 ]] ; then
-					fail=1
-					echo "Ambigious pattern: ${item}"
-					continue
-				fi
-				if ! [[ -f ${file} ]] ; then
-					fail=1
-					echo "Pattern doesn't match anything: ${item}"
-					continue
-				fi
-				switch_profile ${file##*/}
-			fi
-		done
-
-		[[ ${fail} == 1 ]] && die -q "One or more actions have failed!"
-}
-
-### show action
-
-describe_show() {
-	echo "Print the currently active binutils version"
-}
-
-do_show() {
-	local chost=${1:-$(envvar sys-devel/binutils CHOST)} version config
-
-	[[ -n ${chost} ]] \
-		|| die -q "Portage returned empty CHOST!"
-
-	config=${EROOT}/etc/env.d/binutils/config-${chost}
-	[[ ${#config[@]} -eq 1 ]] \
-		|| return
-	[[ -e ${config} ]] \
-		|| return
-
-	version=$(load_config \
-		"${EROOT}/etc/env.d/binutils/config-${chost}" CURRENT)
-	[[ -e ${EROOT}/etc/env.d/binutils/${chost}-${version} ]] \
-		|| die "File \"${EROOT}/etc/env.d/binutils/${chost}-${version}\" is missing!"
-
-	echo "${chost}-${version}"
-}

[gentoo-commits] proj/eselect:master commit in: modules/, man/, /

[Ulrich Müller]

commit:     160383299bdd92067f6b7d000523544c32c55f89
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 06:57:58 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 06:57:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=16038329

Prefer less to more in pager module.

* modules/pager.eselect (EDITOR_LIST): Prefer less to more.
* man/pager.eselect.5: Update.

 ChangeLog             | 5 +++++
 man/pager.eselect.5   | 6 +++---
 modules/pager.eselect | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 087baae..56f76c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-16  Ulrich Müller  <ulm@gentoo.org>
+
+	* modules/pager.eselect (EDITOR_LIST): Prefer less to more.
+	* man/pager.eselect.5: Update.
+
 2016-06-01  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Make testing for git repository more robust.

diff --git a/man/pager.eselect.5 b/man/pager.eselect.5
index 9f5169d..8121811 100644
--- a/man/pager.eselect.5
+++ b/man/pager.eselect.5
@@ -2,7 +2,7 @@
 .\" Copyright 2009-2016 Gentoo Foundation
 .\" Distributed under the terms of the GNU GPL version 2 or later
 .\"
-.TH pager.eselect 5 "September 2012" "Gentoo Linux" eselect
+.TH pager.eselect 5 "June 2016" "Gentoo Linux" eselect
 .SH NAME
 pager.eselect \- The PAGER management module for Gentoo's eselect
 .SH SYNOPSIS
@@ -32,8 +32,8 @@ variable.
 .br
 Available targets for the PAGER variable:
 .br
-  [1]   /bin/more *
-  [2]   /usr/bin/less
+  [1]   /usr/bin/less
+  [2]   /bin/more *
   [ ]   (free form)
 .SH ACTION: SET
 .B eselect pager set

diff --git a/modules/pager.eselect b/modules/pager.eselect
index c4879e9..a0596e8 100644
--- a/modules/pager.eselect
+++ b/modules/pager.eselect
@@ -4,7 +4,7 @@
 
 EDITOR_VAR="PAGER"
 EDITOR_ENVFILE="/etc/env.d/99pager"
-EDITOR_LIST="/bin/more /usr/bin/less /usr/bin/most"
+EDITOR_LIST="/usr/bin/less /bin/more /usr/bin/most"
 
 inherit editor-variable