dosemu version bump

Package-Manager: portage-2.1.2.3

7 files changed, 171 insertions, 5 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index c154f1d900b6..6c69f0a2ea42 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2007/02/25 15:27:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.40 2007/04/02 21:36:22 hanno Exp $
+
+*dosemu-1.3.4 (02 Apr 2007)
+
+  02 Apr 2007; Hanno Boeck <hanno@gentoo.org> +files/dosemu-1.3.4-shm.diff,
+  +files/dosemu-1.3.4-slang2.diff, +files/dosemu-compile-asm.diff,
+  +dosemu-1.3.4.ebuild:
+  Version bump and a bunch of fixes.
 
   25 Feb 2007; Samuli Suominen <drac@gentoo.org> dosemu-1.3.3.ebuild:
   Remove virtual/x11 usage wrt bug 166370.
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 3793e2de9976..a1b6f90c2058 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dosemu-1.2.2-cflags.patch 2584 RMD160 261b920084b003b443161df4693a9230b8064729 SHA1 05b87f7d17fcfbd3b25dcac475d0b6f05554b6d6 SHA256 5760e898606aa81c862ed5eec3f094c010210b8c477730b42d295643e4e6ffe5
 MD5 497a92330b10bea8772669b9bb821233 files/dosemu-1.2.2-cflags.patch 2584
 RMD160 261b920084b003b443161df4693a9230b8064729 files/dosemu-1.2.2-cflags.patch 2584
@@ -6,13 +9,26 @@ AUX dosemu-1.3.3-configure.ac.patch 2523 RMD160 ac78e401fea08d590f45be699dcbda12
 MD5 b636328303fed1f731499ebe1fcf95a0 files/dosemu-1.3.3-configure.ac.patch 2523
 RMD160 ac78e401fea08d590f45be699dcbda12b5093dba files/dosemu-1.3.3-configure.ac.patch 2523
 SHA256 2dc36ab9c04f68928e52582d47fbc9861685d94d21fcfaa57bf536652245600b files/dosemu-1.3.3-configure.ac.patch 2523
+AUX dosemu-1.3.4-shm.diff 394 RMD160 f08fc40376b4281ca0df48147f79aadb3de1e06a SHA1 a242a268189c37766b8a0bc99dda01ce68bbc09c SHA256 2c0091f53f97c55ad9624ccaae91c21ef5245066c8dba5e612ad9f5309694ab7
+MD5 2ff2cf543f7f26f17596f7c1134b0286 files/dosemu-1.3.4-shm.diff 394
+RMD160 f08fc40376b4281ca0df48147f79aadb3de1e06a files/dosemu-1.3.4-shm.diff 394
+SHA256 2c0091f53f97c55ad9624ccaae91c21ef5245066c8dba5e612ad9f5309694ab7 files/dosemu-1.3.4-shm.diff 394
+AUX dosemu-1.3.4-slang2.diff 831 RMD160 c107e36ee76820cfcfe09d0b8aeaf0c4c278d16b SHA1 19c341a0b9597f417011626353f5ffc77eeee3fa SHA256 653ddb520303121c429c4f61edc879b91d5c962b7741d96da040c9117e22e441
+MD5 32b695d9509f1fae9fdd112cab710154 files/dosemu-1.3.4-slang2.diff 831
+RMD160 c107e36ee76820cfcfe09d0b8aeaf0c4c278d16b files/dosemu-1.3.4-slang2.diff 831
+SHA256 653ddb520303121c429c4f61edc879b91d5c962b7741d96da040c9117e22e441 files/dosemu-1.3.4-slang2.diff 831
 AUX dosemu-broken-links.diff 521 RMD160 f5be5ceaa144e1eef2081317a3af734099e0ddef SHA1 332545826cb91e49eb34ac32be1bac12e62db77c SHA256 475ac379c134968841bbe38e4984e5b805f809bb5ff6dff2e2df307b925efc03
 MD5 11e355fbc16d4a8c49fbd93df36e1350 files/dosemu-broken-links.diff 521
 RMD160 f5be5ceaa144e1eef2081317a3af734099e0ddef files/dosemu-broken-links.diff 521
 SHA256 475ac379c134968841bbe38e4984e5b805f809bb5ff6dff2e2df307b925efc03 files/dosemu-broken-links.diff 521
