diff options
Diffstat (limited to 'app-accessibility')
-rw-r--r-- | app-accessibility/Manifest.gz | bin | 4555 -> 4544 bytes | |||
-rw-r--r-- | app-accessibility/epos/Manifest | 3 | ||||
-rw-r--r-- | app-accessibility/epos/epos-2.5.37-r3.ebuild | 7 | ||||
-rw-r--r-- | app-accessibility/epos/files/epos-2.5.37-gcc-11.patch | 81 | ||||
-rw-r--r-- | app-accessibility/speech-tools/Manifest | 5 | ||||
-rw-r--r-- | app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch | 20 | ||||
-rw-r--r-- | app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild | 120 | ||||
-rw-r--r-- | app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 2 |
8 files changed, 90 insertions, 148 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz Binary files differindex 15deab21ee94..bd51aa7fabd9 100644 --- a/app-accessibility/Manifest.gz +++ b/app-accessibility/Manifest.gz diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest index 442b04dcbc0f..1ed6c2bf2e80 100644 --- a/app-accessibility/epos/Manifest +++ b/app-accessibility/epos/Manifest @@ -1,10 +1,11 @@ AUX README.gentoo 108 BLAKE2B 1cd107977e2ed79c26266edf888bb1e33945ac17170f8c7487dd9f2997c0cdbdcaba71f72b250b822aba5f5e152b5728570354be238cc5c68e82c33d38e56a23 SHA512 84afee5caf9c1703f10846e77c1bdc9e298a1d560ffe34b0d8f3b570001f45ca059b86860f62ebdf84ee811aaee7f2d2753db069bb7cb977abfb7ac2b3009829 AUX epos-2.5.37-disable-tests.patch 401 BLAKE2B 1b5d6de2a7ac1f27910e58e311c550ea4101b4ac1e3756ce4950c66b07ee216a3e76afad903ea580b5bcdbebb2b2ee8a10214a22edf01eab5c51efff0144a7e9 SHA512 63e5026789e35b2dbf00479539ca2b7fd0567a9ff018337d14334f54f4840c0aa723e7fe44c29a6fa3709ba4130750da8fb886c65513d4d71cbf0bd026681e2e +AUX epos-2.5.37-gcc-11.patch 3074 BLAKE2B 2eb81cdb8469daf87db136587b3fb22beee894e34293efaa4a8c4dbddc17c4614c939a4cfcc3f37435750de9b3804612c6f6cb2acfb6ba502f0e95fad25b46c8 SHA512 ab3dd7e339c220fada5c5a2ec8f62a2c97c858951af3fc9fb2f3f1beef25260b030ea26067664613ca5fbead92aedfbcbfe94c391310bf5730253bbe59cfd734 AUX epos-2.5.37-gcc43.patch 454 BLAKE2B 6a3db8a49d3368c50bc78b2f3eadd83e46e3408b84b5a2784849f72d073db59b322356e39962fed9c822b8c3baf62f958e0943cd58dbb77b50316467f6b05794 SHA512 34c0b51a722c75e088315202c62dbf42086bd4fa4da19b1c788c759f4c21fee26a6d7c1a414af34c4ec10d30ac8bf7ea7b65c9f3b96779dce5b40201e3611e4d AUX epos-2.5.37-gcc45.patch 507 BLAKE2B 03760db124cfc94c69512f710b3e84704c2bf910e54b632a4cc5a3c563fa15fbd2fcb244cdd770b34873ec7d42bf77ac3784f22a561250926aa85da98aa4636c SHA512 7dfd25ebab3bbe2cd91ccb61945d444215b7ae0f087637d47b5ce422a9b8ab6bf392a614983a49037ac937fdfcb0e6c3091fa39e443e6084348baa0c4f1fb360 AUX epos-2.5.37-gcc47.patch 333 BLAKE2B 0ad7975a408e97aab6761b362063b61b2d914e071b3ce9d2b188c05dda89845f07d545f4b22fab9c74900ccb1c79310bc34dbf6363f6654bf1e184cb786571c4 SHA512 84a5d979fa59eaeef6f560494d67918580eb4574dada052cbf926440a0a960027c50b36284e0870f746b2a5f13f909946661174ce8d6f155d1ea0f6d202c334f AUX epos-2.5.37-gcc7.patch 593 BLAKE2B 10d992f2f886318904dbbaab4707f453ee846e469415b9467ff0e05d586466b5bc176f41b5805f744dc7873fd7223372a59909fedc946cd9d950efd7b4bc7c8d SHA512 b19d218dc3387efb2e9ea8d444692821c53a9cc77ab8541ad7b95a280478983fd8644fbe8dca305539c487c06c60a2b67dae09bd1e3776e3f2a07cb26631b46c AUX eposd 442 BLAKE2B ac420143183e28654de3289fe0d27c9582a2b53024048c7beb4fce4287d38ef0f585cd9a449f92d999bfcf4c382ea8f86d25750655d222e87e2f28416fad076d SHA512 3a60ab455b7c00ece42a759fb98bc3e9948134839f709ed16123e39a323f24fa166907f981f65510d83f2fcc52697a2535cfafb4e7ccbb0f3d8c116123f662ed DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef -EBUILD epos-2.5.37-r3.ebuild 901 BLAKE2B 35d71d3d267278b1f09495f8a7ead603520f2af87a284e7bfc8fccd977cdad87d341f156bee15d5a0c2470b9f4b63dd3a8eba3ce9851047b85ec56224cf6a91c SHA512 1dc80b3e08634c7686913e80c0a9cd55eb2234ace7ee4839510f0b3467b3d8732912aafd2ebde17ee67c02cb04600b2a7e8aa7579f0af7eba24619d150cf1818 +EBUILD epos-2.5.37-r3.ebuild 979 BLAKE2B 144c80b229e6ee6bb441b3faf00796d1f0fcfc18cf62e29a0861446bfdd2a56821426b0eec2d9b239f1656f3a53f648943b48674761ab9ac3c8992a230fc4d49 SHA512 e3ee63ec2456aed74dc922bb947a72fb987926a0fe81d8af3fde4fdd6ff5f420bf9718eabfb5cf13b5e7ddcb60365620cab34f6bfbd9d2daf6d59f555eb22780 MISC metadata.xml 343 BLAKE2B 77d619d13082c8c8248f671c4e29031867028a05373e9ae48950a1d88540f3b1e5529739ef6e1a1479e04e3e6abd4556d1fd8cf39e5f10481d97110ecb0373d6 SHA512 0a3cbb37dfe8c2627ad7082f9f910c949d9f2477068ad7c68bb17658f0331bc7c736e84c452afa2204eb7fbd01c2edd68583800fcaec6962e456743999b0457d diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild index f4146ed522d7..81187ea939bf 100644 --- a/app-accessibility/epos/epos-2.5.37-r3.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -14,6 +14,8 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86" IUSE="" +RESTRICT=test # needs running eposd + DEPEND="dev-util/byacc" RDEPEND="" @@ -23,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.37-gcc47.patch "${FILESDIR}"/${PN}-2.5.37-disable-tests.patch "${FILESDIR}"/${PN}-2.5.37-gcc7.patch + "${FILESDIR}"/${PN}-2.5.37-gcc-11.patch ) src_prepare() { diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch new file mode 100644 index 000000000000..a14488b7d34a --- /dev/null +++ b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch @@ -0,0 +1,81 @@ +Avoid `container` namespace clash with gcc-11's libstdc++ headers. + +https://bugs.gentoo.org/786264 +--- a/src/nnet/xmltempl.cc ++++ b/src/nnet/xmltempl.cc +@@ -22,10 +22,10 @@ CXml * x ::print () const { \ + #define RP(x) x + + #define child(x,tag) retval->AddChild (*xml_print (x,tag)); +-#define container(x,tag) retval->AddChild (*xml_print_container (x,tag)); ++#define epos_container(x,tag) retval->AddChild (*xml_print_container (x,tag)); + #define child_opt(x,tag) if(x) child(x,tag) + #define child_enum(x,tag,enumS) retval->AddChild (*xml_print (enumS[x],tag)); +-#define container_opt(x,tag) if(x.size()) container(x,tag) ++#define container_opt(x,tag) if(x.size()) epos_container(x,tag) + #define structure(x,tag) retval->AddChild (*xml_print_str (x,tag)); + #define structure_opt(x,tag,write_cond) if (write_cond) structure(x,tag) + +@@ -40,7 +40,7 @@ CXml * x ::print () const { \ + #define CHILD(x) child(x,#x) + #define CHILD_OPT(x) child_opt(x,#x) + #define CHILD_ENUM(x,enumS) child_enum(x,#x,enumS) +-#define CONTAINER(x) container(x,#x) ++#define CONTAINER(x) epos_container(x,#x) + #define CONTAINER_OPT(x) container_opt (x,#x) + #define STRUCTURE(x) structure(x,#x) + #define STRUCTURE_OPT(x,cond) structure_opt(x,#x,cond) +@@ -60,7 +60,7 @@ return retval; } + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -82,7 +82,7 @@ CString x ::read (CRox *xml) { \ + #define child(x,tag) err += xml_read (xml,x,tag); + #define child_opt(x,tag) err += xml_read(xml,x,tag,false); + #define child_enum(x,tag,enumS) err += xml_read_enum(xml,x,enumS,tag); +-#define container(x,tag) err += xml_read_container (xml,x,tag); ++#define epos_container(x,tag) err += xml_read_container (xml,x,tag); + #define container_opt(x,tag) err += xml_read_container (xml,x,tag,false); + #define structure(x,tag) err += xml_read_str (xml,x,tag); + #define structure_opt(x,tag,write_cond) err += xml_read_str (xml,x,tag,false); +@@ -105,7 +105,7 @@ else return ""; } + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -119,7 +119,7 @@ else return ""; } + + #define XMLIZE(x,tag) x tmp##tag; retval->AddChild (*tmp##tag.printTemplate ()); + #define child(x,tag) +-#define container(x,tag) ++#define epos_container(x,tag) + #define child_opt(x,tag) + #define child_enum(x,tag,enumS) + #define container_opt(x,tag) +@@ -145,7 +145,7 @@ CRox *xmltempl () + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -171,7 +171,7 @@ CXml * x ::printTemplate () const { \ + CXml *retval = new CXml (#tag,1,0,"comment","structure " #x); \ + retval->SetFF(DODELETE); + #define child(x,tag) retval->AddChild (*(new CXml(tag,1,0,"comment",#x))->SetFF(DODELETE)); +-#define container(x,tag) ++#define epos_container(x,tag) + #define child_opt(x,tag) + #define child_enum(x,tag,enumS) + #define container_opt(x,tag) diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index d29c61199a65..2f2f0195ffa3 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,9 +1,6 @@ -AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afbd07115d98d3149d31eb402611c1dbe70c07d4885e82beef94bfdfe8a9261722eaf7ea43f3704cee27eb5055f7488 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47 AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d52c447b0183cc59146ec892b86d360f16fccab0a85667743c6e0f31a07f20983cce604d3202756c16eae4eff2eb88b1079407c SHA512 ae34fadda5f92dfade923af07222c1ed35b8b39bafc7604a86cebd7196888b2cf9a41fe2686e5210a556309a9c2e71076d22e3f56f1ccec0aca3d4a7bd18f3c1 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 -DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 -EBUILD speech-tools-2.1-r4.ebuild 3055 BLAKE2B 91ff2e524213950a0775e7db6933feef960594fd80847cf08849dcff0b71a1be89a74b0fe20c9944422d48abace3f8aa83e9a1bd150c7f36399521049a26dcd1 SHA512 4a89616b573de9bdbfad9bd952d29675edc9c1fca30b1a2870359bf7bea5e7e244a1cb4f1d9553c9d023c4589b5ccb5285d7847fe63cc2daeb6a9b32940baa96 -EBUILD speech-tools-2.5.0.ebuild 3774 BLAKE2B 05ba61033b3cc1d62be2b19aa05890a7ff250b899e53df39a5a260b2a2264eeb96e779bd7e31a064836d70adb324b6296edce564b8aa90942b12c06df0ba7c28 SHA512 2f7608d4d48f54d499f0cfed95bf08d48ca40d01a9950090fa9f0c635d7c996a3bf1e8327c80bf5e8fe4f7322ae59cda815ac9b922824cb25f7d53bda72b192c +EBUILD speech-tools-2.5.0.ebuild 3772 BLAKE2B b7a494b2a9cf6e356271c8db84c52394657f9747f9eb84780928ffd5e5476ad66e839ffec8385dbd6a0f58a2a759f05a69bbe10e62ac4ddb10727189517c2ec0 SHA512 d6a809b62fbaaaf3b38e608c0274b516340d14c10f2092a2eb1d5ab7b0a450cfe9e7cf60786bd94ec0598545d024a41b7300e58f7fde78880d8be0f01591595c MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch deleted file mode 100644 index 9e1067fa1dc1..000000000000 --- a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/siod/siod.cc -+++ b/siod/siod.cc -@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length) - matches = walloc(char *,siod_llength(lmatches)+1); - for (l=lmatches,i=0; l; l=cdr(l),i++) - matches[i] = wstrdup(PNAME(car(l))); -- matches[i] = '\0'; -+ *matches[i] = '\0'; - - return matches; - } -@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length) - matches = walloc(char *,siod_llength(lmatches)+1); - for (l=lmatches,i=0; l; l=cdr(l),i++) - matches[i] = wstrdup(PNAME(car(l))); -- matches[i] = '\0'; -+ *matches[i] = '\0'; - - return matches; - } diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild deleted file mode 100644 index 2f487ae007ac..000000000000 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils epatch flag-o-matic multilib toolchain-funcs - -MY_P=${P/speech-/speech_} -PATCHSET="r3" - -DESCRIPTION="Speech tools for Festival Text to Speech engine" -HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" -SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz - https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz" - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="nas X" - -RDEPEND=" - nas? ( media-libs/nas ) - X? ( x11-libs/libX11 - x11-libs/libXt ) - >=media-libs/alsa-lib-1.0.20-r1 - !<app-accessibility/festival-1.96_beta - !sys-power/powerman - >=sys-libs/ncurses-5.6-r2:0= -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/speech_tools" - -src_prepare() { - EPATCH_SUFFIX="patch" - epatch - - sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ - main/siod_main.cc || die - - #WRT bug #309983 - sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ - "${S}"/config/systems/sparc_SunOS5.mak || die - - # Fix underlinking, bug #493204 - epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch - - # Fix gcc7 build failure, bug #634224 - epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch -} - -src_configure() { - local CONFIG=config/config.in - sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die - if use nas; then - sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ - ${CONFIG} || die - fi - if ! use X; then - sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die - fi - econf -} - -src_compile() { - emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dolib.so lib/libest*.so* - - dodoc "${S}"/README - dodoc "${S}"/lib/cstrutt.dtd - - insinto /usr/share/doc/${PF} - doins -r lib/example_data - - insinto /usr/share/speech-tools - doins -r config base_class - - insinto /usr/share/speech-tools/lib - doins -r lib/siod - - cd include || die - insinto /usr/include/speech-tools - doins -r * - dosym ../../include/speech-tools /usr/share/speech-tools/include - - cd ../bin || die - for file in *; do - [ "${file}" = "Makefile" ] && continue - dobin ${file} - dstfile="${D}/usr/bin/${file}" - sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \ - ${dstfile} || die - sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \ - ${dstfile} || die - sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \ - ${dstfile} || die - - # This just changes LD_LIBRARY_PATH - sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die - done - - cd "${S}" || die - exeinto /usr/$(get_libdir)/speech-tools - for file in `find main -perm /111 -type f`; do - doexe ${file} - done - - #Remove /usr/bin/resynth as it is broken. See bug #253556 - rm "${D}/usr/bin/resynth" || die - - # Remove bcat (only useful for testing on windows, see bug #418301). - rm "${D}/usr/bin/bcat" || die - rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die -} diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index f14ff35bfac3..1c0615542e77 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/speech_tools" LICENSE="FESTIVAL HPND BSD rc regexp-UofT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="nas openmp X" RDEPEND=" |