Version bump; logic of toolkit USE flags fixed.

Package-Manager: portage-2.1.2.7

5 files changed, 47 insertions, 33 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index bd5497448c3f..6fb569003f75 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.119 2007/05/15 15:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.120 2007/05/17 20:32:51 ulm Exp $
+
+*emacs-cvs-22.0.990 (17 May 2007)
+
+  17 May 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.98.ebuild,
+  +emacs-cvs-22.0.990.ebuild:
+  Version bump; logic of toolkit USE flags fixed. Clean up old version.
 
   15 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
   emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.99.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 981902a299dd..38ae514502bc 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -26,20 +26,20 @@ MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 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
+DIST emacs-22.0.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
 EBUILD emacs-cvs-22.0.97.ebuild 6715 RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc SHA1 81e9412cc902a06a0a86a5660175044447cacafc SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd
 MD5 55f44f9de99ae865353616c46c357a0c emacs-cvs-22.0.97.ebuild 6715
 RMD160 fc3feebf814f6063a7ba2cdcebb42d90237b8afc emacs-cvs-22.0.97.ebuild 6715
 SHA256 2c6dd9da54cd723a8a4d83f02c50921b8cc7e4b83c8a4d9a0b3e68c030585bdd emacs-cvs-22.0.97.ebuild 6715
-EBUILD emacs-cvs-22.0.98.ebuild 7531 RMD160 854898a7341abfdd1d4c3d20461af57a2381403e SHA1 c355d7e9158f989f9536796748f0b409fb6e3b69 SHA256 c1f306b14fc09732dc5dcbafbd2101220a5255f58ca6ea801aa92820f2a994d9
-MD5 f4ca06f37c16827ccdf2b738a446aa10 emacs-cvs-22.0.98.ebuild 7531
-RMD160 854898a7341abfdd1d4c3d20461af57a2381403e emacs-cvs-22.0.98.ebuild 7531
-SHA256 c1f306b14fc09732dc5dcbafbd2101220a5255f58ca6ea801aa92820f2a994d9 emacs-cvs-22.0.98.ebuild 7531
 EBUILD emacs-cvs-22.0.99.ebuild 7535 RMD160 8253d130485408770e88d299aef47950d1676532 SHA1 c9ef0e46629acc3ea90608b3e7559f0490fb4826 SHA256 37c7bd6f8315772ff982ff0f0bbbd9ae60be26708221afe0f226c4660fb2823e
 MD5 f0256b140915feea9cf39ff361a41607 emacs-cvs-22.0.99.ebuild 7535
 RMD160 8253d130485408770e88d299aef47950d1676532 emacs-cvs-22.0.99.ebuild 7535
 SHA256 37c7bd6f8315772ff982ff0f0bbbd9ae60be26708221afe0f226c4660fb2823e emacs-cvs-22.0.99.ebuild 7535
+EBUILD emacs-cvs-22.0.990.ebuild 7562 RMD160 5d6dc9a5576c14e10b643e7a494a610c550f21d6 SHA1 92734bb01e248278c93f9f793a267f6d3dbc45e0 SHA256 00d460192f62229939681e7fe5241f080f4ab2dacfde1c799383529c7692af66
+MD5 c807e945338b74f34a43cee09844d811 emacs-cvs-22.0.990.ebuild 7562
+RMD160 5d6dc9a5576c14e10b643e7a494a610c550f21d6 emacs-cvs-22.0.990.ebuild 7562
+SHA256 00d460192f62229939681e7fe5241f080f4ab2dacfde1c799383529c7692af66 emacs-cvs-22.0.990.ebuild 7562
 EBUILD emacs-cvs-22.0.9999-r10.ebuild 7867 RMD160 aaf543b08478ba45cf26ffa375938739dd02c9a2 SHA1 4d1a4bea4e3424e3d43245d109f592abd8675119 SHA256 d7020d3555959561ca7dad4d470c01bdfb48c498b52f85a5cb2bcd12992c82d7
 MD5 8d4914a2df0f4e6b9f91e02ce2e6d215 emacs-cvs-22.0.9999-r10.ebuild 7867
 RMD160 aaf543b08478ba45cf26ffa375938739dd02c9a2 emacs-cvs-22.0.9999-r10.ebuild 7867
@@ -56,10 +56,10 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7930 RMD160 3c9095db596de14d6e69a41d96a536799a
 MD5 bae450c0f0ba6cefed2c890e287924f8 emacs-cvs-23.0.0-r6.ebuild 7930
 RMD160 3c9095db596de14d6e69a41d96a536799a164b70 emacs-cvs-23.0.0-r6.ebuild 7930
 SHA256 1884956cdda8fda561e32e87300c9eb1c5c354ce2a11ca7fa48b86e6eb4579a0 emacs-cvs-23.0.0-r6.ebuild 7930