+AUX dosemu-compile-asm.diff 450 RMD160 7bd04129dd2523e4978cac1a016b0fc4b8679e6d SHA1 30a98a2ae5c98cab386dc48c0460c25c9a8e5223 SHA256 111a7547f68c4b5d185dae0cc13bc31d505d7e60a2dbd45d6c18a551389a8cf3
+MD5 6a0d92e0b0684e415344acc30652ce6d files/dosemu-compile-asm.diff 450
+RMD160 7bd04129dd2523e4978cac1a016b0fc4b8679e6d files/dosemu-compile-asm.diff 450
+SHA256 111a7547f68c4b5d185dae0cc13bc31d505d7e60a2dbd45d6c18a551389a8cf3 files/dosemu-compile-asm.diff 450
 DIST dosemu-1.2.2.tgz 2184415 RMD160 da86eb5212c880ee06432c56daa3b9329d386123 SHA1 a27eb467a522bbf0747452955ab7fd94e5384fde SHA256 e67eeabdf56444e1fc8439b35b2d7d3c6bc1298454fb532ade4e97f189740c7d
 DIST dosemu-1.3.2.tgz 2119114 RMD160 f20d6a1bfc5a88c523f247452209bbb1eee95ce3 SHA1 383a5f08f04a27e769502119ac99cd1ae6d5f407 SHA256 de7037f7725b1c59584a37a98616d1b1782061768174757a0351930e154e3474
 DIST dosemu-1.3.3.tgz 2118984 RMD160 6afa11d3c10173134ed6cc9485ac05495dd65188 SHA1 557961035dd2cc7c5aa2e78f55bd0a2eb37fa81a SHA256 710adaf9d7e6b3e25ceb180d84056d76fb65d5215897ada04ca6a629b5518c2d
+DIST dosemu-1.3.4.tgz 2250288 RMD160 e6509e9499a91351a79e065e68ed9fc2c453a940 SHA1 b3c0b946afc1de720d0c767643734ad6ddb6759c SHA256 754de8be3ad8720dcc647eb903e681c55976ea06463a75bca3f5ac181a0355dd
 DIST dosemu-freedos-b9r5-bin.tgz 1157598 RMD160 b7fa9e310487997bcbd4fa1a755362f337337c7d SHA1 96ce04dbce6a927f3cf773cbe30c5a2301c0f71c SHA256 9cdaedfcb6ee219bc0fe3bff8b4b7b7661d7508c3b9e7d2eebcda41405397835
 DIST dosemu-freedos-b9r5a-bin.tgz 1154735 RMD160 54b2c7c2ca13139b555f6c0318576b9db91875da SHA1 090941fce071223198576fbb8f5318700787929f SHA256 bd143b04add270425f117c5186468914765437c7b9c9c9a44eb0f278798e6850
 EBUILD dosemu-1.2.2-r1.ebuild 1664 RMD160 4998f304f1eff8ef1fab7353bb7d997b969cf4b0 SHA1 af51db83687c63bcd1ec6af449b42880bca15a6e SHA256 71796e0ef09a82732b8fd6a2ccbf8edeac9b5d3dc1db804c47389142c694ae42
@@ -27,10 +43,14 @@ EBUILD dosemu-1.3.3.ebuild 1597 RMD160 f300184d56c09b3bd8022fa2ab0ab9dc153a9a22
 MD5 65da0cffcdcbc6205bdb8427e43b7e7a dosemu-1.3.3.ebuild 1597
 RMD160 f300184d56c09b3bd8022fa2ab0ab9dc153a9a22 dosemu-1.3.3.ebuild 1597
 SHA256 c29f8f881d0878bc3b5cfc026b535c026068e0adde330a19fd2828ca462aeb65 dosemu-1.3.3.ebuild 1597
