marked dosemu-1.2.0 stable x86

7 files changed, 12 insertions, 129 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 650414f77501..5d36262b4313 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.16 2004/01/19 20:43:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.17 2004/02/09 22:08:19 hanno Exp $
+
+  09 Feb 2004; Hanno Boeck <hanno@gentoo.org> dosemu-1.2.0.ebuild:
+  Marked x86.
 
 *dosemu-1.2.0 (19 Jan 2004)
 
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 7ec4b5a266ef..68c9d41a700f 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,14 +1,10 @@
-MD5 0f960e3f4f306c34336eb21e2fa951d6 dosemu-1.2.0.ebuild 1258
-MD5 1a2cc992ef0c9d6d7ab3f0f210d0fd70 ChangeLog 2750
-MD5 1c96c5a9d90e0fa9e8a858b88e087b4c dosemu-1.1.5-r1.ebuild 1631
-MD5 edcf48b4a5a1374ca1d101e4d62922a9 dosemu-1.1.99.1.ebuild 1202
-MD5 2ff523bd14d65bf29fb180f9a07ec36f dosemu-1.1.99.2.ebuild 1272
+MD5 5a71976e526c7ed86372f41fd42a4d91 ChangeLog 2832
 MD5 875d7073af05adac486dfce043a356f1 dosemu-1.1.99.1-r1.ebuild 1316
+MD5 2ff523bd14d65bf29fb180f9a07ec36f dosemu-1.1.99.2.ebuild 1272
+MD5 330959e8f187d802d5bb7b73b2403f9c dosemu-1.2.0.ebuild 1257
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
-MD5 919e6e482f0bc9f366177904eae0b7c1 files/digest-dosemu-1.2.0 133
-MD5 d9edbc98f1c06b2c5ad563ab29928ec0 files/dosemu_kernel26_patch 1480
-MD5 4bd099bfea08e3269779e92d45d1a25d files/digest-dosemu-1.1.99.2 136
-MD5 1111d8e64602844f871f5c0f2deb839b files/digest-dosemu-1.1.5-r1 133
-MD5 7512fcf270de5d4d5be6bdf556ad1d2a files/digest-dosemu-1.1.99.1 136
 MD5 7512fcf270de5d4d5be6bdf556ad1d2a files/digest-dosemu-1.1.99.1-r1 136
+MD5 4bd099bfea08e3269779e92d45d1a25d files/digest-dosemu-1.1.99.2 136
+MD5 919e6e482f0bc9f366177904eae0b7c1 files/digest-dosemu-1.2.0 133
 MD5 11e355fbc16d4a8c49fbd93df36e1350 files/dosemu-broken-links.diff 521
+MD5 d9edbc98f1c06b2c5ad563ab29928ec0 files/dosemu_kernel26_patch 1480
diff --git a/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild b/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild
deleted file mode 100644
index cdb949c70a04..000000000000
--- a/app-emulation/dosemu/dosemu-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4 2003/10/03 07:59:51 vapier Exp $
-
-inherit eutils
-
-P_FD=dosemu-freedos-b8p-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 | LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="X svga"
-
-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/dosemu-1.1.99.1.ebuild b/app-emulation/dosemu/dosemu-1.1.99.1.ebuild
deleted file mode 100644
index b40d2997e6c9..000000000000
--- a/app-emulation/dosemu/dosemu-1.1.99.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.99.1.ebuild,v 1.2 2003/10/03 07:59:51 vapier Exp $
-
-inherit eutils
-
-P_FD=dosemu-freedos-b9-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 | LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="X svga"
-
-DEPEND="X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )
-	sys-libs/slang"
-
-# Has problems with -O3 on some systems
-replace-flags -O[3-9] -O2
-
-src_unpack() {
-	unpack ${P}.tgz
-	# extract freedos binary
-	cd ${S}/src
-	unpack ${P_FD}.tgz
-}
-
-src_compile() {
-	local myflags
-
-	use X || myflags="${myflags} --with-x=no"
-	use svga && myflags="${myflags} --enable-use-svgalib"
-
-	econf ${myflags} || die "DOSemu Base Configuration Failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall || 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/dosemu-1.2.0.ebuild b/app-emulation/dosemu/dosemu-1.2.0.ebuild
index 7c19c232875e..7859b60a7efa 100644
--- a/app-emulation/dosemu/dosemu-1.2.0.ebuild
+++ b/app-emulation/dosemu/dosemu-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.2.0.ebuild,v 1.1 2004/01/19 20:43:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.2.0.ebuild,v 1.2 2004/02/09 22:08:19 hanno Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="X svga"
 
 DEPEND="X? ( virtual/x11 )
diff --git a/app-emulation/dosemu/files/digest-dosemu-1.1.5-r1 b/app-emulation/dosemu/files/digest-dosemu-1.1.5-r1
deleted file mode 100644
index 10bc94a6a95f..000000000000
--- a/app-emulation/dosemu/files/digest-dosemu-1.1.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3522d2c139c2fd30d333d93570274377 dosemu-freedos-b8p-bin.tgz 794880
-MD5 15b37a5e45bbeaa31bb19269327707ff dosemu-1.1.5.tgz 2121858
diff --git a/app-emulation/dosemu/files/digest-dosemu-1.1.99.1 b/app-emulation/dosemu/files/digest-dosemu-1.1.99.1
deleted file mode 100644
index 719468ad99af..000000000000
--- a/app-emulation/dosemu/files/digest-dosemu-1.1.99.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 078146d2905b1f735573aab37e3d7c4f dosemu-freedos-b9-bin.tgz 1072238
-MD5 23dc1c006707a4bfa1e7eb1e81a1f8d4 dosemu-1.1.99.1.tgz 2149504