Minor formatting and whitespace changes.

Package-Manager: portage-2.1.2.9

5 files changed, 51 insertions, 55 deletions

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index e892dea93bd2..0e3894f4294d 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -40,26 +40,26 @@ EBUILD emacs-cvs-22.0.99.ebuild 7535 RMD160 8253d130485408770e88d299aef47950d167
 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 7543 RMD160 d1828d381cef760c836dd060ea8d32d1bb3387c6 SHA1 547f348e4066b712aead1ee41a9c4b0e65f32ba2 SHA256 feb10f9a12b9ec82371927a6a5bb4485fc7687d34ee85f3912cfbd64e27ac39c
-MD5 db1d77d93973d93c02ff649b26a91ff6 emacs-cvs-22.0.990.ebuild 7543
-RMD160 d1828d381cef760c836dd060ea8d32d1bb3387c6 emacs-cvs-22.0.990.ebuild 7543
-SHA256 feb10f9a12b9ec82371927a6a5bb4485fc7687d34ee85f3912cfbd64e27ac39c emacs-cvs-22.0.990.ebuild 7543
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7863 RMD160 b951a04b2c96f98d225dde2835526cde0845b9fc SHA1 690a7ebfbce896eb8ee91b6bf2484f7ef1d1ad44 SHA256 60a39c7665a1d99e1c8a9c24cfc92455461ac800ff3b6759beed188a51287320
-MD5 2882a3c14a8121906f93152222362d7b emacs-cvs-22.0.9999-r10.ebuild 7863
-RMD160 b951a04b2c96f98d225dde2835526cde0845b9fc emacs-cvs-22.0.9999-r10.ebuild 7863
-SHA256 60a39c7665a1d99e1c8a9c24cfc92455461ac800ff3b6759beed188a51287320 emacs-cvs-22.0.9999-r10.ebuild 7863
-EBUILD emacs-cvs-22.1.50.ebuild 7744 RMD160 aa86798b1fbbecae1d70e14100a5cb840816743e SHA1 f42ac4d9358a5308bbe9de7f7e7dc3e180a6e9b0 SHA256 350c061fc89fda0ce64d3a8d1c770e4e1b23dad94c07ee07ff1c9cfbfbf77fb7
-MD5 4846e6ba462b07c8b4be5d4022176ffc emacs-cvs-22.1.50.ebuild 7744
-RMD160 aa86798b1fbbecae1d70e14100a5cb840816743e emacs-cvs-22.1.50.ebuild 7744
-SHA256 350c061fc89fda0ce64d3a8d1c770e4e1b23dad94c07ee07ff1c9cfbfbf77fb7 emacs-cvs-22.1.50.ebuild 7744
+EBUILD emacs-cvs-22.0.990.ebuild 7525 RMD160 458a8e2f9cefa1ba26fa284d7add489b114c7a1e SHA1 de25bea822a9840802698d18ead4b3cac71e4ba0 SHA256 fa4656f3703ad69e76434d49ecac8f3b2aa7d9a98613441e7fb92de39bfade83
+MD5 c7b9c0641d394dc915cd8853f9bb62ce emacs-cvs-22.0.990.ebuild 7525
+RMD160 458a8e2f9cefa1ba26fa284d7add489b114c7a1e emacs-cvs-22.0.990.ebuild 7525
+SHA256 fa4656f3703ad69e76434d49ecac8f3b2aa7d9a98613441e7fb92de39bfade83 emacs-cvs-22.0.990.ebuild 7525
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7851 RMD160 73867629ac516edcd13a912937dcfb1bb684db07 SHA1 eefaed0ae780f25d099100862d027eddad8415bd SHA256 486567feec90f074e30a1f62db939a09d44e5bbbe71ccffd73505635d5a62940
+MD5 0fe64323ea34a34e715694611ac3767a emacs-cvs-22.0.9999-r10.ebuild 7851
+RMD160 73867629ac516edcd13a912937dcfb1bb684db07 emacs-cvs-22.0.9999-r10.ebuild 7851
+SHA256 486567feec90f074e30a1f62db939a09d44e5bbbe71ccffd73505635d5a62940 emacs-cvs-22.0.9999-r10.ebuild 7851
+EBUILD emacs-cvs-22.1.50.ebuild 7734 RMD160 dd074faf0166bdd775f124d3c5cf305d69da860e SHA1 00aed121d6a45a2de217b802dfaa8c5d1b379641 SHA256 d6bdf9ca76f18e269d59888afe7ed833ce17e43ca25246c360d1dedbd9ff2742
+MD5 216bdcbed4a63d8e132d2348627f079f emacs-cvs-22.1.50.ebuild 7734
+RMD160 dd074faf0166bdd775f124d3c5cf305d69da860e emacs-cvs-22.1.50.ebuild 7734
+SHA256 d6bdf9ca76f18e269d59888afe7ed833ce17e43ca25246c360d1dedbd9ff2742 emacs-cvs-22.1.50.ebuild 7734
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5865 RMD160 6f5916fb4654aa6dd482c07461da99d31d7b9983 SHA1 f161716912accd7e75d928a55a92a831ae065f77 SHA256 018e3b6744b2f73aef422d883000491d6dbb787a74476d77b549b7f777783dbf
 MD5 26c953c88391c8489e6f15cae3d7f422 emacs-cvs-23.0.0-r1.ebuild 5865
 RMD160 6f5916fb4654aa6dd482c07461da99d31d7b9983 emacs-cvs-23.0.0-r1.ebuild 5865
 SHA256 018e3b6744b2f73aef422d883000491d6dbb787a74476d77b549b7f777783dbf emacs-cvs-23.0.0-r1.ebuild 5865
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7942 RMD160 22eba1f7f6aa9f4e5e3854572f2ccb13a8b57653 SHA1 56c998f2e796ca08b203adcaf0b2ab286393fda6 SHA256 3ab9f19ac7186fc27c2f35373a218bcd924d26b5d243a2fba2b259cf1032ec5c
-MD5 c4d90c27450555c576288fc777598005 emacs-cvs-23.0.0-r6.ebuild 7942
-RMD160 22eba1f7f6aa9f4e5e3854572f2ccb13a8b57653 emacs-cvs-23.0.0-r6.ebuild 7942
-SHA256 3ab9f19ac7186fc27c2f35373a218bcd924d26b5d243a2fba2b259cf1032ec5c emacs-cvs-23.0.0-r6.ebuild 7942
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7924 RMD160 6e938b6546da41ad15ccc39321b7af4590171241 SHA1 9fab0c6fd3ae07927aef661240e200638a3f6cfb SHA256 53bf7ce59f5da0f0410b5aa8254896789bae2b38242a19f359e95e60105e3978
+MD5 c62b759b5984040bd72a65e115379297 emacs-cvs-23.0.0-r6.ebuild 7924
+RMD160 6e938b6546da41ad15ccc39321b7af4590171241 emacs-cvs-23.0.0-r6.ebuild 7924
+SHA256 53bf7ce59f5da0f0410b5aa8254896789bae2b38242a19f359e95e60105e3978 emacs-cvs-23.0.0-r6.ebuild 7924
 MISC ChangeLog 25085 RMD160 194444746f58f79fb2d417062efaa38374abafcc SHA1 58a4bc5973ddd50349e604cad701e2d9d5f21d44 SHA256 9ce80aa0c12af3bc42423fb4e7a2bb86f349e5498643a088acfc7323473c4534
 MD5 9141b432518490a6894750a7f264473b ChangeLog 25085
 RMD160 194444746f58f79fb2d417062efaa38374abafcc ChangeLog 25085
