Sync snapshots with app-editors/emacs.

Package-Manager: portage-2.1.4_rc3

13 files changed, 120 insertions, 805 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index b1b58c346c72..1a09dc34fd77 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.173 2007/11/27 14:11:48 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.174 2007/11/27 16:03:26 ulm Exp $
+
+*emacs-cvs-23.0.0_p20070920-r1 (27 Nov 2007)
+*emacs-cvs-22.1.50_p20070829-r2 (27 Nov 2007)
+
+  27 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-format-int.patch, -emacs-cvs-22.1.50-r1.ebuild,
+  -emacs-cvs-22.1.50_p20070829-r1.ebuild,
+  +emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  -emacs-cvs-23.0.0_p20070920.ebuild, +emacs-cvs-23.0.0_p20070920-r1.ebuild,
+  -emacs-cvs-23.0.50.ebuild, -emacs-cvs-23.0.60.ebuild:
+  Synchronize CVS snapshots with app-editors/emacs. Remove old.
 
 *emacs-cvs-23.0.60-r1 (27 Nov 2007)
 *emacs-cvs-23.0.50-r1 (27 Nov 2007)
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 4b264a24e727..dfc1f6be6806 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -9,6 +9,10 @@ AUX emacs-cvs-disable_alsa_detection-r1.patch 1573 RMD160 e41972bc7c8c6ce8012804
 MD5 4d8a875faa61af1fa4d5fd31d85ad5d5 files/emacs-cvs-disable_alsa_detection-r1.patch 1573
 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b files/emacs-cvs-disable_alsa_detection-r1.patch 1573
 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc files/emacs-cvs-disable_alsa_detection-r1.patch 1573
+AUX emacs-cvs-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
+MD5 c90238868fbd7ef8eeaf5993c8b2a9c5 files/emacs-cvs-format-int.patch 3078
+RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 files/emacs-cvs-format-int.patch 3078
+SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd files/emacs-cvs-format-int.patch 3078
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
@@ -31,74 +35,53 @@ RMD160 6c698c2ce80c496079810da7290315ff579c9194 files/emacs-cvs-no-x-compile.pat
 SHA256 cf6b5d8a48796618a98f3a66f85f0010290b277be1d605304e7d83f36cc69349 files/emacs-cvs-no-x-compile.patch 452
 DIST emacs-cvs-22.1.50_p20070829.tar.bz2 20915594 RMD160 47f3c1c543de65c49deadbcdf4e83236aaa68f1b SHA1 6223e5b4cde078814648306b095f6081f56eea77 SHA256 c27196e9359d5ad4f30e3552c7897c995798324a323a4b47060b98426a71891f
 DIST emacs-cvs-23.0.0_p20070920.tar.bz2 21944733 RMD160 4ca3f66530c44a82e1badba4dfc934b2e5e5b8d7 SHA1 7e8b99d695adaec619837a6eec22c04ac69cb7aa SHA256 c38d4be31e047f5a470b1664a2721b3dcb83b3876cb3490a86e05804aebf4f2a
-EBUILD emacs-cvs-22.1.50-r1.ebuild 7872 RMD160 faf84a572670b54a8e061143b3ff156cbeac06b9 SHA1 34837ed2af821a05e99a358de3a10e525562349e SHA256 1730e761093d6a1a6c0d737c5aa0bcb63064f972b49803598bcb71837074ff2c
-MD5 222fbbec8fc191c974691f7cd098857a emacs-cvs-22.1.50-r1.ebuild 7872
-RMD160 faf84a572670b54a8e061143b3ff156cbeac06b9 emacs-cvs-22.1.50-r1.ebuild 7872
-SHA256 1730e761093d6a1a6c0d737c5aa0bcb63064f972b49803598bcb71837074ff2c emacs-cvs-22.1.50-r1.ebuild 7872
 EBUILD emacs-cvs-22.1.50-r2.ebuild 7873 RMD160 1df722d035595403c940bde2a324d7cc934a78d2 SHA1 f1bcb8f6634352bb3727ee932d6614f15d6ab8d9 SHA256 3b8954eb0c1133266d7741a0f6a038fad756ee88ef5a6432d7010a6d1637d195
 MD5 1fb4180dd2755a80e9e49cb9453f0419 emacs-cvs-22.1.50-r2.ebuild 7873
 RMD160 1df722d035595403c940bde2a324d7cc934a78d2 emacs-cvs-22.1.50-r2.ebuild 7873
 SHA256 3b8954eb0c1133266d7741a0f6a038fad756ee88ef5a6432d7010a6d1637d195 emacs-cvs-22.1.50-r2.ebuild 7873