-MISC ChangeLog 23660 RMD160 de92afb2a65ff89d26fe1b27335a5e0113c0c6ad SHA1 6cfe08b0cd81bf4db47a008cf5f9c0e3b8865971 SHA256 bf877d5de3d385c4f815cd2055508fe4c38579a0dc09aad3c11a13b7375e848e
-MD5 f48330bc89d90e13cef28029f9450a0b ChangeLog 23660
-RMD160 de92afb2a65ff89d26fe1b27335a5e0113c0c6ad ChangeLog 23660
-SHA256 bf877d5de3d385c4f815cd2055508fe4c38579a0dc09aad3c11a13b7375e848e ChangeLog 23660
+MISC ChangeLog 23872 RMD160 be895ea3cc897ef05a69e04561a39bbc1c9162a7 SHA1 304d535f3c206672e45aa1ebafa5b071417a5f88 SHA256 59412569ebc90c8da54d91b2a6a208c1d3a184c751b1aac52c6cafa1f184a138
+MD5 a2f1ac8eaad888c38903065a05c1b5b2 ChangeLog 23872
+RMD160 be895ea3cc897ef05a69e04561a39bbc1c9162a7 ChangeLog 23872
+SHA256 59412569ebc90c8da54d91b2a6a208c1d3a184c751b1aac52c6cafa1f184a138 ChangeLog 23872
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -67,12 +67,12 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247
 RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247
 SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247
-MD5 ef3bbd366e19774192bc6661663d09f6 files/digest-emacs-cvs-22.0.98 247
-RMD160 d4113eed932fd6a40f146beef15727488c033005 files/digest-emacs-cvs-22.0.98 247
-SHA256 753b26a456c597fb729acb3697a511848094901478febd88498f463a8eddb39f files/digest-emacs-cvs-22.0.98 247
 MD5 4dd2110cd9b9df0f3378769222d4a79a files/digest-emacs-cvs-22.0.99 247
 RMD160 a2718e7178826e47bb7821ef9f6165d8b25559a5 files/digest-emacs-cvs-22.0.99 247
 SHA256 aa8d54b09b722e8720e8efe10c45d3efd315dc8b7c89c0ab57877601f3327e8e files/digest-emacs-cvs-22.0.99 247
+MD5 07fa6d117472cfb4f75c1d00ec300709 files/digest-emacs-cvs-22.0.990 250
+RMD160 46f7fa259ce23c2a8ee97d9cc5e88b8f93d29b60 files/digest-emacs-cvs-22.0.990 250
+SHA256 00f87abb7a35a8ee4f7f6624fb1ac8e567fe7977dcd7405d603e754122ddb5c4 files/digest-emacs-cvs-22.0.990 250
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r10 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r10 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r10 0
@@ -88,7 +88,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD4DBQFGScwPOeoy/oIi7uwRAgi+AJdmOL+brw3/gH7OBmpzq4bEQmrNAKCbBkqZ
-qxZmqniZ3N/4b7zPzfduxA==
-=MC08
+iD8DBQFGTLzGOeoy/oIi7uwRAgVfAJoCRBjaYyeecNA3MFkaWERCbUQ9EwCeMj61
+p3AjTXMuRWdM6YOtE/UMZws=
+=npyy
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
index 09729d98dfe2..6909c602f453 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.990.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.98.ebuild,v 1.10 2007/05/15 15:02:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.1 2007/05/17 20:32:51 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -22,7 +22,8 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
-	X? ( $X_DEPEND
+	X? (
+		$X_DEPEND
 		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
@@ -30,9 +31,14 @@ RDEPEND="sys-libs/ncurses
 		png? ( media-libs/libpng )
 		xpm? ( x11-libs/libXpm )
 		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				motif? ( x11-libs/openmotif )
+				!motif? ( lesstif? ( x11-libs/lesstif ) )
+			)
+		)
+	)"
 
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
@@ -44,7 +50,7 @@ SLOT="22"
 # determine some path information correctly for copy/move operations later on
 FULL_VERSION="${PV}"
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
 S="${WORKDIR}/emacs-${PV}"
 
 src_unpack() {
@@ -55,9 +61,11 @@ src_unpack() {
 		-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"
+		# 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"
@@ -90,9 +98,9 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
-		# Emacs upstream thinks this should be standard policy on all
-		# distributions
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		myconf="${myconf} --with-x"
 		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -120,8 +128,8 @@ src_compile() {
 		myconf="${myconf} --without-x"
 	fi
 
-	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
-	# system (has been reported upstream)
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
+	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
 
 	econf \
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98
deleted file mode 100644
index e05c6a06aefd..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d01226062d48c18fa0b22e4d0dccecc5 emacs-22.0.98.tar.gz 38144204
-RMD160 ca6b2914509653b8b8b575d33362ea7b4ccf9823 emacs-22.0.98.tar.gz 38144204
-SHA256 c3c5ba8231abfcba060531dafe34b6e2c51681b6dc60164d6d3c8009051faab7 emacs-22.0.98.tar.gz 38144204
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990
new file mode 100644
index 000000000000..d397f8b92767
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.990
@@ -0,0 +1,3 @@
+MD5 809ab62a9b9c36a9d685021a907f6022 emacs-22.0.990.tar.gz 38184881
+RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 emacs-22.0.990.tar.gz 38184881
+SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c emacs-22.0.990.tar.gz 38184881