eselect-emacs updated to newest version in -extra.

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

4 files changed, 104 insertions, 4 deletions

diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog
index 4509129..220b697 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: $
 
+  20 Mar 2007; <ulm@gentoo.org> +eselect-emacs-0.3-r1.ebuild,
+  +files/eselect-emacs-0.3-r119.patch:
+  Make linking to XEmacs auxiliary programs really work.
+
   20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   eselect-emacs-0.3.ebuild:
   changed SRC_URI as the tarball can't find its way to the official mirrors
diff --git a/app-admin/eselect-emacs/Manifest b/app-admin/eselect-emacs/Manifest
index 989f269..7b2138f 100644
--- a/app-admin/eselect-emacs/Manifest
+++ b/app-admin/eselect-emacs/Manifest
@@ -1,3 +1,7 @@
+AUX eselect-emacs-0.3-r119.patch 1604 RMD160 85df32ebf5d383056f641e829fe8fbc63688d2bc SHA1 b248a822191c6ec2ee6d415a51eceeccb7053abe SHA256 1eff3f70f532430f9314de674e95a978a49e918f1b2b507871c51a56201dbe0e
+MD5 18a263088434b1618a2ee98bee5a63ad files/eselect-emacs-0.3-r119.patch 1604
+RMD160 85df32ebf5d383056f641e829fe8fbc63688d2bc files/eselect-emacs-0.3-r119.patch 1604
+SHA256 1eff3f70f532430f9314de674e95a978a49e918f1b2b507871c51a56201dbe0e files/eselect-emacs-0.3-r119.patch 1604
 DIST eselect-emacs-0.1.tar.bz2 7345 RMD160 e4f0d09db620dfad1947af7003f6071e60bd2dc2 SHA1 ff5994d17d21f56d60746618d27c998fca611362 SHA256 21ebc83033a7eb0fc054301fd9f79cb3e18eaf05e65671c0b9668c0a4678b4c0
 DIST eselect-emacs-0.2.tar.bz2 7628 RMD160 40bc44061b37bece8ac493e2903b5de49cf177de SHA1 d19118b5c7d34a6afaa8b53141516040aafb56aa SHA256 6a43692cb63ced74abb82298dc98fc6c0e0d7b9a9eae8ae9d563f3051f2ab587
 DIST eselect-emacs-0.3.tar.bz2 7673 RMD160 f10d59abcd9b2e33c04e7ac279df844a3e008ade SHA1 0e71efba6e7f641d93d7f9cf00ae29f8feaa20f3 SHA256 4237153a55be647d59a37d85c0748b476da60d793b8721cee9f7a62d80c60769
@@ -9,14 +13,22 @@ EBUILD eselect-emacs-0.2.ebuild 528 RMD160 e1c648335460edf026208a303b6269750be4b
 MD5 6a0bcaba1a4108ba4898720b0e4002ef eselect-emacs-0.2.ebuild 528
 RMD160 e1c648335460edf026208a303b6269750be4b4b9 eselect-emacs-0.2.ebuild 528
 SHA256 9cf684388be458d73beafe08e53d139521bfc1d254b09890e3a3f7d56b422c6b eselect-emacs-0.2.ebuild 528
+EBUILD eselect-emacs-0.3-r1.ebuild 590 RMD160 a5102a1e548ba4f511b1b2732be42cf05bd809f0 SHA1 8fe50fcb35d489dbf471ce43db138a83cea34d93 SHA256 2a05d936ee32e688e4438689bd52d8738ad2950c55ed1c3d0524c1ee0be17bc1
+MD5 9a1690d5d8fdd752226bdac9688e9293 eselect-emacs-0.3-r1.ebuild 590
+RMD160 a5102a1e548ba4f511b1b2732be42cf05bd809f0 eselect-emacs-0.3-r1.ebuild 590
+SHA256 2a05d936ee32e688e4438689bd52d8738ad2950c55ed1c3d0524c1ee0be17bc1 eselect-emacs-0.3-r1.ebuild 590
 EBUILD eselect-emacs-0.3.ebuild 508 RMD160 a3b40f1b48f51d0f35146f701fca9b3b3c619999 SHA1 672876fe421056ab6188c3e24ac183aa59b1aac6 SHA256 064322d62c6eecec6434032e2c5d7b1f882d96e2eb377a6b207efb59beba6fe6
 MD5 5b228b5ca3cdfe885432e168d929ff72 eselect-emacs-0.3.ebuild 508
 RMD160 a3b40f1b48f51d0f35146f701fca9b3b3c619999 eselect-emacs-0.3.ebuild 508
 SHA256 064322d62c6eecec6434032e2c5d7b1f882d96e2eb377a6b207efb59beba6fe6 eselect-emacs-0.3.ebuild 508
