dosemu bump

Package-Manager: portage-2.1.2.5

5 files changed, 138 insertions, 8 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/Manifest b/app-emulation/dosemu/Manifest
index a1b6f90c2058..4cd609cffa6d 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -17,6 +17,10 @@ AUX dosemu-1.3.4-slang2.diff 831 RMD160 c107e36ee76820cfcfe09d0b8aeaf0c4c278d16b
 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-1.3.5-slang2.diff 1094 RMD160 7c9f3c3be566654158adb0b406f2222a0784e6ca SHA1 14a8880ca27558c098dd496e7a53fb1e8e5b0409 SHA256 908f8d7826852d885abc9fd0b5946b663cea6697370ba23adc5531f178c3c502
+MD5 5d553380333a2078edbebf1fdba6d6f9 files/dosemu-1.3.5-slang2.diff 1094
+RMD160 7c9f3c3be566654158adb0b406f2222a0784e6ca files/dosemu-1.3.5-slang2.diff 1094
+SHA256 908f8d7826852d885abc9fd0b5946b663cea6697370ba23adc5531f178c3c502 files/dosemu-1.3.5-slang2.diff 1094
 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
@@ -29,6 +33,8 @@ DIST dosemu-1.2.2.tgz 2184415 RMD160 da86eb5212c880ee06432c56daa3b9329d386123 SH
 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-1.3.5.tgz 2324652 RMD160 32f1b02ee3d1b400ca9f2a77a0e8b82f212797c8 SHA1 6bc01f42ac84a145cd367eb414d995ce6adb100d SHA256 75444662a55a580d7d865cdfacfb38aaeaa289a1555f900aae631f919b96b877
+DIST dosemu-freedos-1.0-bin.tgz 1205628 RMD160 0a5083a6e7cdd8de890275beb51069d42009df17 SHA1 55bfa8b289c6ddcd63d93a37c29a2d64a39b3775 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7
 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
@@ -47,10 +53,14 @@ EBUILD dosemu-1.3.4.ebuild 1629 RMD160 05b240ec7c2a5a562d299eaf319708e7c6040c9b
 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
+EBUILD dosemu-1.3.5.ebuild 1583 RMD160 ac9107e5e9096d994a0255af31cbc2c0e2ab51db SHA1 b6fb227a6aebd0c36ec510836964692c86802357 SHA256 36eb1e43d0a415435c64557fc073ba7e223dd4417b984f1fa3dafe0798350dbb
+MD5 8e1fac39cdbc8f330c1673aa60646415 dosemu-1.3.5.ebuild 1583
+RMD160 ac9107e5e9096d994a0255af31cbc2c0e2ab51db dosemu-1.3.5.ebuild 1583
+SHA256 36eb1e43d0a415435c64557fc073ba7e223dd4417b984f1fa3dafe0798350dbb dosemu-1.3.5.ebuild 1583
+MISC ChangeLog 5623 RMD160 fec615acb4b8c0ea3d18a90f1dc512d7034fd5be SHA1 52362648a723f8a7fd690f5f95e4207931077ea6 SHA256 253566eb8d6f0757b040ac2753a61183123d681faa579bcd407890a24a964cc9
+MD5 734ccee6f58f6ae3e432eb48cbd5c632 ChangeLog 5623
+RMD160 fec615acb4b8c0ea3d18a90f1dc512d7034fd5be ChangeLog 5623
+SHA256 253566eb8d6f0757b040ac2753a61183123d681faa579bcd407890a24a964cc9 ChangeLog 5623
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -67,10 +77,13 @@ SHA256 fe8969240a9ac9f3b1063972001ae40a6916c798f08aaf65ce6ff94f2b9a2497 files/di
 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
+MD5 58f27653df63ee7d80a31b4aa1effa94 files/digest-dosemu-1.3.5 494
+RMD160 7a8716f2dac5dbe8f9233ef8ff4cba22614c9370 files/digest-dosemu-1.3.5 494
+SHA256 76df3e874ca01fd4c6cbac9ce9dd61bf4017b34a880f6f12a45c1cefdeeab75b files/digest-dosemu-1.3.5 494
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGEXdIr2QksT29OyARAuQ/AJ93yBWe64GzQc6M7rqoeyD9jkZOMACgmjvP
-hPrGPhngA0BbtiIFT2YSLcU=
-=XjqU
+iD8DBQFGOW3er2QksT29OyARAjE8AJ9fnNVwCEGY7b7dAeLNOo3MFeiozwCcDTVR
++bbYaq7Ma7cwRl5tINjrsWs=
+=sMEQ
 -----END PGP SIGNATURE-----
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