reflect branching from upstream CVS server correctly. Thanks to John R. Graham <john_r_graham@mindspring.com>, who pointed out the correct solution in bug #158730

Package-Manager: portage-2.1.1-r2

5 files changed, 219 insertions, 15 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 307703e988c1..83de67b88b56 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.59 2007/01/05 13:47:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.60 2007/01/05 13:57:33 opfer Exp $
+
+*emacs-cvs-22.0.92 (05 Jan 2007)
+
+  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.91.ebuild, +emacs-cvs-22.0.92.ebuild:
+  reflect branching from upstream CVS server correctly. Thanks to John R.
+  Graham <john_r_graham@mindspring.com>, who pointed out the correct solution
+  in bug #158730
 
   05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   -emacs-cvs-22.0.50-r1.ebuild, -emacs-cvs-22.0.50-r2.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index b9c60cd9e2af..75e4bf578502 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -45,18 +45,22 @@ AUX xft-xfaces-fixcrash.patch 631 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad4
 MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 files/xft-xfaces-fixcrash.patch 631
 SHA256 1924c52d328a846eaa1ef78766cbabeb5fcfe5427d42ca4de3d5d6a646e46b33 files/xft-xfaces-fixcrash.patch 631
-EBUILD emacs-cvs-22.0.91.ebuild 5663 RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 SHA1 510e8fbf11398a7c03d5ea6ff7abcae1748bdafb SHA256 5f9e41899fe67281c5b957a67b3640a6779630f48427675aaafed24213d692a7
-MD5 46d44d98ea8e8f2423a2cb2c2489efce emacs-cvs-22.0.91.ebuild 5663
-RMD160 59cbdd417ffbcc50004fe4f32c6220b82bddb8e0 emacs-cvs-22.0.91.ebuild 5663
-SHA256 5f9e41899fe67281c5b957a67b3640a6779630f48427675aaafed24213d692a7 emacs-cvs-22.0.91.ebuild 5663
+EBUILD emacs-cvs-22.0.91.ebuild 5676 RMD160 76e4f888d80305b717d146b94e073422c8a5ff07 SHA1 c02f1acba2a6d89e7a9387a60e49b734c3713b36 SHA256 5b123f70d712b0f13743abf56cbeea79e9778534b1e15e016b1fef9e5e86e375
+MD5 5705556ab38658653e92e550cc4dd815 emacs-cvs-22.0.91.ebuild 5676
+RMD160 76e4f888d80305b717d146b94e073422c8a5ff07 emacs-cvs-22.0.91.ebuild 5676
+SHA256 5b123f70d712b0f13743abf56cbeea79e9778534b1e15e016b1fef9e5e86e375 emacs-cvs-22.0.91.ebuild 5676
+EBUILD emacs-cvs-22.0.92.ebuild 5678 RMD160 458a78e5082bd2aecc858b69eeb78e94b34e0d88 SHA1 d6678beb28e030b86409b35278626ca6677425aa SHA256 4a3a8afe152d9e64ce91e12c25b7f16d9758accaa74a97a531876a9a0d0731a7
+MD5 30ddd74669c57fbe23464cc3405b7666 emacs-cvs-22.0.92.ebuild 5678
+RMD160 458a78e5082bd2aecc858b69eeb78e94b34e0d88 emacs-cvs-22.0.92.ebuild 5678
+SHA256 4a3a8afe152d9e64ce91e12c25b7f16d9758accaa74a97a531876a9a0d0731a7 emacs-cvs-22.0.92.ebuild 5678
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5984 RMD160 6b728c9a31cf0f56a75badddf5c941500ba8d8e8 SHA1 b998805d32a19c1f27f53a9b3195dd9fcbfcec87 SHA256 dda339425a96853fbd15f59f3546632822b3ef09f04505d29f08c46647addbce
 MD5 bab102caf80f3a93f0ed44583c04e29c emacs-cvs-23.0.0-r1.ebuild 5984
 RMD160 6b728c9a31cf0f56a75badddf5c941500ba8d8e8 emacs-cvs-23.0.0-r1.ebuild 5984
 SHA256 dda339425a96853fbd15f59f3546632822b3ef09f04505d29f08c46647addbce emacs-cvs-23.0.0-r1.ebuild 5984
-MISC ChangeLog 10500 RMD160 c65d1f0313a33080d531a48ff8eb4a0115d78450 SHA1 4a610586ccb48358f4f61886fce2da0ece841660 SHA256 ff72bafc479551bd5a0159e548095e483fe0a0151cf7bbea486349e23be73b68
-MD5 3aaf17aa0793e613395dd717ebede220 ChangeLog 10500
-RMD160 c65d1f0313a33080d531a48ff8eb4a0115d78450 ChangeLog 10500
-SHA256 ff72bafc479551bd5a0159e548095e483fe0a0151cf7bbea486349e23be73b68 ChangeLog 10500
+MISC ChangeLog 10814 RMD160 2925ecd811a84646a2feca791cc06d4092452461 SHA1 0dbae94397126217fd7d44d69cfefa3e91d78fe6 SHA256 9288d1e53c176e5d7e7a398148678b47f6518d17132184b4bdfebbf766311207
+MD5 80ab8a1b346a4441548167c07bc4fe79 ChangeLog 10814
+RMD160 2925ecd811a84646a2feca791cc06d4092452461 ChangeLog 10814
+SHA256 9288d1e53c176e5d7e7a398148678b47f6518d17132184b4bdfebbf766311207 ChangeLog 10814
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -64,13 +68,16 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.91 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.91 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.91 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.92 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.92 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.92 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-23.0.0-r1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-23.0.0-r1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-23.0.0-r1 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFnldXNQqtfCuFneMRApy6AJ0ZQUdkM99vIFCbFtY69l6FdOagsACfSrXd
-KGsYtBpaPxp3H4jJDFAGRjM=
-=bWOV
+iD8DBQFFnllrNQqtfCuFneMRAgRFAKCb/hQ1tQdFXhzh0f/cDHtZqM+9RwCeJvB5
+/xMLC6EUwEnWgmcj5FNNUj0=
+=LakR
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild
index f42c97526b74..d59722cf4450 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild
@@ -1,11 +1,11 @@
 # 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.0.91.ebuild,v 1.3 2007/01/02 20:55:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.91.ebuild,v 1.4 2007/01/05 13:57:33 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
 ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
+ECVS_BRANCH="EMACS_PRETEST_22_0_91"
 
 inherit elisp-common cvs alternatives flag-o-matic eutils
 
@@ -35,7 +35,7 @@ DEPEND=">=sys-libs/ncurses-5.3
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="22.0.92"
+SLOT="22.0.91"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.92.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.92.ebuild
new file mode 100644
index 000000000000..c0461a10a7e8
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.92.ebuild
@@ -0,0 +1,188 @@
+# 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.0.92.ebuild,v 1.1 2007/01/05 13:57:33 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="EMACS_PRETEST_22_0_92"
+
+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.92"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~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
+	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"
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+}
+
+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"
+	else
+		econf \
+			--program-suffix=.emacs-${SLOT} \
+			--without-carbon \
+			${myconf} || die "econf emacs failed"
+		make bootstrap || die "make emacs bootstrap failed"
+	fi
+}
+
+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
+	cp ${FILESDIR}/emacs.desktop.in ${DFILE}
+	sed -i -e "s,@PV@,${SLOT},g" ${DFILE}
+	doins ${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.92 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.92
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.92
@@ -0,0 +1 @@
+