minor ebuild cleanup

Package-Manager: portage-1.589-cvs

2 files changed, 25 insertions, 35 deletions

diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 0fb32abe96ed..66a901807666 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
-MD5 b58eb90bd4f5a7511ee4720225052bc0 sawfish-1.3.20050816.ebuild 3029
 MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
-MD5 b467fb96d09328090ecca586e7825d08 sawfish-1.3.20040120-r1.ebuild 2563
 MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
+MD5 b467fb96d09328090ecca586e7825d08 sawfish-1.3.20040120-r1.ebuild 2563
+MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 105e71bdf0d8d815500def3850883c2f sawfish-1.3.20050816.ebuild 2957
 MD5 232062ffe75f00a8164612c62d106063 ChangeLog 9345
-MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74
-MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
-MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
+MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
-MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
 MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
 MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
-MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDChv4KRy60XGEcJIRAmiuAJ9yzf2ESJBAGhyMW5UzAUX2J4mxOACdFjaz
-oEr3Z50n/xVSIKnpH5fLhlk=
-=XqJz
------END PGP SIGNATURE-----
+MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
+MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
+MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
+MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74
diff --git a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
index 2bc7ab3d4e0a..f4745590cfb9 100644
--- a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
@@ -1,10 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.2 2005/08/16 23:03:32 truedfx Exp $
-
-inherit eutils gnuconfig
-
-IUSE="gnome esd nls audiofile"
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.3 2005/09/01 17:56:16 truedfx Exp $
 
 # detect cvs snapshots; fex. 1.3.20040120
 if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then
@@ -13,19 +9,21 @@ else
 	sawfishsnapshot=false
 fi
 
+inherit eutils gnuconfig
+
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 if $sawfishsnapshot; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	S=${WORKDIR}/${PN}
 else
 	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
-	S=${WORKDIR}/${P}
 fi
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gnome esd nls audiofile"
+
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=x11-libs/rep-gtk-0.17
 	>=dev-libs/librep-0.16
@@ -33,16 +31,18 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	audiofile? ( >=media-libs/audiofile-0.2.3 )
 	esd? ( >=media-sound/esound-0.2.23 )
 	nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
 
-# cvs snapshots require automake/autoconf
 if $sawfishsnapshot; then
-	DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf"
+	DEPEND="${DEPEND}
+		sys-devel/automake
+		sys-devel/autoconf"
+	S="${WORKDIR}/${PN}"
 fi
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd failed"
-
+	unpack ${A}
+	cd "${S}"
 	# This is for alpha, but there's no reason to restrict it
 	gnuconfig_update
 }
@@ -100,12 +100,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
 
 	# Add to Gnome CC's Window Manager list
 	if use gnome; then
 		insinto /usr/share/gnome/wm-properties
-		doins ${S}/Sawfish.desktop
+		doins "${S}/Sawfish.desktop"
 	fi
 }