vapier 14/04/07 18:35:50 Modified: brltty-5.0-r2.ebuild brltty-4.5-r3.ebuild ChangeLog Log: Do not use `pkg-config` all the time. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 app-accessibility/brltty/brltty-5.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild?r1=1.1&r2=1.2 Index: brltty-5.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- brltty-5.0-r2.ebuild 22 Feb 2014 19:52:12 -0000 1.1 +++ brltty-5.0-r2.ebuild 7 Apr 2014 18:35:50 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v 1.1 2014/02/22 19:52:12 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v 1.2 2014/04/07 18:35:50 vapier Exp $ EAPI=5 @@ -48,6 +48,12 @@ java-pkg-opt-2_src_prepare + # The code runs `pkg-config` directly instead of locating a suitable + # pkg-config wrapper (or respecting $PKG_CONFIG). + sed -i \ + -e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \ + aclocal.m4 configure.ac || die + # We run eautoconf instead of using eautoreconf because brltty uses # a custom build system that uses autoconf without the rest of the # autotools. @@ -55,7 +61,7 @@ } src_configure() { - tc-export AR LD + tc-export AR LD PKG_CONFIG # override prefix in order to install into / # braille terminal needs to be available as soon in the boot process as # possible 1.9 app-accessibility/brltty/brltty-4.5-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild?r1=1.8&r2=1.9 Index: brltty-4.5-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- brltty-4.5-r3.ebuild 19 Jan 2014 10:17:26 -0000 1.8 +++ brltty-4.5-r3.ebuild 7 Apr 2014 18:35:50 -0000 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.8 2014/01/19 10:17:26 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.9 2014/04/07 18:35:50 vapier Exp $ EAPI=5 @@ -50,6 +50,12 @@ java-pkg-opt-2_src_prepare + # The code runs `pkg-config` directly instead of locating a suitable + # pkg-config wrapper (or respecting $PKG_CONFIG). + sed -i \ + -e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \ + aclocal.m4 configure.ac || die + # We run eautoconf instead of using eautoreconf because brltty uses # a custom build system that uses autoconf without the rest of the # autotools. @@ -57,7 +63,7 @@ } src_configure() { - tc-export AR LD + tc-export AR LD PKG_CONFIG # override prefix in order to install into / # braille terminal needs to be available as soon in the boot process as # possible 1.149 app-accessibility/brltty/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.149&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.149&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?r1=1.148&r2=1.149 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- ChangeLog 22 Feb 2014 20:04:25 -0000 1.148 +++ ChangeLog 7 Apr 2014 18:35:50 -0000 1.149 @@ -1,6 +1,10 @@ # ChangeLog for app-accessibility/brltty # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.148 2014/02/22 20:04:25 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.149 2014/04/07 18:35:50 vapier Exp $ + + 07 Apr 2014; Mike Frysinger <[email protected]> brltty-4.5-r3.ebuild, + brltty-5.0-r2.ebuild: + Do not use `pkg-config` all the time. 22 Feb 2014; Christopher Brannon <[email protected]> -brltty-4.2.ebuild, -brltty-4.2-r1.ebuild, -files/brltty-4.2-fix-a2.patch,
