[gentoo-commits] gentoo-x86 commit in app-accessibility/flite: ChangeLog flite-1.4-r1.ebuild

["Jeroen Roovers (jer)" <jer@gentoo.org>]

jer         12/02/22 21:26:03

  Modified:             ChangeLog flite-1.4-r1.ebuild
  Log:
  Add patch by Christopher Brannon to respect LDFLAGS (bug #334031). Fix -rpath directory (bug #405339). Remove static libraries in case LIBDIR is not /usr/lib/.
  
  (Portage version: 2.2.0_alpha88/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 app-accessibility/flite/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	28 Feb 2010 23:14:49 -0000	1.38
+++ ChangeLog	22 Feb 2012 21:26:03 -0000	1.39
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/flite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.38 2010/02/28 23:14:49 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.39 2012/02/22 21:26:03 jer Exp $
+
+  22 Feb 2012; Jeroen Roovers <jer@gentoo.org> flite-1.4-r1.ebuild,
+  +files/flite-1.4-ldflags.patch:
+  Add patch by Christopher Brannon to respect LDFLAGS (bug #334031). Fix -rpath
+  directory (bug #405339). Remove static libraries in case LIBDIR is not
+  /usr/lib/.
 
   28 Feb 2010; Jeroen Roovers <jer@gentoo.org> flite-1.3.ebuild:
   Segfaults on HPPA, keywording -hppa (bug #307241).



1.2                  app-accessibility/flite/flite-1.4-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild?r1=1.1&r2=1.2

Index: flite-1.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flite-1.4-r1.ebuild	1 Jan 2010 22:30:51 -0000	1.1
+++ flite-1.4-r1.ebuild	22 Feb 2012 21:26:03 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.1 2010/01/01 22:30:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.2 2012/02/22 21:26:03 jer Exp $
 
 EAPI="2"
 
@@ -30,6 +30,10 @@
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
 	epatch "${FILESDIR}"/${P}-respect-destdir.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i main/Makefile \
+		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
+		|| die
 }
 
 src_configure() {
@@ -49,7 +53,7 @@
 	emake DESTDIR="${D}" install || die "installation failed"
 	dodoc ACKNOWLEDGEMENTS README || die "Documentation installation failed"
 	if ! use static-libs; then
-		rm -rf "${D}"/usr/lib/*.a
+		rm -rf "${D}"/usr/lib*/*.a
 	fi
 }