diff options
Diffstat (limited to 'app-emulation/simh')
| -rw-r--r-- | app-emulation/simh/Manifest | 6 | ||||
| -rw-r--r-- | app-emulation/simh/simh-3.11.0.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/simh/simh-3.11.1.ebuild (renamed from app-emulation/simh/simh-3.9.0-r1.ebuild) | 29 |
3 files changed, 19 insertions, 18 deletions
diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest index ca503e49e507..63a4732e867c 100644 --- a/app-emulation/simh/Manifest +++ b/app-emulation/simh/Manifest @@ -3,8 +3,8 @@ AUX simh-3.11.0-fix-mkdir-race.patch 333 BLAKE2B 2b50d8997d5a782391c6a0174c4c447 AUX simh-3.11.0-respect-FLAGS.patch 265 BLAKE2B ba4134c8e3b0aafc71bbccb2e036d6532532816f30d1ac2a1759eb998479233c5e52a65fea77adf67c28a2e374b9edb998f91b30df9ea6e00f6f77723fdab61f SHA512 0e3c69ce2a7960c872933e60b0a8f043e0b0ae5563c4c5110045d53c34276a04cc110a0831057029ac84b21d818e1698514438d4f890bf4cd8d8e613af2cd9ef AUX simh-3.9.0-fix-mkdir-race.patch 324 BLAKE2B 03cbbbfaf958cb43769a0e2935dfb5f3e9148e5092b7726f2ea570afc34018459692e2c28721e698fc9f158b23176bd1623d99a6b1a15e0fe81bb6c7da370ade SHA512 3ca847ea6c34370c88788c4c3d8997dfe3e7740a201c531731425bc17375b405cef9f1db28d1eb66548add7953aef1d4cdc1b8c7212ab56d0c5f43fa4caea18a AUX simh-3.9.0-respect-FLAGS.patch 336 BLAKE2B 990f49c6da04f6f0e8a8f7c8170a6013376f12271063dab4c01345d98fe406981e3de49cf421017a902732755900d905d13c3a23d03091fa854dedff9bdabfaf SHA512 438386edcca386da7ed3f3a2247584e9aed708d5c54164d736e1dd26b565c065a0f6b62d0dab6e0ed4fc2dd211fa656b5e15388c2a2f18bf0393bf7c902616b2 +DIST simh-3.11.1.tar.gz 2576391 BLAKE2B bebaba75d4264c47202cc0daca2023c03d2e87722798f1ab37c9e3b2cec0b80cd180fccc0077347b2cb5255d26e1ce35f99a908deaf252c1e60e22e0a381e66d SHA512 7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db DIST simhv311-0.zip 2790607 BLAKE2B f9399977093f07d7f58067ed40e22f60e43228bbb1e0fdaa6b04408956962d9ea14b6dc57d758b819cee59f3bade9505a6802d42804df49622990402c0f22600 SHA512 e5fb6915c050e7402363cd9c1f99feb00874c3693905067ce901ffa86fc29a0cd2648684f111216b09a3c847f75812e2db2e2f2fa9f9d0db5dc932d53ec832fa -DIST simhv39-0.zip 3103657 BLAKE2B 3b5fcaa7f1aa24bd5afa78452fb2d5e2822654bcaa3caa478dbdf939770c13f7f1d3f95859674fc02e2cc35a4cfff239bb9ee6a726fb9e31586f639cdf40ca10 SHA512 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6 -EBUILD simh-3.11.0.ebuild 1254 BLAKE2B 917af8c28b3cdac086ef979e8bb455f8f8c4ad546198df947321d9ec8c9fa09c82c2626898454a08b9dbd91597887c7c1036db2e9e009ceaae618fe2ee8d8755 SHA512 75b260ded39c4d9892419d1b2b9d73db06108f439580f0664da6f7430fc3870f30497f4d02573bbd94fa72a774452803a236818f5900b18c49c84cc5871c7370 -EBUILD simh-3.9.0-r1.ebuild 1350 BLAKE2B 75d5a6222ba6eb8204553582d4230fe953a37ab651c4169d743ca3523c51b9cc76aa109ff986757e4ceeb179e5a0f97b000d7474313df225b44372c47f9975ad SHA512 59645f44f783bf032ba622aaea4c31e8d0ca384959ea7b37e4d7b73cb15a057320dfceea493ef3a69916f9e18e317cc5afdbaa7a7ad0977d32c5138cff5bfd16 +EBUILD simh-3.11.0.ebuild 1252 BLAKE2B 7b25129df1e3da425081a73146ed08dd57a349315ad6c0d2de004f586c9d42c68dd2d2a51c8df2d716f190a17d4fd0cdcac9b4174dbf32a9dadd75d9766674e2 SHA512 71ae8835be89bdaab5dcfc6642a23f6f70d1c97531b61a7222914f279b7238667480fe9f7332436f6448f2ab6bf2ced393291d5d5baf2e051bc80abaf4c480fe +EBUILD simh-3.11.1.ebuild 1258 BLAKE2B 55595ceff65666c3daacaf278beb2b22ad912bc635c047a215a63c89b80531efb605b09bb7c319d5e45153dfe4020ea06b1b2c9e5a8e2930d14b9616b26ac3b1 SHA512 1d7551eadd462747aeefe4f6a4fd80f0e08c83b5c855392d24748ec162d2420601cc45b6d533cca6ef2392606914949355e47b06f972086fe2dc92cbb38d52de MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/app-emulation/simh/simh-3.11.0.ebuild b/app-emulation/simh/simh-3.11.0.ebuild index 3be97ccd83eb..350a2779b276 100644 --- a/app-emulation/simh/simh-3.11.0.ebuild +++ b/app-emulation/simh/simh-3.11.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="net-libs/libpcap" diff --git a/app-emulation/simh/simh-3.9.0-r1.ebuild b/app-emulation/simh/simh-3.11.1.ebuild index dcf25c3cb9cd..04f83cc758d5 100644 --- a/app-emulation/simh/simh-3.9.0-r1.ebuild +++ b/app-emulation/simh/simh-3.11.1.ebuild @@ -1,32 +1,33 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils toolchain-funcs versionator +inherit toolchain-funcs -MY_P="${PN}v$(get_version_component_range 1)$(get_version_component_range 2)-$(get_version_component_range 3)" +MY_PV="$(ver_rs 2 '-')" # 'a.b.c' -> 'a.b-c' DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)" HOMEPAGE="http://simh.trailing-edge.com/" -SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip" +SRC_URI="https://github.com/simh/simh/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - app-arch/unzip" +DEPEND="${RDEPEND}" -S=${WORKDIR} +S=${WORKDIR}/simh-${MY_PV} -src_prepare() { - # convert makefile from dos format to unix format - edos2unix makefile +PATCHES=( + "${FILESDIR}"/${PN}-3.11.0-respect-FLAGS.patch + "${FILESDIR}"/${PN}-3.11.0-fix-mkdir-race.patch + "${FILESDIR}"/${PN}-3.11.0-fcommon.patch +) - epatch "${FILESDIR}"/${P}-respect-FLAGS.patch \ - "${FILESDIR}"/${P}-fix-mkdir-race.patch +src_prepare() { + default # fix linking on Darwin if [[ ${CHOST} == *-darwin* ]] ; then @@ -41,7 +42,7 @@ src_compile() { export CFLAGS_O="${CFLAGS}" local my_makeopts="" - if [ "$(gcc-major-version)" -le "4" -a "$(gcc-minor-version)" -lt "6" ] ; then + if tc-is-gcc && ver_test $(gcc-version) -lt 4.6 ; then my_makeopts+=" NO_LTO=1" fi |