summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-12-29 23:30:19 +0000
committerUlrich Müller <ulm@gentoo.org>2007-12-29 23:30:19 +0000
commit6150bb8052ef9f5691fb6d50c02254a2a73ab507 (patch)
tree837b38699f2409d59e43301a3af7c34b4a4c05a8 /app-admin
parentSplit ChangeLog for eclasses. Remove empty directory. (diff)
parentRemoved empty directory. (diff)
downloademacs-6150bb8052ef9f5691fb6d50c02254a2a73ab507.tar.gz
emacs-6150bb8052ef9f5691fb6d50c02254a2a73ab507.tar.bz2
emacs-6150bb8052ef9f5691fb6d50c02254a2a73ab507.zip
Install emacs-updater from FILESDIR on behalf of opfer.
svn path=/emacs-overlay/; revision=905
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect-emacs/ChangeLog4
-rw-r--r--app-admin/eselect-emacs/Manifest6
-rw-r--r--app-admin/eselect-emacs/eselect-emacs-1.3-r2.ebuild7
-rwxr-xr-xapp-admin/eselect-emacs/files/emacs-updater84
4 files changed, 93 insertions, 8 deletions
diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog
index 54bed37..16a1bda 100644
--- a/app-admin/eselect-emacs/ChangeLog
+++ b/app-admin/eselect-emacs/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Dec 2007; Ulrich Mueller <ulm@gentoo.org> +files/emacs-updater:
+ eselect-emacs-1.3-r2.ebuild:
+ Install emacs-updater from FILESDIR on behalf of opfer.
+
29 Dec 2007; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
+eselect-emacs-1.3-r2.ebuild:
Copied from Portage. Install emacs-updater.
diff --git a/app-admin/eselect-emacs/Manifest b/app-admin/eselect-emacs/Manifest
index 3911d43..d50e4b0 100644
--- a/app-admin/eselect-emacs/Manifest
+++ b/app-admin/eselect-emacs/Manifest
@@ -1,5 +1,5 @@
-DIST emacs-updater-0.3.tar.bz2 1827 RMD160 fd9b2ce787e77ae0867d59a0c9e1b973c3646249 SHA1 661d44e133b0ffee681cece17bf90fbf780f860f SHA256 67d5d798e085786989ca6b3ab66f907a04d28e98346faa681012c523f395090b
+AUX emacs-updater 1771 RMD160 34bae58591be4abfb0d8c23580d0567d57a12d99 SHA1 8b33aaab109694436dcd9c386b5a08a9d851b5ab SHA256 0be338c272f14ca8ae4410fac6852a8ec5d715f50fc3c6b14a19b3c1f938f663
DIST eselect-emacs-1.3.tar.bz2 6597 RMD160 28552dc2e263bd26768120fc37433a14ee2feb12 SHA1 93b40064c5740d1f8c5d38e4a07d5062e2a3a22b SHA256 26ad557147a4bbf3757052d58c44874396a7724ea16af52c25e0df01f2178a29
-EBUILD eselect-emacs-1.3-r2.ebuild 1041 RMD160 fb42ee452bcc48d33aa1296a4d99b2149d290e32 SHA1 1c4a7a16b272d04669a1e6598b97b78175ba9e35 SHA256 e3f32ca39811701be79f1f12450a868578b73595a5398d8c2c1ca2ee6a221da6
-MISC ChangeLog 265 RMD160 d95d8e8c3eb99a1e8ef1e1a74bad3226b63147f2 SHA1 d91f7300c204fb38dc3237ba1bb4c30f345d2d76 SHA256 5528814987d99e5e93d2d6baf75e461989af04ea6fe9fcf812d3b9dcb1ea8808
+EBUILD eselect-emacs-1.3-r2.ebuild 945 RMD160 c46ec02e891d79ed38ee1cd07a5de0ff87a4af22 SHA1 1e678d87c033f748cbbb1418488e12e8bbe4571b SHA256 5ecda1ed2fe956d6eac07765cd3efaac21c56d8ad1297858c1f9f72da1a52cce
+MISC ChangeLog 424 RMD160 71665ac31feeabfc50ebd629a038f1140ee21087 SHA1 77e633af61ce8a81fa838beacb4f673ec283e327 SHA256 2cf2b3caefa2ccf1606e61fe6deb220ab03b5d5fd2820fdb935bd4fed52d21ca
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-admin/eselect-emacs/eselect-emacs-1.3-r2.ebuild b/app-admin/eselect-emacs/eselect-emacs-1.3-r2.ebuild
index f30cd51..aaa9e03 100644
--- a/app-admin/eselect-emacs/eselect-emacs-1.3-r2.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-1.3-r2.ebuild
@@ -4,9 +4,7 @@
DESCRIPTION="Manages Emacs versions"
HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-MY_EU_P="emacs-updater-0.3"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- http://dev.gentoo.org/~ulm/distfiles/${MY_EU_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -26,6 +24,5 @@ src_install() {
doins emacs.eselect || die "doins failed"
doman emacs.eselect.5 || die "doman failed"
dodoc ChangeLog || die "dodoc failed"
-
- dosbin "${WORKDIR}/${MY_EU_P}/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..6b9539f
--- /dev/null
+++ b/app-admin/eselect-emacs/files/emacs-updater
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Licensed under GPL version 2
+# Authors:
+# Christian Faulhammer <opfer@gentoo.org>
+# Ulrich Mueller <ulm@gentoo.org>
+
+# Only set colours if output is not redirected
+if tty -s <&1; then
+ BLUE=$'\e[34;01m'
+ GREEN=$'\e[32;01m'
+ RED=$'\e[31;01m'
+ YELLOW=$'\e[33;01m'
+ CYAN=$'\e[36;01m'
+ BOLD=$'\e[0;01m'
+ NORMAL=$'\e[0m'
+fi
+
+SITELISP=/usr/share/emacs/site-lisp
+VERSION=0.3
+TMPFILE="$(mktemp /tmp/emacs-updater.XXXXXX)"
+
+
+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}"
+}
+
+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
+
+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
+
+message "Packages with site files in the wrong location:"
+cat "${TMPFILE}"
+
+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/"