This commit fixes bug #142934.

Package-Manager: portage-2.1.2_pre1

5 files changed, 60 insertions, 24 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index b30862be1504..365f7f97ac07 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.41 2006/02/02 02:08:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.42 2006/09/20 13:02:45 williamh Exp $
+
+  20 Sep 2006; William Hubbs <williamh@gentoo.org>
+  +files/brltty-3.7.2-nostrip.patch, brltty-3.7.2.ebuild:
+  Resolved QA issues in Bug #142934.
+  Thanks, Solar, for the patches.
 
   02 Feb 2006; William Hubbs <williamh@gentoo.org> brltty-3.6.ebuild,
   brltty-3.6.1-r1.ebuild:
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index a90e3d6a71a1..0c6fcd692c31 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,21 +1,35 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b25210b3a0a1c30234ed7eed332835ec ChangeLog 4935
-RMD160 18299c5882e57f9d33af32cdbbc05516e7f557ab ChangeLog 4935
-SHA256 35b6832b1aab6d00af1777fb75f7d2adb277b67b73caee439add7a8eb5deb298 ChangeLog 4935
+AUX brltty-3.7.2-nostrip.patch 324 RMD160 234256bff56637ae609b0cfd06eb593c761fb7c0 SHA1 3e3653f3dc48ab7a149149670c4f8694fa5031d8 SHA256 3afdb8a1506abd94e1770271fe2b57d2027774041e1788e862a68fb4faeae428
+MD5 ed33f06374ffd30ac45d765200cb3f53 files/brltty-3.7.2-nostrip.patch 324
+RMD160 234256bff56637ae609b0cfd06eb593c761fb7c0 files/brltty-3.7.2-nostrip.patch 324
+SHA256 3afdb8a1506abd94e1770271fe2b57d2027774041e1788e862a68fb4faeae428 files/brltty-3.7.2-nostrip.patch 324
+DIST brltty-3.5.tar.gz 968152
+DIST brltty-3.6.1.tar.gz 1072871
+DIST brltty-3.6.tar.gz 1060457
+DIST brltty-3.7.2.tar.gz 1193139 RMD160 30b9df4243ce7f0140e1bdcdf53b6bacea135f88 SHA1 0aa8a51a03687acddadbd422f5dff688a5a89b97 SHA256 1f39a08947833299c6ca6c6dbbc84f6b27a375bb7efe62cf9eebd8d5cdaa6934
+EBUILD brltty-3.5.ebuild 669 RMD160 8be9ebe4cee784a6c4eefb08802e32b8bdfc29f0 SHA1 247e7281f5aa96aa40f5a91f04e4533f05ae0cdd SHA256 04a9b8bb74e90d5c140c0713f289ed4ac2f575f7d9ae48ab94557d1e9180d049
 MD5 b69eb608789e94959869c6fa6a409407 brltty-3.5.ebuild 669
 RMD160 8be9ebe4cee784a6c4eefb08802e32b8bdfc29f0 brltty-3.5.ebuild 669
 SHA256 04a9b8bb74e90d5c140c0713f289ed4ac2f575f7d9ae48ab94557d1e9180d049 brltty-3.5.ebuild 669
+EBUILD brltty-3.6.1-r1.ebuild 926 RMD160 12ebc5a31a9de6ba58de477053612c564db1158b SHA1 f31232f3e928d779f6a3b372b6a95ddae8389ab0 SHA256 01f493bc0cac98424cdff9be29044300bdbb6485941729932aaed73254257220
 MD5 5bf4ee6fcb7993e2d0bbb9dbaa1c48a6 brltty-3.6.1-r1.ebuild 926
 RMD160 12ebc5a31a9de6ba58de477053612c564db1158b brltty-3.6.1-r1.ebuild 926
 SHA256 01f493bc0cac98424cdff9be29044300bdbb6485941729932aaed73254257220 brltty-3.6.1-r1.ebuild 926
