Don't install Sawfish.desktop manually, and modify snapshot detection

(Portage version: 1.589-cvs)

3 files changed, 22 insertions, 26 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index c751e1b1f391..3baf5fd8ddbb 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.58 2005/09/02 19:16:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.59 2005/09/04 13:31:53 truedfx Exp $
+
+  04 Sep 2005; Harald van Dijk <truedfx@gentoo.org>
+  sawfish-1.3.20050816.ebuild:
+  No need to install Sawfish.desktop manually anymore
+  Change snapshot detection a bit
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   sawfish-1.3.20040120-r1.ebuild:
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 42ddb12b9e99..e724d0b94063 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,15 +1,15 @@
-MD5 105e71bdf0d8d815500def3850883c2f sawfish-1.3.20050816.ebuild 2957
-MD5 38a41c33b244c5704ca3dec0a903ba61 sawfish-1.3.20040120-r1.ebuild 2560
 MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
-MD5 fcef948283f6a979f68f98c1a741f5af ChangeLog 9449
-MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
 MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
-MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
-MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
-MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74
-MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
+MD5 38a41c33b244c5704ca3dec0a903ba61 sawfish-1.3.20040120-r1.ebuild 2560
+MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
+MD5 12c6444b68d0838b950530f21b8d13f3 sawfish-1.3.20050816.ebuild 2902
+MD5 fcef948283f6a979f68f98c1a741f5af ChangeLog 9449
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
+MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
+MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
+MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
 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 f4745590cfb9..3a5bbd4ae7a4 100644
--- a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
@@ -1,19 +1,16 @@
 # 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.3 2005/09/01 17:56:16 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.4 2005/09/04 13:31:53 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
-	sawfishsnapshot=true
-else
-	sawfishsnapshot=false
-fi
+[[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
+(( snapshot = !$? ))
 
 inherit eutils gnuconfig
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
-if $sawfishsnapshot; then
+if (( snapshot )); then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 else
 	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
@@ -33,7 +30,7 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}"
 
-if $sawfishsnapshot; then
+if (( snapshot )); then
 	DEPEND="${DEPEND}
 		sys-devel/automake
 		sys-devel/autoconf"
@@ -54,7 +51,7 @@ src_compile() {
 	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
 
 	# If this is a snapshot then we need to create the autoconf stuff
-	if $sawfishsnapshot; then
+	if (( snapshot )); then
 		aclocal || die "aclocal failed"
 		autoconf || die "autoconf failed"
 	fi
@@ -102,10 +99,4 @@ src_compile() {
 src_install() {
 	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"
-	fi
 }