@@ -90,9 +90,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 v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGXwPQAiZjviIA2XgRAlueAJ43/60uKJX7ATLO9M0NA33RM8w56QCfSmSb
-l1KZLtY1nveO/lY3drg9RaU=
-=6dl2
+iD8DBQFGX7hMOeoy/oIi7uwRAu4wAKClW2OfNQDE3ByeZhnCXXgmBLRZDQCdE1ew
+A/9pGqbJDsc5zD3q6wME7zc=
+=99fu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
index c4f33b32b701..4bed8dad7ba7 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.990.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.990.ebuild,v 1.6 2007/05/31 17:20:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.7 2007/06/01 06:09:49 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -58,8 +58,8 @@ FULL_VERSION="${PV}"
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
+
 	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"
@@ -120,12 +120,12 @@ src_compile() {
 			myconf="${myconf} --without-gtk"
 		elif use motif; then
 			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
 		else
 			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
 		fi
 	else
 		myconf="${myconf} --without-x"
@@ -140,8 +140,7 @@ src_compile() {
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
+	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
 }
 
 src_install () {
@@ -153,7 +152,7 @@ src_install () {
 		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place
-	einfo "Fixing 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/*
@@ -164,7 +163,7 @@ src_install () {
 	done
 
 	# move man pages to the correct place
-	einfo "Fixing manpages..."
+	einfo "Fixing manpages ..."
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed"
 	done
@@ -179,12 +178,12 @@ src_install () {
 		# This is not meant to install all the source -- just the
 		# C source you might find via find-function
 		doins src/*.[ch]
-		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<EOF
 (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 X    (setq find-function-C-source-directory
 X	  "/usr/share/emacs/${FULL_VERSION}/src"))
 EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
 	fi
 
 	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index fa83c728020f..31c69bfe58af 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.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.9999-r10.ebuild,v 1.19 2007/05/30 13:32:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.20 2007/06/01 06:09:49 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -132,12 +132,12 @@ src_compile() {
 			myconf="${myconf} --without-gtk"
 		elif use motif; then
 			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
 		else
 			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
 		fi
 	else
 		myconf="${myconf} --without-x"
@@ -152,8 +152,7 @@ src_compile() {
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
+	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
 }
 
 src_install () {
@@ -165,7 +164,7 @@ src_install () {
 		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place
-	einfo "Fixing 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/*
@@ -176,7 +175,7 @@ src_install () {
 	done
 
 	# move man pages to the correct place
-	einfo "Fixing manpages..."
+	einfo "Fixing manpages ..."
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed"
 	done
@@ -191,12 +190,12 @@ src_install () {
 		# This is not meant to install all the source -- just the
 		# C source you might find via find-function
 		doins src/*.[ch]
-		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<EOF
 (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 X    (setq find-function-C-source-directory
 X	  "/usr/share/emacs/${FULL_VERSION}/src"))
 EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
 	fi
 
 	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index e2457713f9ab..8cb33a5dbfe4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.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.1.50.ebuild,v 1.12 2007/05/31 16:31:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.13 2007/06/01 06:09:49 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -134,12 +134,12 @@ src_compile() {
 			myconf="${myconf} --without-gtk"
 		elif use motif; then
 			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
 		else
 			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
 		fi
 	else
 		myconf="${myconf} --without-x"
@@ -154,8 +154,7 @@ src_compile() {
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
+	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
 }
 
 src_install () {
@@ -167,7 +166,7 @@ src_install () {
 		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place
-	einfo "Fixing info documentation..."
+	einfo "Fixing info documentation ..."
 	dodir /usr/share/info/${EMACS_SUFFIX}
 	mv "${D}"/usr/share/info/{,${EMACS_SUFFIX}/}dir || die "mv dir failed"
 	for i in "${D}"/usr/share/info/*
@@ -178,7 +177,7 @@ src_install () {
 	done
 
 	# move man pages to the correct place
-	einfo "Fixing manpages..."
+	einfo "Fixing manpages ..."
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
 	done
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index dbd7c3823760..8ce65b4d9ea9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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-r6.ebuild,v 1.17 2007/05/31 12:48:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.18 2007/06/01 06:09:49 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -136,12 +136,12 @@ src_compile() {
 			myconf="${myconf} --without-gtk"
 		elif use motif; then
 			einfo "Configuring to build with motif toolkit support"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
 		else
 			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
 		fi
 	else
 		myconf="${myconf} --without-x"
@@ -156,8 +156,7 @@ src_compile() {
 		--without-carbon \
 		${myconf} || die "econf emacs failed"
 
-	emake CC="$(tc-getCC) " bootstrap \
-		|| die "make bootstrap failed."
+	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
 }
 
 src_install () {
@@ -169,7 +168,7 @@ src_install () {
 		|| die "moving Emacs executable failed"
 
 	# move info documentation to the correct place
-	einfo "Fixing 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/*
@@ -180,7 +179,7 @@ src_install () {
 	done
 
 	# move man pages to the correct place
-	einfo "Fixing manpages..."
+	einfo "Fixing manpages ..."
 	for m in "${D}"/usr/share/man/man1/* ; do
 		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed"
 	done
@@ -195,12 +194,12 @@ src_install () {
 		# This is not meant to install all the source -- just the
 		# C source you might find via find-function
 		doins src/*.[ch]
-		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<EOF
 (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 X    (setq find-function-C-source-directory
 X	  "/usr/share/emacs/${FULL_VERSION}/src"))
 EOF
-		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
 	fi
 
 	dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed"