Change SLOT also in old ebuilds to reflect slotmove.

Package-Manager: portage-2.1.2.4

4 files changed, 62 insertions, 56 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 7606dd806bd0..83b4d9063290 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.112 2007/04/24 07:57:22 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.113 2007/04/25 06:09:11 ulm Exp $
+
+  25 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild:
+  Change SLOT also in old ebuilds to reflect slotmove.
 
   24 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-cvs-22.0.9999-r10.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 4b82e7612a84..9a59caf0421a 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -28,10 +28,10 @@ SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/em
 DIST emacs-22.0.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b
 DIST emacs-22.0.98.tar.gz 38144204 RMD160 ca6b2914509653b8b8b575d33362ea7b4ccf9823 SHA1 ed8bc3c5000e6a9e72c1f876d906a22c3eb6eb08 SHA256 c3c5ba8231abfcba060531dafe34b6e2c51681b6dc60164d6d3c8009051faab7
 DIST emacs-22.0.99.tar.gz 38105148 RMD160 f405bfd29ede30103485cf4b39f00f6d8de28fed SHA1 95c699a9d09027a96c09dfebbf7c027dce4adbd3 SHA256 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15
-EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb SHA1 52530fd96c414b2cac12ff4576af3acb7d6e41f8 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7
-MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643
-RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643
-SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 emacs-cvs-22.0.97.ebuild 6643
+EBUILD emacs-cvs-22.0.97.ebuild 6729 RMD160 22c70db28d4ae032519fe315540b1d6dade1b643 SHA1 20b646f113e78cb444fe60982d2bcd89911740d1 SHA256 7710604e4f71c366dd5ff9b17e4ec7e96556231c9133bba500835799964f6b38
+MD5 57bbbe4aca499b149ebd9b26e814ee00 emacs-cvs-22.0.97.ebuild 6729
+RMD160 22c70db28d4ae032519fe315540b1d6dade1b643 emacs-cvs-22.0.97.ebuild 6729
+SHA256 7710604e4f71c366dd5ff9b17e4ec7e96556231c9133bba500835799964f6b38 emacs-cvs-22.0.97.ebuild 6729
 EBUILD emacs-cvs-22.0.98.ebuild 7538 RMD160 cef34069050bec208090861de3349b269ea55b96 SHA1 af85856a1d7ced9473372f986a6d9b18c476fd4f SHA256 e85b3d2f3e6c732deab6d8f67c10b7a9d05b0517774b518d95bee7c130fa7f63
 MD5 b3d225ba4b0a4cd119e32bd2d0c55dfb emacs-cvs-22.0.98.ebuild 7538
 RMD160 cef34069050bec208090861de3349b269ea55b96 emacs-cvs-22.0.98.ebuild 7538
@@ -44,18 +44,18 @@ EBUILD emacs-cvs-22.0.9999-r10.ebuild 7869 RMD160 7942d07e5455d1b41268d6c98d6026
 MD5 79ffc4f6d6db033eacd11c23010a4a6e emacs-cvs-22.0.9999-r10.ebuild 7869
 RMD160 7942d07e5455d1b41268d6c98d602698307596e3 emacs-cvs-22.0.9999-r10.ebuild 7869
 SHA256 f2ca69d7f7ee15849619aa9bdbed96b5fee8902f35a74f596ef00e25a9e1d93e emacs-cvs-22.0.9999-r10.ebuild 7869
-EBUILD emacs-cvs-23.0.0-r1.ebuild 5772 RMD160 1db592d913958bf735dc481392a8521ffa4a98de SHA1 b938b32260ebf39f8cab7897bb7155fbfed6167f SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3
-MD5 eb38b95a554cbae3617e204bbb52ea1d emacs-cvs-23.0.0-r1.ebuild 5772
-RMD160 1db592d913958bf735dc481392a8521ffa4a98de emacs-cvs-23.0.0-r1.ebuild 5772
-SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3 emacs-cvs-23.0.0-r1.ebuild 5772
+EBUILD emacs-cvs-23.0.0-r1.ebuild 5863 RMD160 9d735adb41f82243e5f7b90e07d23bb8a42f8a1a SHA1 e8228066cf8ab0f5930479774195526f5be73b55 SHA256 3f76bc3547e6087396a3730ebc1b2b750398a6ad4ff80a3db3f1fca68213b2f3
+MD5 e972070bdbccffafe4c30f921e9df45e emacs-cvs-23.0.0-r1.ebuild 5863
+RMD160 9d735adb41f82243e5f7b90e07d23bb8a42f8a1a emacs-cvs-23.0.0-r1.ebuild 5863
+SHA256 3f76bc3547e6087396a3730ebc1b2b750398a6ad4ff80a3db3f1fca68213b2f3 emacs-cvs-23.0.0-r1.ebuild 5863
 EBUILD emacs-cvs-23.0.0-r6.ebuild 7932 RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 SHA1 9463eba9178940aa3bea7ef1abae7dcb19bf467c SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d
 MD5 ac223f62f36fda9dc3eb0be0d781cc5a emacs-cvs-23.0.0-r6.ebuild 7932
 RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 emacs-cvs-23.0.0-r6.ebuild 7932
 SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d emacs-cvs-23.0.0-r6.ebuild 7932
