Don't PROVIDE=virtual/editor as it is a new-style virtual now.

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

9 files changed, 30 insertions, 34 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 6303d29..ce0d1ca 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
+  Don't PROVIDE=virtual/editor as it is a new-style virtual now.
+
   26 Sep 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
   Sync with Portage: Change WANT_AUTOCONF to 2.5, add some keywords.
 
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 15ffb80..4ee4169 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,6 +5,6 @@ AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520
 AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590
 AUX emacs-22.1-xembed.patch 12136 RMD160 96bf6095e8b6af78f7a5289820bde3a7043e74d8 SHA1 570faf7fa854624ea8f00df38a59c9b83f673f00 SHA256 ba41d8bf8830c657565c9ecc506d662f0eb45043e5aa2ea374031ba3185011f7
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
-EBUILD emacs-22.1-r1.ebuild 7668 RMD160 99ecb6162f8e59370d1642bdb38bfe81a87eecd0 SHA1 a28f26fcf971738a310b4c1e60d176020e04c9a6 SHA256 d7d897d89c2da9be169911e31467e378456868c8cb25b288547d9f8024e88bb3
-MISC ChangeLog 844 RMD160 02349d5201bebadec45cf030e8dd0449157a0a92 SHA1 9493a2c77818659084109522058f44c25f5a15a9 SHA256 46fc594c3e5bdd0e06224ebf0c835773912ec39a3dadab5180660feef08672ff
+EBUILD emacs-22.1-r1.ebuild 7654 RMD160 0487e7283d21d6254433e1b74a62a174e2718bc6 SHA1 b3a590d5ee4539e7d6aecbc195b0082d704797ae SHA256 e931a0214a058665e606c1676b16aa10a8ffbfab1787db209f0fed04d4b1ade7
+MISC ChangeLog 979 RMD160 452dfe298d0daf18a3e2fef3151a4a2ce4c74a4f SHA1 473865c4438cb4741311750a6385bfa664423fd1 SHA256 101f188fbc0a7b9674d06091d8460be88a0ba3b3a68f457fa5a7a1a3c3f97d57
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
index 6c32b74..3bfc300 100644
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ b/app-editors/emacs/emacs-22.1-r1.ebuild
@@ -46,8 +46,6 @@ RDEPEND="!<app-editors/emacs-cvs-22.1
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/editor"
-
 # FULL_VERSION keeps the full version number, which is needed in order to
 # determine some path information correctly for copy/move operations later on
 FULL_VERSION="${PV}"
