add patch to respect ldflags for bug #338161, thanks to Chris Brannon.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 84 insertions, 6 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index b8831f0f1664..f58a73d91f3b 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.108 2011/03/24 14:13:17 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.109 2011/03/28 21:24:31 williamh Exp $
+
+  28 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild,
+  +files/brltty-4.2-fix-ldflags.patch:
+  add patch to respect ldflags for bug #338161, thanks to Chris Brannon.
 
   24 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild,
   +files/brltty-4.2-fix-ocaml-install.patch:
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 4f6caa057bbf..21487a90d11c 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX brltty-4.2-fix-ldflags.patch 2404 RMD160 64b5d89e0aab2c90895f055d54410b8081097473 SHA1 8afc9434f125a1665e7ea5388a911750274dc927 SHA256 5ebc7140937b3f2e43a8c7cd20a8ca5269d2874e150fcb65336d42b8f92e369b
 AUX brltty-4.2-fix-ocaml-install.patch 842 RMD160 72835d59022dc0fb2e865d7dab21a8b8f6427e40 SHA1 598e78ca4573eb75c4a8092afde12bf6494efb65 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284
 AUX brltty-4.2-glibc-212.patch 287 RMD160 7d12d6e7b0311d9e205b5619d08cf27095322828 SHA1 c3ad4b457acad0808b8aa68ad1a05ad6f8a9247f SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516
 AUX brltty.rc 530 RMD160 60f5f91fbdba71954685330b9e2c4db1e2c1090f SHA1 5e4ddda21ef8d3eb04199f262006a589e8d08c2f SHA256 c6899cab19f94feb83030c9df4541a025891869d72009bac944b3cd3535a24c2
 DIST brltty-4.1.tar.gz 2169303 RMD160 a46c0e42dd3504b6b3ef24309042d2915dee770a SHA1 3e81746cb1e455ca5116d11fcce1e158371146df SHA256 29d0bd271ed3b8ec92c378bdf90489936c26d375515aa326f74bd515dfcb36a4
 DIST brltty-4.2.tar.gz 2234191 RMD160 f099f92c8e44f1cedf20a70e8b874796bae9daab SHA1 d25802d08599b75841e7bb2f29bc88737f2992d2 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2
 EBUILD brltty-4.1.ebuild 3594 RMD160 0e6b376b8d516c81478fe75c42cb922b9e6caad2 SHA1 6cd75f7ca050e3edca3a39b224cc0a7d226b0862 SHA256 8a4798cd09531abf24a8ff2677e9b9a94338c1ab297a839bf2b53f468f8500f9
-EBUILD brltty-4.2.ebuild 3742 RMD160 ccfb3191ef76218947dbf1c1e4876b373a62b5d5 SHA1 95f5e699af306b9dbf7ce4a4030b18b9c4507684 SHA256 6e2a22e9b9c57a4f81dfd27a54f68ca292d959d46d177e8e9c3e8336d5537d67
-MISC ChangeLog 13196 RMD160 6de36c17fb1b21f2362cc95588c651dfa3b7b465 SHA1 afd0375691c9926d338cca64925ba7bb5572dc01 SHA256 0140f824f0f35762ac41cf8bc60ee395ef5a95e4dae1c8bef5c63db5d287f3cc
+EBUILD brltty-4.2.ebuild 3813 RMD160 7e99eeaca682d8e0e64352c721fa86d5c338c828 SHA1 b7777d708c27c45888440d72e87ec414cd744000 SHA256 514a54e46095c793b822eb03031b7e4ecb4ffd74263788fe519360852b9555f7
+MISC ChangeLog 13379 RMD160 3018b9d4204c35c0ad650403aa8a750c1b40f087 SHA1 26656c5636b865457211d22fa0c571a4e90d7e57 SHA256 e14a5066914d87a76c17d8a75e3553e600e6731464c280a14ee6a9780575d647
 MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Q/KEACgkQblQW9DDEZTgixACfWxcOUd/O1QfAR1abpJg0sY0s
+rCcAoKh/FQ5KsFI/2BcZAURWa/25WZVO
+=c1xM
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index 152d2abf363e..ab82c2a35002 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.3 2011/03/24 14:13:17 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.4 2011/03/28 21:24:31 williamh Exp $
 
 EAPI="2"
 FINDLIB_USE="ocaml"
 
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	autotools
 
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
 HOMEPAGE="http://mielke.cc/brltty/"
@@ -33,10 +34,12 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 	${COMMON_DEP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-212.patch
+	epatch "${FILESDIR}"/${P}-fix-ldflags.patch
 	epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch
+	epatch "${FILESDIR}"/${P}-glibc-212.patch
 
 	java-pkg-opt-2_src_prepare
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch
new file mode 100644
index 000000000000..c3b73ca14aed
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch
@@ -0,0 +1,60 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 5474)
++++ configure.ac	(working copy)
+@@ -377,7 +377,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|eabi*)
+-      brltty_mkmod_ld_make="-shared"
++      brltty_mkmod_ld_make="-shared ${LDFLAGS}"
+       ;;
+    solaris*)
+       brltty_mkmod_ld_make="-G"
+@@ -404,7 +404,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
++   brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
+ else
+    brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
+ fi])
+@@ -414,7 +414,7 @@
+ case "${host_os}"
+ in
+    linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|eabi*)
+-      brltty_mklib_ld_make="-shared"
++      brltty_mklib_ld_make="-shared ${LDFLAGS}"
+       brltty_mklib_ld_options="-soname"
+       ;;
+    solaris*)
+@@ -449,7 +449,7 @@
+ esac
+ if test "${GCC}" = "yes"
+ then
+-   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
++   brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ else
+    brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
+ fi])
+Index: Bindings/Caml/Makefile.in
+===================================================================
+--- Bindings/Caml/Makefile.in	(revision 5474)
++++ Bindings/Caml/Makefile.in	(working copy)
+@@ -55,13 +55,13 @@
+ all : $(OCAML_FILES)
+ 
+ $(OCAML_CLIBS) : brlapi_stubs.$O
+-	$(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ 
+ $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
+ 	$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
+ 
+ $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
+-	$(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
++	$(OCAMLMKLIB) -ldopt "$(LDFLAGS)"  $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ 
+ brlapi.cmi: brlapi.mli
+ 	$(OCAMLC) -o $@ -c brlapi.mli