diff options
Diffstat (limited to 'app-emulation/ski')
| -rw-r--r-- | app-emulation/ski/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/ski/ski-1.3.2-r2.ebuild | 51 | ||||
| -rw-r--r-- | app-emulation/ski/ski-1.3.2-r3.ebuild | 5 |
3 files changed, 5 insertions, 54 deletions
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest index 523ae16e4978..86b9ac7472af 100644 --- a/app-emulation/ski/Manifest +++ b/app-emulation/ski/Manifest @@ -9,6 +9,5 @@ AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821ced 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-r2.ebuild 1135 BLAKE2B 3922aa14df47b99a3d6593c3c4929962be33df3e80cd799f57a0d25d59b91a08e1882d99beae90153c26275993535846041fff054ee5b96ed11859e396417a5d SHA512 3c30c10723ebf96820e233f15349112682d65613119e1af89a70b31cfda0e951f9748d84dd29ae5ae68c9e88452e71cfc98971cbc772fd0c266345de4204d8e5 -EBUILD ski-1.3.2-r3.ebuild 1199 BLAKE2B e3610cf87dde3cde3f377fc16a6b8e15de789d679c86d13d778ba6ca6e3b5cfb229248b9797bb2695c89a149154328c6405a027ea9a855095ed7f58d25e396e2 SHA512 0e3c6952539f57f7f778c3c2542e9f4815ffb2fe552aa6d67a2e2e0df5f9e963a154f3ab17ae184a3fc7f87fc3b79236449415135dc6c1627091095f1ea34cbd +EBUILD ski-1.3.2-r3.ebuild 1317 BLAKE2B a7f1161ff8d57d89a372b5894fdeb46c9566ffa6b8569e867c85c8dc996e5f3f1564be1ee01c965bfbb85cab5b060c8906f9e5a1b92defe00e5d9faa481ed89b SHA512 25a3a024cb671dcc013c529036923a833e7795079205228687d588b3c649596e0ead8a323a76a192d0c61ff93be02cdade3dff66ca554fc398a165fb2c627b68 MISC metadata.xml 335 BLAKE2B 079d4ba6e17a3d3351d2ca5021c67a7a87489358d5d0541e60e41105511b36f203713605fb76b84cdda6a799d63a51af0923ca4c58c7c482ca13626d3938136f SHA512 4b9ac18f2d0cbb672eb1af814e0f09a8bcd5b2f9f4cd1f1c30efff18ae2eccd2ea4f166cc3446756733e2bcc581b9a1f7ab62a96234fe9e02f649eac2a011b20 diff --git a/app-emulation/ski/ski-1.3.2-r2.ebuild b/app-emulation/ski/ski-1.3.2-r2.ebuild deleted file mode 100644 index 389d021a5d24..000000000000 --- a/app-emulation/ski/ski-1.3.2-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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) -} diff --git a/app-emulation/ski/ski-1.3.2-r3.ebuild b/app-emulation/ski/ski-1.3.2-r3.ebuild index a6551f5c0b89..1063017aad06 100644 --- a/app-emulation/ski/ski-1.3.2-r3.ebuild +++ b/app-emulation/ski/ski-1.3.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,6 +24,9 @@ DEPEND="${RDEPEND} sys-devel/flex dev-util/gperf" +# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110 +RDEPEND="${RDEPEND} !!games-sports/ski" + PATCHES=( "${FILESDIR}"/${P}-syscall-linux-includes.patch "${FILESDIR}"/${P}-remove-hayes.patch |