dosemu bump

(Portage version: 2.1.2.5)

4 files changed, 118 insertions, 1 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 6c69f0a2ea42..60a72c295f21 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.40 2007/04/02 21:36:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.41 2007/05/03 05:06:27 hanno Exp $
+
+*dosemu-1.3.5 (02 May 2007)
+
+  02 May 2007; Hanno Boeck <hanno@gentoo.org>
+  +files/dosemu-1.3.5-slang2.diff, +dosemu-1.3.5.ebuild:
+  Version bump.
 
 *dosemu-1.3.4 (02 Apr 2007)
 
diff --git a/app-emulation/dosemu/dosemu-1.3.5.ebuild b/app-emulation/dosemu/dosemu-1.3.5.ebuild
new file mode 100644
index 000000000000..e053dab584f3
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.3.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.3.5.ebuild,v 1.1 2007/05/03 05:06:28 hanno Exp $
+
+inherit flag-o-matic eutils autotools
+
+P_FD=dosemu-freedos-1.0-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"
+
+RDEPEND="X? (
+	|| ( (
+		x11-libs/libXxf86vm
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-proto/xf86dgaproto
+		x11-apps/xset
+		x11-apps/xlsfonts
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir
+	)
+	virtual/x11
+	) )
+	svga? ( media-libs/svgalib )
+	gpm? ( sys-libs/gpm )
+	>=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+
+src_unpack() {
+	unpack ${P}.tgz
+	cd ${S}
+
+	epatch ${FILESDIR}/dosemu-1.3.3-configure.ac.patch
+	epatch ${FILESDIR}/dosemu-1.3.4-shm.diff
+	epatch ${FILESDIR}/dosemu-1.3.5-slang2.diff
+
+	eautoreconf || die "autoconf failed"
+}
+
+src_compile() {
+	# Has problems with -O3 on some systems
+	replace-flags -O[3-9] -O2
+
+	# Fix compilation on hardened
+	append-flags -fno-pic
+
+	unset KERNEL
+
+	econf `use_with X x` \
+		`use_enable svga svgalib` \
+		`use_enable debug` \
+		`use_with gpm` \
+		--with-fdtarball=${DISTDIR}/${P_FD}.tgz \
+		--sysconfdir=/etc/dosemu/ \
+		--with-docdir=/usr/share/doc/${PF} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	# Don't remove COPYING, see bug #137286
+	dodoc Bugs ChangeLog COPYING NEWS THANKS
+}
diff --git a/app-emulation/dosemu/files/digest-dosemu-1.3.5 b/app-emulation/dosemu/files/digest-dosemu-1.3.5
new file mode 100644
index 000000000000..0ed49bf84717
--- /dev/null
+++ b/app-emulation/dosemu/files/digest-dosemu-1.3.5
@@ -0,0 +1,6 @@
+MD5 16cb31112d5928c9d45319157948bb7c dosemu-1.3.5.tgz 2324652
+RMD160 32f1b02ee3d1b400ca9f2a77a0e8b82f212797c8 dosemu-1.3.5.tgz 2324652
+SHA256 75444662a55a580d7d865cdfacfb38aaeaa289a1555f900aae631f919b96b877 dosemu-1.3.5.tgz 2324652
+MD5 2e09774fe91cff4372cb4a393eb467f5 dosemu-freedos-1.0-bin.tgz 1205628
+RMD160 0a5083a6e7cdd8de890275beb51069d42009df17 dosemu-freedos-1.0-bin.tgz 1205628
+SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 dosemu-freedos-1.0-bin.tgz 1205628
diff --git a/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff b/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff
new file mode 100644
index 000000000000..464ed9a7e75d
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff
@@ -0,0 +1,32 @@
+--- dosemu-1.3.5/configure.ac	2006-12-10 15:03:24.000000000 +0100
++++ dosemu-1.3.5-fix/configure.ac	2007-05-02 04:46:00.000000000 +0200
+@@ -291,6 +291,8 @@
+       SLANGINC="-I${prefix}/include/slang"
+     elif test -d /usr/include/slang; then
+       SLANGINC="-I/usr/include/slang"
++    elif test -d /usr/include/slang-2; then
++      SLANGINC="-I/usr/include/slang-2"
+     fi
+   fi
+ else
+@@ -313,13 +315,19 @@
+ AC_MSG_RESULT($SLANGINC $SLANGLIB)
+ have_slang="no"
+ AC_CHECK_HEADER(slang.h,
++  AC_CHECK_LIB(slang-2, SLtt_get_terminfo,
++    AC_MSG_NOTICE(Compiling with S-Lang support...)
++    have_slang="yes"
++    AC_DEFINE(USE_SLANG)
++    SLANGLIB="$SLANGLIB -lslang-2 -lm",
++    [AC_MSG_WARN([No S-Lang library found.])]
++  ),
+   AC_CHECK_LIB(slang, SLtt_get_terminfo,
+     AC_MSG_NOTICE(Compiling with S-Lang support...)
+     have_slang="yes"
+     AC_DEFINE(USE_SLANG)
+     SLANGLIB="$SLANGLIB -lslang -lm",
+     [AC_MSG_WARN([No S-Lang library found.])]
+-    $srcdir/mkpluginhooks enable term no
+   ),
+   [AC_MSG_WARN([No S-Lang header file found.])]
+   $srcdir/mkpluginhooks enable term no