From 6fc80d360594d817eab84e8346c33983902a52a2 Mon Sep 17 00:00:00 2001 From: idl0r Date: Mon, 25 Oct 2010 21:16:03 +0000 Subject: Move ego into DEPRECATED. svn path=/trunk/gentoolkit-dev/; revision=828 --- ChangeLog | 2 + Makefile | 2 +- src/DEPRECATED/ego/AUTHORS | 1 + src/DEPRECATED/ego/ChangeLog | 2 + src/DEPRECATED/ego/Makefile | 18 +++++++++ src/DEPRECATED/ego/README | 2 + src/DEPRECATED/ego/ego | 88 ++++++++++++++++++++++++++++++++++++++++++++ src/ego/AUTHORS | 1 - src/ego/ChangeLog | 2 - src/ego/Makefile | 18 --------- src/ego/README | 2 - src/ego/ego | 88 -------------------------------------------- 12 files changed, 114 insertions(+), 112 deletions(-) create mode 100644 src/DEPRECATED/ego/AUTHORS create mode 100644 src/DEPRECATED/ego/ChangeLog create mode 100644 src/DEPRECATED/ego/Makefile create mode 100644 src/DEPRECATED/ego/README create mode 100644 src/DEPRECATED/ego/ego delete mode 100644 src/ego/AUTHORS delete mode 100644 src/ego/ChangeLog delete mode 100644 src/ego/Makefile delete mode 100644 src/ego/README delete mode 100644 src/ego/ego diff --git a/ChangeLog b/ChangeLog index f0967e1..d787936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Cleanup. Make it a bit more POSIX conform. Update manpage. Add support for multiple ebuilds to bump. Bump version. Fix header. + * ego: Move "ego" into DEPRECATED. + 2010-10-23: Christian Ruppert * echangelog: Fix version bump detection for hg/mercurial, bug 335636, diff --git a/Makefile b/Makefile index fdd48a7..c3dffab 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ include makedefs.mak -TOOLS=ebump echangelog ego ekeyword eshowkw eviewcvs imlate +TOOLS=ebump echangelog ekeyword eshowkw eviewcvs imlate RELEASE="gentoolkit-dev-$(VERSION)$(RELEASE_TAG)" all: diff --git a/src/DEPRECATED/ego/AUTHORS b/src/DEPRECATED/ego/AUTHORS new file mode 100644 index 0000000..36d5bfd --- /dev/null +++ b/src/DEPRECATED/ego/AUTHORS @@ -0,0 +1 @@ +Aron Griffis diff --git a/src/DEPRECATED/ego/ChangeLog b/src/DEPRECATED/ego/ChangeLog new file mode 100644 index 0000000..503d0da --- /dev/null +++ b/src/DEPRECATED/ego/ChangeLog @@ -0,0 +1,2 @@ +2004-15-01 Karl Trygve Kalleberg + * Added Makefile diff --git a/src/DEPRECATED/ego/Makefile b/src/DEPRECATED/ego/Makefile new file mode 100644 index 0000000..6cb32ee --- /dev/null +++ b/src/DEPRECATED/ego/Makefile @@ -0,0 +1,18 @@ +# Copyright 2004 Karl Trygve Kalleberg +# Copyright 2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# +# $Header$ + +include ../../makedefs.mak + +all: + +dist: + mkdir -p ../../$(distdir)/src/ego/ + cp Makefile AUTHORS README ChangeLog ego ../../$(distdir)/src/ego/ + +install: all + install -d $(docdir)/ego + install -m 0644 AUTHORS README ego $(docdir)/ego/ + diff --git a/src/DEPRECATED/ego/README b/src/DEPRECATED/ego/README new file mode 100644 index 0000000..6c44b4c --- /dev/null +++ b/src/DEPRECATED/ego/README @@ -0,0 +1,2 @@ +[ -f ${HOME}/scripts/ego.bash ] && +alias ego="unalias ego ; source ${HOME}/scripts/ego.bash ; ego " diff --git a/src/DEPRECATED/ego/ego b/src/DEPRECATED/ego/ego new file mode 100644 index 0000000..cacd188 --- /dev/null +++ b/src/DEPRECATED/ego/ego @@ -0,0 +1,88 @@ +#!/bin/sh + +echo1() { + echo "$1" +} + +ego() { + local portdir tmpdir category pkg target + + # This is WAY faster than portageq: + # portdir=$(portageq portdir) + # tmpdir=$(portageq envvar PORTAGE_TMPDIR)/portage + eval $( + . /etc/make.globals + . /etc/make.conf + export PORTDIR PORTAGE_TMPDIR + export | sed -n ' + s/^declare -x PORTDIR=/portdir=/p + s/^declare -x PORTAGE_TMPDIR=\(.*\)/tmpdir=\1\/portage/p' + ) + + case $1 in + *-*/*) + pkg=${1##*/} + category=${1%/*} + ;; + + ?*) + pkg=$1 + # require an ebuild so that we can block deprecated packages + # such as dev-libs/rep-gtk + category=$(echo1 $portdir/*-*/$pkg/*.ebuild) + [[ -f $category ]] || category=$(echo1 $portdir/*-*/$pkg*/*.ebuild) + [[ -f $category ]] || category=$(echo1 $portdir/*-*/*$pkg/*.ebuild) + [[ -f $category ]] || category=$(echo1 $portdir/*-*/*$pkg*/*.ebuild) + if [[ ! -f $category ]]; then + echo "Can't find $pkg in $portdir" >&2 + return 1 + fi + pkg=${category%/*} + pkg=${pkg##*/} + category=${category#$portdir/} + category=${category%%/*} + ;; + + *) + # Check if we're under $portdir first + pkg=${PWD##*/} + category=${PWD%/*} + category=${category##*/} + if [[ ! -d $portdir/$category/$pkg ]]; then + # Next check if we're in PORTAGE_TMPDIR + if [[ $PWD = $tmpdir/* ]]; then + pkg=${PWD#$tmpdir/} + pkg=${pkg%%/*} + pkg=${pkg%%-[0-9]*} # not really a valid assumption + category=$(echo1 $portdir/*-*/$pkg/*.ebuild) + if [[ ! -f $category ]]; then + echo "Can't find $pkg in $portdir" >&2 + return 1 + fi + category=${category#$portdir/} + category=${category%%/*} + else + echo "syntax: ego [pkgname]" >&2 + echo "or simply ego from a dir under $portdir or $tmpdir" >&2 + return 1 + fi + fi + ;; + esac + + # go to tmpdir or portdir? + if [[ $PWD/ = */$category/$pkg/* ]]; then + [[ -n $tmpdir ]] || tmpdir=$(portageq envvar PORTAGE_TMPDIR)/portage + target=$(command ls -1td $tmpdir/$pkg-* 2>/dev/null | head -n 1) + if [[ -z $target ]]; then + echo "No matches found for $tmpdir/$pkg-*" >&2 + return 1 + fi + cd $target/work/$pkg* 2>/dev/null || + cd $target/work 2>/dev/null || + cd $target + else + cd $portdir/$category/$pkg + fi +} + diff --git a/src/ego/AUTHORS b/src/ego/AUTHORS deleted file mode 100644 index 36d5bfd..0000000 --- a/src/ego/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Aron Griffis diff --git a/src/ego/ChangeLog b/src/ego/ChangeLog deleted file mode 100644 index 503d0da..0000000 --- a/src/ego/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2004-15-01 Karl Trygve Kalleberg - * Added Makefile diff --git a/src/ego/Makefile b/src/ego/Makefile deleted file mode 100644 index 6cb32ee..0000000 --- a/src/ego/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2004 Karl Trygve Kalleberg -# Copyright 2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# -# $Header$ - -include ../../makedefs.mak - -all: - -dist: - mkdir -p ../../$(distdir)/src/ego/ - cp Makefile AUTHORS README ChangeLog ego ../../$(distdir)/src/ego/ - -install: all - install -d $(docdir)/ego - install -m 0644 AUTHORS README ego $(docdir)/ego/ - diff --git a/src/ego/README b/src/ego/README deleted file mode 100644 index 6c44b4c..0000000 --- a/src/ego/README +++ /dev/null @@ -1,2 +0,0 @@ -[ -f ${HOME}/scripts/ego.bash ] && -alias ego="unalias ego ; source ${HOME}/scripts/ego.bash ; ego " diff --git a/src/ego/ego b/src/ego/ego deleted file mode 100644 index cacd188..0000000 --- a/src/ego/ego +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -echo1() { - echo "$1" -} - -ego() { - local portdir tmpdir category pkg target - - # This is WAY faster than portageq: - # portdir=$(portageq portdir) - # tmpdir=$(portageq envvar PORTAGE_TMPDIR)/portage - eval $( - . /etc/make.globals - . /etc/make.conf - export PORTDIR PORTAGE_TMPDIR - export | sed -n ' - s/^declare -x PORTDIR=/portdir=/p - s/^declare -x PORTAGE_TMPDIR=\(.*\)/tmpdir=\1\/portage/p' - ) - - case $1 in - *-*/*) - pkg=${1##*/} - category=${1%/*} - ;; - - ?*) - pkg=$1 - # require an ebuild so that we can block deprecated packages - # such as dev-libs/rep-gtk - category=$(echo1 $portdir/*-*/$pkg/*.ebuild) - [[ -f $category ]] || category=$(echo1 $portdir/*-*/$pkg*/*.ebuild) - [[ -f $category ]] || category=$(echo1 $portdir/*-*/*$pkg/*.ebuild) - [[ -f $category ]] || category=$(echo1 $portdir/*-*/*$pkg*/*.ebuild) - if [[ ! -f $category ]]; then - echo "Can't find $pkg in $portdir" >&2 - return 1 - fi - pkg=${category%/*} - pkg=${pkg##*/} - category=${category#$portdir/} - category=${category%%/*} - ;; - - *) - # Check if we're under $portdir first - pkg=${PWD##*/} - category=${PWD%/*} - category=${category##*/} - if [[ ! -d $portdir/$category/$pkg ]]; then - # Next check if we're in PORTAGE_TMPDIR - if [[ $PWD = $tmpdir/* ]]; then - pkg=${PWD#$tmpdir/} - pkg=${pkg%%/*} - pkg=${pkg%%-[0-9]*} # not really a valid assumption - category=$(echo1 $portdir/*-*/$pkg/*.ebuild) - if [[ ! -f $category ]]; then - echo "Can't find $pkg in $portdir" >&2 - return 1 - fi - category=${category#$portdir/} - category=${category%%/*} - else - echo "syntax: ego [pkgname]" >&2 - echo "or simply ego from a dir under $portdir or $tmpdir" >&2 - return 1 - fi - fi - ;; - esac - - # go to tmpdir or portdir? - if [[ $PWD/ = */$category/$pkg/* ]]; then - [[ -n $tmpdir ]] || tmpdir=$(portageq envvar PORTAGE_TMPDIR)/portage - target=$(command ls -1td $tmpdir/$pkg-* 2>/dev/null | head -n 1) - if [[ -z $target ]]; then - echo "No matches found for $tmpdir/$pkg-*" >&2 - return 1 - fi - cd $target/work/$pkg* 2>/dev/null || - cd $target/work 2>/dev/null || - cd $target - else - cd $portdir/$category/$pkg - fi -} - -- cgit v1.2.3-18-g5258