From df78365b93a780b2efe17655567e819bcb974ae6 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 7 Jan 2015 10:06:48 +0000 Subject: [PATCH] =?utf8?q?Fix=20underlinking,=20bug=20#493204=20by=20Jaakk?= =?utf8?q?o=20Perttil=C3=A4;=20drop=20old?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- app-accessibility/speech-tools/ChangeLog | 13 ++- app-accessibility/speech-tools/Manifest | 23 ++-- .../speech-tools-1.2.96_beta-gcc42.patch | 61 ---------- ...eech-tools-1.2.96_beta-gcc43-include.patch | 22 ---- .../speech-tools-1.2.96_beta-gcc44.patch | 21 ---- .../files/speech-tools-2.1-underlinking.patch | 11 ++ .../speech-tools-1.2.96_beta-r2.ebuild | 106 ------------------ .../speech-tools-1.2.96_beta.ebuild | 94 ---------------- .../speech-tools-2.0.95_beta.ebuild | 105 ----------------- .../speech-tools/speech-tools-2.1-r2.ebuild | 27 +++-- 10 files changed, 44 insertions(+), 439 deletions(-) delete mode 100644 app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch delete mode 100644 app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch delete mode 100644 app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch create mode 100644 app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch delete mode 100644 app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild delete mode 100644 app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild delete mode 100644 app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog index 86af64f730f9..60a9af144e20 100644 --- a/app-accessibility/speech-tools/ChangeLog +++ b/app-accessibility/speech-tools/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-accessibility/speech-tools -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.85 2013/08/07 22:46:11 neurogeek Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.86 2015/01/07 10:06:47 pacho Exp $ + + 07 Jan 2015; Pacho Ramos + +files/speech-tools-2.1-underlinking.patch, + -files/speech-tools-1.2.96_beta-gcc42.patch, + -files/speech-tools-1.2.96_beta-gcc43-include.patch, + -files/speech-tools-1.2.96_beta-gcc44.patch, + -speech-tools-1.2.96_beta-r2.ebuild, -speech-tools-1.2.96_beta.ebuild, + -speech-tools-2.0.95_beta.ebuild, speech-tools-2.1-r2.ebuild: + Fix underlinking, bug #493204 by Jaakko Perttilä; drop old 07 Aug 2013; speech-tools-2.1-r2.ebuild: Bumped rev on patchset and added a patch to fix ncurses[tinfo]. Closes diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index 2c7cd40313b0..1352d3e3f016 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,27 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX speech-tools-1.2.96_beta-gcc42.patch 2203 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e SHA512 57e7fb3aa27e47461cdf6788e3fabc07cc7725790fe8adb11016c70afd552c41929db18abb990fae066a64ae5962bbaae151dac15e7054c424ac54f553408e29 WHIRLPOOL dd824621375ff307ca93947ad15339286b68548a79329b865294b2142621b37256d20c5547f8b3a4f434c6c7aa462b67f66e53c39926beabb143099bb6cf548a -AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe SHA512 b88068c42735ad3279c4d95d091bba13a536597dd0d09f8c6ccfab448011fdd974f09d5ba1b6e9e1d31c8e59a4d8dc678c2891b9efb28dcc364684f5d902004c WHIRLPOOL b2f59826c75b71057a47b1f1195629ceea79c397826ad65bce0d319220cd27c7f4d4db9c13b7a12a449f4760c97cb5f942b2c768ac7235f4c7f859e690b6f09f -AUX speech-tools-1.2.96_beta-gcc44.patch 579 SHA256 720cb246c3845779291038e945e09024370b3478d3e84416886efb9263f490bf SHA512 8b5f454134c2aae8ca42d5dab2585e7ffc691671fac6b109f213caa5295073267385ab7af0a8ce6edef7a45b14f60eaaa2b599ecc61a774e6d94e15ee5600c07 WHIRLPOOL df87916195b86bbb09c83f322b0a550d2542a94ac094f7506555ce9b735a1f324c81fd16c16c3bfba0f6b5b894ed5e8ae223510dd5a19e19504527d4044f543a -DIST speech_tools-1.2.96-beta-patches.tar.gz 17282 SHA256 389a4fb53854dc9b4c822b4ad7310fa4dd121bad22ccbee9bfe24cf4163459d0 SHA512 39617f96010209f21129213be38ddf590fd7ccdd3adb23b4e47e177fe73cd2bba0d359980535267d49d4635abf5d71ddcbf59d42600acf0c9f647fa50e41c71f WHIRLPOOL 865bf9778b8b9705260f58557710aea5090fa012f30669415d67606ff65f746ae8dcb071748725254ca75ec97d1a974f0a08bc07b0d5e45d7ae2bfd9f92dd952 -DIST speech_tools-1.2.96-beta.tar.gz 1275015 SHA256 fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428 SHA512 e3e97b0580e5abd3e493cb6ad2890f8dd6eaa1821897c474f372a78a57c85660d881fb6a30487aa513366a6eda845a363a39d5ab27128afb57ee612112698b1a WHIRLPOOL fbb0152b6122df62d949e4b14a11a792a9467f3088d2308958f8c94fc32946fbd82c10c6deb3586625f707e1ccb77f0f137f226388b661a4fc852665783cafd0 -DIST speech_tools-2.0.95-beta-patches.tar.gz 5773 SHA256 e7d6780ccf7f1cc4e61f1f70f3fc6d981344b2b2d1c5a1631fe15397f7daac0e SHA512 b38abc6a9895217ba642e8995d37878738f40274f6bc822f9cc87ff7d184691a3f3f71eaedf8657538b4880fc9780a3de1010172c5a715f030db29bf5d5e2dfd WHIRLPOOL cc96971ed64cf5c8ceb366a61ae45eab579c6928c7fc190dd5c839d6e03eaa435638f7482bb27e3f2e91ce9a0f59e12bb17e5e6163c8a656cdaa4bef490dae89 -DIST speech_tools-2.0.95-beta.tar.gz 1681824 SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554 SHA512 586332027a437cb94a75c753a140a0e8f194e2867f28cbfed061186133bee7173b30ce892589553465ee8790465fc27999b7cf296328dbb02cd33641501a5c8e WHIRLPOOL 40c786112df364ce9beb5f2bf9539c9cd9b42be67a2ba5f4fee63b5ac1cbdb44d92e8994f43d979e5dffacf999b48fc84f92bee51403667469257bd3e91a3cd5 +AUX speech-tools-2.1-underlinking.patch 565 SHA256 2f0b8781c03362cf0a6c67e842778c44566db6b0089e980ec84779245b77468d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47 WHIRLPOOL 93464e4fa43cefcdce6599ab5cdfef741a5ec90909a78019c3e56485b9d3f47df09f39316679ca7ee61a84bbabad0cd072dc9ffdaeeb844db1a923cbd101b794 DIST speech_tools-2.1-patches.tar.gz 5688 SHA256 4b1a3579a39fe78e4d524e69c2199f19509ff9d15f8e74c1ea8c6865efc23f65 SHA512 6b33e8831da2c26fe3d8fe4e1a9628916c6c0b20d01df02131eb2f95dec837eb68f2c2008160e237eb0eefa7f1a9772ff108d9e9937482c48fd4dc3e5555d0c1 WHIRLPOOL 190fdeeac41c282fcf2300786e8b8572575f9e9a152f969f2a031df4b5f48e8831d2718cd3822938cfbb0318a0381bd81c6c4c1ba48eec2d4b9afb5410706a0b DIST speech_tools-2.1-r3-patches.tar.gz 6876 SHA256 c37357211aa88ca6038932222f664ee332d58c553960d13ef93c489d2bb41e11 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 WHIRLPOOL a038534ab83819e5c36e74026ee510bfc279e41b6eea62e6fcb54df599a888d51e7398bd91db615e8e6cdc140b52bc99d8d7c7e52c158ce161d2a74e5909cb2c DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644 -EBUILD speech-tools-1.2.96_beta-r2.ebuild 2959 SHA256 2e15e46f504291f792db9078119193714ac01c14d0b9151270c2140b6bd88abc SHA512 284103c196a3c827b72eea519cea7c0f93c6dbb3049758a1e6394b0f1d6d0c76d71a39af768c83fd57c4f8742e0358cf5d1978d13b07587c438ae5f7140b2491 WHIRLPOOL e150dfaa412d9421a74e7cc805d8e3d91805676505abc43e9e3cea183b50c8523ff3a4d824e409a82f7c3f19088c555e1d3dafec94de66b82d1d1ed2316e733d -EBUILD speech-tools-1.2.96_beta.ebuild 2710 SHA256 03e34391b504acc55ff27be83617f34fb736ca4f3b6436b04b30b8c374648fb5 SHA512 c7749edc1e2498f05212f3912efe03a9effee10d5b62846b95d8f434421bdd2aca863e3d6785e29dc3e0ebfe35d74d1fb2f423e019dabaae49ccd7dd364d9058 WHIRLPOOL 42baa258c2d0a69f83e8865082ba568ba1c290e6b6032f700198d0bb864b6e65bd6503bd17f8be0c6b57806fdbdadf0311ba0443f8580e08bca198583023ca45 -EBUILD speech-tools-2.0.95_beta.ebuild 2931 SHA256 b222d5198625e81733d364d6ac0abdc3a04eaa2ffe44ffee45e0d0afb6d05d3c SHA512 e8d8dff2d718e63e72fc8d1c50df166d59555fb60d30d3cd76808fd0dc6f6fadf9f68446920cd8024ff2100568e5ae05dee2d480d46777b4bc501966dbed5f5f WHIRLPOOL cb7a06771ae408fc5e6666cfc805cb71179b93d9b7dfbd2bd7e0f912e43ad61845f42d4626b741b9f4077e7bd1813c0da2d72fdf90f66ac995eefd6ab37411bf EBUILD speech-tools-2.1-r1.ebuild 2663 SHA256 0be3245158410ded8f461a2afeed689056bff684d96ca2d3d8d30224e1b047ca SHA512 a608f65cd3dc9a8e8eb3148b85d3053787e8dfb86b678f53fb4ecb5fc255ef6d63eb059c6f46f38ac278a0c561d7ba6f51afe7c321fba472d9b87604b509a895 WHIRLPOOL d220b66d03c7f4cac478f46440dc79a69a65b6948c6fd744bf217e099856b97aa5675485002c6b3fbdd77339913fa61f6befc3c4f302be674c3274a7369921b8 -EBUILD speech-tools-2.1-r2.ebuild 2804 SHA256 90f763d376e4036cb9e6bf7e7946df224b0ae8bd9400c2f0a9ef2eccfe0c1ea1 SHA512 d63c74b496059b51535578e3100967ac1f00ec8ff086f2442ff4e07e60f407aa7aa9e8235c0f9f23614d1f22889f45dfd7e7e1136266f942844365709b18d4f7 WHIRLPOOL 280472f2fdf38787a01a2275aa44184c36c621320fc558243e84c7bd03136a846145612c7f3443610434559ca8532d4bc79b53e8822ddfcce187be8fea517dd4 -MISC ChangeLog 13887 SHA256 25d64e47b32c4c611c4ee6988590ca9e2e69ef6d0a8954e75c4f52a8a0d97c40 SHA512 f0ec0f0f0dd6b47d339c21498ee6152fe89853351b6a6c2ebd456557593a5b5fc0cef78f6672fff79f2e68ff9e1eb12d7e092c231216f7502b19264ce04e8bd6 WHIRLPOOL b8a966ebc60ad05e1428f860e7f514b2c150db43fea2ee9f0555de66442c65e44199a2d4874f34bafd23d678052b685ccac438cdc9434c18920b3944b4023336 +EBUILD speech-tools-2.1-r2.ebuild 2836 SHA256 155e395ddf123c411b86de1ed3a5fa1cdfbb57362728ba123549d26e4af2f4da SHA512 1eb5cc7156c2853b806fbd397df7505d740cd9f6f34fe36f602d9cd9de7302e4947334440416a66579ad407a3e5f7663e5713aeb0365b6cb4221295470186f7c WHIRLPOOL dc6877edd3e2a2fc43b4c65109caa6b5962eadab59994bb76d9d69e4317b4c728ae552e641592d36ef09978a9c3acc353e5de6c1f49a21d24f82df97672fa64e +MISC ChangeLog 14324 SHA256 1516bb0b57000c9c3c043ad1d6130360308b2dce2a6400b5dda65c2c0216c400 SHA512 cbe96d72718e2c96efefb8d3fc745a97df8a7158abc2b454a7ce83802e45423f86844a9b0afd997f2d921523f35020751b030f056a29cf2452350925694a8165 WHIRLPOOL 560847aa195629d2be0cbd1459197f0f26a26e9bd77dd0bab770615478cd0186b3c3b19996eb071b23780cb396a73a84c6bc464a2af8b825f56fbbd0722aae2d MISC metadata.xml 249 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a SHA512 5d0f694d49c84a53b2f504fe98ab89c54a505cf991603923fd4b255899fd076d832a1b1e4ab30bed1a765e708513434da4f16c64a01aeb7bca9886caf5a6629f WHIRLPOOL 559c9365b8ba9856ef2c25a90d97a3d961c2378680af5e3703da684152eb81ba75faa5bbfdc9bb015df2a2214e94934e5b13fa0d5056d972285fd9e0da363828 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlICzjwACgkQdIssYB9vBoPs5wCfSvyHtxBYIkcHzMMqBhLXoMKC -kDMAn0uWVfT5jq1xVwBCcwBqfLqyR/X7 -=FeeY +iEYEAREIAAYFAlStBTgACgkQCaWpQKGI+9Qw8wCfW4apAD4fd8xB+PgXuNvzkYrn +rn0AnRjS9wqIEYv0H4wl88qclWr8fzet +=+DL8 -----END PGP SIGNATURE----- diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch deleted file mode 100644 index 1810a96e6446..000000000000 --- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc42.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- speech_tools/config/compilers/egcs.mak 2001-04-04 13:55:32.000000000 +0200 -+++ speech_tools/config/compilers/egcs.mak 2007-08-28 23:08:01.000000000 +0200 -@@ -54,7 +54,7 @@ - CXX=$(EGCS_CXX) - - ifndef EGCS_MAKE_SHARED_LIB -- MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX -+ MAKE_SHARED_LIB = gcc -shared -o XXX -Xlinker -h -Xlinker XXX - else - MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) - endif ---- speech_tools/config/compilers/gcc_defaults.mak 2006-08-05 17:37:59.000000000 +0200 -+++ speech_tools/config/compilers/gcc_defaults.mak 2007-08-28 23:08:30.000000000 +0200 -@@ -76,12 +76,12 @@ - PROFILE_gprof_CXXFLAGS = -pg - PROFILE_gprof_LINKFLAGS = -pg - --SHARED_CCFLAGS = -fPIC -fno-shared-data --SHARED_CXXFLAGS = -fPIC -fno-shared-data --SHARED_LINKFLAGS = -fno-shared-data -+SHARED_CCFLAGS = -fPIC -+SHARED_CXXFLAGS = -fPIC -+SHARED_LINKFLAGS = - - ifndef GCC_MAKE_SHARED_LIB -- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -+ MAKE_SHARED_LIB = $(CXX) -shared -o XXX - else - MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) - endif ---- speech_tools/doc/estjavaapp.sgml 2001-04-04 13:55:32.000000000 +0200 -+++ speech_tools/doc/estjavaapp.sgml 2007-08-28 23:08:43.000000000 +0200 -@@ -105,7 +105,7 @@ - &shellprompt; cd tmpdir - &shellprompt; ar x ../libgcc.a - &shellprompt; cd .. -- &shellprompt; gcc -shared -fno-shared-data -o libgcc.so.2.7.2 tmpdir/*.o -+ &shellprompt; gcc -shared -o libgcc.so.2.7.2 tmpdir/*.o - - - ---- speech_tools/stats/EST_DProbDist.cc 2004-09-30 14:53:36.000000000 +0200 -+++ speech_tools/stats/EST_DProbDist.cc 2007-08-28 23:21:17.000000000 +0200 -@@ -310,7 +310,7 @@ - if (type == tprob_discrete) - return 0; - else -- return (int)scounts.list.head(); -+ return (long)scounts.list.head(); - } - - int EST_DiscreteProbDistribution::item_end(int idx) const -@@ -326,7 +326,7 @@ - if (type == tprob_discrete) - return ++idx; - else -- return (int)next((EST_Litem *)idx); -+ return (long)next((EST_Litem *)idx); - } - - const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch deleted file mode 100644 index 6ab7ebf56614..000000000000 --- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc43-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur speech_tools-orig/base_class/EST_TSimpleMatrix.cc speech_tools/base_class/EST_TSimpleMatrix.cc ---- speech_tools-orig/base_class/EST_TSimpleMatrix.cc 2004-09-30 06:53:35.000000000 -0600 -+++ speech_tools/base_class/EST_TSimpleMatrix.cc 2008-01-05 11:00:07.000000000 -0600 -@@ -42,6 +42,7 @@ - - #include "EST_TSimpleMatrix.h" - #include "EST_TVector.h" -+#include - #include - #include - #include "EST_cutils.h" -diff -Naur speech_tools-orig/base_class/EST_TSimpleVector.cc speech_tools/base_class/EST_TSimpleVector.cc ---- speech_tools-orig/base_class/EST_TSimpleVector.cc 2006-07-06 06:57:18.000000000 -0600 -+++ speech_tools/base_class/EST_TSimpleVector.cc 2008-01-05 11:00:32.000000000 -0600 -@@ -42,6 +42,7 @@ - - #include "EST_TSimpleVector.h" - #include "EST_matrix_support.h" -+#include - #include - #include "EST_cutils.h" - diff --git a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch b/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch deleted file mode 100644 index 98f8fda2f7ca..000000000000 --- a/app-accessibility/speech-tools/files/speech-tools-1.2.96_beta-gcc44.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- speech_tools/speech_class/EST_wave_io.cc.orig 2009-05-26 03:49:24.000000000 -0700 -+++ speech_tools/speech_class/EST_wave_io.cc 2009-05-26 03:54:01.000000000 -0700 -@@ -68,7 +68,7 @@ - - int nist_get_param_int(const char *hdr, const char *field, int def_val) - { -- char *p; -+ const char *p; - int val; - - if (((p=strstr(hdr,field)) != NULL) && -@@ -84,7 +84,8 @@ - - char *nist_get_param_str(const char *hdr, const char *field, const char *def_val) - { -- char *p,*val; -+ const char *p; -+ char *val; - int size; - - if (((p=strstr(hdr,field)) != NULL) && diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch new file mode 100644 index 000000000000..35011735cc8c --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.1-underlinking.patch @@ -0,0 +1,11 @@ +--- speech_tools.orig/config/systems/GentooLinux.mak.old 2013-11-24 01:49:44.000000000 +0200 ++++ speech_tools/config/systems/GentooLinux.mak 2013-11-24 13:04:14.327758435 +0200 +@@ -38,6 +38,7 @@ + ########################################################################### + + MANDIR=$(INSTALL_PREFIX)/share/man ++GENTOO_ALSA_LIBS=$(shell pkg-config --libs alsa) + GENTOO_CURSES_LIBS=$(shell pkg-config --libs ncurses) + # Gentoo does not use termcap +-OS_LIBS = $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl ++OS_LIBS = $(GENTOO_ALSA_LIBS) $(GENTOO_CURSES_LIBS) $(LDFLAGS) -ldl diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild deleted file mode 100644 index 1a78e868a5be..000000000000 --- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $ - -EAPI="2" - -inherit eutils flag-o-matic multilib toolchain-funcs - -MY_P=${P/speech-/speech_} -MY_P=${MY_P/_beta/-beta} - -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/1.96/${MY_P}.tar.gz - mirror://gentoo/${MY_P}-patches.tar.gz" - -LICENSE="FESTIVAL HPND BSD rc regexp-UofT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nas X" - -DEPEND="nas? ( media-libs/nas ) - X? ( x11-libs/libX11 - x11-libs/libXt ) - !=media-libs/alsa-lib-1.0.20-r1 !=sys-libs/ncurses-5.6-r2" - -DEPEND="${PDEPEND} - virtual/pkgconfig" - -RDEPEND=${PDEPEND} + >=sys-libs/ncurses-5.6-r2 +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" S="${WORKDIR}/speech_tools" @@ -42,6 +42,9 @@ src_prepare() { #WRT bug #309983 sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" "${S}"/config/systems/sparc_SunOS5.mak + + # Fix underlinking, bug #493204 + epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch } src_configure() { @@ -53,12 +56,12 @@ src_configure() { if ! use X; then sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak fi - econf || die + econf } src_compile() { emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" || die "Compile failed" + LDFLAGS="${LDFLAGS}" } src_install() { -- 2.26.2