some dosemu cleanups and fixes

4 files changed, 67 insertions, 4 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 88d83844a599..b8056430d793 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.22 2005/01/01 14:09:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.23 2005/01/10 09:52:21 hanno Exp $
+
+*dosemu-1.2.2-r1 (10 Jan 2005)
+
+  10 Jan 2005; Hanno Boeck <hanno@gentoo.org> +dosemu-1.2.2-r1.ebuild:
+  A bunch of cleanups and fixes, most of them found in bug #62882.
 
 *dosemu-1.2.2 (31 Jul 2004)
 
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index f3db0c648631..0f275bb8c4fd 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,10 +1,12 @@
-MD5 f5b8294ec36d1801d49686a02a0f4f5a ChangeLog 3241
+MD5 a411ef65068f1f2a224e921250565bb1 ChangeLog 3407
 MD5 a82db77e6fbec7c01e2f0f8780750e4b dosemu-1.2.0.ebuild 1268
 MD5 61467ef407e42f1b13d8668a4fcae951 dosemu-1.2.1.ebuild 1269
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 MD5 9aa383239a58607f2da3c0ef004fe398 dosemu-1.2.2.ebuild 1343
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 159f76c26dfb13e7507aff72e8301e67 dosemu-1.2.2-r1.ebuild 1370
 MD5 919e6e482f0bc9f366177904eae0b7c1 files/digest-dosemu-1.2.0 133
 MD5 f07393e4b6ed8e7785ada12c7c1e9763 files/digest-dosemu-1.2.1 133
+MD5 c55a4301f45354bf6dd78364654eedf8 files/digest-dosemu-1.2.2 133
 MD5 11e355fbc16d4a8c49fbd93df36e1350 files/dosemu-broken-links.diff 521
 MD5 d9edbc98f1c06b2c5ad563ab29928ec0 files/dosemu_kernel26_patch 1480
-MD5 c55a4301f45354bf6dd78364654eedf8 files/digest-dosemu-1.2.2 133
+MD5 7b6524cc4d37cd8b381b03fbd1db190b files/digest-dosemu-1.2.2-r1 135
diff --git a/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild b/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..764e72607f22
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.2.2-r1.ebuild,v 1.1 2005/01/10 09:52:21 hanno Exp $
+
+inherit flag-o-matic eutils
+
+P_FD=dosemu-freedos-b9r5-bin
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+	mirror://sourceforge/dosemu/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="X svga gpm debug"
+
+DEPEND="X? ( virtual/x11 )
+	svga? ( media-libs/svgalib )
+	gpm? ( sys-libs/gpm )
+	sys-libs/slang"
+
+src_unpack() {
+	unpack ${P}.tgz
+	cd ${S}
+	epatch ${FILESDIR}/dosemu-broken-links.diff
+}
+
+src_compile() {
+	local myflags="--with-fdtarball=none --sysconfdir=/etc/dosemu/ \
+	--with-mandir=/usr/share/man/"
+
+	use X || myflags="${myflags} --with-x=no"
+	use svga && myflags="${myflags} --enable-use-svgalib"
+	use gpm || myflags="${myflags} --without-gpm"
+	use debug && myflags="${myflags} --enable-debug"
+
+	# Has problems with -O3 on some systems
+	replace-flags -O[3-9] -O2
+
+	econf ${myflags} || die "DOSemu Base Configuration Failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc doc/*
+	rm -rf ${D}/usr/share/doc/dosemu
+
+	# freedos tarball is needed in /usr/share/dosemu
+	cp ${DISTDIR}/${P_FD}.tgz ${D}/usr/share/dosemu/dosemu-freedos-bin.tgz
+}
diff --git a/app-emulation/dosemu/files/digest-dosemu-1.2.2-r1 b/app-emulation/dosemu/files/digest-dosemu-1.2.2-r1
new file mode 100644
index 000000000000..e6008f45324f
--- /dev/null
+++ b/app-emulation/dosemu/files/digest-dosemu-1.2.2-r1
@@ -0,0 +1,2 @@
+MD5 34c0015398f35b30d4d8e484ced3be17 dosemu-freedos-b9r5-bin.tgz 1157598
+MD5 53849a324cde7aa5a89646cf6de20e06 dosemu-1.2.2.tgz 2184415