New upstream (pre-release version numbers).

Package-Manager: portage-2.1.2_pre3-r9

8 files changed, 221 insertions, 21 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 97650e7a72a8..4146649806c1 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.51 2006/08/23 03:59:11 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.52 2006/10/28 06:54:35 mkennedy Exp $
+
+*emacs-cvs-22.0.90 (28 Oct 2006)
+
+  28 Oct 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +emacs-cvs-22.0.90.ebuild:
+  New upstream (pre-release version numbers).
 
   23 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
   emacs-cvs-22.0.50-r3.ebuild, emacs-cvs-23.0.0.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index f1580acdfb01..c500b1b07d3a 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
@@ -46,27 +49,41 @@ EBUILD emacs-cvs-22.0.50-r3.ebuild 5307 RMD160 b703c9c77645ed3676c9339c9d42882c8
 MD5 d83b36ceddd7edbb544423d98a0e018d emacs-cvs-22.0.50-r3.ebuild 5307
 RMD160 b703c9c77645ed3676c9339c9d42882c8eda8009 emacs-cvs-22.0.50-r3.ebuild 5307
 SHA256 970c5325e12a1b0f27bc1325fa3455b396f2f3955cba164c0dd65ade8f91d9b1 emacs-cvs-22.0.50-r3.ebuild 5307
+EBUILD emacs-cvs-22.0.90.ebuild 5304 RMD160 ad85638682a04067a1e4d44944dbce79667d6c2e SHA1 79ff4d909c3ae5cece39276b3e9f03a5fa0d705a SHA256 1878e0432cc7ee17979e86e66c50bd296d0c4d9a2b9f9760bb63b9269ee4d2c9
+MD5 b7435d2964cccce9c6b0bd1fe2d0fbf1 emacs-cvs-22.0.90.ebuild 5304
+RMD160 ad85638682a04067a1e4d44944dbce79667d6c2e emacs-cvs-22.0.90.ebuild 5304
+SHA256 1878e0432cc7ee17979e86e66c50bd296d0c4d9a2b9f9760bb63b9269ee4d2c9 emacs-cvs-22.0.90.ebuild 5304
 EBUILD emacs-cvs-23.0.0.ebuild 5238 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 SHA1 740ffd7e4416be19cb4a40db63d33d1066800cd9 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2
 MD5 10d02dd5a3cbe31f162edaebf502797c emacs-cvs-23.0.0.ebuild 5238
 RMD160 69658f6f15cde1d369751fe3bcdcd93325df1c60 emacs-cvs-23.0.0.ebuild 5238
 SHA256 032229a1d06307801e350ad47d2f2caea70f57230cb8b80c75a9fc14508292d2 emacs-cvs-23.0.0.ebuild 5238
-MISC ChangeLog 8887 RMD160 d907c6feac01cf4f8377daf181c801269880ee74 SHA1 1e84f80552138ba6854f67debce13292186e16f3 SHA256 75cc2c40407119e6a960cf0737e2cd02496e2dcdf838b8927ca0e3b5d610e1ba
-MD5 6866bc4dd9aac04fce290be81ca9c934 ChangeLog 8887
-RMD160 d907c6feac01cf4f8377daf181c801269880ee74 ChangeLog 8887
-SHA256 75cc2c40407119e6a960cf0737e2cd02496e2dcdf838b8927ca0e3b5d610e1ba ChangeLog 8887
+MISC ChangeLog 9050 RMD160 01bb03cac048a6ebb739b63b0833e1a9259254fd SHA1 1dc762e82dc84472445ce0b2111cc2c1cff99a1f SHA256 bb38e01c898e5d3354ff4547025ef0a65b29b563411df126267e9e9de69272ea
+MD5 b8cb02a7800ac71c021bf3b5f2be2926 ChangeLog 9050
+RMD160 01bb03cac048a6ebb739b63b0833e1a9259254fd ChangeLog 9050
+SHA256 bb38e01c898e5d3354ff4547025ef0a65b29b563411df126267e9e9de69272ea ChangeLog 9050
 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 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.50-r3 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.50-r3 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.50-r3 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r3 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r3 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.90 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.90 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.90 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQv6xyiNZaEAZA+ARAqE+AJsHzppCkxzbyjVR0R3nyHCvf6VgdgCfWMHM
+mkjOoxllzp7Yk7bplGseKlc=
+=t7Xv
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild
new file mode 100644
index 000000000000..ab17fc7faf6a
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.90.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2006 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.0.90.ebuild,v 1.1 2006/10/28 06:54:35 mkennedy Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+inherit elisp-common cvs alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bars"
+
+S=${WORKDIR}/emacs
+
+DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND=">=sys-libs/ncurses-5.3
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
+		jpeg? ( >=media-libs/jpeg-6b )
+		tiff? ( >=media-libs/tiff-3.5.7 )
+		png? ( >=media-libs/libpng-1.2.5 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+	sys-libs/zlib
+	>=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.90"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+	cvs_src_unpack
+	cd ${S};
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+}
+
+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 X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			einfo "Configuring to build with GTK support"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		else
+			einfo "Configuring to build with lucid toolkit support"
+			myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+	if use aqua ; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			 || die "econf carbon emacs failed"
+		make bootstrap || die "make carbon emacs bootstrap failed"
+	fi
+	econf \
+		--program-suffix=.emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+	make bootstrap || die "make emacs bootstrap failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
+
+	if use aqua ; then
+		einfo "Installing Carbon Emacs..."
+		dodir /Applications/Gentoo/Emacs.app
+		pushd mac/Emacs.app
+		tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
+		popd
+	fi
+
+	# fix info documentation
+	einfo "Fixing info documentation..."
+	dodir /usr/share/info/emacs-${SLOT}
+	mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+	for i in ${D}/usr/share/info/*
+	do
+		if [ "${i##*/}" != emacs-${SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${SLOT}}.info
+			gzip -9 ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+	fi
+	insinto /etc/env.d
+	cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+	einfo "Fixing manpages..."
+	for m in  ${D}/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	if use source; then
+		insinto /usr/share/emacs/${SLOT}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	if ! use gzip-el; then
+		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
+	fi
+	dodoc BUGS ChangeLog README
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${DFILE}
+}
+
+update-alternatives() {
+	for i in emacs emacsclient etags ctags b2m ebrowse \
+		rcs-checkin grep-changelog ; do
+		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
+	done
+}
+
+pkg_postinst() {
+	use ppc-macos || update-alternatives
+	elisp-site-regen
+	if use X; then
+		while read line; do einfo "${line}"; done<<'EOF'
+
+You need to install some fonts for Emacs.  Under monolithic
+XFree86/Xorg you typically had such fonts installed by default.	 With
+modular Xorg, you will have to perform this step yourself.
+
+Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
+Emacs requirements under X11.
+
+EOF
+	fi
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+	elisp-site-regen
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
index 8b137891791f..e69de29bb2d1 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r1
@@ -1 +0,0 @@
-
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
index 8b137891791f..e69de29bb2d1 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
@@ -1 +0,0 @@
-
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
index 8b137891791f..e69de29bb2d1 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
@@ -1 +0,0 @@
-
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.90
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
index 8b137891791f..e69de29bb2d1 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0
@@ -1 +0,0 @@
-