pacho 15/01/07 10:06:47
Modified: speech-tools-2.1-r2.ebuild ChangeLog
Removed: speech-tools-1.2.96_beta-r2.ebuild
speech-tools-2.0.95_beta.ebuild
speech-tools-1.2.96_beta.ebuild
Log:
Fix underlinking, bug #493204 by Jaakko Perttilä; drop old
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.5 app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild?r1=1.4&r2=1.5
Index: speech-tools-2.1-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- speech-tools-2.1-r2.ebuild 7 Aug 2013 22:46:11 -0000 1.4
+++ speech-tools-2.1-r2.ebuild 7 Jan 2015 10:06:47 -0000 1.5
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v
1.4 2013/08/07 22:46:11 neurogeek Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v
1.5 2015/01/07 10:06:47 pacho Exp $
-EAPI="4"
+EAPI="5"
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -19,18 +19,18 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd"
IUSE="nas X"
-PDEPEND="nas? ( media-libs/nas )
+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"
-
-DEPEND="${PDEPEND}
- virtual/pkgconfig"
-
-RDEPEND=${PDEPEND}
+ >=sys-libs/ncurses-5.6-r2
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
S="${WORKDIR}/speech_tools"
@@ -42,6 +42,9 @@
#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 @@
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() {
1.86 app-accessibility/speech-tools/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?rev=1.86&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?rev=1.86&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/speech-tools/ChangeLog?r1=1.85&r2=1.86
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog 7 Aug 2013 22:46:11 -0000 1.85
+++ ChangeLog 7 Jan 2015 10:06:47 -0000 1.86
@@ -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 <[email protected]>
+ +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; <[email protected]> speech-tools-2.1-r2.ebuild:
Bumped rev on patchset and added a patch to fix ncurses[tinfo]. Closes