-EBUILD emacs-cvs-22.1.50_p20070829-r1.ebuild 7518 RMD160 8df8e0e1c25bc4cd2a16aa4933b6ab421845b0e2 SHA1 cfb627c0a0274d28089c759d706de81ed1e73be0 SHA256 50afd1eb6104fa636bd72a5b4a0212254f4aa1bcd8a290a6c6adc1ea1048c0b4
-MD5 d8d9a0198feb476020cad6f770a3b96b emacs-cvs-22.1.50_p20070829-r1.ebuild 7518
-RMD160 8df8e0e1c25bc4cd2a16aa4933b6ab421845b0e2 emacs-cvs-22.1.50_p20070829-r1.ebuild 7518
-SHA256 50afd1eb6104fa636bd72a5b4a0212254f4aa1bcd8a290a6c6adc1ea1048c0b4 emacs-cvs-22.1.50_p20070829-r1.ebuild 7518
-EBUILD emacs-cvs-23.0.0_p20070920.ebuild 7775 RMD160 9c518a298665cabd6f56cf518e6e25e1b567996a SHA1 69b846f5a9d17a0cd5babb4bb067ff29c1558f41 SHA256 7c18e34bf90b413e67c2a5fd57e363d336918cd4ace72aad7e66a3b1242fc7f3
-MD5 c8c3b89a360e53e818c4ea7f92b27aa1 emacs-cvs-23.0.0_p20070920.ebuild 7775
-RMD160 9c518a298665cabd6f56cf518e6e25e1b567996a emacs-cvs-23.0.0_p20070920.ebuild 7775
-SHA256 7c18e34bf90b413e67c2a5fd57e363d336918cd4ace72aad7e66a3b1242fc7f3 emacs-cvs-23.0.0_p20070920.ebuild 7775
+EBUILD emacs-cvs-22.1.50_p20070829-r2.ebuild 7562 RMD160 a65554f468c404ac377c00edf6d1c22d5cdfd891 SHA1 4864d61bd0a2ac1f44d3f53ed0758ddbe5354aed SHA256 fcea871899a7be87e8572551985686d8be190e7a4953e11e7624973f2e8850ee
+MD5 6133e4f210eafa52786fc3ef84885082 emacs-cvs-22.1.50_p20070829-r2.ebuild 7562
+RMD160 a65554f468c404ac377c00edf6d1c22d5cdfd891 emacs-cvs-22.1.50_p20070829-r2.ebuild 7562
+SHA256 fcea871899a7be87e8572551985686d8be190e7a4953e11e7624973f2e8850ee emacs-cvs-22.1.50_p20070829-r2.ebuild 7562
+EBUILD emacs-cvs-23.0.0_p20070920-r1.ebuild 7823 RMD160 2e7e9d01d45a877a8780b42b2c23a381451d73f3 SHA1 2bae30959138efcd211587292951fad2e933bbbf SHA256 6c4868d14e6e234bcae07ae7a3af16a510d8dc4ca2cb34533c90bfeb7fdb2b5c
+MD5 7660c92031d4e8afc376e693bace999b emacs-cvs-23.0.0_p20070920-r1.ebuild 7823
+RMD160 2e7e9d01d45a877a8780b42b2c23a381451d73f3 emacs-cvs-23.0.0_p20070920-r1.ebuild 7823
+SHA256 6c4868d14e6e234bcae07ae7a3af16a510d8dc4ca2cb34533c90bfeb7fdb2b5c emacs-cvs-23.0.0_p20070920-r1.ebuild 7823
 EBUILD emacs-cvs-23.0.50-r1.ebuild 7880 RMD160 f6ac89b4d6128539314361d942aec733af8734cb SHA1 e5af4e909cb65580833067d37ec864a99c4cc089 SHA256 e8c668819654d2fe0ec840e4a51ff0d9b9f20bee14e711b3216564363bae5ff6
 MD5 f1d9f208a996125871d468bc2e3d5b22 emacs-cvs-23.0.50-r1.ebuild 7880
 RMD160 f6ac89b4d6128539314361d942aec733af8734cb emacs-cvs-23.0.50-r1.ebuild 7880
 SHA256 e8c668819654d2fe0ec840e4a51ff0d9b9f20bee14e711b3216564363bae5ff6 emacs-cvs-23.0.50-r1.ebuild 7880