-MISC ChangeLog 5239 RMD160 8caaa9cbb4c3fff6794455ee9abca248ad9e5e2a SHA1 670c414dd71f9836cc40fac1248756501595494b SHA256 5018e023c00df91cd87192591fac8016f259234975ea84e5347ff35bd2f3a944
-MD5 a2ee76d123021bc19b64e4502c2d38e4 ChangeLog 5239
-RMD160 8caaa9cbb4c3fff6794455ee9abca248ad9e5e2a ChangeLog 5239
-SHA256 5018e023c00df91cd87192591fac8016f259234975ea84e5347ff35bd2f3a944 ChangeLog 5239
+EBUILD dosemu-1.3.4.ebuild 1629 RMD160 05b240ec7c2a5a562d299eaf319708e7c6040c9b SHA1 25abc168da90c86018c4096617d6dae36ac7658b SHA256 86b1697a4c6845230beb69491e77037f03a1e78d26aa870f0f257fb1c5a74db2
+MD5 97d65e4d92db405880dbed6fcce3fe78 dosemu-1.3.4.ebuild 1629
+RMD160 05b240ec7c2a5a562d299eaf319708e7c6040c9b dosemu-1.3.4.ebuild 1629
+SHA256 86b1697a4c6845230beb69491e77037f03a1e78d26aa870f0f257fb1c5a74db2 dosemu-1.3.4.ebuild 1629
+MISC ChangeLog 5474 RMD160 c300ca557cd22da63c1c4aea9617170294312ee9 SHA1 8fe2beb9f639ceb660e644a7991bda26966ef92a SHA256 fd499e2bdb5be09e5b929a74d8757c9028b24ba84b3e71762a5978da0b38609f
+MD5 9b22e6c45dac376a4b797fc934ce44f0 ChangeLog 5474
+RMD160 c300ca557cd22da63c1c4aea9617170294312ee9 ChangeLog 5474
+SHA256 fd499e2bdb5be09e5b929a74d8757c9028b24ba84b3e71762a5978da0b38609f ChangeLog 5474
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -44,3 +64,13 @@ SHA256 81e0579eeb75de69f8cc7a36ff282a30ec3fe6fcd7e6b657dd9902a54aad3024 files/di
 MD5 83b2b93d9a72c9112b67aa8423cf6f24 files/digest-dosemu-1.3.3 500
 RMD160 61d803e90f51eab0dd96161f6308938f662e2f67 files/digest-dosemu-1.3.3 500
 SHA256 fe8969240a9ac9f3b1063972001ae40a6916c798f08aaf65ce6ff94f2b9a2497 files/digest-dosemu-1.3.3 500