+EBUILD brltty-3.6.ebuild 883 RMD160 4ed8107ddd8b3014cfe017de13ac77a9ca3eb043 SHA1 abc985ea26336d2985612b41b88680bd8fa0eb55 SHA256 90f7ca54b3961f8e1053f20a526eba59191f917e4d17f6471f705119a997f064
 MD5 5ce1e793de71daf22e755f423a8213d0 brltty-3.6.ebuild 883
 RMD160 4ed8107ddd8b3014cfe017de13ac77a9ca3eb043 brltty-3.6.ebuild 883
 SHA256 90f7ca54b3961f8e1053f20a526eba59191f917e4d17f6471f705119a997f064 brltty-3.6.ebuild 883
-MD5 0ed0793b0c172052cf51feb3536fa540 brltty-3.7.2.ebuild 1098
-RMD160 e06f8cdf92d7a5f8744023985caf2b34e9762b77 brltty-3.7.2.ebuild 1098
-SHA256 6f5b56f6fdc7ee74fa10f613f1322266a426d61cf80844eac41eee63b53a2af2 brltty-3.7.2.ebuild 1098
+EBUILD brltty-3.7.2.ebuild 1411 RMD160 1ac07668f48dc1712877f1e015625f8d8eb929d0 SHA1 8f0b1d6f603aaf965ff6250ab7f726222cdcd3f5 SHA256 ee48faca5387e2f676a9f367eff0ca61dec2af61ea48a9aa65abdf594256887e
+MD5 e18f00f75f352e5bb12f1c48f05358e7 brltty-3.7.2.ebuild 1411
+RMD160 1ac07668f48dc1712877f1e015625f8d8eb929d0 brltty-3.7.2.ebuild 1411
+SHA256 ee48faca5387e2f676a9f367eff0ca61dec2af61ea48a9aa65abdf594256887e brltty-3.7.2.ebuild 1411
+MISC ChangeLog 5116 RMD160 042b7ed4015318958a1091b86688873a2df2ae5a SHA1 2e9c299a67ecda2085921125d1685e94c52b0054 SHA256 6b906dc54ba490d702e35adaa149f76658e10b47745d4b7dcad1291b0ca7017e
+MD5 a8df4deb2e95f09d00831bc3ca043431 ChangeLog 5116
+RMD160 042b7ed4015318958a1091b86688873a2df2ae5a ChangeLog 5116
+SHA256 6b906dc54ba490d702e35adaa149f76658e10b47745d4b7dcad1291b0ca7017e ChangeLog 5116
+MISC metadata.xml 1369 RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 SHA1 551fae162278c8600c1a4547184e17af9eca5bb4 SHA256 263e4d610a1ed22f4f7176a3759194490e4a1b9d02f339c149c4a462524a63be
+MD5 e385ac1a0787152b5b9dfb9c2fa24681 metadata.xml 1369
+RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 metadata.xml 1369
+SHA256 263e4d610a1ed22f4f7176a3759194490e4a1b9d02f339c149c4a462524a63be metadata.xml 1369
 MD5 7d93e814d84d01d5a05daab69875e2f9 files/digest-brltty-3.5 62
 RMD160 35649a1318428d861d25c5a175bcf69515a1dee2 files/digest-brltty-3.5 62
 SHA256 f0d9e07ccb23455f821bd649624fdce4c9208f33e8e15803eb21b32670ca2f69 files/digest-brltty-3.5 62
@@ -25,16 +39,6 @@ SHA256 aaf9f3c9bd8bc3e80a6458ebe0c68b5d25d2cf11b48152910104958fbede1b35 files/di
 MD5 af551ceff5cb2d450b638b0116e2898d files/digest-brltty-3.6.1-r1 65
 RMD160 ff9a80a841a2e71eeecd8a288be06b7acce64171 files/digest-brltty-3.6.1-r1 65
 SHA256 efaa0975fd6026f7726a9f4398d88b67eee73e51bb83cc76283342b767457a12 files/digest-brltty-3.6.1-r1 65