-EBUILD emacs-cvs-23.0.50.ebuild 7876 RMD160 f93da5a68016bf9315a0cfb164ee615b774a9852 SHA1 0790a9c0d29f8f2311b9fae9b02f8070a588c863 SHA256 31634833127a44e6cf402f76cf4922f846f51abd16c8c204606b9d82bcaede19
-MD5 236ab8b5569c7bc907adc9dc1c7ede8d emacs-cvs-23.0.50.ebuild 7876
-RMD160 f93da5a68016bf9315a0cfb164ee615b774a9852 emacs-cvs-23.0.50.ebuild 7876
-SHA256 31634833127a44e6cf402f76cf4922f846f51abd16c8c204606b9d82bcaede19 emacs-cvs-23.0.50.ebuild 7876
 EBUILD emacs-cvs-23.0.60-r1.ebuild 8070 RMD160 1470290f28b98555982acebe1db979789ca544ba SHA1 64f30a4e62752041a76a64c9f6a5d715a585f22f SHA256 63d84125a94ccaffd8b89e2776c0b96a5c251e332011a143549c669bb5582d4e
 MD5 5a622e407b3cad2b2b1234f5f536ee40 emacs-cvs-23.0.60-r1.ebuild 8070
 RMD160 1470290f28b98555982acebe1db979789ca544ba emacs-cvs-23.0.60-r1.ebuild 8070
 SHA256 63d84125a94ccaffd8b89e2776c0b96a5c251e332011a143549c669bb5582d4e emacs-cvs-23.0.60-r1.ebuild 8070
