Version bump, prerelease eselect-{ctags,emacs}.

svn path=/emacs-overlay/; revision=1059

7 files changed, 148 insertions, 23 deletions

diff --git a/app-admin/eselect-ctags/ChangeLog b/app-admin/eselect-ctags/ChangeLog
index 1e285f0..429cff4 100644
--- a/app-admin/eselect-ctags/ChangeLog
+++ b/app-admin/eselect-ctags/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*eselect-ctags-1.3 (30 Apr 2008)
+*eselect-ctags-1.4_pre1 (03 May 2008)
+
+  03 May 2008; Ulrich Mueller <ulm@gentoo.org>
+  +eselect-ctags-1.4_pre1.ebuild, -eselect-ctags-9999.ebuild:
+  Prerelease.
+
+*eselect-ctags-9999 (30 Apr 2008)
 
   30 Apr 2008; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
   +eselect-ctags-9999.ebuild:
diff --git a/app-admin/eselect-ctags/Manifest b/app-admin/eselect-ctags/Manifest
index 86a7369..99c8277 100644
--- a/app-admin/eselect-ctags/Manifest
+++ b/app-admin/eselect-ctags/Manifest
@@ -1,3 +1,4 @@
-EBUILD eselect-ctags-9999.ebuild 769 RMD160 eb20918f2d6a5e61bd07ae7de409090d2d3d717e SHA1 502ee583f37c88170490e92663af1b874ce04824 SHA256 c36580dde90093f300e9b0b75f024d436b853ca8c0d79d1bf74f7f377d106486
-MISC ChangeLog 270 RMD160 1b133ed0d82f9a1f57919b71b274c80b3a585cdb SHA1 fa6aed710cab5343f285cc9ecf58d40687eb1070 SHA256 bd7f00c899e28a36870a6b7e1faf28d0d808c24c09f5d0fc0b5004b609a5f669
+DIST eselect-emacs-1.4_pre1.tar.bz2 7381 RMD160 3ec4df30bc528ee931df2fdca0e843cfeaf91cee SHA1 f75c80e9c0b5af11d9a5c258c4298de9bfdbe024 SHA256 18d0359430026dddf043bc2a6db728de0e8f6cf374a36089fdf9458e542b5fbc
+EBUILD eselect-ctags-1.4_pre1.ebuild 742 RMD160 6ec8e985264176ae7d62fc5f4b8005352ea9d940 SHA1 00137883a6456360dd10ead51be7bc17603da282 SHA256 b7593b51148cb932a9dbf8fca7363d5020f099ba786102a837d90370dcf7c4f3
+MISC ChangeLog 434 RMD160 f30f3ed49d48320efebd22f40f5ba1fbbb9587f0 SHA1 0e45af3a6dee4ba05fb10a64461ebe3caa4735c7 SHA256 78379ab87306b34f872d2048d898d1a56d6ee16c4228bfc6275ae8f6b1fa7819
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild b/app-admin/eselect-ctags/eselect-ctags-1.4_pre1.ebuild
index 58ac502..8f51958 100644
--- a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-1.4_pre1.ebuild
@@ -2,25 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit subversion
-
-MY_PN="eselect-emacs"
+MY_P="eselect-emacs-${PV}"
 DESCRIPTION="Manages ctags implementations"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 #SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-ESVN_REPO_URI="svn://anonsvn.gentoo.org/emacs/${MY_PN}"
-ESVN_PROJECT="${MY_PN}"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND=">=app-admin/eselect-1.0.10
 	!<=app-admin/eselect-emacs-1.3"
 
-S="${WORKDIR}/${MY_PN}"
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog
index e5eebb6..a639930 100644
--- a/app-admin/eselect-emacs/ChangeLog
+++ b/app-admin/eselect-emacs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*eselect-emacs-1.4_pre1 (03 May 2008)
+
+  03 May 2008; Ulrich Mueller <ulm@gentoo.org> +files/emacs-updater,
+  +eselect-emacs-1.4_pre1.ebuild, -eselect-emacs-9999.ebuild:
+  Prerelease.
+
   01 May 2008; Ulrich Mueller <ulm@gentoo.org> eselect-emacs-9999.ebuild:
   etags.eselect is created from Makefile.
 
