added fixes for dosemu

4 files changed, 72 insertions, 2 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 6121c9f3c71e..a7708b83497f 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.11 2003/06/18 14:23:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.12 2003/06/20 17:47:41 hanno Exp $
+
+*dosemu-1.1.5-r1 (20 Jun 2003)
+
+  20 Jun 2003; Hanno Boeck <hanno@gentoo.org> dosemu-1.1.5-r1.ebuild:
+  Added patch to resolve installation problems (see bug #23110).
+  Changed ebuild to use CFLAGS.
 
   18 Jun 2003; Hanno Boeck <hanno@gentoo.org> dosemu-1.1.5.ebuild:
   Change ~x86 to x86.
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index defbbff194a2..a8857dfbf9f7 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,9 +1,11 @@
-MD5 1ba4edb019707d8f5d41c70d4db4f745 ChangeLog 1917
+MD5 7929ef99a21275f85506a88ca62888ee ChangeLog 2117
 MD5 27739374e52001236c26589a9f84f2c2 dosemu-1.1.3-r1.ebuild 2162
 MD5 63eec26157c6bd4f6d9e4090d8fd6883 dosemu-1.1.4.ebuild 2208
 MD5 180c11a4c53fcd6b7b87e18551ec3f20 dosemu-1.1.4.15.ebuild 1923
 MD5 c453563813460b8171b5472c58741979 dosemu-1.1.5.ebuild 1551
+MD5 aba391b4217eb39ef257f357a0d473d4 dosemu-1.1.5-r1.ebuild 1645
 MD5 20a65e5999072d738757e22ed2626e28 files/digest-dosemu-1.1.3-r1 129
 MD5 a6ff6e1d128581d10035bc7d7bc781a5 files/digest-dosemu-1.1.4 129
 MD5 5e4f5c1cb8a157071502e110dbb13e15 files/digest-dosemu-1.1.4.15 195
 MD5 1111d8e64602844f871f5c0f2deb839b files/digest-dosemu-1.1.5 133
+MD5 1111d8e64602844f871f5c0f2deb839b files/digest-dosemu-1.1.5-r1 133
diff --git a/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild b/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..c58f7b2a98f6
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild,v 1.1 2003/06/20 17:47:41 hanno Exp $
+
+IUSE="X svga"
+
+P_FD=dosemu-freedos-b8p-bin
+S=${WORKDIR}/${P}
+DESCRIPTION="DOS Emulator"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+	mirror://sourceforge/dosemu/${P}.tgz"
+HOMEPAGE="http://www.dosemu.org/"
+LICENSE="GPL-2 | LGPL-2.1"
+KEYWORDS="~x86 -ppc"
+SLOT="0"
+DEPEND="X? ( virtual/x11 )
+	svga? ( media-libs/svgalib )
+	sys-libs/slang"
+
+src_unpack() {
+	unpack ${P}.tgz
+        epatch ${FILESDIR}/dosemu-broken-links.diff
+	# extract freedos binary
+	cd ${S}/src
+	unpack ${P_FD}.tgz
+}
+
+src_compile() {
+
+	local myflags
+
+### mitshm will bork ./base-configure entirely, so we disable it here
+	myflags="--enable-mitshm=no"
+	myflags="${myflags} --enable-experimental"
+	myflags="${myflags} --disable-force-slang"
+
+### and then set build paramaters based on USE variables
+	use X || myflags="${myflags} --with-x=no"
+	use svga && myflags="${myflags} --enable-use-svgalib"
+
+	econf ${myflags} || die "DOSemu Base Configuration Failed"
+
+### Ok, the build tree is clean, lets make the executables, and 'dos' commands
+	emake CFLAGS="${CFLAGS}" -C src || die "DOSemu Make Failed!"
+	emake CFLAGS="${CFLAGS}" dosbin || die "DOSbin Make Failed"
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+
+	doman man/*.1
+	rm -rf ${D}/opt/dosemu/man/
+
+	mv ${D}/usr/share/doc/dosemu ${D}/usr/share/doc/${PF}
+
+	# 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.1.5-r1 b/app-emulation/dosemu/files/digest-dosemu-1.1.5-r1
new file mode 100644
index 000000000000..10bc94a6a95f
--- /dev/null
+++ b/app-emulation/dosemu/files/digest-dosemu-1.1.5-r1
@@ -0,0 +1,2 @@
+MD5 3522d2c139c2fd30d333d93570274377 dosemu-freedos-b8p-bin.tgz 794880
+MD5 15b37a5e45bbeaa31bb19269327707ff dosemu-1.1.5.tgz 2121858