-EBUILD emacs-cvs-23.0.60.ebuild 8065 RMD160 e38dcf80a11551130c501a3cba9d026369816e79 SHA1 a24cfeef6a62091a4dc73c68deaf90b6ede5fc78 SHA256 bfa9fe2cf777ea86285716861aec525ded324d37cf472f4c3a1b115faf571051
-MD5 d2141cfb1094c830bda708509fdd72f1 emacs-cvs-23.0.60.ebuild 8065
-RMD160 e38dcf80a11551130c501a3cba9d026369816e79 emacs-cvs-23.0.60.ebuild 8065
-SHA256 bfa9fe2cf777ea86285716861aec525ded324d37cf472f4c3a1b115faf571051 emacs-cvs-23.0.60.ebuild 8065
-MISC ChangeLog 33237 RMD160 d45f1a3050c479276d4bf9e433608ff41969de53 SHA1 b72421d99920a86a51e3ab558e606f605c004f31 SHA256 e98c8ccefe5110f3a5824016722b527fd3298559011de3c94e69ab4cc854c11f
-MD5 ce05ec28acfb0ba32df7db9d38af4a60 ChangeLog 33237
-RMD160 d45f1a3050c479276d4bf9e433608ff41969de53 ChangeLog 33237
-SHA256 e98c8ccefe5110f3a5824016722b527fd3298559011de3c94e69ab4cc854c11f ChangeLog 33237
+MISC ChangeLog 33723 RMD160 f032e83c7cc70c12a0e33c4071ec6e563d58ff50 SHA1 ac9cf46ac3f1ee609c1cea2ee4678c8c807564dd SHA256 a7c0756bbb71a1f8898ccdd37f4e192d220da3e6f0e43cc6a82923b5dea71179
+MD5 eac12a3ecb17306ee0d45fd35e143ee3 ChangeLog 33723
+RMD160 f032e83c7cc70c12a0e33c4071ec6e563d58ff50 ChangeLog 33723
+SHA256 a7c0756bbb71a1f8898ccdd37f4e192d220da3e6f0e43cc6a82923b5dea71179 ChangeLog 33723
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.1.50-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.1.50-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50-r2 0
-MD5 08d04ee3aa07f9a88cf73d28408c7721 files/digest-emacs-cvs-22.1.50_p20070829-r1 292
-RMD160 59349e87f85f6e45d54187a51b2de8b597b0c046 files/digest-emacs-cvs-22.1.50_p20070829-r1 292
-SHA256 22ea0e4fd1a053f49b5981c46d0dfb1d40c7cabed2a1d68f3cd2979cdca1f6e6 files/digest-emacs-cvs-22.1.50_p20070829-r1 292
-MD5 08b9e8738ac81d9a4280a87a1130d15a files/digest-emacs-cvs-23.0.0_p20070920 289
-RMD160 ec2975b38f3469379493be38894d602bdd0dc04c files/digest-emacs-cvs-23.0.0_p20070920 289
-SHA256 52f25c4c075236b33d1a2f4634db234396c92ec71f699b84305e3e5f6e8d71fe files/digest-emacs-cvs-23.0.0_p20070920 289
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.50 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.50 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.50 0
+MD5 08d04ee3aa07f9a88cf73d28408c7721 files/digest-emacs-cvs-22.1.50_p20070829-r2 292
+RMD160 59349e87f85f6e45d54187a51b2de8b597b0c046 files/digest-emacs-cvs-22.1.50_p20070829-r2 292
+SHA256 22ea0e4fd1a053f49b5981c46d0dfb1d40c7cabed2a1d68f3cd2979cdca1f6e6 files/digest-emacs-cvs-22.1.50_p20070829-r2 292
+MD5 08b9e8738ac81d9a4280a87a1130d15a files/digest-emacs-cvs-23.0.0_p20070920-r1 289
+RMD160 ec2975b38f3469379493be38894d602bdd0dc04c files/digest-emacs-cvs-23.0.0_p20070920-r1 289
+SHA256 52f25c4c075236b33d1a2f4634db234396c92ec71f699b84305e3e5f6e8d71fe files/digest-emacs-cvs-23.0.0_p20070920-r1 289
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.50-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.50-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.50-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.60 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.60 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.60 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.60-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.60-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.60-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHTCYDNQqtfCuFneMRAu7NAJ4iFZmjRI9MIoLt/L6RBgWo4srLUgCeKV/f
-NUu/I/9gOvhawH9+KgB+cco=
-=XlHo
+iD8DBQFHTD/pOeoy/oIi7uwRAmydAKDEhcKs0IyH9KaQCdvBIy7T4uxB5QCbBEjJ
+hyC0R8+zQqAYwjaqfK3r+vo=
+=PUux
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
deleted file mode 100644
index d8b515a524dd..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v 1.12 2007/11/22 22:08:00 ulm Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="EMACS_22_BASE"
-ECVS_LOCALNAME="emacs-22"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		$X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-EMACS_SUFFIX="emacs-${SLOT}-cvs"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# 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=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION}" = ${PV} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
-	echo
-
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		echo
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		myconf="${myconf} $(use_with xpm)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	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
-	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
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "You can therefore test emacs-cvs along with the stable release."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild
index 30b93ed46866..830b0063291c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild,v 1.10 2007/11/22 22:08:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild,v 1.1 2007/11/27 16:03:26 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -72,6 +72,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch"
 	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
 	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
+	epatch "${FILESDIR}/${PN}-format-int.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild
index 81e85843b775..fdc0e6624168 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.8 2007/11/22 22:08:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild,v 1.1 2007/11/27 16:03:26 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -74,6 +74,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch"
 	epatch "${FILESDIR}/${PN}-no-x-compile.patch"
 	epatch "${FILESDIR}/${PN}-hack-local-variables.patch"