-MISC ChangeLog 1870 RMD160 406af95ef0dc8d56c90ad9164ad4bd7a69260af9 SHA1 5b2f5c9b297cf988c1ad48597f49c8e666b52c22 SHA256 ebab15ce4b6a3c8f4f410ceb7ce3263a1b4e08a49cb3db6a6cad148b4a80bb3d
-MD5 829591f783b9de594cb24966afc96d2d ChangeLog 1870
-RMD160 406af95ef0dc8d56c90ad9164ad4bd7a69260af9 ChangeLog 1870
-SHA256 ebab15ce4b6a3c8f4f410ceb7ce3263a1b4e08a49cb3db6a6cad148b4a80bb3d ChangeLog 1870
+MISC ChangeLog 2029 RMD160 e7bc5715fd67cbaf33f7085c38b4cfe0fa0bb84e SHA1 6bb39fe676dd659c6bdec65cebc45cef90583342 SHA256 387c7fea5276cce8b38e47666e86696675b961c6789cd82db856b8b99f922a11
+MD5 887d900a4441cfb165c31455f82b5715 ChangeLog 2029
+RMD160 e7bc5715fd67cbaf33f7085c38b4cfe0fa0bb84e ChangeLog 2029
+SHA256 387c7fea5276cce8b38e47666e86696675b961c6789cd82db856b8b99f922a11 ChangeLog 2029
+MISC eselect-emacs-0.3-r1.ebuild~ 508 RMD160 a3b40f1b48f51d0f35146f701fca9b3b3c619999 SHA1 672876fe421056ab6188c3e24ac183aa59b1aac6 SHA256 064322d62c6eecec6434032e2c5d7b1f882d96e2eb377a6b207efb59beba6fe6
+MD5 5b228b5ca3cdfe885432e168d929ff72 eselect-emacs-0.3-r1.ebuild~ 508
+RMD160 a3b40f1b48f51d0f35146f701fca9b3b3c619999 eselect-emacs-0.3-r1.ebuild~ 508
+SHA256 064322d62c6eecec6434032e2c5d7b1f882d96e2eb377a6b207efb59beba6fe6 eselect-emacs-0.3-r1.ebuild~ 508
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -30,3 +42,6 @@ SHA256 dd00a9243490e859b5c57d050d604c1a319b2da06d6d0e7bfb426501833aa7f9 files/di
 MD5 9bc880d045ed0c69c59f53bef36afe54 files/digest-eselect-emacs-0.3 250
 RMD160 c44f4f37f6847bccd82b4544908aba20310ad4d2 files/digest-eselect-emacs-0.3 250
 SHA256 5b12ddf43083562b2123d44e9744e243b9eee078b1988d29742f17e193cb4fde files/digest-eselect-emacs-0.3 250
+MD5 9bc880d045ed0c69c59f53bef36afe54 files/digest-eselect-emacs-0.3-r1 250
+RMD160 c44f4f37f6847bccd82b4544908aba20310ad4d2 files/digest-eselect-emacs-0.3-r1 250
+SHA256 5b12ddf43083562b2123d44e9744e243b9eee078b1988d29742f17e193cb4fde files/digest-eselect-emacs-0.3-r1 250
diff --git a/app-admin/eselect-emacs/eselect-emacs-0.3-r1.ebuild b/app-admin/eselect-emacs/eselect-emacs-0.3-r1.ebuild
new file mode 100644
index 0000000..c06ce8b
--- /dev/null
+++ b/app-admin/eselect-emacs/eselect-emacs-0.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Manages the /usr/bin/emacs symlink"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~opfer/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.7"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-r119.patch"
+}
+
+src_install() {
+	cd "${S}"
+	domenu emacs.desktop
+	doicon emacs.png
+	insinto /usr/share/eselect/modules
+	doins emacs.eselect || die "doins failed"
+}
diff --git a/app-admin/eselect-emacs/files/eselect-emacs-0.3-r119.patch b/app-admin/eselect-emacs/files/eselect-emacs-0.3-r119.patch
new file mode 100644
index 0000000..6ec8d21
--- /dev/null
+++ b/app-admin/eselect-emacs/files/eselect-emacs-0.3-r119.patch
@@ -0,0 +1,51 @@
+Index: emacs.eselect
+===================================================================
+--- emacs.eselect	(revision 105)
++++ emacs.eselect	(revision 119)
+@@ -69,17 +69,10 @@
+ 
+ set_man_symlinks() {
+ 	local target="${1}" z
+-	local extension=$(echo ${ROOT}/usr/share/man/man1/emacs-${target}.1* |
++	local extension=$(echo ${ROOT}/usr/share/man/man1/*-${target}.1* |
+ 		sed 's/.*\.1//')
+ 
+-	if [[ ! -f "${ROOT}/usr/share/man/man1/emacs-${target}.1${extension}" ]]
+-	then
+-		echo "Couldn't find a man page for ${target}; skipping." 1>&2
+-		return 1
+-	fi
+-
+-	for z in ${MANPAGELIST}
+-	do
++	for z in ${MANPAGELIST}; do
+ 		if [[ -f "${ROOT}/usr/share/man/man1/${z}-${target}.1${extension}" ]]
+ 		then
+ 			ln -s "${z}-${target}.1${extension}" \
+@@ -95,12 +88,15 @@
+ 		target=${targets[$(( ${target} - 1 ))]}
+ 	fi
+ 	if [[ -f "${ROOT}/usr/bin/${target}" ]]; then
+-		remove_symlinks			# is this necessary here?
+-		ln -s "${target}" "${ROOT}/usr/bin/emacs" ||
+-			die "Couldn't set ${target} /usr/bin/emacs symlink"
++		remove_symlinks
++		if [[ ${target} == emacs-* ]]; then
++			ln -s "${target}" "${ROOT}/usr/bin/emacs" ||
++				die "Couldn't set ${target} /usr/bin/emacs symlink"
++		fi
+ 		set_bin_symlinks "${target}"
+ 		set_man_symlinks "${target}"
+ 		set_infopath "${target}"
++		return 0
+ 	else
+ 		die -q	"Target \"${1}\" doesn't appear to be valid!"
+ 	fi
+@@ -216,6 +212,6 @@
+ 		set_symlinks ${#targets[@]} || die -q "Couldn't set a new symlink"
+ 	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
+ 		# no Emacs target found - link ctags, etags etc. to XEmacs
+-		set_bin_symlinks xemacs
++		set_symlinks xemacs
+ 	fi
+ }