* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2014-04-23 17:51 Christoph Junghans
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Junghans @ 2014-04-23 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 2774da49bd3beffe7fe956e50f3c61ab4c2fd145
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 17:49:57 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Apr 23 17:49:57 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=2774da49
Add support for mac
---
ChangeLog | 4 ++++
modules/wxwidgets.eselect | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f0f5c6a..9c1945a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-23 Christoph Junghans <ottxor@gentoo.org>
+
+ * modules/wxwidgets.eselect: add prefix (mac) support (bug #508438)
+
2013-03-11 Christoph Junghans <ottxor@gentoo.org>
* modules/xvmc.eselect: add myself as maintainer,
diff --git a/modules/wxwidgets.eselect b/modules/wxwidgets.eselect
index 4be13e9..55d49d2 100644
--- a/modules/wxwidgets.eselect
+++ b/modules/wxwidgets.eselect
@@ -1,12 +1,12 @@
# -*-eselect-*- vim: ft=eselect
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit config
DESCRIPTION="Manage the system default wxWidgets profile"
MAINTAINER="wxwidgets@gentoo.org"
-VERSION="20131230"
+VERSION="20140423"
WXCONFFILE="${EROOT}"/var/lib/wxwidgets/current
WXCONFDIR="${EROOT}"/usr/lib/wx/config
@@ -165,7 +165,7 @@ do_update() {
i=1
case ${component} in
toolkit)
- for opt in base gtk2; do
+ for opt in base gtk2 mac; do
if [[ ${opt} == ${wxtoolkit[0]} ]]; then
continue
else
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2014-11-22 6:47 Ben de Groot
0 siblings, 0 replies; 7+ messages in thread
From: Ben de Groot @ 2014-11-22 6:47 UTC (permalink / raw
To: gentoo-commits
commit: 911b8edaa0b019edb840a5c49a344ac638c86202
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 22 06:43:37 2014 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 06:43:37 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=911b8eda
vi.eselect: apply patch from 1.1.7-r1
---
AUTHORS | 3 +++
ChangeLog | 4 ++++
modules/vi.eselect | 52 ++++++++++++++++++++++++++--------------------------
3 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index fb58161..c1e3a1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,3 +30,6 @@ Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Christoph Junghans <ottxor@gentoo.org>
Modules: awk, timezone
+
+Ben de Groot <yngwin@gentoo.org>
+ Modules: vi
diff --git a/ChangeLog b/ChangeLog
index 9c1945a..ebab7dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-22 Ben de Groot <yngwin@gentoo.org>
+
+ * modules/vi.eselect: apply patch from 1.1.7-r1
+
2014-04-23 Christoph Junghans <ottxor@gentoo.org>
* modules/wxwidgets.eselect: add prefix (mac) support (bug #508438)
diff --git a/modules/vi.eselect b/modules/vi.eselect
index 8fc600f..70ce1c8 100644
--- a/modules/vi.eselect
+++ b/modules/vi.eselect
@@ -11,13 +11,13 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" )
find_targets() {
local f
for f in \
- "${ROOT}"/usr/bin/vim \
- "${ROOT}"/usr/bin/nvi \
- "${ROOT}"/usr/bin/elvis \
- "${ROOT}"/usr/bin/vile \
- "${ROOT}"/usr/bin/gvim \
- "${ROOT}"/usr/bin/xvile \
- "${ROOT}"/bin/busybox \
+ "${EROOT}"/usr/bin/vim \
+ "${EROOT}"/usr/bin/nvi \
+ "${EROOT}"/usr/bin/elvis \
+ "${EROOT}"/usr/bin/vile \
+ "${EROOT}"/usr/bin/gvim \
+ "${EROOT}"/usr/bin/xvile \
+ "${EROOT}"/bin/busybox \
; do
if [[ -f "${f}" ]] ; then
echo $(basename "${f}" )
@@ -27,8 +27,8 @@ find_targets() {
# try to remove the vi, ex, view and man vi symlinks
remove_symlinks() {
- rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \
- rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null
+ rm -f "${EROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \
+ rm -f "${EROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null
}
# set a man page symlink
@@ -36,7 +36,7 @@ set_man_symlink() {
local target="${1}" link_name="${2}" x extension
for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do
- if [[ -e /usr/share/man/man1/${target}${x} ]] ; then
+ if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then
extension="${x}"
break
fi
@@ -48,7 +48,7 @@ set_man_symlink() {
fi
ln -s "${target}${extension}" \
- "${ROOT}/usr/share/man/man1/${link_name}${extension}"
+ "${EROOT}/usr/share/man/man1/${link_name}${extension}"
}
# set the vi, ex, view, and man vi symlinks
@@ -61,9 +61,9 @@ set_symlinks() {
local dir
if [[ ${target} == "busybox" ]]; then
- dir="${ROOT}/bin"
+ dir="${EROOT}/bin"
else
- dir="${ROOT}/usr/bin"
+ dir="${EROOT}/usr/bin"
fi
if [[ -f "${dir}/${target}" ]] ; then
@@ -75,12 +75,12 @@ set_symlinks() {
set_man_symlink "${target}" "view"
# it's not okay if these fail
- target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin")
- ln -s "${target}" "${ROOT}/usr/bin/vi" \
+ target=$(relative_name "${dir}/${target}" "${EROOT}/usr/bin")
+ ln -s "${target}" "${EROOT}/usr/bin/vi" \
|| die "Couldn't set ${target} /usr/bin/vi symlink"
- ln -s "${target}" "${ROOT}/usr/bin/ex" \
+ ln -s "${target}" "${EROOT}/usr/bin/ex" \
|| die "Couldn't set ${target} /usr/bin/ex symlink"
- ln -s "${target}" "${ROOT}/usr/bin/view" \
+ ln -s "${target}" "${EROOT}/usr/bin/view" \
|| die "Couldn't set ${target} /usr/bin/view symlink"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
@@ -97,9 +97,9 @@ do_show() {
[[ -z "${@}" ]] || die -q "Too many parameters"
write_list_start "Current vi implementation:"
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
- write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" ""
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then
+ write_kv_list_entry "$(basename $(canonicalise ${EROOT}/usr/bin/vi ) )" ""
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then
write_kv_list_entry "(not a symlink)" ""
else
write_kv_list_entry "(unset)" ""
@@ -119,7 +119,7 @@ do_list() {
targets=( $(find_targets ) )
for (( i = 0; i < ${#targets[@]}; i++ )); do
[[ ${targets[i]} = \
- $(basename "$(canonicalise "${ROOT}/usr/bin/vi")") ]] \
+ $(basename "$(canonicalise "${EROOT}/usr/bin/vi")") ]] \
&& targets[i]=$(highlight_marker "${targets[i]}")
done
write_list_start "Available vi implementations:"
@@ -147,15 +147,15 @@ do_set() {
elif [[ -n "${2}" ]] ; then
die -q "Too many parameters"
- elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
+ elif [[ -L "${EROOT}/usr/bin/vi" ]] ; then
if ! remove_symlinks ; then
die -q "Can't remove existing provider"
elif ! set_symlinks "${1}" ; then
die -q "Can't set new provider"
fi
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
- die -q "Sorry, ${ROOT}/usr/bin/vi confuses me"
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then
+ die -q "Sorry, ${EROOT}/usr/bin/vi confuses me"
else
set_symlinks "${1}" || die -q "Can't set a new provider"
@@ -176,11 +176,11 @@ do_update() {
[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
die -q "Usage error"
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then
[[ ${1} == "--if-unset" ]] && return
remove_symlinks || die -q "Can't remove existing link"
fi
- if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
+ if [[ -e "${EROOT}/usr/bin/vi" ]] ; then
die -q "Can't set a new provider"
elif ! [[ -z $(find_targets ) ]] ; then
set_symlinks 1 || die -q "Can't set a new provider"
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2013-03-11 14:27 Christoph Junghans
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Junghans @ 2013-03-11 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 77f51da24c362d78a63fac9c1b96901c65d99685
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 14:27:37 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 14:27:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=77f51da2
xvmc.eselect: version bumped to 0.4
---
ChangeLog | 5 +++++
modules/xvmc.eselect | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b3256cf..f0f5c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-11 Christoph Junghans <ottxor@gentoo.org>
+
+ * modules/xvmc.eselect: add myself as maintainer,
+ version bump to 0.4 for release
+
2013-03-11 Ulrich Müller <ulm@gentoo.org>
* modules/xvmc.eselect (get_libname): Use the OSTYPE bash variable
diff --git a/modules/xvmc.eselect b/modules/xvmc.eselect
index cd435cc..eefd566 100644
--- a/modules/xvmc.eselect
+++ b/modules/xvmc.eselect
@@ -3,9 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
DESCRIPTION="Manage the XvMC implementation used by your system"
-MAINTAINER="cardoe@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
+MAINTAINER="{cardoe,ottxor}@gentoo.org"
+VERSION="0.4"
init_XVMC_vars() {
get_libname() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2013-03-11 7:21 Ulrich Mueller
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Mueller @ 2013-03-11 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 59a88458c795674b63f5d668695712a2c063d9ab
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 07:24:31 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 07:24:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=59a88458
xvmc.eselect: Use OSTYPE instead of uname.
* modules/xvmc.eselect (get_libname): Use the OSTYPE bash variable
instead of calling uname -s.
---
ChangeLog | 5 +++++
modules/xvmc.eselect | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d3ae9c5..b3256cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-11 Ulrich Müller <ulm@gentoo.org>
+
+ * modules/xvmc.eselect (get_libname): Use the OSTYPE bash variable
+ instead of calling uname -s.
+
2013-03-10 Christoph Junghans <ottxor@gentoo.org>
* modules/xvmc.eselect: added changes from gx86
diff --git a/modules/xvmc.eselect b/modules/xvmc.eselect
index 46deac5..cd435cc 100644
--- a/modules/xvmc.eselect
+++ b/modules/xvmc.eselect
@@ -9,9 +9,10 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" )
init_XVMC_vars() {
get_libname() {
- [[ $(uname) == "Darwin" ]] \
- && echo ${1:+.}${1}.dylib \
- || echo .so${1:+.}${1}
+ case ${OSTYPE} in
+ darwin*) echo ${1:+.}${1}.dylib ;;
+ *) echo .so${1:+.}${1} ;;
+ esac
}
XVMCLIBS=(
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2013-03-11 2:16 Christoph Junghans
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Junghans @ 2013-03-11 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 17a26967e83d98849dcac6ef278b2f1d03f576ce
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 02:08:10 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 02:12:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=17a26967
xvmc.eselect: move XVMC vars in local context
---
ChangeLog | 5 ++++
modules/xvmc.eselect | 60 ++++++++++++++++++++++++++++---------------------
2 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1e6d9a4..d3ae9c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-10 Christoph Junghans <ottxor@gentoo.org>
+
+ * modules/xvmc.eselect: added changes from gx86
+ version 0.3 and fixes for bugs #434518 and #393027
+
2013-01-06 Christoph Junghans <ottxor@gentoo.org>
* modules/awk.eselect: Add awk selection module
diff --git a/modules/xvmc.eselect b/modules/xvmc.eselect
index cb3be65..96db76e 100644
--- a/modules/xvmc.eselect
+++ b/modules/xvmc.eselect
@@ -7,37 +7,42 @@ MAINTAINER="cardoe@gentoo.org"
SVN_DATE='$Date$'
VERSION=$(svn_date_to_version "${SVN_DATE}" )
-get_libname() {
+init_XVMC_vars() {
+ get_libname() {
[[ $(uname) == "Darwin" ]] \
&& echo ${1:+.}${1}.dylib \
|| echo .so${1:+.}${1}
+ }
+
+ XVMCLIBS=(
+ "libXvMCNVIDIA_dynamic$(get_libname 1)"
+ "libXvMC$(get_libname 1)"
+ "libviaXvMC$(get_libname 1)"
+ "libviaXvMCPro$(get_libname 1)"
+ "libchromeXvMC$(get_libname 1)"
+ "libchromeXvMCPro$(get_libname 1)"
+ "libXvMCVIA$(get_libname)"
+ "libXvMCVIAPro$(get_libname)"
+ "libI810XvMC$(get_libname 1)"
+ "/usr/lib/libIntelXvMC$(get_libname)"
+ "libAMDXvBA$(get_libname 1)"
+ )
+
+ XVMCPRETTY=(
+ "nvidia"
+ "xorg-x11"
+ "via"
+ "via-pro"
+ "openchrome"
+ "openchrome-pro"
+ "unichrome"
+ "unichrome-pro"
+ "intel-i810"
+ "intel-i915/i965"
+ "ati"
+ )
}
-XVMCLIBS=(
-"libXvMCNVIDIA_dynamic$(get_libname 1)"
-"libXvMC$(get_libname 1)"
-"libviaXvMC$(get_libname 1)"
-"libviaXvMCPro$(get_libname 1)"
-"libchromeXvMC$(get_libname 1)"
-"libchromeXvMCPro$(get_libname 1)"
-"libXvMCVIA$(get_libname)"
-"libXvMCVIAPro$(get_libname)"
-"libI810XvMC$(get_libname 1)"
-"/usr/lib/libIntelXvMC$(get_libname)"
-"libAMDXvBA$(get_libname 1)" )
-XVMCPRETTY=(
-"nvidia"
-"xorg-x11"
-"via"
-"via-pro"
-"openchrome"
-"openchrome-pro"
-"unichrome"
-"unichrome-pro"
-"intel-i810"
-"intel-i915/i965"
-"ati" )
-
get_implementation_indices() {
local ret n
for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
@@ -85,6 +90,7 @@ describe_list() {
do_list() {
local output n
+ init_XVMC_vars
local avail=( $(get_implementation_indices) )
local current=$(get_current_implementation_index)
write_list_start \
@@ -109,6 +115,7 @@ describe_show() {
}
do_show() {
+ init_XVMC_vars
local current=$(get_current_implementation_index)
write_list_start "Current XvMC implementation:"
@@ -139,6 +146,7 @@ describe_set_options() {
}
do_set() {
+ init_XVMC_vars
local current=$(get_current_implementation_index)
local avail=( $(get_implementation_indices) )
local n new action
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2013-01-15 19:02 Christoph Junghans
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Junghans @ 2013-01-15 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 43ca639fb83870d24dc022ba22e3aa6b61d85299
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 00:45:26 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 00:45:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=43ca639f
awk, timezone: added
---
AUTHORS | 3 +
ChangeLog | 6 ++
modules/awk.eselect | 159 ++++++++++++++++++++++++++++++++++++++++++++++
modules/timezone.eselect | 132 ++++++++++++++++++++++++++++++++++++++
4 files changed, 300 insertions(+), 0 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index a54f624..fb58161 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,3 +27,6 @@ Ryan Hill <dirtyepic@gentoo.org>
Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Modules: mesa
+
+Christoph Junghans <ottxor@gentoo.org>
+ Modules: awk, timezone
diff --git a/ChangeLog b/ChangeLog
index d4c3a67..9499f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-06 Christoph Junghans <ottxor@gentoo.org>
+
+ * modules/awk.eselect: Add awk selection module
+ * modules/timezoe.eselect: Add timezone setting module
+ * AUTHOR: Add myself
+
2013-01-01 Matt Turner <mattst88@gentoo.org>
* modules/opengl.eselect: switch GLES3, bug #444114.
diff --git a/modules/awk.eselect b/modules/awk.eselect
new file mode 100644
index 0000000..61650c4
--- /dev/null
+++ b/modules/awk.eselect
@@ -0,0 +1,159 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: $
+
+DESCRIPTION="Manage {,/usr}/bin/awk implementations"
+MAINTAINER="ottxor@gentoo.org"
+VERSION="0.2"
+
+## Functions ##
+
+# find a list of awk symlink targets, best first
+find_targets() {
+ local t
+ for t in \
+ "${EROOT}/usr/bin/gawk" \
+ "${EROOT}/usr/bin/mawk" \
+ "${EROOT}/usr/bin/nawk" \
+ "${EROOT}/bin/busybox" \
+ ; do
+ if [[ -x ${t} ]]; then
+ echo ${t##*/}
+ fi
+ done
+}
+
+# set the awk symlink
+set_symlinks() {
+ local target=${1} targets extension dir i rel_target
+
+ [[ ! -L ${EROOT}/bin/awk && -e ${EROOT}/bin/awk ]] && \
+ die -q "/bin/awk is not a symlink!"
+
+ [[ ! -L ${EROOT}/usr/bin/awk && -e ${EROOT}/usr/bin/awk ]] && \
+ die -q "/usr/bin/awk is not a symlink!"
+
+ if is_number "${target}" && [[ ${target} -ge 1 ]]; then
+ targets=( $(find_targets) )
+ target=${targets[target-1]}
+ fi
+
+ if [[ ${target} == "busybox" ]]; then
+ dir="${EROOT}/bin"
+ else
+ dir="${EROOT}/usr/bin"
+ fi
+
+ [[ -x ${dir}/${target} ]] || die -q "Target '${target}' doesn't appear to be valid!"
+
+ for i in /bin /usr/bin; do
+ rel_target=$(relative_name "${dir}/${target}" "${EROOT}${i}")
+ ln -sf "${rel_target}" "${EROOT}${i}/awk" || \
+ die -q "Couldn't set ${target} ${i}/awk symlink"
+ done
+
+ rm -f "${EROOT}"/usr/share/man/man1/awk.1{,.bz2,.gz,lzma}
+ for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do
+ if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then
+ extension="${x}"
+ break
+ fi
+ done
+
+ #busybox has no man page
+ if [[ -z "${extension}" ]] ; then
+ echo "Couldn't find a man page for ${target}; skipping." 1>&2
+ return 1
+ fi
+
+ if ! ln -s "${target}${extension}" "${EROOT}/usr/share/man/man1/awk${extension}"; then
+ echo "Couldn't create man page symlink for ${target}; skipping." 1>&2
+ return 1
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current awk implementation"
+}
+
+do_show() {
+ [[ -z ${@} ]] || die -q "Too many parameters"
+
+ write_list_start "Current awk implementation:"
+ if [[ -L ${EROOT}/usr/bin/awk ]]; then
+ write_kv_list_entry "$(basename $(readlink ${ROOT}/usr/bin/awk))" ""
+ elif [[ -e ${EROOT}/usr/bin/awk ]]; then
+ write_kv_list_entry "(not a symlink)" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available awk implementations"
+}
+
+do_list() {
+ [[ -z ${@} ]] || die -q "Too many parameters"
+
+ local i targets
+
+ targets=( $(find_targets) )
+ for (( i = 0; i < ${#targets[@]}; i++ )) ; do
+ [[ ${targets[${i}]} == $(basename $(readlink "${EROOT}"/usr/bin/awk)) ]] && \
+ targets[${i}]=$(highlight_marker "${targets[${i}]}")
+ done
+ write_list_start "Available awk implementations:"
+ write_numbered_list -m '(none found)' "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new awk 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 awk 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 ${EROOT}/usr/bin/awk && -x ${EROOT}/usr/bin/awk ]] && \
+ return
+
+ set_symlinks 1
+}
+
+# vim: set syn=sh :
diff --git a/modules/timezone.eselect b/modules/timezone.eselect
new file mode 100644
index 0000000..d2abd57
--- /dev/null
+++ b/modules/timezone.eselect
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: $
+
+DESCRIPTION="Manages timezone selection"
+MAINTAINER="ottxor@gentoo.org"
+VERSION="0.2"
+
+ZONE_DIR="${EROOT}/usr/share/zoneinfo"
+## Functions ##
+
+# find a list of zones in ZONE_DIR
+find_targets() {
+ local t
+ [[ -d ${ZONE_DIR}/${1} ]] || die -q "Directory ${1} does not exist in ${ZONE_DIR}"
+ for t in $(find "${ZONE_DIR}/${1}" -type f | sort ) ; do
+ [[ $(file ${t}) = *"timezone data"* ]] && echo ${t#${ZONE_DIR}/}
+ done
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current timezone selection"
+}
+
+do_show() {
+ [[ -z ${@} ]] || die -q "Too many parameters"
+
+ local zone
+
+ [[ -f ${EROOT}/etc/timezone ]] && \
+ zone=$(grep -e "^[^#]" "${EROOT}"/etc/timezone)
+
+ write_list_start "Current timezone selection:"
+ if [[ -z ${zone} ]]; then
+ write_kv_list_entry "(unset in ${EROOT}/etc/timezone)" ""
+ elif [[ ! -f ${ZONE_DIR}/${zone} ]]; then
+ write_kv_list_entry "(invalid zone in ${EROOT}/etc/localtime)" ""
+ elif [[ -f ${EROOT}/etc/localtime ]]; then
+ cmp -s "${ZONE_DIR}/${zone}" "${EROOT}/etc/localtime" && \
+ write_kv_list_entry "${zone}" "" || \
+ write_kv_list_entry "(set to ${zone} in ${EROOT}/etc/timezone, but differs from ${EROOT}/etc/localtime"
+ else
+ write_kv_list_entry "(set to ${zone} in ${EROOT}/etc/timezone, but unset in ${EROOT}/etc/localtime)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available timezones"
+}
+
+describe_list_options() {
+ echo "basedir : Basedir to show zones from (from 'list' action)"
+}
+
+describe_list_parameters() {
+ echo "[basedir]"
+}
+
+do_list() {
+ local basedir=
+ if [[ -n ${1} ]]; then
+ basedir="${1}"
+ shift
+ [[ -d ${ZONE_DIR}/${basedir} ]] || die -q "Directory ${basedir} does not exist in ${ZONE_DIR}"
+ fi
+
+ [[ -z ${@} ]] || die -q "Too many parameters"
+
+ local i targets
+
+ local zone
+
+ zone=$(grep -e "^[^#]" "${EROOT}"/etc/timezone)
+
+ targets=( $(find_targets "${basedir}") )
+ for (( i = 0; i < ${#targets[@]}; i++ )) ; do
+ [[ ${targets[${i}]} == ${zone} ]] && \
+ targets[${i}]=$(highlight_marker "${targets[${i}]}")
+ done
+ write_list_start "Available timezones:"
+ if [[ -z ${basedir} ]] ; then
+ write_numbered_list -m '(none found)' "${targets[@]}"
+ else
+ for (( i = 0; i < ${#targets[@]}; i++ )) ; do
+ write_kv_list_entry -p "${targets[i]}" ""
+ done
+ fi
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new timezone"
+}
+
+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"
+ fi
+
+ local target=${1} targets
+
+ if is_number "${target}" && [[ ${target} -ge 1 ]]; then
+ targets=( $(find_targets "") )
+ target=${targets[target-1]}
+ fi
+
+ [[ -f ${ZONE_DIR}/${target} ]] || die -q "Target '${target}' doesn't appear to be valid!"
+
+ #if localtime is a symlink cp would fail
+ rm -f "${EROOT}/etc/localtime" || die -q "Couldn't remove ${EROOT}/etc/localtime"
+ cp "${ZONE_DIR}/${target}" "${EROOT}"/etc/localtime || \
+ die -q "Couldn't copy ${target} to ${EROOT}/etc/localtime"
+ echo "${target}" > "${EROOT}"/etc/timezone || \
+ die -q "Couldn't save ${target} in ${EROOT}/etc/timezone"
+}
+
+# vim: set syn=sh :
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/eselect:extern commit in: /, modules/
@ 2013-01-01 19:17 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2013-01-01 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 1ba301aeae25c8284538d00671ff0bd6c9528925
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 1 19:18:58 2013 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Jan 1 19:18:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=1ba301ae
opengl: Handle GLES3 switching
---
ChangeLog | 4 ++++
modules/opengl.eselect | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c723984..d4c3a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-01 Matt Turner <mattst88@gentoo.org>
+
+ * modules/opengl.eselect: switch GLES3, bug #444114.
+
2012-03-08 Ulrich Müller <ulm@gentoo.org>
* modules/esd.eselect (VERSION):
diff --git a/modules/opengl.eselect b/modules/opengl.eselect
index fa1e8f7..6bffb74 100644
--- a/modules/opengl.eselect
+++ b/modules/opengl.eselect
@@ -250,10 +250,11 @@ set_new_implementation() {
gl_header[GL]="gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h"
gl_header[GLES]="egl.h gl_extensions.h glext.h gl.h glplatform.h"
gl_header[GLES2]="gl2ext.h gl2.h gl2platform.h"
+ gl_header[GLES3]="gl3ext.h gl3.h gl3platform.h"
gl_header[EGL]="eglext.h egl.h eglplatform.h"
gl_header[KHR]="khrplatform.h"
gl_header[VG]="openvg.h vgext.h vgplatform.h vgu.h"
- for gl_dir in {EGL,GL,GLES,GLES2,KHR,VG}; do
+ for gl_dir in {EGL,GL,GLES,GLES2,GLES3,KHR,VG}; do
setup_includes_symlinks \
"${DST_PREFIX}/include/${gl_dir}" \
"${gl_header[${gl_dir}]}" \
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-11-22 6:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-23 17:51 [gentoo-commits] proj/eselect:extern commit in: /, modules/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2014-11-22 6:47 Ben de Groot
2013-03-11 14:27 Christoph Junghans
2013-03-11 7:21 Ulrich Mueller
2013-03-11 2:16 Christoph Junghans
2013-01-15 19:02 Christoph Junghans
2013-01-01 19:17 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox