[gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/

[Sergei Trofimovich]

commit:     7e2bd3a587a5adee7d7482310ff93ce0fdc7a0b2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 10:30:51 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 10:34:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2bd3a5

app-emulation/dosemu: drop old

Package-Manager: portage-2.3.2

 app-emulation/dosemu/Manifest                      |  1 -
 .../dosemu/dosemu-1.4.1_pre20091009.ebuild         | 65 ----------------------
 .../files/dosemu-1.4.1_pre20091009-fix-glibc.patch | 35 ------------
 .../files/dosemu-1.4.1_pre20091009-flex.patch      | 45 ---------------
 4 files changed, 146 deletions(-)

diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 166c308..b23f68f 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,3 +1,2 @@
-DIST dosemu-1.4.1_pre20091009.tar.bz2 1965194 SHA256 bf57f3a567008892fcaf0a58f69aae37a4b251f08855968958fa8fc6c06b1d4b SHA512 45aa0fff97f11270a50f9d5f10ec0be137e585c33a163e2b3318e924fe60f6aff90433fa52e90a5f8f9f1557b69720c4750ea685f3f72b644345021a01efc6ae WHIRLPOOL 607a1f92a60f31540d9e7e4033ef913d115a1e2f0a578e4083f8b55c2d0144352fe9f04273dfe953f80ad7bf38dab901dc6b7a4fce2ea3b0676329837b2719cb
 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c
 DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
deleted file mode 100644
index 39b9815..00000000
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils flag-o-matic
-
-P_FD="dosemu-freedos-1.0-bin"
-DESCRIPTION="DOS Emulator"
-HOMEPAGE="http://www.dosemu.org/"
-SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="X svga gpm debug alsa sndfile"
-
-RDEPEND="X? ( x11-libs/libXxf86vm
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-apps/xset
-		x11-apps/xlsfonts
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir )
-	svga? ( media-libs/svgalib )
-	gpm? ( sys-libs/gpm )
-	alsa? ( media-libs/alsa-lib )
-	sndfile? ( media-libs/libsndfile )
-	>=sys-libs/slang-1.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86dgaproto )
-	>=sys-devel/autoconf-2.57"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	epatch "${FILESDIR}"/${P}-flex.patch #437074
-	epatch "${FILESDIR}"/${P}-dash.patch
-	epatch "${FILESDIR}"/${P}-fix-glibc.patch #597880
-
-	eautoreconf
-
-	# Has problems with -O3 on some systems
-	replace-flags -O[3-9] -O2
-
-	unset KERNEL
-
-	econf `use_with X x` \
-		`use_enable svga svgalib` \
-		`use_enable debug` \
-		`use_with gpm` \
-		`use_with alsa` \
-		`use_with sndfile` \
-		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
-		--sysconfdir=/etc/dosemu/ \
-		--with-docdir=/usr/share/doc/${PF} || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# Don't remove COPYING, see bug #137286
-	dodoc BUGS ChangeLog COPYING NEWS README THANKS || die #nowarn
-}

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch
deleted file mode 100644
index 62a4319..00000000
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-The patch is a subset of
-
-    commit b028d3fd33b004ac61583927884a64577e2d64c3
-    Author: Bart Oldeman <bartoldeman@×××××××××××××××××.net>
-    Date:   Sun Dec 23 22:08:11 2012 -0500
-
-to fix glibc detection for
-Bug: https://bugs.gentoo.org/597880
-diff --git a/configure.ac b/configure.ac
-index 70bc154..b8da5e2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -644,19 +640,9 @@ if test "$GCC" = "yes" ; then
-   fi
- 
-   AC_MSG_CHECKING(for glibc...)
--  set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
--  major=$1; minor=$2
--  if test "$major" = "__GLIBC__"; then
--    AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.])
--  else
--    if test "$minor" = "__GLIBC_MINOR__"; then
--      minor=0;
--    fi
--    GLIBC_VERSION_CODE=$((($major * 1000) + $minor))
--    AC_MSG_RESULT([yes, version code $GLIBC_VERSION_CODE])
--    if test $GLIBC_VERSION_CODE -lt 2001; then
--      AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.])
--    fi
-+  set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2}'`
-+  if test "$1" = "__GLIBC__"; then
-+    AC_MSG_ERROR([Sorry, you need glibc.])
-   fi
- fi
- 

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
deleted file mode 100644
index 7e8e291..00000000
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Gentoo-bug: http://bugs.gentoo.org/437074
-
-commit 81232816b90e85488d7f11f96b8fcdc5f4988c93
-Author: Stas Sergeev <stsp@×××××××××××××××××.net>
-Date:   Sun Oct 14 19:51:09 2012 +0400
-
-    remove prototypes for lex-generated functions
-
-diff --git a/src/base/init/lexer.h b/src/base/init/lexer.h
-index 65b3ab8..082f08c 100644
---- a/src/base/init/lexer.h
-+++ b/src/base/init/lexer.h
-@@ -1,4 +1,4 @@
--/* 
-+/*
-  * (C) Copyright 1992, ..., 2007 the "DOSEMU-Development-Team".
-  *
-  * for details see file COPYING.DOSEMU in the DOSEMU distribution
-@@ -6,7 +6,9 @@
- 
- /*
-  * We are intercepting the yylex() function calls from the parser
-- */ 
-+ */
-+#ifndef LEXER_H
-+#define LEXER_H
- #define OUR_YY_DECL int yylex (YYSTYPE* yylval)
- OUR_YY_DECL;
- 
-@@ -27,14 +29,4 @@ extern int include_lines[];
- extern int line_count;
- extern int last_include;
- 
--extern int yyget_lineno(void);
--extern void yyset_lineno(int line_number);
--extern void yyset_out(FILE * out_str);
--extern void yyset_in(FILE * out_str);
--extern void yyset_debug(int bdebug );
--extern int yyget_debug(void);
--extern int yylex_destroy(void);
--extern FILE* yyget_in(void);
--extern FILE* yyget_out(void);
--extern int yyget_leng(void);
--extern char *yyget_text(void);
-+#endif