gentoo resync : 14.07.2018

13 files changed, 387 insertions, 0 deletions

diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
new file mode 100644
index 000000000000..f16336aad069
--- /dev/null
+++ b/app-emulation/ski/Manifest
@@ -0,0 +1,13 @@
+AUX ski-1.3.2-AC_C_BIGENDIAN.patch 2266 BLAKE2B 26ca07d5e23acd9c3e0a7b3fba78e5b16e2957aa657340b1886458d17f2b97f21c1eca0bff9319d667a28b10efbb72666788d39ca5ba7068eef867302c6945dd SHA512 0970007c99f29dd19d4e64f433cd7addec8a316ec68a7e3c07c11ec3849d70086ba262883eb82f66c0517b9bf2c77399d69d72345ca0e8d9cb3723086fe4a6a0
+AUX ski-1.3.2-binutils.patch 1039 BLAKE2B 72a03fc70b3473ba760297f97cd8722c6f3b9a2dc247f57c07669ab16c112edff5250b5c79bff192ea28bdbc2024bd746a4139863904c32916f969e6e97f4b83 SHA512 b473ed658a5496c849cbb82dfeaa1913834dde60e2da17d09a4a882e87067236ecf25b807281921c86fc4a2cca5461f2a608e1a4c301d4cfda39507bdfcc4d6a
+AUX ski-1.3.2-configure-withval.patch 634 BLAKE2B 3a32acdfd37d7b2622f6add89ebdb5ca0d55a9ef6bb13f78bc4b6d82638ba63c2473bf12f1971a1aaca83f10ad0061a2d16a031bee50f9dcba5cc2c01efcd86f SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec
+AUX ski-1.3.2-ncurses-config.patch 584 BLAKE2B a6876394e368f1f793bce339618c668e9d117c9206455e7d3cf74372b3214c9984fde52753fb453e73d390a3f57011c7a3406a40daaaee04fc8231fbb40d34d1 SHA512 64bd0b4ee7d7e9117f9907eaf71f92b0b74dc4d1c4724845de31820a9853199f8834d3d01afdfb725c389d45f353e2d8b99264aa5ddff5c3067c22e990cd967e
+AUX ski-1.3.2-no-local-ltdl.patch 366 BLAKE2B 1d4de13c62a474c41aa77ec91db2c6c0da51d65992d2d1dcc15518dd34fbdcd101c9df2a50585ef6cc54b71197d9354ad1f4092b80de2e1714986e7744ae83c6 SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81
+AUX ski-1.3.2-prototypes.patch 656 BLAKE2B 6f85c3acd7eff720f7f25fbad77389c16c203a31d3cc00494b0624e38b333fd694912ad5882abc61efefaa033042e9bbb28c932870e29bc7336565345428aba3 SHA512 d1f37e57a0aaea4621a749b94453121f16cd3ce6c51cae4cdde8b6258f5a4a7a63c5b35e8bc50cf43d5462ab8be9abfc4196443e329641622ab848f56e27616d
+AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821cedb7c277e2b38a86499c5a9486af6d79c0241b4bb2457ee29dab9751ecbff322a2e6d020497107477ca4b2db8ec7dd2 SHA512 efbaac0e9c6d1423def13d22b361aa9e7766b8959f2def6e146e12e74393f142b0212e2234ba2753aa71e19b6a0c30e86a74a05026efba2db01229d1a7e43a5e
+AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
+AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
+DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
+EBUILD ski-1.3.2-r1.ebuild 1223 BLAKE2B 86e9539fa5d55cee2b8b6ae9da37b62728f4e64c4a6fbf06cb88202609f162e813aa42165f0983d75014dd871210c3c71b5e0af4d2743ea3534af53bea58c74b SHA512 642a6e1351ef8cf984a7c842a62347183afeb23174ba7d7972301c7a6514311a00e5e9b009206d14d1a2a15b194784ff4db0d7376b4393db4c69632bd34c092b
+EBUILD ski-1.3.2-r2.ebuild 1135 BLAKE2B 3922aa14df47b99a3d6593c3c4929962be33df3e80cd799f57a0d25d59b91a08e1882d99beae90153c26275993535846041fff054ee5b96ed11859e396417a5d SHA512 3c30c10723ebf96820e233f15349112682d65613119e1af89a70b31cfda0e951f9748d84dd29ae5ae68c9e88452e71cfc98971cbc772fd0c266345de4204d8e5
+MISC metadata.xml 335 BLAKE2B 079d4ba6e17a3d3351d2ca5021c67a7a87489358d5d0541e60e41105511b36f203713605fb76b84cdda6a799d63a51af0923ca4c58c7c482ca13626d3938136f SHA512 4b9ac18f2d0cbb672eb1af814e0f09a8bcd5b2f9f4cd1f1c30efff18ae2eccd2ea4f166cc3446756733e2bcc581b9a1f7ab62a96234fe9e02f649eac2a011b20
diff --git a/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch b/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
new file mode 100644
index 000000000000..34a7d8183702
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch
@@ -0,0 +1,75 @@
+use standard AC_C_BIGENDIAN macro rather than trying to define it manually
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -155,52 +155,24 @@ AC_SUBST(GSKI_CFLAGS)
+ AC_SUBST(GSKI_LIBS)
+ AM_CONDITIONAL(WITH_GTK_INTERFACE, test "x$with_gtk" = "xyes")
+ 
+-dnl Target endianness
+-AC_ARG_ENABLE(bigendian,
+-AC_HELP_STRING([--enable-bigendian],
+-    [the target is big endian default=no]),
+-ski_cv_c_target_bigendian=${enableval}, ski_cv_c_target_bigendian=no)
+-
+ dnl Check for host endianness
+ AC_CACHE_CHECK([whether host byte ordering is defined in sys/param.h],
+ ski_cv_c_bigendian_compile,
+ [AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <sys/param.h>
+ ],[
+ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ #error bogus endian macros
+ #endif
+ ],
+ ski_cv_c_bigendian_compile=yes, ski_cv_c_bigendian_compile=no)])
+ 
+ if test "x$ski_cv_c_bigendian_compile" = xyes; then
+ AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1,
+     [define if sys/param.h defines the endiness])
+-else
+-AC_CACHE_CHECK([whether host byte ordering is big endian],
+-ski_cv_c_bigendian,
+-[AC_TRY_RUN([int main () {
+-    union {
+-        long l;
+-        char c[sizeof (long)];
+-    } u;
+-    u.l = 1;
+-    return (u.c[sizeof (long) - 1] == 1);
+-}],
+-ski_cv_c_bigendian=no, ski_cv_c_bigendian=yes,
+-AC_MSG_ERROR([cannot detect host endianness]))])
+-
+-AC_DEFINE(BIG_ENDIAN,    4321, [define to 4321 if missing from sys/param.h])
+-AC_DEFINE(LITTLE_ENDIAN, 1234, [define to 4321 if missing from sys/param.h])
+-if test "x$ski_cv_c_bigendian" = xyes; then
+-    AC_DEFINE(BYTE_ORDER, 4321,
+-        [define to 4321 if host is big endian, 1234 if little endian])
+-else
+-    AC_DEFINE(BYTE_ORDER, 1234,
+-        [define to 4321 if host is big endian, 1234 if little endian])
+-fi
+ fi
++AC_C_BIGENDIAN
+ 
+ dnl Check for variables & functions
+ 
+--- a/src/std.h
++++ b/src/std.h
+@@ -62,6 +62,14 @@ extern unsigned long long __strtoull(const char *, char **, int);
+ #   define BIG_ENDIAN 4321
+ #   define LITTLE_ENDIAN 1234
+ #   define BYTE_ORDER BIG_ENDIAN
++# else
++#  define BIG_ENDIAN 4321
++#  define LITTLE_ENDIAN 1234
++#  ifdef WORDS_BIGENDIAN
++#   define BYTE_ORDER BIG_ENDIAN
++#  else
++#   define BYTE_ORDER LITTLE_ENDIAN
++#  endif
+ # endif /* !defined HAVE_CONFIG_H */
+ #endif /* !defined ENDIANESS_IN_SYS_PARAM_H */
+ 
diff --git a/app-emulation/ski/files/ski-1.3.2-binutils.patch b/app-emulation/ski/files/ski-1.3.2-binutils.patch
new file mode 100644
index 000000000000..71094f3bf4b6
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-binutils.patch
@@ -0,0 +1,31 @@
+From 30d3253c6b413ba22ca0ca30dcd4c4c24daec2e1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 19 Aug 2014 09:42:43 +0300
+Subject: [PATCH] Fix build failure against binutils-2.16.1 and upper.
+
+Follow binutils' upstream change from 2004:
+
+    https://sourceware.org/git/?p=binutils.git;a=commitdiff;h=7e2dd9e4c3e0b69dcb7d471b891879b5fd28687e
+    > section.c (struct sec): Rename "_cooked_size" to "size".
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/linux/dwarf-linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/linux/dwarf-linux.c b/src/linux/dwarf-linux.c
+index 1941a1f..73be0e6 100644
+--- a/src/linux/dwarf-linux.c
++++ b/src/linux/dwarf-linux.c
+@@ -155,7 +155,7 @@ find_in_section (bfd * bfd, asection * sect, PTR obj)
+ 	      first.function = function;
+ 	      first.line = line;
+ 	      first.num_lines = 1;
+-	      first.limit = sect->_cooked_size;
++	      first.limit = sect->size;
+ 	      last_line = line;
+ 	    }
+ 	  if (line > last_line
+-- 
+2.0.4
+
diff --git a/app-emulation/ski/files/ski-1.3.2-configure-withval.patch b/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
new file mode 100644
index 000000000000..7bb3ce9fc85c
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-configure-withval.patch
@@ -0,0 +1,22 @@
+fix handling of 3rd/4th args to AC_ARG_WITH()
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -130,7 +130,7 @@ dnl See if we build X11
+ AC_ARG_WITH(x11,
+ AC_HELP_STRING([--with-x11],
+     [Enable the Motif based X11 interface default=no]),
+-    [with_x11=yes],[with_x11=no])
++    [with_x11=$withval])
+   
+ if test "x$with_x11" = "xyes"; then
+   dnl Check for motif, error out if not found
+@@ -144,7 +144,7 @@ dnl See if we build GTK
+ AC_ARG_WITH(gtk,
+ AC_HELP_STRING([--with-gtk],
+     [Enable building the GTK Ski interface default=no]),
+-    [with_gtk=yes],[with_gtk=no]
++    [with_gtk=$withval]
+ )
+ 
+ if test "x$with_gtk" = "xyes"; then
diff --git a/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
new file mode 100644
index 000000000000..4317df415efa
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-ncurses-config.patch
@@ -0,0 +1,25 @@
+use pkg-config to look up ncurses deps to support things like split tinfo
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,6 +93,7 @@
+ AC_PROG_SED
+ AC_PROG_YACC
+ AM_PROG_LEX
++PKG_PROG_PKG_CONFIG
+ 
+ AC_C_INLINE
+ AC_C_CONST
+@@ -304,9 +305,9 @@
+ fi    
+ 
+ if test "x$check_curses" != xno; then
+-AC_CHECK_LIB(curses, tgetent, [],
+-    [AC_CHECK_LIB(ncurses, tgetent, ,
+-            [AC_MSG_ERROR(Required curses library not found.)])])
++    PKG_CHECK_MODULES([NCURSES], [ncurses])
++    CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++    LIBS="$LIBS $NCURSES_LIBS"
+ fi
+ 
+ AC_CHECK_LIB(elf, elf_begin, [],
diff --git a/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch b/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
new file mode 100644
index 000000000000..aa75146668b5
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch
@@ -0,0 +1,22 @@
+build against the system ltdl rather than the local copy
+
+--- ski-1.3.2/src/Makefile.am
++++ ski-1.3.2/src/Makefile.am
+@@ -181,8 +181,7 @@
+ 	eparse.h \
+ 	libdas.h \
+ 	netdev.h \
+-	osload.h \
+-	ltdl.h
++	osload.h 
+ 
+ EXTRA_linux_FILES = \
+ 	linux/dwarf-linux.c \
+@@ -279,7 +278,6 @@
+ 	eparse.y \
+ 	escan.l \
+ 	load.c \
+-	ltdl.c \
+ 	platform.c \
+ 	libdas.c \
+ 	libsrs.c
diff --git a/app-emulation/ski/files/ski-1.3.2-prototypes.patch b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
new file mode 100644
index 000000000000..b66614368708
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-prototypes.patch
@@ -0,0 +1,31 @@
+fix up prototypes to avoid -Wimplicit-function-declaration warnings
+
+--- a/src/coreui.h
++++ b/src/coreui.h
+@@ -177,6 +177,7 @@
+ void stepIt_setupGtk(CTR cnt);
+ 
+ void runIt_setupX(void);
++void runIt_setupGtk(void);
+ 
+ 
+ /*--------------------------------------------------------------------------
+--- a/src/ssGtk.c
++++ b/src/ssGtk.c
+@@ -82,6 +82,7 @@
+ 
+ /* externals */
+ extern dataStart;
++ADDR iAinstAddr(ADDR baseAddr, BYTE iAmode, int delta);
+ 
+ static GtkLabel* instcount_label;
+ /* sits in a background loop */
+@@ -100,7 +101,7 @@
+ }
+ 
+ 
+-void runIt_setupGtk(void *data)
++void runIt_setupGtk(void)
+ {
+ 	g_idle_add(runItGtk, NULL);
+ 	stopPressed = NO;
diff --git a/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch b/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
new file mode 100644
index 000000000000..3e9de483fd17
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-remove-hayes.patch
@@ -0,0 +1,14 @@
+## Description: Remove references to HAYES
+## Origin/Author: Andreas Moog <amoog@ubuntu.com>
+## Bug-Ubuntu: https://bugs.launchpad.net/bugs/756157
+--- ski//src/linux/syscall-linux.c
++++ ski.new//src/linux/syscall-linux.c
+@@ -2250,8 +2250,6 @@
+ 	case TIOCSERSETMULTI:	/* Set multiport config */
+ 	case TIOCMIWAIT:	/* wait for a change on serial input line(s) */
+ 	case TIOCGICOUNT:	/* read serial port inline interrupt counts */
+-	case TIOCGHAYESESP:	/* Get Hayes ESP configuration */
+-	case TIOCSHAYESESP:	/* Set Hayes ESP configuration */
+ 	case SIOCRTMSG:	/* call to routing system	*/
+ 	case SIOCSIFLINK:	/* set iface channel		*/
+ 	case SIOCGIFMEM:	/* get memory address (BSD)	*/
diff --git a/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch b/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
new file mode 100644
index 000000000000..e3c1083687ac
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch
@@ -0,0 +1,18 @@
+--- ski-1.3.2/src/linux/syscall-linux.c
++++ ski-1.3.2/src/linux/syscall-linux.c
+@@ -45,7 +45,6 @@
+ #include <linux/posix_types.h>
+ #include <linux/personality.h>
+ #include <linux/sockios.h>
+-#include <sys/io.h>
+ 
+ #include <sys/file.h>
+ #include <sys/fsuid.h>
+@@ -72,7 +71,6 @@
+ #include <sys/uio.h>
+ 
+ #include <linux/serial.h>
+-#include <asm/page.h>
+ #include <asm/unistd.h>
+ 
+ #include "std.h"
diff --git a/app-emulation/ski/files/ski-1.3.2-uselib.patch b/app-emulation/ski/files/ski-1.3.2-uselib.patch
new file mode 100644
index 000000000000..d600cb2ce3fa
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-uselib.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/592226
+
+patch taken from Fedora
+
+glibc-2.23+ no longer exports the uselib function.  make the syscall directly.
+
+--- ski-1.3.2/src/linux/syscall-linux.c
++++ ski-1.3.2/src/linux/syscall-linux.c
+@@ -554,7 +554,8 @@
+ extern void munmapSyms (ADDR, ADDR);
+ extern void dynBlock (ADDR, ADDR);
+ extern void memFree (ADDR);
+-extern int uselib (const char *libname);	/* Linux specific */
++#include <sys/syscall.h>
++#define uselib(libname) syscall(__NR_uselib, libname)
+ 
+ extern int setresuid (uid_t, uid_t, uid_t);
+ extern int getresuid (uid_t *, uid_t *, uid_t *);
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
new file mode 100644
index 000000000000..a82c03848dd3
--- /dev/null
+++ b/app-emulation/ski/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ia64@gentoo.org</email>
+		<name>Gentoo Linux IA-64 Development</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ski</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/ski/ski-1.3.2-r1.ebuild b/app-emulation/ski/ski-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..3ca262479f5d
--- /dev/null
+++ b/app-emulation/ski/ski-1.3.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="ia64 instruction set simulator"
+HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk motif"
+
+RDEPEND="dev-libs/libltdl:0=
+	sys-libs/ncurses:0=
+	virtual/libelf
+	gtk? (
+		gnome-base/libglade:2.0
+		gnome-base/libgnomeui
+		x11-libs/gtk+:2
+	)
+	motif? ( x11-libs/motif:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/gperf"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syscall-linux-includes.patch
+	"${FILESDIR}"/${P}-remove-hayes.patch
+	"${FILESDIR}"/${P}-no-local-ltdl.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
+	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-uselib.patch #592226
+	"${FILESDIR}"/${P}-ncurses-config.patch
+	"${FILESDIR}"/${P}-prototypes.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-ltdl \
+		$(use_with gtk) \
+		$(use_with motif x11)
+}
diff --git a/app-emulation/ski/ski-1.3.2-r2.ebuild b/app-emulation/ski/ski-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..389d021a5d24
--- /dev/null
+++ b/app-emulation/ski/ski-1.3.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="ia64 instruction set simulator"
+HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="motif"
+
+RDEPEND="dev-libs/libltdl:0=
+	sys-libs/ncurses:0=
+	virtual/libelf
+	motif? ( x11-libs/motif:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-util/gperf"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-syscall-linux-includes.patch
+	"${FILESDIR}"/${P}-remove-hayes.patch
+	"${FILESDIR}"/${P}-no-local-ltdl.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN.patch
+	"${FILESDIR}"/${P}-configure-withval.patch
+	"${FILESDIR}"/${P}-binutils.patch
+	"${FILESDIR}"/${P}-uselib.patch #592226
+	"${FILESDIR}"/${P}-ncurses-config.patch
+	"${FILESDIR}"/${P}-prototypes.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf libltdl src/ltdl.[ch] macros/ltdl.m4
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-ltdl \
+		--without-gtk \
+		$(use_with motif x11)
+}