diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-emulation/ski | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-emulation/ski')
-rw-r--r-- | app-emulation/ski/Manifest | 1 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-AC_C_BIGENDIAN.patch | 75 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-binutils.patch | 31 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-configure-withval.patch | 22 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-no-local-ltdl.patch | 22 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-remove-hayes.patch | 14 | ||||
-rw-r--r-- | app-emulation/ski/files/ski-1.3.2-syscall-linux-includes.patch | 18 | ||||
-rw-r--r-- | app-emulation/ski/metadata.xml | 8 | ||||
-rw-r--r-- | app-emulation/ski/ski-1.3.2-r1.ebuild | 54 | ||||
-rw-r--r-- | app-emulation/ski/ski-1.3.2.ebuild | 54 |
10 files changed, 299 insertions, 0 deletions
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest new file mode 100644 index 000000000000..d22f98f73de6 --- /dev/null +++ b/app-emulation/ski/Manifest @@ -0,0 +1 @@ +DIST ski-1.3.2.tar.gz 2715791 SHA256 34b2a1b2575d6c8703df8f1f3980f7b668e744c4a03f20ed4ed91d40cf40c076 SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0 WHIRLPOOL a6b00dc928612a37c33dc3dacd8a53f749ffa660f3aef5572b214e5c97ed93728e987c4be8abb2d375e0a84eb3037f9de490f3f0474a579e3c0476e50d6010ef 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-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-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/metadata.xml b/app-emulation/ski/metadata.xml new file mode 100644 index 000000000000..96baef6ac811 --- /dev/null +++ b/app-emulation/ski/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>ia64</herd> + <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..875a6ddf4361 --- /dev/null +++ b/app-emulation/ski/ski-1.3.2-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit autotools eutils + +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 + || ( dev-libs/elfutils dev-libs/libelf ) + sys-libs/ncurses + gtk? ( + gnome-base/libglade:2.0 + gnome-base/libgnomeui + x11-libs/gtk+:2 + ) + motif? ( x11-libs/motif )" +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 +) + +src_prepare() { + epatch "${PATCHES[@]}" + + 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.ebuild b/app-emulation/ski/ski-1.3.2.ebuild new file mode 100644 index 000000000000..4d62c2acc364 --- /dev/null +++ b/app-emulation/ski/ski-1.3.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit autotools eutils + +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 + || ( dev-libs/elfutils dev-libs/libelf ) + sys-libs/ncurses + gtk? ( + gnome-base/libglade:2.0 + gnome-base/libgnomeui + x11-libs/gtk+:2 + ) + motif? ( x11-libs/motif )" +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 +) + +src_prepare() { + epatch "${PATCHES[@]}" + + 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) +} |