added a lot of quotes around variables; fix slang dependency,see bug 141947

Package-Manager: portage-2.1.2.7

4 files changed, 53 insertions, 57 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index 512e65112a50..43952227d6ba 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jed
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.36 2007/06/08 06:35:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.37 2007/06/18 07:10:22 opfer Exp $
+
+  18 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
+  jed-0.99.16-r2.ebuild, jed-0.99.18.ebuild:
+  added a lot of quotes around variables; fix slang dependency,see bug 141947
 
   08 Jun 2007; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
   adding emacs team to herd tag
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 5043aedf9e3d..21af70bf3f05 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -19,18 +19,18 @@ RMD160 05eb299d22391f803ae87c0cf2e2440be7a81e02 files/jed.info.diff 333
 SHA256 1b8e89dc72a1cb47c9b76fed8fcd775be3ffd9c6052c75dd1433af8af1a7d56a files/jed.info.diff 333
 DIST jed-0.99-16.tar.bz2 667623 RMD160 1c7dc29feb7513a46af13ead11e6abf3f5303ec3 SHA1 34649571fb5caa61314553c10db2e15ebf248d82 SHA256 f820bc26c1e4ad2d97f8c122b78b5eb0202734b799968875867128c679078036
 DIST jed-0.99-18.tar.bz2 762826 RMD160 6925b67eab24d6dd2d5b5a975c350cfda515632d SHA1 fa4b3313fdde0466546e36100b0de2d9cc75806d SHA256 71c394640cf07286ffc7abe45d91477a64310e2024f81a1d5a79729887d8d43e
-EBUILD jed-0.99.16-r2.ebuild 2401 RMD160 0e9adee642d72872273a97f151f93d72ca459d4e SHA1 2f1ca9fbca2231bda957e272fe3a7715d47cde28 SHA256 6fc7c90ec78896f8b2b6787a64fab1b720db047caecdf328bcb99871e39f624d
-MD5 892d559b2329e4a9454c8279c5af6833 jed-0.99.16-r2.ebuild 2401
-RMD160 0e9adee642d72872273a97f151f93d72ca459d4e jed-0.99.16-r2.ebuild 2401
-SHA256 6fc7c90ec78896f8b2b6787a64fab1b720db047caecdf328bcb99871e39f624d jed-0.99.16-r2.ebuild 2401
-EBUILD jed-0.99.18.ebuild 2607 RMD160 36bc898ccc707d1950b4729db5a314bc3f2f9632 SHA1 87e000df4f1bf81e7d8c7e3e6e27b5a2a3fa7412 SHA256 02271690f0d5e491eb6dbabd88c8b1a6d1c608bcf6ad62d9ca76f9301ca171a1
-MD5 6108b9dfaf1d3d23f10fd45928b5c615 jed-0.99.18.ebuild 2607
-RMD160 36bc898ccc707d1950b4729db5a314bc3f2f9632 jed-0.99.18.ebuild 2607
-SHA256 02271690f0d5e491eb6dbabd88c8b1a6d1c608bcf6ad62d9ca76f9301ca171a1 jed-0.99.18.ebuild 2607
-MISC ChangeLog 4344 RMD160 64f01fd1039f9371ae0f9c766851bf5d60b12734 SHA1 a572e09e7e1802454bdd2c79e187cf03cee62b8a SHA256 7a33f98e7c2c7e069727a277ef13c7b341784bb68a7aa54a06770783a034c8cc
-MD5 06811c12b62133070b1c82398094d859 ChangeLog 4344
-RMD160 64f01fd1039f9371ae0f9c766851bf5d60b12734 ChangeLog 4344
-SHA256 7a33f98e7c2c7e069727a277ef13c7b341784bb68a7aa54a06770783a034c8cc ChangeLog 4344
+EBUILD jed-0.99.16-r2.ebuild 2396 RMD160 3dd828c911d21e30b7b22ab905cde38b14a46086 SHA1 3d6f28c7cb1077e3c4fa5621d1eeee7ac66e455b SHA256 2b08345ce12bc0234e3cfe0936df9d0370c36d683885147b9739b22a2345bba0
+MD5 3e642824daa9af02707e9adc81025840 jed-0.99.16-r2.ebuild 2396
+RMD160 3dd828c911d21e30b7b22ab905cde38b14a46086 jed-0.99.16-r2.ebuild 2396
+SHA256 2b08345ce12bc0234e3cfe0936df9d0370c36d683885147b9739b22a2345bba0 jed-0.99.16-r2.ebuild 2396
+EBUILD jed-0.99.18.ebuild 2591 RMD160 f1e82baefeb3ad02092f0e34b287108d4e4a96b5 SHA1 819c96920e005d6f1a8597a6657ff21794b7b8d3 SHA256 31b6c2da989f2f3f488f151364b48745d0a2629cf09e5a88ff95d1b730ef1a24
+MD5 0a6a047c6e29b0fc37c676f56d511260 jed-0.99.18.ebuild 2591
+RMD160 f1e82baefeb3ad02092f0e34b287108d4e4a96b5 jed-0.99.18.ebuild 2591
+SHA256 31b6c2da989f2f3f488f151364b48745d0a2629cf09e5a88ff95d1b730ef1a24 jed-0.99.18.ebuild 2591
+MISC ChangeLog 4523 RMD160 c9860485c05afa28177abb4c0dd40c6d2f093977 SHA1 26d5e299eb16940d569cd2852ecc005e89027651 SHA256 eeede320a20f3d5654f6a7ec4293c65ca83a52f7b2b7e8ba923fbab5f3931645
+MD5 01fbf23fad11d797625f0cf5d60ad8c1 ChangeLog 4523
+RMD160 c9860485c05afa28177abb4c0dd40c6d2f093977 ChangeLog 4523
+SHA256 eeede320a20f3d5654f6a7ec4293c65ca83a52f7b2b7e8ba923fbab5f3931645 ChangeLog 4523
 MISC metadata.xml 217 RMD160 d73e6dbb13bd9a957b38819b4c46987922d44289 SHA1 1dc866ddcb2df1a817d1beb8fb00f5dfb6aa8fa8 SHA256 091001ae6934e798fbfaba6fcbc2dbc3020eadb68ed9475304406d602371eba5
 MD5 eb6939e7033b754cc9902b5d39c39d3d metadata.xml 217
 RMD160 d73e6dbb13bd9a957b38819b4c46987922d44289 metadata.xml 217