+	epatch "${FILESDIR}/${PN}-format-int.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
deleted file mode 100644
index a3c76b312aa6..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v 1.14 2007/11/22 22:08:00 ulm Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-ECVS_LOCALNAME="emacs"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="!=app-editors/emacs-cvs-23.0.0-r6
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	X? (
-		$X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# 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=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION}" = ${PV} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
-	echo
-
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		echo
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-	myconf="${myconf} $(use_with gpm)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc README BUGS || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	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
-	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
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "You can therefore test emacs-cvs along with the stable release."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild
deleted file mode 100644
index c08dec75a8c9..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60.ebuild,v 1.7 2007/11/22 22:08:00 ulm Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="emacs-unicode-2"
-ECVS_LOCALNAME="emacs-unicode"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="23-unicode"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	X? (
-		$X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		xpm? ( x11-libs/libXpm )
-		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# 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=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION}" = ${PV} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
-	echo
-
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		echo
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_enable xft font-backend)"
-		myconf="${myconf} $(use_with xft freetype)"
-		myconf="${myconf} $(use_with xft)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-	myconf="${myconf} $(use_with gpm)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc README README.unicode BUGS || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	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
-	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
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "You can therefore test emacs-cvs along with the stable release."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50-r1
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r2
index cf34b95faeba..cf34b95faeba 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r1
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50_p20070829-r2
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920-r1
index c55affeeaa4b..c55affeeaa4b 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0_p20070920-r1
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.50
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.60
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch b/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch
new file mode 100644
index 000000000000..851bcb91f4d9
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-format-int.patch
@@ -0,0 +1,79 @@
+2007-11-15  Andreas Schwab  <schwab@suse.de>
+
+	* editfns.c (Fformat): Correctly format EMACS_INT values.  Also
+	take precision into account when formatting an integer.
+
+--- src/editfns.c	8 Aug 2007 07:49:19 -0000	1.439.2.3
++++ src/editfns.c	16 Nov 2007 00:18:55 -0000	1.439.2.8
+@@ -3543,8 +3543,10 @@ usage: (format STRING &rest OBJECTS)  */
+ 	      precision[n+1] = 10 * precision[n+1] + *format - '0';
+ 	  }
+ 
+-	if (format - this_format_start + 1 > longest_format)
+-	  longest_format = format - this_format_start + 1;
++	/* Extra +1 for 'l' that we may need to insert into the
++	   format.  */
++	if (format - this_format_start + 2 > longest_format)
++	  longest_format = format - this_format_start + 2;
+ 
+ 	if (format == end)
+ 	  error ("Format string ends in middle of format specifier");
+@@ -3605,7 +3607,7 @@ usage: (format STRING &rest OBJECTS)  */
+ 		  && *format != 'i' && *format != 'X' && *format != 'c')
+ 		error ("Invalid format operation %%%c", *format);
+ 
+-	    thissize = 30;
++	    thissize = 30 + (precision[n] > 0 ? precision[n] : 0);
+ 	    if (*format == 'c')
+ 	      {
+ 		if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
+@@ -3803,23 +3805,35 @@ usage: (format STRING &rest OBJECTS)  */
+ 		     format - this_format_start);
+ 	      this_format[format - this_format_start] = 0;
+ 
+-	      if (INTEGERP (args[n]))
++	      if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
++		sprintf (p, this_format, XFLOAT_DATA (args[n]));
++	      else
+ 		{
+-		  if (format[-1] == 'd')
+-		    sprintf (p, this_format, XINT (args[n]));
+-		  /* Don't sign-extend for octal or hex printing.  */
++		  if (sizeof (EMACS_INT) > sizeof (int))
++		    {
++		      /* Insert 'l' before format spec.  */
++		      this_format[format - this_format_start]
++			= this_format[format - this_format_start - 1];
++		      this_format[format - this_format_start - 1] = 'l';
++		      this_format[format - this_format_start + 1] = 0;
++		    }
++
++		  if (INTEGERP (args[n]))
++		    {
++		      if (format[-1] == 'd')
++			sprintf (p, this_format, XINT (args[n]));
++		      /* Don't sign-extend for octal or hex printing.  */
++		      else
++			sprintf (p, this_format, XUINT (args[n]));
++		    }
++		  else if (format[-1] == 'd')
++		    /* Maybe we should use "%1.0f" instead so it also works
++		       for values larger than MAXINT.  */
++		    sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
+ 		  else
+-		    sprintf (p, this_format, XUINT (args[n]));
++		    /* Don't sign-extend for octal or hex printing.  */
++		    sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
+ 		}
+-	      else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
+-		sprintf (p, this_format, XFLOAT_DATA (args[n]));
+-	      else if (format[-1] == 'd')
+-		/* Maybe we should use "%1.0f" instead so it also works
+-		   for values larger than MAXINT.  */
+-		sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
+-	      else
+-		/* Don't sign-extend for octal or hex printing.  */
+-		sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
+ 
+ 	      if (p > buf
+ 		  && multibyte