-MISC ChangeLog 22200 RMD160 ae518fa96017f7226d77154ae7f1777cd4f2ebe0 SHA1 d509ff9fbaaa699c2b1cd7b90b9eea7c12154a87 SHA256 f0ad0ca9addaa92ac564dcf7ae4c076e6ebccb847cc5bf2ad117cca9bc989ebc
-MD5 de7a098f6824d28154024997bb656d3a ChangeLog 22200
-RMD160 ae518fa96017f7226d77154ae7f1777cd4f2ebe0 ChangeLog 22200
-SHA256 f0ad0ca9addaa92ac564dcf7ae4c076e6ebccb847cc5bf2ad117cca9bc989ebc ChangeLog 22200
+MISC ChangeLog 22357 RMD160 7b1bec750916d5b1a2dff422d137148b9c0484e2 SHA1 4ceebc86e1978091d81fe7a62f6d462c768811ef SHA256 a0ca3236bcedaabfeab19f7a2aa04a6c9e2bd133131f4f7abe640c51fb83ec0d
+MD5 c6e87459d628744214007ac329267c51 ChangeLog 22357
+RMD160 7b1bec750916d5b1a2dff422d137148b9c0484e2 ChangeLog 22357
+SHA256 a0ca3236bcedaabfeab19f7a2aa04a6c9e2bd133131f4f7abe640c51fb83ec0d ChangeLog 22357
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -79,9 +79,9 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGLbhuNQqtfCuFneMRAplJAJ4wTYUcZzp+bYlMK2c6jXp1c6mnLwCaA3ok
-A6c63WudFN/vD71KQb0SAA8=
-=nBLb
+iD8DBQFGLvEROeoy/oIi7uwRAvPdAKClaTryIcy7yZ+pXdJb7+qJDL0xRgCgzUR6
+13hg2eIQObhhWqXOMVirdNI=
+=oDTe
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
index b23bc598e722..b64fc4b2b0dd 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.97.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.0.97.ebuild,v 1.2 2007/04/04 13:26:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild,v 1.3 2007/04/25 06:09:11 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -35,7 +35,8 @@ DEPEND="sys-libs/ncurses
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="22.0.97"
+SLOT="22"
+OLD_SLOT="22.0.97"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 S="${WORKDIR}/emacs-${PV}"
@@ -105,7 +106,7 @@ src_compile() {
 			 || die "econf carbon emacs failed"
 	else
 		econf \
-			--program-suffix=.emacs-${SLOT} \
+			--program-suffix=.emacs-${OLD_SLOT} \
 			--without-carbon \
 			${myconf} || die "econf emacs failed"
 	fi
@@ -117,8 +118,8 @@ src_compile() {
 src_install () {
 	emake install DESTDIR="${D}" || die "make install failed"
 
-	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
+	rm "${D}"/usr/bin/emacs-${OLD_SLOT}.emacs-${OLD_SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${OLD_SLOT} /usr/bin/emacs-${OLD_SLOT} || die
 
 	if use aqua ; then
 		einfo "Installing Carbon Emacs..."
@@ -130,37 +131,37 @@ src_install () {
 
 	# 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"
+	dodir /usr/share/info/emacs-${OLD_SLOT}
+	mv "${D}"/usr/share/info/{,emacs-${OLD_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
+		if [ "${i##*/}" != emacs-${OLD_SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${OLD_SLOT}}.info
 		fi
 	done
 
 	insinto /etc/env.d
-	cat >"${D}"/etc/env.d/50emacs-cvs-${SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${SLOT}
+	cat >"${D}"/etc/env.d/50emacs-cvs-${OLD_SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${OLD_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"
+		mv ${m} ${m/.1/.emacs-${OLD_SLOT}.1} || die "mv man failed"
 	done
 
 	# avoid collision between slots
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 
 	if use source; then
-		insinto /usr/share/emacs/${SLOT}/src
+		insinto /usr/share/emacs/${OLD_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"))
+		cat >00emacs-cvs-${OLD_SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${OLD_SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${OLD_SLOT}/src"))
 EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+		elisp-site-file-install 00emacs-cvs-${OLD_SLOT}-gentoo.el
 	fi
 
 	dodoc BUGS ChangeLog README
@@ -186,7 +187,7 @@ update-alternatives() {
 
 pkg_postinst() {
 	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${SLOT},}/site-lisp/subdirs.el
+		cp ${ROOT}/usr/share/emacs{/${OLD_SLOT},}/site-lisp/subdirs.el
 
 	update-alternatives
 	elisp-site-regen
@@ -194,7 +195,7 @@ pkg_postinst() {
 	# ecompress from Portage 2.2.* does auto-compression
 	# which is not desired for the dir file, so remove it to
 	# let it be recreated
-	rm "${ROOT}/usr/share/info/emacs-${SLOT}/dir.*" 2> /dev/null
+	rm "${ROOT}/usr/share/info/emacs-${OLD_SLOT}/dir.*" 2> /dev/null
 
 	if use X; then
 		elog "You need to install some fonts for Emacs.	 Under monolithic"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
index c9fde8df9cab..a506213d8dbb 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-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-r1.ebuild,v 1.10 2007/04/11 20:46:15 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.11 2007/04/25 06:09:11 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -35,11 +35,12 @@ DEPEND=">=sys-libs/ncurses-5.3
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="23.0.0"
+SLOT="23"
+OLD_SLOT="23.0.0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86"
 
-DFILE=emacs-${SLOT}.desktop
+DFILE=emacs-${OLD_SLOT}.desktop
 
 src_unpack() {
 	cvs_src_unpack
@@ -88,7 +89,7 @@ src_compile() {
 		einfo "Configuring to build with Carbon Emacs"
 		econf --enable-debug \
 			--enable-carbon-app=/Applications/Gentoo \
-			--program-suffix=.emacs-${SLOT} \
+			--program-suffix=.emacs-${OLD_SLOT} \
 			--without-x \
 			$(use_with jpeg) $(use_with tiff) \
 			$(use_with gif) $(use_with png) \
@@ -97,7 +98,7 @@ src_compile() {
 		make bootstrap || die "make carbon emacs bootstrap failed"
 	else
 		econf --enable-debug \
-			--program-suffix=.emacs-${SLOT} \
+			--program-suffix=.emacs-${OLD_SLOT} \
 			--without-carbon \
 			${myconf} || die "econf emacs failed"
 		make bootstrap || die "make emacs bootstrap failed"
@@ -106,8 +107,8 @@ src_compile() {
 
 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
+	rm ${D}/usr/bin/emacs-${OLD_SLOT}.emacs-${OLD_SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${OLD_SLOT} /usr/bin/emacs-${OLD_SLOT} || die
 
 	if use aqua ; then
 		einfo "Installing Carbon Emacs..."
@@ -119,34 +120,34 @@ src_install () {
 
 	# 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"
+	dodir /usr/share/info/emacs-${OLD_SLOT}
+	mv ${D}/usr/share/info/{,emacs-${OLD_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
+		if [ "${i##*/}" != emacs-${OLD_SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${OLD_SLOT}}.info
 		fi
 	done
 
 	insinto /etc/env.d
-	cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${SLOT}
+	cat >${D}/etc/env.d/50emacs-cvs-${OLD_SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${OLD_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"
+		mv ${m} ${m/.1/.emacs-${OLD_SLOT}.1} || die "mv man failed"
 	done
 
 	if use source; then
-		insinto /usr/share/emacs/${SLOT}/src
+		insinto /usr/share/emacs/${OLD_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"))
+		cat >00emacs-cvs-${OLD_SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${OLD_SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${OLD_SLOT}/src"))
 EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+		elisp-site-file-install 00emacs-cvs-${OLD_SLOT}-gentoo.el
 	fi
 
 
@@ -156,7 +157,7 @@ EOF
 	dodoc BUGS ChangeLog ChangeLog.unicode README README.unicode
 	insinto /usr/share/applications
 	cp ${FILESDIR}/emacs.desktop.in ${DFILE}
-	sed -i -e "s,@PV@,${SLOT},g" ${DFILE}
+	sed -i -e "s,@PV@,${OLD_SLOT},g" ${DFILE}
 	doins ${DFILE}
 }