From 607d3ebe70e773c1747aa6d94114dd3c5051eaf8 Mon Sep 17 00:00:00 2001
From: David Shakaryan <omp@gentoo.org>
Date: Mon, 28 Apr 2008 00:28:32 +0000
Subject: Various ebuild cleanup.

svn path=/; revision=14
---
 x11-wm/fvwm/Manifest           |  2 +-
 x11-wm/fvwm/fvwm-2.5.25.ebuild | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index ff5c861..e21ddaf 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,5 +5,5 @@ AUX fvwm-2.5.23-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a6220
 AUX fvwm-menu-xlock-xlockmore-compat.patch 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
 DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
 DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa
-EBUILD fvwm-2.5.25.ebuild 5080 RMD160 8fd042edf84ce364d81c156fdf9a47b7aa98f932 SHA1 3125cd43f325b6904c7fde7cfadb17e3850fc22b SHA256 31298bbb620216a09f87bfe2f82e0069427779067728b52ed02081c87523af6f
+EBUILD fvwm-2.5.25.ebuild 4795 RMD160 96877d07c5bf29e21ac9ddaf1fedec4f1dac2442 SHA1 2c2efc6c793f186b5708a78062dde74de280c7b6 SHA256 e50ef9a82545ef3eb122a1b3fcabb4bce6911a844fe1ddc813e7620eed1cb46e
 EBUILD fvwm-9999.ebuild 6985 RMD160 fadfaa9ca384911f2a5930991a494c7ea80754ca SHA1 60c6c84d287b3c6c4fa2249bc8b7e1c816f8d0f2 SHA256 b7a725d6bd63582a89cfde414263acdf9b2c1709180039fce96d2273176e63a2
diff --git a/x11-wm/fvwm/fvwm-2.5.25.ebuild b/x11-wm/fvwm/fvwm-2.5.25.ebuild
index 4990680..a41216e 100644
--- a/x11-wm/fvwm/fvwm-2.5.25.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.25.ebuild
@@ -144,33 +144,23 @@ src_install() {
 		rm -rf "${D}/usr/bin/fvwm-perllib" "${D}/usr/share/man/man1/fvwm-perllib.1"
 	fi
 
-	# neat utility for testing fvwm behaviour on applications setting various
-	# hints, creates a simple black window with configurable hints set.
+	# Utility for testing FVWM behaviour by creating a simple window with
+	# configurable hints.
 	if use debug; then
 		dobin "${S}/tests/hints/hints_test"
 		newdoc "${S}/tests/hints/README" README.hints
 	fi
 
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	rm -f "${D}/usr/bin/fvwm-convert-2.6" "${D}/usr/share/man/man1/fvwm-convert-2.6.1"
+	# Remove fvwm-convert-2.6 as it does not contain any code.
+	rm -f "${D}/usr/bin/fvwm-convert-2.6" \
+		"${D}/usr/share/man/man1/fvwm-convert-2.6.1"
 
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
+	echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}"
 
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS \
-		docs/{ANNOUNCE,BUGS,COMMANDS,DEVELOPERS,FAQ,error_codes,TODO,fvwm.lsm}
+	dodoc AUTHORS ChangeLog NEWS README \
+		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
+		docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
 
 	# README file for translucent menus patch.
 	use vanilla || dodoc "${FILESDIR}/README.translucency"
 }
-
-pkg_postinst() {
-	einfo
-	einfo "For information about the changes in this release, please"
-	einfo "refer to the NEWS file."
-	einfo
-}
-- 
cgit v1.2.3-65-gdbad