-MD5 3f696c04f5a04d1ee32aeeb99853f2bf files/digest-brltty-3.7.2 65
-RMD160 b77e9a92a94104a8f2b2d1f332e3c9d1a518d3d6 files/digest-brltty-3.7.2 65
-SHA256 9ada2237cde64c59146edbd0060838ebf6212248de4c1dda100cf9a3088ecb78 files/digest-brltty-3.7.2 65
-MD5 e385ac1a0787152b5b9dfb9c2fa24681 metadata.xml 1369
-RMD160 b84aea78cca99f745caeea7cc3a96bca3d594fc8 metadata.xml 1369
-SHA256 263e4d610a1ed22f4f7176a3759194490e4a1b9d02f339c149c4a462524a63be metadata.xml 1369
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5OenJrHF4yAQTrARAtU7AKCw0JLts0aIXAxwuguTZhkJBcaEEQCgxD0V
-RXPIoSSNrZ6OqDQG7m5QtfE=
-=7gVa
------END PGP SIGNATURE-----
+MD5 a2dd677533a62607e5edbdc7a3a1b839 files/digest-brltty-3.7.2 241
+RMD160 705abfcfd6f1056f76ced9e6aa55ca3cff6273ad files/digest-brltty-3.7.2 241
+SHA256 61aa01f9fea03f8bae35c16e7898ec5bb6ea4e1481b8c1d6f95c17b3458899a5 files/digest-brltty-3.7.2 241
diff --git a/app-accessibility/brltty/brltty-3.7.2.ebuild b/app-accessibility/brltty/brltty-3.7.2.ebuild
index 25a4d74d0699..885d12e55923 100644
--- a/app-accessibility/brltty/brltty-3.7.2.ebuild
+++ b/app-accessibility/brltty/brltty-3.7.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.7.2.ebuild,v 1.1 2006/01/26 05:05:38 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.7.2.ebuild,v 1.2 2006/09/20 13:02:45 williamh Exp $
+
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
 HOMEPAGE="http://mielke.cc/brltty/"
@@ -17,6 +19,13 @@ RDEPEND="virtual/libc
 DEPEND="${RDEPEND}
 	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
 
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-3.7.2-nostrip.patch
+}
+
 src_compile() {
 	econf `use_enable gpm` \
 		`use_with X x` \
@@ -28,6 +37,11 @@ src_compile() {
 
 src_install() {
 	make INSTALL_ROOT=${D} install || die
+	TMPDIR=../../Programs scanelf -RBXr ${D} -o /dev/null
+	libdir="$(get_libdir)"
+	mkdir -p ${D}/usr/${libdir}/
+	mv ${D}/${libdir}/*.a ${D}/usr/${libdir}/
+	gen_usr_ldscript libbrlapi.so
 	cd Documents
 	rm *.made
 	dodoc ChangeLog README* Manual.* TODO brltty.conf
diff --git a/app-accessibility/brltty/files/brltty-3.7.2-nostrip.patch b/app-accessibility/brltty/files/brltty-3.7.2-nostrip.patch
new file mode 100644
index 000000000000..4b4c47402ef3
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-3.7.2-nostrip.patch
@@ -0,0 +1,11 @@
+--- config.mk.in	2006-09-17 23:45:21.000000000 +0000
++++ config.mk.in	2006-09-17 23:45:40.000000000 +0000
+@@ -89,7 +89,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_SCRIPT = $(INSTALL)
+-INSTALL_PROGRAM = $(INSTALL_SCRIPT) -s
++INSTALL_PROGRAM = $(INSTALL_SCRIPT)
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_DIRECTORY = $(INSTALL) -d
+ 
diff --git a/app-accessibility/brltty/files/digest-brltty-3.7.2 b/app-accessibility/brltty/files/digest-brltty-3.7.2
index 11bb076d8832..84f84bf77bcb 100644
--- a/app-accessibility/brltty/files/digest-brltty-3.7.2
+++ b/app-accessibility/brltty/files/digest-brltty-3.7.2
@@ -1 +1,3 @@
 MD5 0ae3da8252783a4d20e1ed4e55cede5b brltty-3.7.2.tar.gz 1193139
+RMD160 30b9df4243ce7f0140e1bdcdf53b6bacea135f88 brltty-3.7.2.tar.gz 1193139
+SHA256 1f39a08947833299c6ca6c6dbbc84f6b27a375bb7efe62cf9eebd8d5cdaa6934 brltty-3.7.2.tar.gz 1193139