Update SRC_URI for new upstream tarballs; installed files should be unchanged, however. Remove unused code from 23.2 ebuild.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

4 files changed, 25 insertions, 46 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 2883342de762..fc1b6125866f 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.424 2011/08/02 05:41:31 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.425 2011/08/02 17:44:03 ulm Exp $
+
+  02 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r2.ebuild,
+  emacs-23.3.ebuild:
+  Update SRC_URI for new upstream tarballs; installed files should be
+  unchanged, however. Remove unused code from 23.2 ebuild.
 
   02 Aug 2011; Matt Turner <mattst88@gentoo.org> emacs-21.4-r23.ebuild,
   emacs-22.3-r7.ebuild, emacs-23.2-r2.ebuild, emacs-23.3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 15a3738d555d..8d60cd4cad79 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,21 +9,21 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.3-patches-7.tar.bz2 5788 RMD160 0b3eead2c4bb2e523e51102bfcb863cdf0351555 SHA1 d0c696b8f7b09ded161ad4e0215903a165902c8b SHA256 1fe220dbc1388fffb19fdc4fda3643c7f177ce4e07757b238f381f49b528b6cd
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
-DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
+DIST emacs-23.2a.tar.bz2 38641827 RMD160 68fa504b06856a82a2aa4aa12f5bd4d574d55320 SHA1 6ff2b076ade518ab62d3350e74a67df9a4b20d2f SHA256 4d9a2d18b1cd69a1b849dda1fd9423c2809194a73d144e50cc4cb9e7abc7781f
 DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
-DIST emacs-23.3.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
+DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r23.ebuild 5022 RMD160 b7ece01e4d6bd874b4f719682ec89ad02e92356b SHA1 9191514319e49ab2747df372089cba4e8a8a8b90 SHA256 59d12555ab365a0dba567d33fe7b816568de6a337cd02c6a756781c161b93f40
 EBUILD emacs-22.3-r7.ebuild 7896 RMD160 833ef638afd29149f9bcef45ecedf0902000da86 SHA1 8ccfc1b80ad6d2feffadf8183330ee846be92650 SHA256 49ef70b5edfaf8c70ed84de836e94c0d2c57cd70d6ba31d2ac5b75492ebff123
-EBUILD emacs-23.2-r2.ebuild 10022 RMD160 b1a758336c24afcc3612297f391a499b9c75362f SHA1 79cecee0eafc1a4dc292e9753694f55b609adc91 SHA256 5f00fd9751e8c31ca776e48c0c122a51e8f30c3accb85855dd5de615b757093a
-EBUILD emacs-23.3.ebuild 10087 RMD160 a724db321b89f8e89dd4965ba8229588d9408607 SHA1 ad7f0df2e5a15ed37e765f19b4a2f011e5109218 SHA256 d3f081f2522feac4737e526cf92c59ad280f2144503703c18ac8b69e7a5590fe
-MISC ChangeLog 60318 RMD160 5a4a02464beca4654b42bdae80ff12447f755f93 SHA1 5175ab143d9412d4c9fb0c54e997859382dbc0c9 SHA256 e76909c4dd91f5ea79d99a11bda70dc8bf1f99be6649a00cf3a1309a11b8b24b
+EBUILD emacs-23.2-r2.ebuild 9169 RMD160 da42435c54872e15a786f36e586b39855b33686f SHA1 b84b1d60ba0f4f3a9aa8b1952aa3cfd40c731b1c SHA256 7dd8751820b59c7b6619e05d879263fe91a56269a74240daf9d6326e44a942e1
+EBUILD emacs-23.3.ebuild 10083 RMD160 0762383a7d2209b80d64317d845184404375eb51 SHA1 caa7ee7547066effedebc41215d22808531d6f46 SHA256 9019d1fdb03ae9ecf103cad3f88718614f01e8c06b9ce874ec9c3fe3fe3e184a
+MISC ChangeLog 60533 RMD160 6e61ac8ac81bd3655a38f8df461eb5b7f26ec5fb SHA1 66e316e5e2ae612fb21107bdd7312e713df62595 SHA256 3ed37e14a462957adf9a9a8e6ce71f9b65f00f23fceb9b74ae78d2ddb6b7ef40
 MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43jhAACgkQTVUdg23rv50KBACeMKLfZLrrmwax35+dDsQIkOCz
-axUAoIsROtTYoyP5Xzj0XtG2swliOu7y
-=wBV6
+iEYEARECAAYFAk44OJ0ACgkQOeoy/oIi7uzw2wCeKjE97q7kHhFI45htBYorci6h
+SOcAnRt2HPo2d8HZRZnQ23sa+3voraPX
+=/lvW
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild
index cdab255399a2..385104611cf1 100644
--- a/app-editors/emacs/emacs-23.2-r2.ebuild
+++ b/app-editors/emacs/emacs-23.2-r2.ebuild
@@ -1,29 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.14 2011/08/02 05:41:31 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.15 2011/08/02 17:44:03 ulm Exp $
 
 EAPI=2
 
 inherit autotools elisp-common eutils flag-o-matic multilib
 
-if [ "${PV##*.}" = "9999" ]; then
-	inherit bzr
-	EMACS_BRANCH="emacs-23"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/"
-	EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}"
-	SRC_URI=""
-else
-	SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-		mirror://gentoo/${P}-patches-2.tar.bz2"
-	# 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%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
+	mirror://gentoo/${P}-patches-2.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
@@ -76,21 +62,14 @@ RDEPEND="${RDEPEND}
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# 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%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 src_prepare() {
-	if [ "${PV##*.}" = "9999" ]; then
-		FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-			| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-		[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-		echo
-		einfo "Emacs branch: ${EMACS_BRANCH}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-		echo
-	else
-		EPATCH_SUFFIX=patch epatch
-	fi
+	EPATCH_SUFFIX=patch epatch
 
 	sed -i \
 		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
@@ -199,11 +178,6 @@ src_configure() {
 
 src_compile() {
 	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	if [ "${PV##*.}" = "9999" ]; then
-		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-		# cleanup, otherwise emacs will be dumped again in src_install
-		(cd src; emake versionclean)
-	fi
 	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
diff --git a/app-editors/emacs/emacs-23.3.ebuild b/app-editors/emacs/emacs-23.3.ebuild
index d1e3d3232125..9ed16ad68c8d 100644
--- a/app-editors/emacs/emacs-23.3.ebuild
+++ b/app-editors/emacs/emacs-23.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v 1.12 2011/08/02 05:41:31 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v 1.13 2011/08/02 17:44:03 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -9,7 +9,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
 	mirror://gentoo/${P}-patches-1.tar.bz2"
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"