@@ -44,7 +44,7 @@ SHA256 11458f3452f8b90e4293fd2fc33c2e8550743e2d8c99ae763f19c19b4ebcd038 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGaOo2NQqtfCuFneMRAq0aAJwLKrDGga7f3GyfXrhfexOLGxChugCfWflk
-Hp73pvS7rbj6d73IsSCziew=
-=EHZM
+iD8DBQFGdi/lNQqtfCuFneMRAj5cAJ425XjGy8k8YtuE+K/cfFQbZasXEACaAq+m
+Rd4MlJEkxV3UV/12/pnxXlA=
+=HlLR
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild
index fab741127a7f..fe0c069d524f 100644
--- a/app-editors/jed/jed-0.99.16-r2.ebuild
+++ b/app-editors/jed/jed-0.99.16-r2.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/jed/jed-0.99.16-r2.ebuild,v 1.20 2007/02/09 21:29:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.21 2007/06/18 07:10:22 opfer Exp $
 
 inherit eutils
 
@@ -15,12 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="X gpm truetype"
 
-RDEPEND="<sys-libs/slang-2
-	X? ( || (
-			( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
-			  virtual/x11
-		)
-	)
+RDEPEND="=sys-libs/slang-1.4*
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
 	gpm? ( sys-libs/gpm )
 	X? ( truetype? ( || ( x11-libs/libXft virtual/xft )
 					>=media-libs/freetype-2.0 ) )"
@@ -31,8 +27,8 @@ PROVIDE="virtual/editor"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
-	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
+	cd "${S}"; epatch "${FILESDIR}/${P}-jed.info.patch"
+	use userland_Darwin && "epatch ${FILESDIR}/${P}-darwin.patch"
 }
 
 src_compile() {
@@ -50,7 +46,7 @@ src_compile() {
 			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
 			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
 			Makefile
-		cd ${S}
+		cd "${S}"
 	fi
 
 	if use X && use truetype ; then
@@ -58,7 +54,7 @@ src_compile() {
 	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
 	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
 	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h
-	   cd ${S}
+	   cd "${S}"
 	fi
 
 	make clean || die
@@ -73,19 +69,19 @@ src_compile() {
 src_install() {
 	# make install in ${S} claims everything is up-to-date,
 	# so we manually cd ${S}/src before installing
-	cd ${S}/src
-	make DESTDIR=${D} install || die
+	cd "${S}/src"
+	make DESTDIR="${D}" install || die
 
-	cd ${S}/doc
+	cd "${S}/doc"
 	cp README AUTHORS
 
-	cd ${S}
+	cd "${S}"
 	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
 
-	cd ${S}/info
+	cd "${S}/info"
 	rm info.info
-	epatch ${FILESDIR}/jed.info.diff
-	cd ${S}
+	epatch "${FILESDIR}/jed.info.diff"
+	cd "${S}"
 
 	insinto /usr/share/info
 	doins info/*
@@ -94,9 +90,9 @@ src_install() {
 	doins lib/jed.conf
 
 	# replace IDE mode with EMACS mode
-	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' ${D}/etc/jed.conf || die "patching jed.conf failed"
+	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' "${D}/etc/jed.conf" || die "patching jed.conf failed"
 
-	cd ${D}
+	cd "${D}"
 	rm -rf usr/share/jed/info
 	# can't rm usr/share/jed/doc -- used internally by jed/xjed
 }
diff --git a/app-editors/jed/jed-0.99.18.ebuild b/app-editors/jed/jed-0.99.18.ebuild
index a59880bb44eb..d51d11bb5550 100644
--- a/app-editors/jed/jed-0.99.18.ebuild
+++ b/app-editors/jed/jed-0.99.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.1 2006/08/09 12:47:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.2 2007/06/18 07:10:22 opfer Exp $
 
 inherit eutils versionator
 
@@ -15,15 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X gpm truetype"
 
-RDEPEND=">=sys-libs/slang-2.0
-	X? ( || (
-			( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
-			  virtual/x11
-		)
-	)
-	gpm? ( sys-libs/gpm )
+RDEPEND="=sys-libs/slang-2*
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
 	X? ( truetype? ( || ( x11-libs/libXft virtual/xft )
-					>=media-libs/freetype-2.0 ) )"
+					>=media-libs/freetype-2.0 ) )
+	gpm? ( sys-libs/gpm )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -33,7 +29,7 @@ src_unpack() {
 	unpack ${A}
 
 	# Gennto slotted slang-2
-	cd ${S}
+	cd "${S}"
 	sed -e 's:-lslang:-lslang-2:g' -i src/Makefile.in
 	sed -e 's:libslang:libslang-2:g' -i configure
 
@@ -57,7 +53,7 @@ src_compile() {
 			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
 			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
 			Makefile
-		cd ${S}
+		cd "${S}"
 	fi
 
 	if use X && use truetype ; then
@@ -65,7 +61,7 @@ src_compile() {
 	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
 	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
 	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h
-	   cd ${S}
+	   cd "${S}"
 	fi
 
 	make clean || die
@@ -80,19 +76,19 @@ src_compile() {
 src_install() {
 	# make install in ${S} claims everything is up-to-date,
 	# so we manually cd ${S}/src before installing
-	cd ${S}/src
-	make DESTDIR=${D} install || die
+	cd "${S}/src"
+	make DESTDIR="${D}" install || die
 
-	cd ${S}/doc
+	cd "${S}/doc"
 	cp README AUTHORS
 
-	cd ${S}
+	cd "${S}"
 	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
 
-	cd ${S}/info
+	cd "${S}/info"
 	rm info.info
 	#epatch ${FILESDIR}/jed.info.diff
-	cd ${S}
+	cd "${S}"
 
 	insinto /usr/share/info
 	doins info/*
@@ -101,9 +97,9 @@ src_install() {
 	doins lib/jed.conf
 
 	# replace IDE mode with EMACS mode
-	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' ${D}/etc/jed.conf || die "patching jed.conf failed"
+	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' "${D}/etc/jed.conf" || die "patching jed.conf failed"
 
-	cd ${D}
+	cd "${D}"
 	rm -rf usr/share/jed/info
 	# can't rm usr/share/jed/doc -- used internally by jed/xjed
 }