diff --git a/app-admin/eselect-emacs/Manifest b/app-admin/eselect-emacs/Manifest
index 0ab363c..02ca27e 100644
--- a/app-admin/eselect-emacs/Manifest
+++ b/app-admin/eselect-emacs/Manifest
@@ -1,3 +1,5 @@
-EBUILD eselect-emacs-9999.ebuild 905 RMD160 235e8be13739cdf373b7e48588998ef0c184fe3c SHA1 66fe06c711c08b0f5bda35edc8075578c60509cd SHA256 3bac5377ffe9054e41097a75efdcdcaecd67ae6ab9390edd72e311f85f068a43
-MISC ChangeLog 388 RMD160 1ed7c453d1633d3971b25c4c591d96b29d8c81ae SHA1 1f7982107cbeb6ffc3ef6542d8a826e7de5eee25 SHA256 81bf258821a4ca48d64e2ed5663b16775f0d861b85328d35350b52810b2e60d9
+AUX emacs-updater 2880 RMD160 670ba0b40d7c957d1ebf7a61ef6f37205569a721 SHA1 f80a4a5127f1d54494a3b1f3e842f17bd96ba0a1 SHA256 dfdf65efad666f5133e9d2cfdefae31589618de1addd2ae3057cb708ce493f5e
+DIST eselect-emacs-1.4_pre1.tar.bz2 7381 RMD160 3ec4df30bc528ee931df2fdca0e843cfeaf91cee SHA1 f75c80e9c0b5af11d9a5c258c4298de9bfdbe024 SHA256 18d0359430026dddf043bc2a6db728de0e8f6cf374a36089fdf9458e542b5fbc
+EBUILD eselect-emacs-1.4_pre1.ebuild 780 RMD160 01251c6ccc3a02133df04fc2bd31d99757441f86 SHA1 7cf124e21c7c12b364102dac07f84cd076e40173 SHA256 721f7747d7dfe68fb05d6fac394494d9293219484e233785ce8006100303a908
+MISC ChangeLog 573 RMD160 dbb30ad12c22cd4d62be67d316def17101c4708b SHA1 df3720754a605c6c38b03a0d4b40ae909753f7e2 SHA256 51b12cde4116db9fba456fabc717d93f3b469d9955b115a65bd769e649688b41
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-admin/eselect-emacs/eselect-emacs-9999.ebuild b/app-admin/eselect-emacs/eselect-emacs-1.4_pre1.ebuild
index 1d72f56..42752e9 100644
--- a/app-admin/eselect-emacs/eselect-emacs-9999.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-1.4_pre1.ebuild
@@ -2,12 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit subversion
-
 DESCRIPTION="Manages Emacs versions"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 #SRC_URI="mirror://gentoo/${P}.tar.bz2"
-ESVN_REPO_URI="svn://anonsvn.gentoo.org/emacs/${PN}"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,17 +16,10 @@ DEPEND=""
 RDEPEND=">=app-admin/eselect-1.0.10
 	~app-admin/eselect-ctags-${PV}"
 
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	subversion_fetch || die
-	subversion_fetch "${ESVN_REPO_URI%/*}/emacs-updater" || die
-}
-
 src_install() {
 	insinto /usr/share/eselect/modules
 	doins {emacs,etags}.eselect || die "doins failed"
 	doman {emacs,etags}.eselect.5 || die "doman failed"
 	dodoc ChangeLog || die "dodoc failed"
-	dosbin emacs-updater || die "dosbin failed"
+	dosbin "${FILESDIR}/emacs-updater" || die "dosbin failed"
 }