+MD5 bfcfe4b661c75f8446630bc28375ce42 files/digest-dosemu-1.3.4 500
+RMD160 724005649939bc4e01f046b4c947429e43262637 files/digest-dosemu-1.3.4 500
+SHA256 dc8c2b25c864acdcf8fc4ce6e401828c8089a413c5f4ce8e64c4295525fc3ed9 files/digest-dosemu-1.3.4 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGEXdIr2QksT29OyARAuQ/AJ93yBWe64GzQc6M7rqoeyD9jkZOMACgmjvP
+hPrGPhngA0BbtiIFT2YSLcU=
+=XjqU
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/dosemu/dosemu-1.3.4.ebuild b/app-emulation/dosemu/dosemu-1.3.4.ebuild
new file mode 100644
index 000000000000..b633f2de208e
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.3.4.ebuild
@@ -0,0 +1,74 @@
+# 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.4.ebuild,v 1.1 2007/04/02 21:36:22 hanno Exp $
+
+inherit flag-o-matic eutils autotools
+
+P_FD=dosemu-freedos-b9r5a-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.4-slang2.diff
+	epatch ${FILESDIR}/dosemu-compile-asm.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.4 b/app-emulation/dosemu/files/digest-dosemu-1.3.4
new file mode 100644
index 000000000000..17b268bc267f
--- /dev/null
+++ b/app-emulation/dosemu/files/digest-dosemu-1.3.4
@@ -0,0 +1,6 @@
+MD5 4fbfdc50ea86d860dd9cea59ea7f4b47 dosemu-1.3.4.tgz 2250288
+RMD160 e6509e9499a91351a79e065e68ed9fc2c453a940 dosemu-1.3.4.tgz 2250288
+SHA256 754de8be3ad8720dcc647eb903e681c55976ea06463a75bca3f5ac181a0355dd dosemu-1.3.4.tgz 2250288
+MD5 153ef4f6ab653497836502c9e3e18c3a dosemu-freedos-b9r5a-bin.tgz 1154735
+RMD160 54b2c7c2ca13139b555f6c0318576b9db91875da dosemu-freedos-b9r5a-bin.tgz 1154735
+SHA256 bd143b04add270425f117c5186468914765437c7b9c9c9a44eb0f278798e6850 dosemu-freedos-b9r5a-bin.tgz 1154735
diff --git a/app-emulation/dosemu/files/dosemu-1.3.4-shm.diff b/app-emulation/dosemu/files/dosemu-1.3.4-shm.diff
new file mode 100644
index 000000000000..f0868a988f0b
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.3.4-shm.diff
@@ -0,0 +1,11 @@
+--- dosemu-1.3.4/etc/dosemu.conf.orig	2007-01-28 22:19:44.000000000 +0100
++++ dosemu-1.3.4/etc/dosemu.conf	2007-01-28 22:19:58.000000000 +0100
+@@ -166,7 +166,7 @@
+ # preferred mapping driver, one of: auto, mapshm, mapashm, mapfile
+ # Default: ""="auto"
+ 
+-# $_mapping= ""
++$_mapping= "mapshm"
+ 
+ ##############################################################################
+ ## Debug settings
diff --git a/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff b/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff
new file mode 100644
index 000000000000..dbf4a2ac6893
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff
@@ -0,0 +1,27 @@
+--- dosemu-1.1.5-old/configure.ac
++++ dosemu-1.1.5/configure.ac
+@@ -262,8 +262,8 @@
+   else
+     if test -d $prefix/include/slang; then
+       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
+@@ -286,11 +286,11 @@
+ AC_MSG_RESULT($SLANGINC $SLANGLIB)
+ have_slang="no"
+ AC_CHECK_HEADER(slang.h,
+-  AC_CHECK_LIB(slang, SLtt_get_terminfo,
++  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 -lm",
++    SLANGLIB="$SLANGLIB -lslang-2 -lm",
+     [AC_MSG_WARN([No S-Lang library found.])]
+     $srcdir/mkpluginhooks enable term no
+   ),
diff --git a/app-emulation/dosemu/files/dosemu-compile-asm.diff b/app-emulation/dosemu/files/dosemu-compile-asm.diff
new file mode 100644
index 000000000000..a404d57cf4ab
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-compile-asm.diff
@@ -0,0 +1,11 @@
+--- dosemu-1.3.4/src/env/video/instremu.c	2006-11-11 23:22:27.000000000 +0100
++++ dosemu-1.3.4-p/src/env/video/instremu.c	2007-01-30 13:36:08.000000000 +0100
+@@ -112,7 +112,7 @@
+        shr     $1, %0\n\
+        "#insn" %4, %1\n\
+        pushf; pop     %0\n \
+-       " : "=g" (eflags), #istype (op1)  : "0" (eflags), "1" (op1), #type (op2));
++        " : "=r" (eflags), #istype (op1)  : "0" (eflags), "1" (op1), #type (op2));
+ 
+ 
+ #if !defined True