summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2014-04-02 19:56:41 +0000
committerWilliam Hubbs <williamh@gentoo.org>2014-04-02 19:56:41 +0000
commitfb9e81503fe82d80bbb764a4aa47944a3f6244f6 (patch)
tree747a230372ea46a88391f635d3b302eca0244740 /sys-apps/gentoo-functions
parentVersion bump. (diff)
downloadhistorical-fb9e81503fe82d80bbb764a4aa47944a3f6244f6.tar.gz
historical-fb9e81503fe82d80bbb764a4aa47944a3f6244f6.tar.bz2
historical-fb9e81503fe82d80bbb764a4aa47944a3f6244f6.zip
remove some old versions
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x8568F528
Diffstat (limited to 'sys-apps/gentoo-functions')
-rw-r--r--sys-apps/gentoo-functions/ChangeLog7
-rw-r--r--sys-apps/gentoo-functions/Manifest12
-rw-r--r--sys-apps/gentoo-functions/files/gentoo-functions-0.1.sh471
-rw-r--r--sys-apps/gentoo-functions/files/gentoo-functions-0.sh464
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.1.ebuild25
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.ebuild25
6 files changed, 10 insertions, 994 deletions
diff --git a/sys-apps/gentoo-functions/ChangeLog b/sys-apps/gentoo-functions/ChangeLog
index 9712939173aa..261b2c9f1e99 100644
--- a/sys-apps/gentoo-functions/ChangeLog
+++ b/sys-apps/gentoo-functions/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/gentoo-functions
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.5 2014/03/19 02:01:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.6 2014/04/02 19:56:04 williamh Exp $
+
+ 02 Apr 2014; William Hubbs <williamh@gentoo.org>
+ -files/gentoo-functions-0.1.sh, -files/gentoo-functions-0.sh,
+ -gentoo-functions-0.1.ebuild, -gentoo-functions-0.ebuild:
+ remove some old versions
*gentoo-functions-0.3 (19 Mar 2014)
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 4743ad5cc8df..e505b0f13ad9 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,20 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gentoo-functions-0.1.sh 8821 SHA256 ba1b8644b801e561f14e69a0393d2d5e3724f06e3d68703ba8abb1b1c8cce22a SHA512 fff651f97c140f4c2cb1d6225d6d2a4a5c0c19c081fffae918802e8f8332347fcb63e73984dd9a89c02bc49075bdc6763466ab8149936f3ee0499e556e6c30b2 WHIRLPOOL 1a9f9516e1acaf1e692dc503bfdcd871ba6709192602e235aecac3a051c5c77940e954c13714946ff1b91f7a580cb511f80e0f11abb45b5c0470cd4bcb72450d
AUX gentoo-functions-0.2.sh 8810 SHA256 27aa9f655ada5b18b97872997d262969a924d09a8b8c6b9abc2337ff48d3b5a6 SHA512 cdd5f57755235eaf181e948d09095b75f002668b0080b38516813ea5c4f71f4a0836b9df78358346533e336e75a4969872431cc0fdc0b646e3c5259b9c9e9871 WHIRLPOOL 2449e164a1ebbe1c4dbb31dc32f7f0a3119ed4126df87702e659e87f11c05d938156ef4190196c6028047fa4aaa9d6cd06422055ff7ad7678f0856e1eb25eae0
AUX gentoo-functions-0.3.sh 8833 SHA256 cda87182117570463e262a3a229c1a92ae4ae093f746784d9e758ee138b483b1 SHA512 d80e9f199dd805d2a09603a94c577279ede84a5fe35f1c447cdb56bb513117cdae437949a9aa9162b27e335ec511da41999aed1a8dc92ba0ac543c082619365e WHIRLPOOL 8920dc7c7918aa60bf0b7bdd85c319bf229c1c47b4a9006194522ed1c4d983c7f65d8d872c61567f4e75e3e01d517203d39ec56d49e3b6fbc69fa0a6b6126569
-AUX gentoo-functions-0.sh 8440 SHA256 d3f038fe159d81ce9c5e57b2910ae5cd1fc826e7ca83c7fe8b3814fa90be917a SHA512 cfeef8dbcb8541d91f9db9aba9caa07e1a4081f5e3511eb27810883941784f1151e6502bfb5a271c3fe3f993ab621df90f48f62a9a13113232d48972bcabbc39 WHIRLPOOL ead49ff61d02f65adb285c5e3bb669f43060b482ff04e42d7094370a6a25562647ccc9a42d1c74a9dc6374ac2e3430b9759386b8dbff104096b4e743db856e00
-EBUILD gentoo-functions-0.1.ebuild 659 SHA256 000927e6c3f0fc62c40420d7c3e8baccbd9aaf50f1317f5ab304e76fe164dfe3 SHA512 d01553dd10fab075075a77a6b51b7172f02b630b8644edfd5569cf6b960c6c67090b6266460c398c4a7d73d0132e25616f39cac392dd790808b6c0e63b73bb75 WHIRLPOOL aac39a1dd0cef9b6a0bdccd3303646e4271fb0c22d1c73bb08fe217e948d254f70bad42edba94c734025164471e5120db1cd1dfb8d8a8df9b80cd4ac67219e94
EBUILD gentoo-functions-0.2.ebuild 659 SHA256 63934ec07319ab3ec250a7c0acb79b43e6d0733a652d367c8ca2425639423c60 SHA512 c70649d3cf20491e403da1ab6c06a913ed36737e581117f3d61a4d44f77372f290fd1c5d47c081c42475b3d156da245f1d597ee83a3705d728dc0cff4e421ee3 WHIRLPOOL cfb8e3b5ace2b2ac594d64f0e1d7f5bf8e68c814e7d96707c90a67cf124adc35ec863aa36dc2d671a597109cebdca56f78aa411c05fc2ef866ce56dee827cce3
EBUILD gentoo-functions-0.3.ebuild 659 SHA256 7d0154de8090e5b28803fcffd7410dad26ffdc83c063783e69b780a7e40f7a44 SHA512 9d6a72029d3dc7d6053576c10a4ef58f9a4582cd601086df34054cec7f8cae0b40028ddb46cf2a1a6d9f7a15959d5f59682eff9d420fbe01d0e89bc3cc1bdcd7 WHIRLPOOL 2e2d1551446d22dc5cab860d7840776ac71ea87a02e71e73d342d3345dcc63263f9163d9cdb25c94db8493272c5647b05ee03f23ad814fe99b9a7eca9c87dd56
-EBUILD gentoo-functions-0.ebuild 657 SHA256 bd921dd1da6e4569eafd84dca2a0b89ec04238e0008e1bb1b693229d73f6b1c4 SHA512 af56b18e26a43606d85b4e559663d3d2c1dd6fea1d1106ddd50f69eeafb8040b069347d8e4b8f92d67b5b7a8bcd35d6d2a94a06889fdd561ccdf14464f29293a WHIRLPOOL 96d35fafff55028afeb7d235a95a1f7b439c727b9428b2b1aeac8ef019df3c93335dd16142c7f119b70c5695eb9189cd2648e74eca45f9de07488978127e1cb6
-MISC ChangeLog 1164 SHA256 148f926004813128ea809912361830feeb6bc385d684b0c4ceaf288b6c2e7839 SHA512 1133a9eef938542ffb5e741980ad73c57091c69d4cef150466e810c27e472e7606057c7a00baf494816e460585a12e35bf290774065e4b853467fe3d4ad8ed04 WHIRLPOOL f2a6fa375a87d067e6f7743ce08356952e8e11ea0cd32300fc130a3c3e3695050c099577ae4aa1296bb9f19fe5700561b74322bce88fc5286c420637e0b2ae8b
+MISC ChangeLog 1367 SHA256 6230d64d6a683c6839e0ed00009a29c653a352849f35a3cf9c3942d8c6833824 SHA512 340dc8ca5e0cea9454aa17aaef720acf156b6f3a5d1b33a79f67de70eac9bba6c55a7452d1faea570cbc4c7785bdcf7fdb9b8a825ff6036047307bc75b5d8d35 WHIRLPOOL fdab279cde9e2d3b1e3c8abcef1ddc5446598a1ac18dd889afd7f9b5e0fd4b84522101634bd2fe24e6250bc5342311a60846e2bef360021ba51ef98c4cddf455
MISC metadata.xml 398 SHA256 d413bd2b83e87682d76677290bf28028ee3688fd7838044e2f8a92d7846dbced SHA512 5258fd100f5f19647e2206253d314cb97371401aed8c760224f5e3856a21062593adb8c167045cbeae4973cb7a15e5d83bbccb63e75e5a16156a02efb87085fb WHIRLPOOL a22b833eb820674aa141c478595bf77f033f41678f4dff03772efb6f9204b9a50fc706c4108a7b1f58e2966340dbf808f0083ab482d1dd8189d08e11733c1133
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlMo+ogACgkQblQW9DDEZTjZWACgtbCAtSFNyGsWzZCUvptnTurn
-LfUAn0WdN1j+0bhWeQKCMIB63QBBqYNl
-=RXX2
+iEYEAREIAAYFAlM8a3gACgkQblQW9DDEZTiBBwCfUNq7bbSVfAoSik6Ip123YEnc
+Rg8An1QPtQkI32i1h2hE3I7C3y1uwgAY
+=kyJF
-----END PGP SIGNATURE-----
diff --git a/sys-apps/gentoo-functions/files/gentoo-functions-0.1.sh b/sys-apps/gentoo-functions/files/gentoo-functions-0.1.sh
deleted file mode 100644
index 9e32ae5a4cb0..000000000000
--- a/sys-apps/gentoo-functions/files/gentoo-functions-0.1.sh
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# All functions in this file should be written in POSIX sh. Please do
-# not use bashisms.
-#
-
-RC_GOT_FUNCTIONS="yes"
-
-#
-# hard set the indent used for e-commands.
-# num defaults to 0
-# This is a private function.
-#
-_esetdent()
-{
- local i="$1"
- [ -z "$i" ] || [ "$i" -lt 0 ] && i=0
- RC_INDENTATION=$(printf "%${i}s" '')
-}
-
-#
-# increase the indent used for e-commands.
-#
-eindent()
-{
- local i="$1"
- [ -n "$i" ] && [ "$i" -gt 0 ] || i=$RC_DEFAULT_INDENT
- _esetdent $(( ${#RC_INDENTATION} + i ))
-}
-
-#
-# decrease the indent used for e-commands.
-#
-eoutdent()
-{
- local i="$1"
- [ -n "$i" ] && [ "$i" -gt 0 ] || i=$RC_DEFAULT_INDENT
- _esetdent $(( ${#RC_INDENTATION} - i ))
-}
-
-#
-# this function was lifted from OpenRC. It returns 0 if the argument or
-# the value of the argument is "yes", "true", "on", or "1" or 1
-# otherwise.
-#
-yesno()
-{
- [ -z "$1" ] && return 1
-
- case "$1" in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;;
- esac
-
- local value=
- eval value=\$${1}
- case "$value" in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;;
- *) vewarn "\$$1 is not set properly"; return 1;;
- esac
-}
-
-#
-# use the system logger to log a message
-#
-esyslog()
-{
- local pri=
- local tag=
-
- if command -v logger > /dev/null 2>&1; then
- pri="$1"
- tag="$2"
-
- shift 2
- [ -z "$*" ] && return 0
-
- logger -p "${pri}" -t "${tag}" -- "$*"
- fi
-
- return 0
-}
-
-#
-# show an informative message (without a newline)
-#
-einfon()
-{
- if yesno "${EINFO_QUIET}"; then
- return 0
- fi
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*"
- LAST_E_CMD="einfon"
- return 0
-}
-
-#
-# show an informative message (with a newline)
-#
-einfo()
-{
- einfon "$*\n"
- LAST_E_CMD="einfo"
- return 0
-}
-
-#
-# show a warning message (without a newline) and log it
-#
-ewarnn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*"
- else
- if ! yesno "${RC_ENDCOL}" && [ ${LAST_E_CMD} = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*"
- fi
-
- local name="${0##*/}"
- # Log warnings to system log
- esyslog "daemon.warning" "${name}" "$*"
-
- LAST_E_CMD="ewarnn"
- return 0
-}
-
-#
-# show a warning message (with a newline) and log it
-#
-ewarn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*\n"
- else
- if ! yesno "${RC_ENDCOL}" && [ ${LAST_E_CMD} = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n"
- fi
-
- local name="${0##*/}"
- # Log warnings to system log
- esyslog "daemon.warning" "${name}" "$*"
-
- LAST_E_CMD="ewarn"
- return 0
-}
-
-#
-# show an error message (without a newline) and log it
-#
-eerrorn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*" >/dev/stderr
- else
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*"
- fi
-
- local name="${0##*/}"
- # Log errors to system log
- esyslog "daemon.err" "rc-scripts" "$*"
-
- LAST_E_CMD="eerrorn"
- return 0
-}
-
-#
-# show an error message (with a newline) and log it
-#
-eerror()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*\n" >/dev/stderr
- else
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n"
- fi
-
- local name="${0##*/}"
- # Log errors to system log
- esyslog "daemon.err" "rc-scripts" "$*"
-
- LAST_E_CMD="eerror"
- return 0
-}
-
-#
-# show a message indicating the start of a process
-#
-ebegin()
-{
- local msg="$*"
- if yesno "${EINFO_QUIET}"; then
- return 0
- fi
-
- msg="${msg} ..."
- einfon "${msg}"
- if yesno "${RC_ENDCOL}"; then
- printf "\n"
- fi
-
- LAST_E_LEN="$(( 3 + ${#RC_INDENTATION} + ${#msg} ))"
- LAST_E_CMD="ebegin"
- return 0
-}
-
-#
-# indicate the completion of process, called from eend/ewend
-# if error, show errstr via efunc
-#
-# This function is private to functions.sh. Do not call it from a
-# script.
-#
-_eend()
-{
- local retval="${1:-0}" efunc="${2:-eerror}" msg
- shift 2
-
- if [ "${retval}" = "0" ]; then
- yesno "${EINFO_QUIET}" && return 0
- msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
- else
- if [ -c /dev/null ] ; then
- rc_splash "stop" >/dev/null 2>&1 &
- else
- rc_splash "stop" &
- fi
- if [ -n "$*" ] ; then
- ${efunc} "$*"
- fi
- msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
- fi
-
- if yesno "${RC_ENDCOL}"; then
- printf "${ENDCOL} ${msg}\n"
- else
- [ "${LAST_E_CMD}" = ebegin ] || LAST_E_LEN=0
- printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}"
- fi
-
- return ${retval}
-}
-
-#
-# indicate the completion of process
-# if error, show errstr via eerror
-#
-eend()
-{
- local retval="${1:-0}"
- shift
-
- _eend "${retval}" eerror "$*"
-
- LAST_E_CMD="eend"
- return ${retval}
-}
-
-#
-# indicate the completion of process
-# if error, show errstr via ewarn
-#
-ewend()
-{
- local retval="${1:-0}"
- shift
-
- _eend "${retval}" ewarn "$*"
-
- LAST_E_CMD="ewend"
- return ${retval}
-}
-
-# v-e-commands honor EINFO_VERBOSE which defaults to no.
-# The condition is negated so the return value will be zero.
-veinfo()
-{
- yesno "${EINFO_VERBOSE}" && einfo "$@"
-}
-
-veinfon()
-{
- yesno "${EINFO_VERBOSE}" && einfon "$@"
-}
-
-vewarn()
-{
- yesno "${EINFO_VERBOSE}" && ewarn "$@"
-}
-
-veerror()
-{
- yesno "${EINFO_VERBOSE}" && eerror "$@"
-}
-
-vebegin()
-{
- yesno "${EINFO_VERBOSE}" && ebegin "$@"
-}
-
-veend()
-{
- yesno "${EINFO_VERBOSE}" && { eend "$@"; return $?; }
- return ${1:-0}
-}
-
-vewend()
-{
- yesno "${EINFO_VERBOSE}" && { ewend "$@"; return $?; }
- return ${1:-0}
-}
-
-veindent()
-{
- yesno "${EINFO_VERBOSE}" && eindent
-}
-
-veoutdent()
-{
- yesno "${EINFO_VERBOSE}" && eoutdent
-}
-
-#
-# prints the current libdir {lib,lib32,lib64}
-#
-get_libdir()
-{
- if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
- CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
- elif [ -x /usr/bin/portageq ] ; then
- CONF_LIBDIR="$(/usr/bin/portageq envvar CONF_LIBDIR)"
- fi
- printf "${CONF_LIBDIR:=lib}\n"
-}
-
-#
-# return 0 if gentoo=param was passed to the kernel
-#
-# EXAMPLE: if get_bootparam "nodevfs" ; then ....
-#
-get_bootparam()
-{
- local x copt params retval=1
-
- [ ! -r /proc/cmdline ] && return 1
-
- read copts < /proc/cmdline
- for copt in $copts ; do
- if [ "${copt%=*}" = "gentoo" ] ; then
- params=$(gawk -v PARAMS="${copt##*=}" '
- BEGIN {
- split(PARAMS, nodes, ",")
- for (x in nodes)
- print nodes[x]
- }')
-
- # Parse gentoo option
- for x in ${params} ; do
- if [ "${x}" = "$1" ] ; then
-# echo "YES"
- retval=0
- fi
- done
- fi
- done
-
- return ${retval}
-}
-
-#
-# return 0 if any of the files/dirs are newer than
-# the reference file
-#
-# EXAMPLE: if is_older_than a.out *.o ; then ...
-is_older_than()
-{
- local x=
- local ref="$1"
- shift
-
- for x in "$@" ; do
- [ "${x}" -nt "${ref}" ] && return 0
- [ -d "${x}" ] && is_older_than "${ref}" "${x}"/* && return 0
- done
-
- return 1
-}
-
-# This is the main script, please add all functions above this point!
-
-# Dont output to stdout?
-EINFO_QUIET="${EINFO_QUIET:-no}"
-EINFO_VERBOSE="${EINFO_VERBOSE:-no}"
-
-# Should we use color?
-RC_NOCOLOR="${RC_NOCOLOR:-no}"
-# Can the terminal handle endcols?
-RC_ENDCOL="yes"
-
-# Default values for e-message indentation and dots
-RC_INDENTATION=''
-RC_DEFAULT_INDENT=2
-RC_DOT_PATTERN=''
-
-# Cache the CONSOLETYPE - this is important as backgrounded shells don't
-# have a TTY. rc unsets it at the end of running so it shouldn't hang
-# around
-if [ -z "${CONSOLETYPE}" ] ; then
- CONSOLETYPE="$( /sbin/consoletype 2>/dev/null )"; export CONSOLETYPE
-fi
-if [ "${CONSOLETYPE}" = "serial" ] ; then
- RC_NOCOLOR="yes"
- RC_ENDCOL="no"
-fi
-
-for arg in "$@" ; do
- case "${arg}" in
- # Lastly check if the user disabled it with --nocolor argument
- --nocolor|-nc)
- RC_NOCOLOR="yes"
- ;;
- esac
-done
-
-# Setup COLS and ENDCOL so eend can line up the [ ok ]
-COLS="${COLUMNS:-0}" # bash's internal COLUMNS variable
-[ "$COLS" -eq 0 ] && \
- COLS="$(set -- $(stty size 2>/dev/null) ; printf "$2\n")"
-[ "$COLS" -gt 0 ] || COLS=80 # width of [ ok ] == 7
-
-if yesno "${RC_ENDCOL}"; then
- ENDCOL='\033[A\033['$(( COLS - 8 ))'C'
-else
- ENDCOL=''
-fi
-
-# Setup the colors so our messages all look pretty
-if yesno "${RC_NOCOLOR}"; then
- unset GOOD WARN BAD NORMAL HILITE BRACKET
-elif (type tput && tput colors) >/dev/null 2>&1; then
- GOOD="$(tput sgr0)$(tput bold)$(tput setaf 2)"
- WARN="$(tput sgr0)$(tput bold)$(tput setaf 3)"
- BAD="$(tput sgr0)$(tput bold)$(tput setaf 1)"
- HILITE="$(tput sgr0)$(tput bold)$(tput setaf 6)"
- BRACKET="$(tput sgr0)$(tput bold)$(tput setaf 4)"
- NORMAL="$(tput sgr0)"
-else
- GOOD=$(printf '\033[32;01m')
- WARN=$(printf '\033[33;01m')
- BAD=$(printf '\033[31;01m')
- HILITE=$(printf '\033[36;01m')
- BRACKET=$(printf '\033[34;01m')
- NORMAL=$(printf '\033[0m')
-fi
-
-# vim:ts=4
diff --git a/sys-apps/gentoo-functions/files/gentoo-functions-0.sh b/sys-apps/gentoo-functions/files/gentoo-functions-0.sh
deleted file mode 100644
index 815a73df9648..000000000000
--- a/sys-apps/gentoo-functions/files/gentoo-functions-0.sh
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# All functions in this file should be written in POSIX sh. Please do
-# not use bashisms.
-#
-
-RC_GOT_FUNCTIONS="yes"
-
-#
-# hard set the indent used for e-commands.
-# num defaults to 0
-# This is a private function.
-#
-_esetdent()
-{
- local i="$1"
- [ -z "$i" ] || [ "$i" -lt 0 ] && i=0
- RC_INDENTATION=$(printf "%${i}s" '')
-}
-
-#
-# increase the indent used for e-commands.
-#
-eindent()
-{
- local i="$1"
- [ -n "$i" ] && [ "$i" -gt 0 ] || i=$RC_DEFAULT_INDENT
- _esetdent $(( ${#RC_INDENTATION} + i ))
-}
-
-#
-# decrease the indent used for e-commands.
-#
-eoutdent()
-{
- local i="$1"
- [ -n "$i" ] && [ "$i" -gt 0 ] || i=$RC_DEFAULT_INDENT
- _esetdent $(( ${#RC_INDENTATION} - i ))
-}
-
-#
-# this function was lifted from OpenRC. It returns 0 if the argument or
-# the value of the argument is "yes", "true", "on", or "1" or 1
-# otherwise.
-#
-yesno()
-{
- [ -z "$1" ] && return 1
-
- case "$1" in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;;
- esac
-
- local value=
- eval value=\$${1}
- case "$value" in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;;
- *) vewarn "\$$1 is not set properly"; return 1;;
- esac
-}
-
-#
-# use the system logger to log a message
-#
-esyslog()
-{
- local pri=
- local tag=
-
- if command -v logger > /dev/null 2>&1; then
- pri="$1"
- tag="$2"
-
- shift 2
- [ -z "$*" ] && return 0
-
- logger -p "${pri}" -t "${tag}" -- "$*"
- fi
-
- return 0
-}
-
-#
-# show an informative message (without a newline)
-#
-einfon()
-{
- if yesno "${EINFO_QUIET}"; then
- return 0
- fi
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*"
- LAST_E_CMD="einfon"
- return 0
-}
-
-#
-# show an informative message (with a newline)
-#
-einfo()
-{
- einfon "$*\n"
- LAST_E_CMD="einfo"
- return 0
-}
-
-#
-# show a warning message (without a newline) and log it
-#
-ewarnn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*"
- else
- if ! yesno "${RC_ENDCOL}" && [ ${LAST_E_CMD} = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*"
- fi
-
- local name="${0##*/}"
- # Log warnings to system log
- esyslog "daemon.warning" "${name}" "$*"
-
- LAST_E_CMD="ewarnn"
- return 0
-}
-
-#
-# show a warning message (with a newline) and log it
-#
-ewarn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*\n"
- else
- if ! yesno "${RC_ENDCOL}" && [ ${LAST_E_CMD} = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n"
- fi
-
- local name="${0##*/}"
- # Log warnings to system log
- esyslog "daemon.warning" "${name}" "$*"
-
- LAST_E_CMD="ewarn"
- return 0
-}
-
-#
-# show an error message (without a newline) and log it
-#
-eerrorn()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*" >/dev/stderr
- else
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*"
- fi
-
- local name="${0##*/}"
- # Log errors to system log
- esyslog "daemon.err" "rc-scripts" "$*"
-
- LAST_E_CMD="eerrorn"
- return 0
-}
-
-#
-# show an error message (with a newline) and log it
-#
-eerror()
-{
- if yesno "${EINFO_QUIET}"; then
- printf " $*\n" >/dev/stderr
- else
- if ! yesno "${RC_ENDCOL}" && [ "${LAST_E_CMD}" = "ebegin" ]; then
- printf "\n"
- fi
- printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n"
- fi
-
- local name="${0##*/}"
- # Log errors to system log
- esyslog "daemon.err" "rc-scripts" "$*"
-
- LAST_E_CMD="eerror"
- return 0
-}
-
-#
-# show a message indicating the start of a process
-#
-ebegin()
-{
- local msg="$*"
- if yesno "${EINFO_QUIET}"; then
- return 0
- fi
-
- msg="${msg} ..."
- einfon "${msg}"
- if yesno "${RC_ENDCOL}"; then
- printf "\n"
- fi
-
- LAST_E_LEN="$(( 3 + ${#RC_INDENTATION} + ${#msg} ))"
- LAST_E_CMD="ebegin"
- return 0
-}
-
-#
-# indicate the completion of process, called from eend/ewend
-# if error, show errstr via efunc
-#
-# This function is private to functions.sh. Do not call it from a
-# script.
-#
-_eend()
-{
- local retval="${1:-0}" efunc="${2:-eerror}" msg
- shift 2
-
- if [ "${retval}" = "0" ]; then
- yesno "${EINFO_QUIET}" && return 0
- msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}"
- else
- if [ -c /dev/null ] ; then
- rc_splash "stop" >/dev/null 2>&1 &
- else
- rc_splash "stop" &
- fi
- if [ -n "$*" ] ; then
- ${efunc} "$*"
- fi
- msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}"
- fi
-
- if yesno "${RC_ENDCOL}"; then
- printf "${ENDCOL} ${msg}\n"
- else
- [ "${LAST_E_CMD}" = ebegin ] || LAST_E_LEN=0
- printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}"
- fi
-
- return ${retval}
-}
-
-#
-# indicate the completion of process
-# if error, show errstr via eerror
-#
-eend()
-{
- local retval="${1:-0}"
- shift
-
- _eend "${retval}" eerror "$*"
-
- LAST_E_CMD="eend"
- return ${retval}
-}
-
-#
-# indicate the completion of process
-# if error, show errstr via ewarn
-#
-ewend()
-{
- local retval="${1:-0}"
- shift
-
- _eend "${retval}" ewarn "$*"
-
- LAST_E_CMD="ewend"
- return ${retval}
-}
-
-# v-e-commands honor EINFO_VERBOSE which defaults to no.
-# The condition is negated so the return value will be zero.
-veinfo()
-{
- yesno "${EINFO_VERBOSE}" && einfo "$@"
-}
-
-veinfon()
-{
- yesno "${EINFO_VERBOSE}" && einfon "$@"
-}
-
-vewarn()
-{
- yesno "${EINFO_VERBOSE}" && ewarn "$@"
-}
-
-veerror()
-{
- yesno "${EINFO_VERBOSE}" && eerror "$@"
-}
-
-vebegin()
-{
- yesno "${EINFO_VERBOSE}" && ebegin "$@"
-}
-
-veend()
-{
- yesno "${EINFO_VERBOSE}" && { eend "$@"; return $?; }
- return ${1:-0}
-}
-
-vewend()
-{
- yesno "${EINFO_VERBOSE}" && { ewend "$@"; return $?; }
- return ${1:-0}
-}
-
-veindent()
-{
- yesno "${EINFO_VERBOSE}" && eindent
-}
-
-veoutdent()
-{
- yesno "${EINFO_VERBOSE}" && eoutdent
-}
-
-#
-# prints the current libdir {lib,lib32,lib64}
-#
-get_libdir()
-{
- if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
- CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
- elif [ -x /usr/bin/portageq ] ; then
- CONF_LIBDIR="$(/usr/bin/portageq envvar CONF_LIBDIR)"
- fi
- printf "${CONF_LIBDIR:=lib}\n"
-}
-
-#
-# return 0 if gentoo=param was passed to the kernel
-#
-# EXAMPLE: if get_bootparam "nodevfs" ; then ....
-#
-get_bootparam()
-{
- local x copt params retval=1
-
- [ ! -r /proc/cmdline ] && return 1
-
- read copts < /proc/cmdline
- for copt in $copts ; do
- if [ "${copt%=*}" = "gentoo" ] ; then
- params=$(gawk -v PARAMS="${copt##*=}" '
- BEGIN {
- split(PARAMS, nodes, ",")
- for (x in nodes)
- print nodes[x]
- }')
-
- # Parse gentoo option
- for x in ${params} ; do
- if [ "${x}" = "$1" ] ; then
-# echo "YES"
- retval=0
- fi
- done
- fi
- done
-
- return ${retval}
-}
-
-#
-# return 0 if any of the files/dirs are newer than
-# the reference file
-#
-# EXAMPLE: if is_older_than a.out *.o ; then ...
-is_older_than()
-{
- local x=
- local ref="$1"
- shift
-
- for x in "$@" ; do
- [ "${x}" -nt "${ref}" ] && return 0
- [ -d "${x}" ] && is_older_than "${ref}" "${x}"/* && return 0
- done
-
- return 1
-}
-
-# This is the main script, please add all functions above this point!
-
-# Dont output to stdout?
-EINFO_QUIET="${EINFO_QUIET:-no}"
-EINFO_VERBOSE="${EINFO_VERBOSE:-no}"
-
-# Should we use color?
-RC_NOCOLOR="${RC_NOCOLOR:-no}"
-# Can the terminal handle endcols?
-RC_ENDCOL="yes"
-
-# Default values for e-message indentation and dots
-RC_INDENTATION=''
-RC_DEFAULT_INDENT=2
-RC_DOT_PATTERN=''
-
-# Cache the CONSOLETYPE - this is important as backgrounded shells don't
-# have a TTY. rc unsets it at the end of running so it shouldn't hang
-# around
-if [ -z "${CONSOLETYPE}" ] ; then
- CONSOLETYPE="$( /sbin/consoletype 2>/dev/null )"; export CONSOLETYPE
-fi
-if [ "${CONSOLETYPE}" = "serial" ] ; then
- RC_NOCOLOR="yes"
- RC_ENDCOL="no"
-fi
-
-for arg in "$@" ; do
- case "${arg}" in
- # Lastly check if the user disabled it with --nocolor argument
- --nocolor|-nc)
- RC_NOCOLOR="yes"
- ;;
- esac
-done
-
-# Setup COLS and ENDCOL so eend can line up the [ ok ]
-COLS="${COLUMNS:-0}" # bash's internal COLUMNS variable
-[ "$COLS" -eq 0 ] && \
- COLS="$(set -- $(stty size 2>/dev/null) ; printf "$2\n")"
-[ "$COLS" -gt 0 ] || COLS=80 # width of [ ok ] == 7
-
-if yesno "${RC_ENDCOL}"; then
- ENDCOL='\033[A\033['$(( COLS - 8 ))'C'
-else
- ENDCOL=''
-fi
-
-# Setup the colors so our messages all look pretty
-if yesno "${RC_NOCOLOR}"; then
- unset GOOD WARN BAD NORMAL HILITE BRACKET
-else
- GOOD='\033[32;01m'
- WARN='\033[33;01m'
- BAD='\033[31;01m'
- HILITE='\033[36;01m'
- BRACKET='\033[34;01m'
- NORMAL='\033[0m'
-fi
-
-# vim:ts=4
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.1.ebuild
deleted file mode 100644
index a245dca6bba9..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-0.1.ebuild,v 1.1 2014/03/11 21:55:41 williamh Exp $
-
-EAPI=5
-
-DESCRIPTION="base shell functions required by all gentoo systems"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
- dodir /lib/gentoo
- insinto /lib/gentoo
- newins "${FILESDIR}"/${P}.sh functions.sh
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.ebuild
deleted file mode 100644
index cf5a25a27ac1..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-0.ebuild,v 1.1 2014/03/10 19:47:21 williamh Exp $
-
-EAPI=5
-
-DESCRIPTION="base shell functions required by all gentoo systems"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
- dodir /lib/gentoo
- insinto /lib/gentoo
- newins "${FILESDIR}"/${P}.sh functions.sh
-}