From bcab8264e39ba4fef3d2510b0dde8f9700a21d9f Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 9 Oct 2005 16:51:10 +0000 Subject: [PATCH] Clifford Wolf: Updated mine-0.23 [2005093014083518048] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6449 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/mine/mine.desc | 4 +-- package/base/mine/rocket-rev70.patch | 54 ---------------------------- package/base/mine/rocket-rev72.patch | 38 -------------------- package/base/mine/rocket-rev73.patch | 44 ----------------------- package/base/mine/rocket-rev74.patch | 45 ----------------------- 5 files changed, 2 insertions(+), 183 deletions(-) delete mode 100644 package/base/mine/rocket-rev70.patch delete mode 100644 package/base/mine/rocket-rev72.patch delete mode 100644 package/base/mine/rocket-rev73.patch delete mode 100644 package/base/mine/rocket-rev74.patch diff --git a/package/base/mine/mine.desc b/package/base/mine/mine.desc index 6930c267f..5056dc68c 100644 --- a/package/base/mine/mine.desc +++ b/package/base/mine/mine.desc @@ -35,8 +35,8 @@ [L] GPL [S] Stable -[V] 0.22 +[V] 0.23 [P] X 01---5---9 112.100 -[D] 3702179039 mine-0.22.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/ +[D] 2372097410 mine-0.23.tar.bz2 http://www.rocklinux.net/people/clifford/GEM-MINE/ diff --git a/package/base/mine/rocket-rev70.patch b/package/base/mine/rocket-rev70.patch deleted file mode 100644 index 8faa9ab1f..000000000 --- a/package/base/mine/rocket-rev70.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- ./rocket.sh (revision 69) -+++ ./rocket.sh (revision 70) -@@ -135,9 +135,14 @@ - search) - matches=0; - while read f; do -- echo; echo "Match #$((matches++)) ${f##*/}:" -+ echo -+ if [ -f "/var/adm/packages/${f##*/}" ]; then -+ echo "Match #$((matches++)) ${f##*/} (installed):" -+ else -+ echo "Match #$((matches++)) ${f##*/} (not installed):" -+ fi - egrep -i "^(\[I\]|\[T\].*$2)" $f -- done < <( egrep -lir "^\[(I|T)\].*$2" /var/adm/rocket/descs; ) -+ done < <( egrep -lir "^\[(I|T)\].*$2" /var/adm/rocket/descs | sort; ) - if [ $matches -gt 0 ]; then - echo - fi -@@ -145,17 +150,27 @@ - - list) - while read p; do -+ if [ -f "/var/adm/packages/$p" ] -+ then s='i'; else s='.'; fi - grep '^\[I\].*' /var/adm/rocket/descs/$p | -- sed "s,^....,$p\t," | expand -t20,30,40,50 -- done < <( egrep "^.*$2.* " /var/adm/rocket/locations.txt | cut -f1 -d' '; ) -+ sed "s,^....,$s $p\t," | expand -t25,35,45,55 -+ done < <( egrep "^.*$2.* " /var/adm/rocket/locations.txt | cut -f1 -d' ' | sort; ) - ;; - - info) -- echo; echo "$2"; echo -- egrep '^\[I\]' /var/adm/rocket/descs/$2 && echo -- egrep '^\[T\]' /var/adm/rocket/descs/$2 && echo -- egrep '^\[V\]' /var/adm/rocket/descs/$2 && echo -- egrep '^\[L\]' /var/adm/rocket/descs/$2 && echo -+ echo -+ if [ -f "/var/adm/packages/$2" ]; then -+ echo "$2 (installed)" -+ else -+ echo "$2 (not installed)" -+ fi -+ echo -+ egrep '^\[[I ]\]' /var/adm/rocket/descs/$2 && echo -+ egrep '^\[[T ]\]' /var/adm/rocket/descs/$2 && echo -+ egrep '^\[[U ]\]' /var/adm/rocket/descs/$2 && echo -+ egrep '^\[[MA]\]' /var/adm/rocket/descs/$2 && echo -+ egrep '^\[[V ]\]' /var/adm/rocket/descs/$2 && echo -+ egrep '^\[[LS]\]' /var/adm/rocket/descs/$2 && echo - ;; - - install) diff --git a/package/base/mine/rocket-rev72.patch b/package/base/mine/rocket-rev72.patch deleted file mode 100644 index 6bf43cccd..000000000 --- a/package/base/mine/rocket-rev72.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./rocket.sh -+++ ./rocket.sh -@@ -20,6 +20,7 @@ - rocket remove ........ remove package - - rocket search ...... search packge descriptions for this regex -+rocket fsearch ..... search packge file list for this regex - rocket list ........ list all packages with a name matching the regex - rocket info .......... print package details - -@@ -148,6 +149,27 @@ - fi - ;; - -+ fsearch) -+ matches=0; -+ if [ "${2#^}" != "$2" ]; then -+ regex="^[^ ]+ [^ ]+ ${2#^}" -+ else -+ regex="^[^ ]+ [^ ]+ .*$2" -+ fi -+ while read f; do -+ echo -+ if [ -f "/var/adm/packages/${f##*/}" ]; then -+ echo "Match #$((matches++)) ${f##*/} (installed):" -+ else -+ echo "Match #$((matches++)) ${f##*/} (not installed):" -+ fi -+ egrep -i "$regex" $f | cut -f3- -d' ' -+ done < <( egrep -lir "$regex" /var/adm/rocket/cksums | sort; ) -+ if [ $matches -gt 0 ]; then -+ echo -+ fi -+ ;; -+ - list) - while read p; do - if [ -f "/var/adm/packages/$p" ] diff --git a/package/base/mine/rocket-rev73.patch b/package/base/mine/rocket-rev73.patch deleted file mode 100644 index 66e5d172c..000000000 --- a/package/base/mine/rocket-rev73.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ./rocket.sh (revision 72) -+++ ./rocket.sh (revision 73) -@@ -9,6 +9,8 @@ - The GEM Pools (install sources) are configured in /etc/rocket.conf - - rocket updsrc .............. update local rock source tree -+rocket which ....... search in the "provides" package information -+ - rocket build ......... build tar.bz2 and .gem from sources - rocket emerge ........ build and install a package - -@@ -22,7 +24,9 @@ - rocket search ...... search packge descriptions for this regex - rocket fsearch ..... search packge file list for this regex - rocket list ........ list all packages with a name matching the regex -+ - rocket info .......... print package details -+rocket flist ......... print package file list - - EOT - exit 1 -@@ -67,6 +71,11 @@ - ./scripts/Cleanup - ;; - -+ which) -+ cd /usr/src/rock-src || exit 1 -+ egrep -l "^\[PROVIDES\].* ($2)($| )" package/*/*/*.cache | cut -f3 -d/ -+ ;; -+ - build) - shift - "$0" emerge "$@"; rc=$? -@@ -195,6 +204,10 @@ - egrep '^\[[LS]\]' /var/adm/rocket/descs/$2 && echo - ;; - -+ flist) -+ cut -f3- -d' ' /var/adm/rocket/cksums/$2 -+ ;; -+ - install) - shift - deps=$( echo $( echo "$*" | tr ' ' '\n' | diff --git a/package/base/mine/rocket-rev74.patch b/package/base/mine/rocket-rev74.patch deleted file mode 100644 index 35758d907..000000000 --- a/package/base/mine/rocket-rev74.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- ./rocket.sh (revision 73) -+++ ./rocket.sh (revision 74) -@@ -63,6 +63,15 @@ - ' < <( curl -s "$1/packages.db" | gunzip; ) - } - -+call_postinstall() { -+ if [ -n "$( /bin/ls /var/adm/postinstall/ | head -n1 )" ]; then -+ read -p "Do you want to run the postinstall scripts now? [Y/n] " yn -+ if [ "$yn" = "y" -o "$yn" = "Y" -o "$yn" = "" ]; then -+ postinstall -+ fi -+ fi -+} -+ - case "$1" in - - updsrc) -@@ -92,7 +101,9 @@ - cp -r /etc/ROCK-CONFIG/* config/rocket/ - ./scripts/Config -cfg rocket -oldconfig - fi -- exec -a "$0" ./scripts/Emerge-Pkg -cfg rocket "$@" -+ ./scripts/Emerge-Pkg -cfg rocket "$@"; rc=$? -+ call_postinstall -+ exit $rc - ;; - - create) -@@ -282,12 +293,15 @@ - echo "+ mine -i '$url'"; mine -i "$url" - fi - done -+ call_postinstall - exit 0 - ;; - - remove) - shift -+ echo "+ mine -rs $*" - mine -rs "$@" -+ call_postinstall - ;; - - index)