diff --git a/app-admin/eselect-emacs/files/emacs-updater b/app-admin/eselect-emacs/files/emacs-updater
new file mode 100755
index 0000000..7f94d97
--- /dev/null
+++ b/app-admin/eselect-emacs/files/emacs-updater
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# Copyright 2007-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: emacs-updater,v 1.3 2008/03/08 06:53:06 ulm Exp $
+
+# Authors:
+# Christian Faulhammer <opfer@gentoo.org>
+# Ulrich Mueller <ulm@gentoo.org>
+
+VERSION=0.6
+SITELISP=/usr/share/emacs/site-lisp
+TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
+
+cat <<-EOF
+
+Emacs updater version ${VERSION}
+Written by the Gentoo Emacs team http://www.gentoo.org/proj/en/lisp/emacs/
+Find packages that are installed in the wrong location
+
+EOF
+
+usage() {
+    sed -e 's/^X//' <<-EOF
+	Usage: ${0##*/} [OPTION]...
+	X  -n, --nocolour   disable colour in output
+	X  -p, --pretend    don't actually emerge packages
+	X  -h, --help       display this help and exit
+	EOF
+    exit ${1}
+}
+
+# Read in all command-line options and force English output
+OPTIONS=$(LC_ALL=C getopt -o hpn --long help,pretend,nocolour \
+     -n 'emacs-updater' -- "$@")
+[ $? -eq 0 ] || usage 1
+
+eval set -- "${OPTIONS}"
+
+while true
+do
+    case "${1}" in
+	-h|--help)      usage 0 ;;
+	-p|--pretend)   PRETEND="true"; shift 1 ;;
+	-n|--nocolour)  NOCOLOUR="true"; shift 1 ;;
+	--)             shift; break ;;
+    esac
+done
+
+# Only set colours if output is not redirected or the --no-colour
+# option is not set
+if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
+    RED=$(tput -S <<<$'setaf 1\nbold')
+    GREEN=$(tput -S <<<$'setaf 2\nbold')
+    YELLOW=$(tput -S <<<$'setaf 3\nbold')
+    BLUE=$(tput -S <<<$'setaf 4\nbold')
+    MAGENTA=$(tput -S <<<$'setaf 5\nbold')
+    CYAN=$(tput -S <<<$'setaf 6\nbold')
+    BOLD=$(tput bold)
+    NORMAL=$(tput sgr0)
+fi
+
+message() {
+    local OUTPUT=$@
+    echo "${GREEN}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
+}
+
+warning() {
+    local OUTPUT=$@
+    echo "${YELLOW}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}"
+}
+
+failure() {
+    local OUTPUT=$@
+    echo "${RED}*${NORMAL}${BOLD} ${OUTPUT}${NORMAL}" 
+}
+
+if ! [ -x /usr/bin/qfile ]; then
+    echo
+    failure "Please emerge app-portage/portage-utils to use this tool"
+    exit 1
+fi
+
+for sf in "${ROOT}${SITELISP}"/[0-9][0-9]*-gentoo.el
+do
+    [ "${sf##*/}" = 00site-gentoo.el ] && continue
+    message "Processing ${sf##*/} ..."
+    qfile -qCR "${sf}" >> "${TMPFILE}"
+done
+echo
+
+if [ ! -s "${TMPFILE}" ]; then
+    warning "No packages to update, quitting."
+    exit 2
+fi
+
+NO_OF_PACKAGES=$(sed -n '$=' "${TMPFILE}")
+
+[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
+message "${NO_OF_PACKAGES} package${s} with site files in the wrong location:"
+cat "${TMPFILE}"
+
+if [ "${PRETEND}" ]; then
+    exit 3
+fi
+
+echo
+echo -n "${BOLD}Remerge packages?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
+read choice
+echo
+case "${choice}" in
+    y*|Y*|"")
+	;;
+    *)
+	warning "Quitting."
+	exit 10 ;;
+esac
+
+emerge --oneshot --ask --verbose $(cat "${TMPFILE}")
+
+warning "If a package is being rebuilt over and over again,"
+warning "please report it on http://bugs.gentoo.org/"