diff options
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/Manifest.gz | bin | 15486 -> 15496 bytes | |||
-rw-r--r-- | app-emulation/dosemu/Manifest | 3 | ||||
-rw-r--r-- | app-emulation/dosemu/dosemu-1.4.1_pre20130107-r6.ebuild (renamed from app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild) | 4 | ||||
-rw-r--r-- | app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-gcc10-const.patch | 64 | ||||
-rw-r--r-- | app-emulation/free42/Manifest | 10 | ||||
-rw-r--r-- | app-emulation/free42/files/free42-2.5.16-fix-makefile.patch | 39 | ||||
-rw-r--r-- | app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch | 12 | ||||
-rw-r--r-- | app-emulation/free42/free42-2.5.24.ebuild | 50 | ||||
-rw-r--r-- | app-emulation/free42/free42-3.1.9.ebuild (renamed from app-emulation/free42/free42-3.1.7.ebuild) | 2 | ||||
-rw-r--r-- | app-emulation/plus42/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/plus42/plus42-1.1.13.ebuild (renamed from app-emulation/free42/free42-3.1.3.ebuild) | 21 | ||||
-rw-r--r-- | app-emulation/virt-firmware/Manifest | 2 | ||||
-rw-r--r-- | app-emulation/virt-firmware/metadata.xml | 4 |
13 files changed, 90 insertions, 123 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 4b2a20d24cac..41b13d7d2026 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest index 60b3d5152a83..bb5a3d67f933 100644 --- a/app-emulation/dosemu/Manifest +++ b/app-emulation/dosemu/Manifest @@ -3,6 +3,7 @@ AUX dosemu-1.4.1_pre20130107-as.patch 421 BLAKE2B 4ad9440d9553f1162cb33fef6570bf AUX dosemu-1.4.1_pre20130107-fix-inline.patch 560 BLAKE2B 015ac356542cf8cdcb8de6e1f6441704bf2d89eafdba2a2f1a54ff7069bc49393b7e86ab20bb433c34eeaaada43c3cb437ed31f9fbc5ec6fa28832a23921dff3 SHA512 66f3e9a119fb0f80d311d46af6e980ce2f519f389317391746805b875eaecf2f0f714f726e2d6306345c7f68c3e2b2432f8adb16a72a51faf49067ac618e1424 AUX dosemu-1.4.1_pre20130107-flex-2.6.3.patch 463 BLAKE2B d4bc8b47ce97742b0f162a0d03f9347a420ccd8c5d6dbcc92907cdb00654c73ebfaf5b108fd6ed4fb7528d4f254c7e125bc70292cce7634cb04baad27cade69d SHA512 51674b60fb341f56c7120a9349c9890a9770cdef524ae3ccf6795769fde31823b2b57aaaafd6111c236550c16caf53246773dda1cd71639887ffaa7093d95cc0 AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 BLAKE2B ec1e9a8d78ac041c33ae4b4c534a028fa47fc84b8383183006b2830cf28d1a4c227324d2dd0f6aa07c138fbbe3fb991d3ad76012ccd85da973c65b851d965f50 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a +AUX dosemu-1.4.1_pre20130107-gcc10-const.patch 2184 BLAKE2B 820966ad2c63713ccb852e1e00086387f715a9634d1ae91d602fd347bf7e5ea8b2d042ae04443eec8dbcf6f9ab85fbdd4e9af6c7aaf563a6f78f3adbecec8d65 SHA512 21a3995b9be9da9becf8a6e473997132bed2b975ca5f363ab951fe4d10945f4e500fd6f2706a9cb39e7bf61f843ba7c2d56ceaa576fe9f720c4820bf99de3ba9 AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 BLAKE2B a265263de5ccb12df7224343daba5d43786d7f522ae071057105e710d9cfab384a7020c0cdbb305f9da57ecf5ed8ae745ebf115f3cd0b370962e7054dc6690dc SHA512 53fe8b40bc57a2459dcd16d3fba9d81d1cdab498232afe0c19f612737861f88b2f98c584d4fa1a4548e273a38fc17d254f890a64f3112cb0433d7679e7afcdb3 AUX dosemu-1.4.1_pre20130107-lto.patch 921 BLAKE2B 6b36f4e5502fb8b8202ab4396e6c9394d073a88843f3ad67d49bfc02130e6f15f793019e2532b98836975467951d6cf50b008b6401292d9495d55992f636b2fb SHA512 f8b2326abdff86b41e8125e9df242c08834c9f4d28c42ac90b45b409806fc9d453c951d22c2f61d5069844d6f0743600df42ca45d98e103798fbffc28485a0d5 AUX dosemu-1.4.1_pre20130107-nm.patch 1491 BLAKE2B b4a493a882ee82b5e8ae9ba9397b8bcaaff9b77cd585cfcb65af77125231538a993c6303da0271087da9048e3f3e5865ca8abb5c0738a6838252a21e14267ff8 SHA512 ce33f6cc1ba9e1e0ed9947098a8ee6740efe3aae3b7b129f55bac6e41519dc2ac46059e6164faaeee139c890924ee4bb5b382f4453d80a68c5add611f3179b23 @@ -10,5 +11,5 @@ AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393 AUX dosemu-1.4.1_pre20130107-pcm_write_interleaved-incompatiible-pointer-type.patch 579 BLAKE2B a0b909b98ee4fc41dd02d1f98e63afb791a9c07592134b24d1095ef125017839654bfbdcacbecb9640f740d1178e71235b1f241526d448f8ecd028d5650d867d SHA512 002799cda6801bbb214d99444424879c660ed85945453c4dbbc1698b7169489bd3c70e42205c265acf71455a7edeb079789cc6b14df6ed45aa8ab5668aebc80c DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd -EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 3194 BLAKE2B eae4210e5387b6af704b15766440df62ed3bab11021febdc1c55040035bcac0e4623f7d7672c5e04a91979fd8bddb5db4f4456a1445382e68287f91d47016003 SHA512 3e2237b4de911ccc80380ce8fe46c2973e1bc781c839c30119c13464c1c7118a984ce2e10fc4114387c1c9b1f1fe6e6524fa09edbed40c31fe57aea4eedc39d8 +EBUILD dosemu-1.4.1_pre20130107-r6.ebuild 3262 BLAKE2B 58a5b0c18698ab6af8f8c9dd77ab314a6831817c4b00c6d54a6d1bfe9193adc55dceaf71972b1487d24ecc4c18af2aecad2a016327d8ee618d06ff05c0451ff5 SHA512 aa5198bf124cb024fc27f3039837591e08895507ecf32227b5b365cbc0d7c4dd3186349e4dd2796187a8293798c588d87d5cea1924f5e8eb53599e2a33dde5bc MISC metadata.xml 349 BLAKE2B fedd50e957691cd0f390899d1895eae1883db66df4518b7e12d16cb5a942e7b3748bfa06d7af38dfbab2386305c473713f6303eb2746573c68dbabaff7b4a5ea SHA512 a6b190200756ecb3df7744aaba0f431fbfbb3dd327c652782c3dd3cb2fbd16694cdc223e63b7db471532497786702fdb0f93848297ec2c686815789ccb60a86b diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r6.ebuild index bb6904b66047..96d4eda00252 100644 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r6.ebuild @@ -21,6 +21,7 @@ KEYWORDS="-* amd64 x86" IUSE="X alsa debug fluidsynth gpm svga" BDEPEND="app-arch/unzip + sys-devel/bison X? ( x11-apps/bdftopcf >=x11-apps/mkfontscale-1.2.0 @@ -58,6 +59,7 @@ PATCHES=( "${FILESDIR}"/${P}-as.patch "${FILESDIR}"/${P}-nm.patch "${FILESDIR}"/${P}-pcm_write_interleaved-incompatiible-pointer-type.patch + "${FILESDIR}"/${P}-gcc10-const.patch ) pkg_pretend() { @@ -80,6 +82,8 @@ src_prepare() { } src_configure() { + unset YACC + # workaround binutils ld.gold bug #618366 local nopie_flag= if tc-enables-pie; then diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-gcc10-const.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-gcc10-const.patch new file mode 100644 index 000000000000..01cf146c603c --- /dev/null +++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-gcc10-const.patch @@ -0,0 +1,64 @@ +https://bugs.gentoo.org/890302 +https://bugzilla.redhat.com/1866474 +https://sourceforge.net/p/dosemu/patches/129/ + +commit b3320c3a67c0bb050b40e76831ec95a4d156890a +Author: Matthew Ogilvie <mmogilvi+gnto@zoho.com> +Date: Thu Jun 15 21:55:30 2023 -0600 + + mem_base: avoid undefined behavior writing to const global with casts + + Fix crash under gcc 10 or later. + +--- a/src/arch/linux/mapping/mapping.c ++++ b/src/arch/linux/mapping/mapping.c +@@ -47,8 +47,8 @@ static int kmem_mappings = 0; + static struct mem_map_struct kmem_map[MAX_KMEM_MAPPINGS]; + + static int init_done = 0; +-unsigned char * const mem_base; +-char * const lowmem_base; ++unsigned char * mem_base; ++char * lowmem_base; + + static struct mappingdrivers *mappingdrv[] = { + #ifdef HAVE_SHM_OPEN +@@ -205,7 +205,7 @@ void *alias_mapping(int cap, unsigned targ, size_t mapsize, int protect, void *s + addr = mappingdriver.alias(cap, target, mapsize, protect, source); + update_aliasmap(target, mapsize, (cap & MAPPING_VGAEMU) ? target : source); + if (cap & MAPPING_INIT_LOWRAM) { +- *(unsigned char **)&mem_base = addr; ++ mem_base = addr; + } + return addr; + } +@@ -416,7 +416,7 @@ void *alloc_mapping(int cap, size_t mapsize, off_t target) + + if (cap & MAPPING_INIT_LOWRAM) { + Q__printf("MAPPING: LOWRAM_INIT, cap=%s, base=%p\n", cap, addr); +- *(char **)(&lowmem_base) = addr; ++ lowmem_base = addr; + } + return addr; + } +--- a/src/include/memory.h ++++ b/src/include/memory.h +@@ -209,7 +209,7 @@ void *lowmemp(const void *ptr); + restrictions it can be non-zero. Non-zero values block vm86 but at least + give NULL pointer protection. + */ +-extern unsigned char * const mem_base; ++extern unsigned char * mem_base; + + /* lowmem_base points to a shared memory image of the area 0--1MB+64K. + It does not have any holes or mapping for video RAM etc. +@@ -221,7 +221,7 @@ extern unsigned char * const mem_base; + It is set "const" to help GCC optimize accesses. In reality it is set only + once, at startup + */ +-extern char * const lowmem_base; ++extern char * lowmem_base; + + #define UNIX_READ_BYTE(addr) (*(Bit8u *) (addr)) + #define UNIX_WRITE_BYTE(addr, val) (*(Bit8u *) (addr) = (val) ) + diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 9a2134ad3857..fd4f69d23340 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,13 +1,7 @@ -AUX free42-2.5.16-fix-makefile.patch 1144 BLAKE2B 9bb78c5b5bde9fef99eace62c55e32ba769b7d900dd0ee06331dce908508d660d3324d547517bb6e806924511642970148d4a7332017b65743ee613e96ace4a9 SHA512 5bc11081460274078b87760054e3d554355eca651fe782a96d5bab7a450b61f3c007c3b9967c31412c74ce26d88f9cbd684307e5c0699427292233c3f0974093 -AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976 AUX free42-3.0.14-fix-makefile.patch 731 BLAKE2B 0534c19c6ecf9836ab10f71beeffe6e9068b8af340c5d73befef8ef24e2a0a2436fedceaffd822f3a89fd1d9b250201069fa0f0c3d079adadc5248af95c2fe4c SHA512 8610cf7230f2e6aaa1997d48c06e96bcfc4ff3eb233b1f5643c487a2c30870113e7617ccb13558735998a973f0e21f6fa9389bea4f17b6cfc8387d73c1e048c8 AUX free42-3.0.16-fix-build-intel-lib.patch 2435 BLAKE2B d95d31e0322454b0578f52a1e1ad50213786c14cba8e91bb440fd44397184021da3ce6813eb82114820d9649c8e33969ff5dcfb454c72d7f89b4785564139533 SHA512 7376289f5ed760e48c3c00ee9d1135532cb0aca9ee1eb8116a284925f00d59434544c10de612acaa14f8fd2af409091a19aaf03b01ae80fa185ae3beb70c85cf -DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b -DIST free42-nologo-3.1.3.tgz 7461009 BLAKE2B 915954de24a31f89f112d0d5e13ed01bd6a1e341549c8a86f463858e4071fc0a4751e94a6a257d561da570fd3705250d740c741925ee2b022a50966b8d5b16f8 SHA512 5ad6e6702a789c81d8942c4030606e44112fc21f1af6e5e23f21825115cabbc03cbcb142351d5d0451f5bf8d603d653b783ebe1293fa7ebfb04c93dfdea3455d -DIST free42-nologo-3.1.7.tgz 7464073 BLAKE2B 0cff2d3292f45fc7341f8ed084c931da6a635498a62b7a20cc250df64a16d44a1c18a260e701971e2e7d68e11b1b84aa301405cd08c5e11b39e31f59a78647cc SHA512 2464385acf58aa17091d94ae81dde8e6e7f543c728c31cc03f1bc45a9ed5af9b27a3db41624222fd29ea61fe18541af9350e3e4369c54744c7b2a4dc799034fc DIST free42-nologo-3.1.8.tgz 7464179 BLAKE2B 122175508b2da42f101fae37d7c1627ef802d6e21af9cfb4114b657591f0ba1011a109ec3d75823911d3342fdd02e84a58553e616cd0b4c6288b5d39d9648250 SHA512 ef350d963a11c1a195024f57532a22771a3d0d9b7058bf38557e81c943e7cbd8b500472275b7094be3f7f01c3edf557cf3a3ee2d493cb756d108211b7391a4bc -EBUILD free42-2.5.24.ebuild 988 BLAKE2B 018e42a0d178fddad32220fb80a8052b883341ed595aeacb8c62189167b92354df147821701c496010a2d41d4492b9c8f9591e3dc3726277fca9032f22877b7b SHA512 558ca798068bb404d040e4f95ef2a404f8184d23f1b91c03801dd29599b2615f8bbaef509edac11d958a641ba103e2871cc7d5e4f1e2b7be47f6cfdc22d3cdac -EBUILD free42-3.1.3.ebuild 981 BLAKE2B 2a1c4d1a6258b90bb571e61c009502194155d30be1f595d9dd0f6f6acbfa2c81e26e2c52c8f66868f198b7a40e6e4f8c8e24a81caf60ec88b149a04fc628407b SHA512 285d201e00e9f6670da9e28ed6236e10e23c82018bf3b481bb323493ed921bb48ccea9952699049bc60589f80cac56060110184d68c90a24cac90c317bcbf961 -EBUILD free42-3.1.7.ebuild 978 BLAKE2B c3a4c3bc87adec0b446a2dc59f540253fe0458cef590566f6cd8c5ff0950a33835b18ef22fecc21505f5c30ab247d97f3fa8df82524d0f0847e0d8304c8976ca SHA512 a43b154709566e9bc8ae472c9beb2d946f1327929f1b5777670eb4ba883b1e7d39583dcdeb72d5f8d0a7b9faf83cacded5d6c265230b836057e658c8d7cf0e14 +DIST free42-nologo-3.1.9.tgz 7464567 BLAKE2B d3a8e87a71b1e6de0da2f9d0efe20e3131c8589151b1f67873d29aa45131b513a2e7fb127fd93fec35c318ed9ed9959f356df3b8c39ea31ed89022d9d66de3eb SHA512 350a0f15f08afbca04cf59e453ac0e48c78fb068b67746ac4174a595140085a167409a51eb9f627a71b931177495456ab31ae3ec00a9dda29bb21db7244381fd EBUILD free42-3.1.8.ebuild 976 BLAKE2B fdac700a7965299f84511ace42e5b49665431f42dd6c02eb4f58e235b60ede1bb719fe5a553242aced72a22572a117cee839522cb98bc10193cf8ff88cfc2dad SHA512 5b994121ff250b72b0b01ac05f00d07d6cb3d8f302b22b5f0d0bb1db6ad7d6a2624f1e7b68fbb980597993992123188a095af46588d54142c86554b09a99ea53 +EBUILD free42-3.1.9.ebuild 976 BLAKE2B fdac700a7965299f84511ace42e5b49665431f42dd6c02eb4f58e235b60ede1bb719fe5a553242aced72a22572a117cee839522cb98bc10193cf8ff88cfc2dad SHA512 5b994121ff250b72b0b01ac05f00d07d6cb3d8f302b22b5f0d0bb1db6ad7d6a2624f1e7b68fbb980597993992123188a095af46588d54142c86554b09a99ea53 MISC metadata.xml 346 BLAKE2B e7d31b887aade448cfdd31d3221c1d01f13ae1ad9097c4b18fa39b927401d7aa1c0b0b4bad4c36251b74f976ae79899e1b64b6086656cfbbee2036e1cf85946d SHA512 a848ab39ebadfe8b2c866cec845b16c1a0d92070a8e4365bc576a3d4287078594d0eb41f704f5a2f9b35618e24d91de99f6760ced7d39d9a4f706ca6f5c5480b diff --git a/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch deleted file mode 100644 index f59a700628dd..000000000000 --- a/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur free42-nologo-2.5.16.orig/gtk/Makefile free42-nologo-2.5.16/gtk/Makefile ---- free42-nologo-2.5.16.orig/gtk/Makefile 2020-01-25 05:16:45.000000000 +0100 -+++ free42-nologo-2.5.16/gtk/Makefile 2020-02-02 20:18:50.460458652 +0100 -@@ -15,7 +15,7 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ############################################################################### - --CFLAGS = -MMD \ -+CFLAGS := -MMD \ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -@@ -34,12 +34,14 @@ - -DDECIMAL_GLOBAL_ROUNDING=1 \ - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ -- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 -+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ -+ ${CFLAGS} - --CXXFLAGS = $(CFLAGS) \ -+CXXFLAGS := $(CFLAGS) \ - -fno-exceptions \ - -fno-rtti \ -- -D_WCHAR_T_DEFINED -+ -D_WCHAR_T_DEFINED \ -+ ${CXXFLAGS} - - LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0) - -@@ -114,7 +116,7 @@ - ./keymap2cc - - gcc111libbid.a: -- sh ./build-intel-lib.sh -+ +sh ./build-intel-lib.sh - ln -s IntelRDFPMathLib20U1/TESTS/readtest.c - - symlinks: diff --git a/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch deleted file mode 100644 index e1e2ea89897a..000000000000 --- a/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh free42-nologo-2.5.3/gtk/build-intel-lib.sh ---- free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh 2019-09-01 17:44:47.000000000 +0200 -+++ free42-nologo-2.5.3/gtk/build-intel-lib.sh 2019-09-03 23:58:30.604579443 +0200 -@@ -65,7 +65,7 @@ - esac - - cd LIBRARY --$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG -+$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG - mv libbid.a ../../gcc111libbid.a - cd ../.. - ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc diff --git a/app-emulation/free42/free42-2.5.24.ebuild b/app-emulation/free42/free42-2.5.24.ebuild deleted file mode 100644 index a8ede08965a1..000000000000 --- a/app-emulation/free42/free42-2.5.24.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/free42bin gtk/free42dec -} diff --git a/app-emulation/free42/free42-3.1.7.ebuild b/app-emulation/free42/free42-3.1.9.ebuild index 063f0e457429..962007422a29 100644 --- a/app-emulation/free42/free42-3.1.7.ebuild +++ b/app-emulation/free42/free42-3.1.9.ebuild @@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+alsa" DEPEND="app-accessibility/at-spi2-core diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest index 8ad439d482cd..9c5be2414a7e 100644 --- a/app-emulation/plus42/Manifest +++ b/app-emulation/plus42/Manifest @@ -2,6 +2,8 @@ AUX plus42-1.0.12-fix-build-intel-lib.patch 2435 BLAKE2B d95d31e0322454b0578f52a AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3 DIST plus42-upstream-1.1.11.tgz 7613219 BLAKE2B edd390be71318fbe351e997e3cedb2bf145fea89ed39ac91726c712d1906a28860f515de5bb657d0447d496d7469c6c01b185f6396c9227e120cbb8ea078bca3 SHA512 082042319ee9f58fc6c3fe86e9b15d03e17ae6e3d30441df2e953d71fe670f8004ff25da8986fb6f89fd4f6823a473fbfa620560e6051aa2a3bfebd9fbbd67a2 DIST plus42-upstream-1.1.12.tgz 7613262 BLAKE2B 983388034eca0bfceb4d2ca129a7fad5192e642e6bb05365bb883b7cb9a7bc571181b28214c2d4a9efd97a87d2836f95e4755e33f7a98bcc8bba0b5a97e4f226 SHA512 b0502d3132e49fc29d3e5b6b9d9fe4d6de52ebf5a44937a3847932993563e7ba12cca72dfa6d505acaa5eb95ffd5692df4b10b35075e846a17a9a621f31df225 +DIST plus42-upstream-1.1.13.tgz 7613465 BLAKE2B 88940160f2d5aa9c06b9b19b12a4bc747ef7c9e354075ca144997cffda42f7a07f3da602385b9e574402fa957463dce4bf3ba1237c11fa34d99bb3ed36249a67 SHA512 ff1f80be13337debf98e1a3e157e4bd5f017acde27e716254496606af8b4ffd967f8a03dc4e263e6fdf4ec62acf46fd5981297c0b29748b7dc0320969b14fa5b EBUILD plus42-1.1.11.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb EBUILD plus42-1.1.12.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb +EBUILD plus42-1.1.13.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2 diff --git a/app-emulation/free42/free42-3.1.3.ebuild b/app-emulation/plus42/plus42-1.1.13.ebuild index 1fd58bbcf2cf..3916a804001b 100644 --- a/app-emulation/free42/free42-3.1.3.ebuild +++ b/app-emulation/plus42/plus42-1.1.13.ebuild @@ -5,11 +5,12 @@ EAPI=8 inherit toolchain-funcs -MY_PV="${PN}-nologo-${PV}" +MY_PV="${PN}-upstream-${PV}" -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" +DESCRIPTION="An Enhanced HP-42S Calculator Simulator" +HOMEPAGE="https://thomasokken.com/plus42/" +SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz" +S=${WORKDIR}/${MY_PV} LICENSE="GPL-2" SLOT="0" @@ -21,17 +22,19 @@ DEPEND="app-accessibility/at-spi2-core x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )" - RDEPEND="${DEPEND}" DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" PATCHES=( - "${FILESDIR}/${PN}-3.0.14-fix-makefile.patch" - "${FILESDIR}/${PN}-3.0.16-fix-build-intel-lib.patch" + "${FILESDIR}/${PN}-1.0.9-fix-makefile.patch" + "${FILESDIR}/${PN}-1.0.12-fix-build-intel-lib.patch" ) +src_prepare() { + default +} + src_compile() { local myconf use alsa && myconf="AUDIO_ALSA=yes" @@ -42,5 +45,5 @@ src_compile() { src_install() { default - dobin gtk/free42bin gtk/free42dec + dobin gtk/plus42bin gtk/plus42dec } diff --git a/app-emulation/virt-firmware/Manifest b/app-emulation/virt-firmware/Manifest index 1e229da6198a..184ef38e96b8 100644 --- a/app-emulation/virt-firmware/Manifest +++ b/app-emulation/virt-firmware/Manifest @@ -3,4 +3,4 @@ DIST virt-firmware-24.4.tar.gz 111964 BLAKE2B 16005a6f911abf227988abaedd45237d44 DIST virt_firmware-24.7.tar.gz 114229 BLAKE2B a5b6bf39a72ce68622bbc4f75505633b92c322e4a02ab0384bb3b618abfbeeb19cfb057b5333ae53042732b131dcaa475c2c920922c920b0d0c21ef4185ad5b9 SHA512 1cd209b500e0ec1a5b8284b72b499bd16e998fd9489db6c8f8e3b49befb6186c5c09c95b2761254696b479daff1afaf2bdccb6ca7e115b11eb9a5df847f43628 EBUILD virt-firmware-24.4.ebuild 1197 BLAKE2B 30bb2a1a196afd35d8d4bd716b1936529b9f05e20fd60b9d1d85e368088971e2243da144c4c6c5bd1ecd419438ca9488a182e026529fdd716b1b34e5d072b2c9 SHA512 58086985f77f451a1b8be3826e34b3efb7190ea8593cd6060733b3a943bbaa0accd0d4c4cc45e564e1e8143f8331ca4a040240d6ee0084c47a9bfaf8a21fb99e EBUILD virt-firmware-24.7.ebuild 1169 BLAKE2B 0deb04adfe02793d3708d4a4381e0fc7a981a8d96d19d5b2cbd42fcc2002c38b1631425591df717520f16c65b5f84119ec610ff6e4d08e307247a298efdb825a SHA512 49ffe60e6b051ea3d230ab85cf4042e29d005c488d59b22c8d46674edbcde64f50e7f61ca19886fbf1df660b3445cb4dccd28ed7de3029941d401dd8bda302d7 -MISC metadata.xml 726 BLAKE2B 809ef093c67bf4c03ae99efa7112b92c3d6d24058ba8ae444045ae52adf9accf60e42a84966f8fd7ab793dfb3238660f4f422fbae2c36f6fd35bf0b02b42a1f1 SHA512 af58f69792dadd71c66022fb08f0f878c3f140114287000a16e96fd8b30bf410e595d373a5cd92b56bd28d5f9996ab5cdecac91ba1b743f2e807feeeaf6e9cbd +MISC metadata.xml 713 BLAKE2B 76bcfddfb45427c166d17b6235ba9241a91bf8cb7671683d8b89efbfdead868c001a959ba1a0bc732e1f746b5c2d7f68747a633ee49933d4eb6bf6aa4c0eff06 SHA512 88a26c43cec552dffeab242392f224a94213410dc5f6489421c97e49d27870b53823fd058ecb3696018a3debfd40b29ceb8eb35629f9188d847130ba359e3a22 diff --git a/app-emulation/virt-firmware/metadata.xml b/app-emulation/virt-firmware/metadata.xml index 1059efa31d78..1245a09b345c 100644 --- a/app-emulation/virt-firmware/metadata.xml +++ b/app-emulation/virt-firmware/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> + <email>nowa@gentoo.org</email> + <name>Nowa Ammerlaan</name> </maintainer> <stabilize-allarches/> <longdescription lang="en"> |