@@ -198,27 +196,27 @@ emacs-infodir-rebuild() {
 
 	local infodir=/usr/share/info/emacs-${SLOT} f
 	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f ${ROOT}${infodir}/dir{,.*}
-	for f in ${ROOT}${infodir}/*.info*; do
+	rm -f "${ROOT}"${infodir}/dir{,.*}
+	for f in "${ROOT}"${infodir}/*.info*; do
 		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+			|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
 	done
 	echo
 }
 
 pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
+		cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
 
 	local f
-	for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
+	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
 		test -e ${f} || touch ${f}
 	done
 
 	elisp-site-regen
 	emacs-infodir-rebuild
 
-	if [[ "$(readlink ${ROOT}/usr/bin/emacs)" == emacs.emacs-${SLOT}* ]]; then
+	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
 		# transition from pre-eselect revision
 		eselect emacs set emacs-${SLOT}
 	else
diff --git a/app-editors/ermacs/ChangeLog b/app-editors/ermacs/ChangeLog
index 9a3b5bb..52e7fee 100644
--- a/app-editors/ermacs/ChangeLog
+++ b/app-editors/ermacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> ermacs-20070104.ebuild:
+  Don't PROVIDE=virtual/editor as it is a new-style virtual now.
+
   16 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
   +files/ermacs-20070104-gcc4.patch, +metadata.xml, +ermacs-20070104.ebuild:
   Initial import.
diff --git a/app-editors/ermacs/Manifest b/app-editors/ermacs/Manifest
index acb14b8..e6a1b74 100644
--- a/app-editors/ermacs/Manifest
+++ b/app-editors/ermacs/Manifest
@@ -1,5 +1,5 @@
 AUX ermacs-20070104-gcc4.patch 558 RMD160 0314a9887c25d9c031c8ea532de3ddbf80929de8 SHA1 6fcb139556e13986431f74a86da48decfe30fbfa SHA256 d0993f100a0a08d74d7e7a3082f6ec6c97cd44cfd172ad6b3f807aa17946cd76
 DIST ermacs-20070104.tar.bz2 153018 RMD160 eb854c615d5b84af7bef5f400178f74734d7d525 SHA1 f3848a50280b4d9d403f2cca1f925f88b88c0cd5 SHA256 177b7a7e0a91bbcea413f7be27717833f434892869434f1451887d69d86a20dd
-EBUILD ermacs-20070104.ebuild 1373 RMD160 b3282168b09de5391e6b3bee8adf03ec66144e30 SHA1 3560bdb8dd6574b155ea8a873e9822878668a4b2 SHA256 208ef1ff83b5bfc32f09d40298fc7ea8ec845bb864a9bdbe930fa680ecf6dc38
-MISC ChangeLog 262 RMD160 2af33848a9bf4f849d2c4e39c6593f280c95721c SHA1 cebd4a3f534df9b60eaf7f7d78e2b2f2c0a9c324 SHA256 e56847b3d7836bb077f2881536f8b8d90c09136e75266502653d60309a9506f6
+EBUILD ermacs-20070104.ebuild 1348 RMD160 e21ae5531c659ab1f9550ce8726e454e60d2a11a SHA1 19f8be0ecea46b16c3c5383d3f480dcf2c7298ce SHA256 2486f8f0fe07e8cb3c5cf4ba744568f3bd4b154a836e1665bbd7d6b4618f5119
+MISC ChangeLog 399 RMD160 184052f37f6109f23afadcee7b9910225a24142d SHA1 86e24f10fe9dbed8b85cea0f522541f10a21e016 SHA256 434a4e66f5c8ba6e12b2afddebdea2aef4ac3317f87b5b03db56d51a8f097c5e
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/ermacs/ermacs-20070104.ebuild b/app-editors/ermacs/ermacs-20070104.ebuild
index 8afccfa..b322480 100644
--- a/app-editors/ermacs/ermacs-20070104.ebuild
+++ b/app-editors/ermacs/ermacs-20070104.ebuild
@@ -18,7 +18,6 @@ IUSE=""
 DEPEND=">=dev-lang/erlang-11.2.5
 	>=sys-libs/slang-1.4.9-r2"
 RDEPEND="${DEPEND}"
-PROVIDE="virtual/editor"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
new file mode 100644
index 0000000..9d72774
--- /dev/null
+++ b/app-editors/xemacs/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for app-editors/xemacs
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> xemacs-21.5.28.ebuild:
+  Don't PROVIDE=virtual/editor as it is a new-style virtual now.
+
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bcf1c64..eded191 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,21 +1,7 @@
 AUX font-lock-warning-face.patch 766 RMD160 54a1eb71872a97d10aadc30326fa600356eb821c SHA1 33a590b2f79291262e50b240f9ac518ae555020f SHA256 608eeb3e9b02519cc0373782c00cf7f42914abf93b05c2509490e3c00d4c987c
-MD5 54a1bc4475e7f6bd1a2c0f3672f9b527 files/font-lock-warning-face.patch 766
-RMD160 54a1eb71872a97d10aadc30326fa600356eb821c files/font-lock-warning-face.patch 766
-SHA256 608eeb3e9b02519cc0373782c00cf7f42914abf93b05c2509490e3c00d4c987c files/font-lock-warning-face.patch 766
 AUX gdbm-and-db.patch 1425 RMD160 e0481823ea9d192a32737e71896a3ccde478db5c SHA1 60077800c56c49f8db1911bc5d787e9fb2bb4685 SHA256 bc2c38dfa7a4cc014d6e1776cb09c4219e40ba066fb29861264eb83642ed757e
-MD5 6c2caf3f4c7f48b367615822b7d17bff files/gdbm-and-db.patch 1425
-RMD160 e0481823ea9d192a32737e71896a3ccde478db5c files/gdbm-and-db.patch 1425
-SHA256 bc2c38dfa7a4cc014d6e1776cb09c4219e40ba066fb29861264eb83642ed757e files/gdbm-and-db.patch 1425
 AUX xemacs.desktop 1080 RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 SHA1 6a3a88ea334b510951a15efb126c4fb71a3b8c38 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060
-MD5 dcc34b333a77cb16d44bc60a2310b364 files/xemacs.desktop 1080
-RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 files/xemacs.desktop 1080
-SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060 files/xemacs.desktop 1080
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.5.28.tar.gz 15310202 RMD160 a225a2da39c22dccbc5d14399d40dadecead5e11 SHA1 6de5f4b4cecac0480dd9ff50170a72f23f36dbac SHA256 588a3970ee44426975cd86026a932ed0e2cf47f597ebcf76d376bbd18638eae2
-EBUILD xemacs-21.5.28.ebuild 6885 RMD160 ce5a47f1f7dafbb404b26eadb008f2cee0ecefe6 SHA1 e32ad58d2e307fd42cdb00961d64bba67e8a608e SHA256 64fcf1af3c4129aa261a15d277878728631242bc8badebbb5820820dc72177f4
-MD5 6cb379e0e20b0bb9fcdd6f8f5225974f xemacs-21.5.28.ebuild 6885
-RMD160 ce5a47f1f7dafbb404b26eadb008f2cee0ecefe6 xemacs-21.5.28.ebuild 6885
-SHA256 64fcf1af3c4129aa261a15d277878728631242bc8badebbb5820820dc72177f4 xemacs-21.5.28.ebuild 6885
-MD5 b83616acf1ac70a93c56df96f25e5378 files/digest-xemacs-21.5.28 482
-RMD160 a86113268eeef04fcd5bdc5be149fb5cecc183af files/digest-xemacs-21.5.28 482
-SHA256 65b5fcae35ac740ec61bdc7e45942f7cb15ce08b229561f79db7feb145708b3c files/digest-xemacs-21.5.28 482
+EBUILD xemacs-21.5.28.ebuild 6858 RMD160 6cf3d2f5ca70d593f55a4de018c1faa3f0f4813a SHA1 b134a6bba6d73a95c20c5563ab2df01a9e246097 SHA256 96436af9a6f93c44b72d1fbf0e1587c7f98615bdf3ec7db53099d6d2093f9b6a
+MISC ChangeLog 255 RMD160 f538272c219b40df5c377bf8b97bafa406af2b55 SHA1 02c4b7697327662b0306fe7e7825ce92f727e6f7 SHA256 03cc073660a1cb31ca0d0be6e3ba7733e115a41698fa24c39162930b4beda76e
diff --git a/app-editors/xemacs/xemacs-21.5.28.ebuild b/app-editors/xemacs/xemacs-21.5.28.ebuild
index 8421c20..a9d4404 100644
--- a/app-editors/xemacs/xemacs-21.5.28.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.28.ebuild
@@ -53,7 +53,7 @@ DEPEND="virtual/libc
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
 
-PROVIDE="virtual/xemacs virtual/editor"
+PROVIDE="virtual/xemacs"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -112,7 +112,7 @@ src_compile() {
 			myconf="${myconf} --without-xface"
 
 		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
-		    myconf="${myconf} --with-xft=no"
+			myconf="${myconf} --with-xft=no"
 
 	else
 		myconf="${myconf}
@@ -155,7 +155,7 @@ src_compile() {
 	if use gdbm || use berkdb ; then
 		if use gdbm ; then
 			mydb="gdbm"
-	        # We have GDBM in a non-standard location
+			# We have GDBM in a non-standard location
 			append-flags "-I/usr/include/gdbm"
 		fi
 
@@ -173,7 +173,7 @@ src_compile() {
 	use ia64  && myconf="${myconf} --with-system-malloc"
 
 	use debug && myconf="${myconf} --with-optimization=no --with-debug" ||
-	    myconf="${myconf} --with-optimizations=yes"
+		myconf="${myconf} --with-optimizations=yes"
 
 	# Don't use econf because it uses options which this configure
 	# script does not understand (like --host).