cleanups and fixes

3 files changed, 14 insertions, 16 deletions

diff --git a/app-emulation/winex/ChangeLog b/app-emulation/winex/ChangeLog
index 70430a5e44c6..2e6639a76694 100644
--- a/app-emulation/winex/ChangeLog
+++ b/app-emulation/winex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/winex
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/ChangeLog,v 1.27 2003/06/23 18:36:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/ChangeLog,v 1.28 2003/06/24 18:22:31 coronalvr Exp $
+
+  24 Jun 2003; coronalvr <coronalvr@gentoo.org> winex-20030328.ebuild:
+  cleanups and minor fixes
 
   23 Jun 2003; Martin Holzer <mholzer@gentoo.org> winex-20030328.ebuild:
   Doing silly things before holiday is always very bad.
diff --git a/app-emulation/winex/Manifest b/app-emulation/winex/Manifest
index 2416b27988f7..b3cb57e6c0a8 100644
--- a/app-emulation/winex/Manifest
+++ b/app-emulation/winex/Manifest
@@ -1,8 +1,8 @@
-MD5 f2c648fb689eda88e37b59aa829c7941 ChangeLog 5049
 MD5 7d657cf15ae7ff1a73b9927c5270198a winex-20021123.ebuild 3610
-MD5 4055553736b2390b56e867411eb7a2a0 winex-20030328.ebuild 3796
-MD5 63a46a2b78be05243179e46f7c1c4d40 files/81winex 78
+MD5 278ceb4785631424986ddd1ab90ec5c7 ChangeLog 5150
+MD5 27b52840f822fe0237be3ef9455083cd winex-20030328.ebuild 3656
+MD5 190b622ae744fb68561764ce1b2d9f1d files/winex-20030328.patch 287
 MD5 68d70a8e7d43268ac2675e7d15915b05 files/winex 97
 MD5 6ce999531acadae10d447a3a0c5ae1b4 files/digest-winex-20021123 215
 MD5 1e77e730bda4488a62a61ad396996232 files/digest-winex-20030328 288
-MD5 190b622ae744fb68561764ce1b2d9f1d files/winex-20030328.patch 287
+MD5 63a46a2b78be05243179e46f7c1c4d40 files/81winex 78
diff --git a/app-emulation/winex/winex-20030328.ebuild b/app-emulation/winex/winex-20030328.ebuild
index f0b4a95c6aad..ae1933e47d5d 100644
--- a/app-emulation/winex/winex-20030328.ebuild
+++ b/app-emulation/winex/winex-20030328.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20030328.ebuild,v 1.5 2003/06/23 18:36:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20030328.ebuild,v 1.6 2003/06/24 18:22:31 coronalvr Exp $
 
 inherit base
 
@@ -32,11 +32,6 @@ S=${WORKDIR}/wine
 
 src_unpack() {
 	base_src_unpack
-	# Unpacking the miscellaneous files
-	mkdir misc
-	cd misc
-	tar jxvf ${DISTDIR}/${P}-misc.tar.bz2 &> /dev/null
-	chown root:root *
 	cd ${S}
 	epatch ${DISTDIR}/${P}-xopenfont.patch
 }
@@ -98,14 +93,14 @@ src_install () {
 
 	# moving the wrappers to bin/
 	insinto /usr/bin
-	dobin ${WORKDIR}/misc/regedit-winex ${WORKDIR}/misc/winex
+	dobin ${WORKDIR}/regedit-winex ${WORKDIR}/winex
 
 	### Set up the remaining files
 	cd ${S}
 
 	# copying the winedefault.reg into .data
 	insinto /usr/lib/winex/.data
-	doins winedefault.reg ${WORKDIR}/misc/config
+	doins winedefault.reg ${WORKDIR}/config
 
 	# Set up this dynamic data
 	insinto /usr/lib/wine/.data/fake_windows/Windows
@@ -118,7 +113,7 @@ src_install () {
 	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
 
 	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
+	mv ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
 	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
 	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
 	
@@ -130,8 +125,8 @@ src_install () {
 pkg_postinst() {
 	einfo "Use /usr/bin/winex to start winex."
 	einfo "This is a wrapper-script which will take care of everything"
-	einfo "else. If you have further questions, enhancements or patches"
-	einfo "send an email to phoenix@gentoo.org"
+	einfo "else. If you have bugs, enhancements or patches"
+	einfo "send a bug report and assign it to wine@gentoo.org"
 	einfo ""
 	einfo "Manpage has been installed to the system."
 	einfo "\"man winex\" should show it."