port previous multilib-strict fix to Makefile.am instead of .in; bug 145293

Package-Manager: portage-2.1.1_rc1

3 files changed, 22 insertions, 20 deletions

diff --git a/net-wireless/libbtctl/ChangeLog b/net-wireless/libbtctl/ChangeLog
index e5bb3f3b5fa9..1e53a5ff1cc0 100644
--- a/net-wireless/libbtctl/ChangeLog
+++ b/net-wireless/libbtctl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/libbtctl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.26 2006/07/18 21:54:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.27 2006/08/29 12:50:54 blubb Exp $
+
+  29 Aug 2006; <blubb@gentoo.org> files/libbtctl-0.6.0-libdir.patch:
+  port previous multilib-strict fix to Makefile.am instead of .in; bug 145293
 
   18 Jul 2006; Michael Hanselmann <hansmi@gentoo.org>
   libbtctl-0.6.0-r1.ebuild:
diff --git a/net-wireless/libbtctl/Manifest b/net-wireless/libbtctl/Manifest
index 9287e771c892..8f8d09ec6d35 100644
--- a/net-wireless/libbtctl/Manifest
+++ b/net-wireless/libbtctl/Manifest
@@ -6,10 +6,10 @@ AUX libbtctl-0.6.0-aclocal_openobex.patch 2478 RMD160 156797f962780cf30889df2335
 MD5 d3fe396aae87eb4dc70db1b5441dc984 files/libbtctl-0.6.0-aclocal_openobex.patch 2478
 RMD160 156797f962780cf30889df2335575181cf468536 files/libbtctl-0.6.0-aclocal_openobex.patch 2478
 SHA256 cd891f422f7e6b950b638159e62037f56509f196abbc51dbeb3877a3c1f8e669 files/libbtctl-0.6.0-aclocal_openobex.patch 2478
-AUX libbtctl-0.6.0-libdir.patch 579 RMD160 eb486ffd09384b6161074a3ab14452763347ae77 SHA1 52e038f9f9c398eb4b2984a8f076830c4fee73b0 SHA256 2c880091f7eba1abae223fb3356714cc2f94179c690dd5e1aee0d2ce6559f960
-MD5 9a7c7103474fa10267eb4e0eb791db2d files/libbtctl-0.6.0-libdir.patch 579
-RMD160 eb486ffd09384b6161074a3ab14452763347ae77 files/libbtctl-0.6.0-libdir.patch 579
-SHA256 2c880091f7eba1abae223fb3356714cc2f94179c690dd5e1aee0d2ce6559f960 files/libbtctl-0.6.0-libdir.patch 579
+AUX libbtctl-0.6.0-libdir.patch 372 RMD160 e3c16ed5878c8951f2a5bee876a603451643b551 SHA1 30e3d399193d8e95c89fcab50de2a07ef6bf2d80 SHA256 49ae41e2f699aeb28c994c19a524382eaf3f1c4b03bb4b21f36fdffacaa7bacc
+MD5 0c50d1225aa778b3bfff88d2d0353d39 files/libbtctl-0.6.0-libdir.patch 372
+RMD160 e3c16ed5878c8951f2a5bee876a603451643b551 files/libbtctl-0.6.0-libdir.patch 372
+SHA256 49ae41e2f699aeb28c994c19a524382eaf3f1c4b03bb4b21f36fdffacaa7bacc files/libbtctl-0.6.0-libdir.patch 372
 DIST libbtctl-0.3.tar.gz 237886 RMD160 f3109c778c8cfae1615677a687aaa7346185c7cc SHA1 dcab7b96958509f8f629893f2d6072c099be1778 SHA256 05466a658fbe30586af17bb53aa1594416b4af6d40a09e0f5ef7100aef006890
 DIST libbtctl-0.4.1.tar.gz 416947 RMD160 eaeae7ebeeec35323dc86f224dd3a64c0dd90f46 SHA1 5e4f5318199ff778bd294e0248dc0a9637f70687 SHA256 56b103a9692a7388c86e7f19a9991f464a4d55af4ed8f732b523ab2596c393a2
 DIST libbtctl-0.5.0.tar.bz2 321409 RMD160 9193a3c37308a3780bf150b1dc0e1e80e2ead6ec SHA1 63ebf02a3dc8831882d1654428393655ab4029cc SHA256 0706d77013e36b14e550c3b42cc6a1c22e5f6ffb0c6d1c163cff179df5d02560
@@ -38,10 +38,10 @@ EBUILD libbtctl-0.6.0.ebuild 1118 RMD160 71f2f0f0cdafbe5fb37fd5c8b85a63e7603584b
 MD5 63e663db1b2d215f43454436f3365d55 libbtctl-0.6.0.ebuild 1118
 RMD160 71f2f0f0cdafbe5fb37fd5c8b85a63e7603584bb libbtctl-0.6.0.ebuild 1118
 SHA256 80805655b2eb5d7b369d9071e034d96df65d9489424f843f49869e664982fd0b libbtctl-0.6.0.ebuild 1118
-MISC ChangeLog 4063 RMD160 da3d8378f158e985e9d15f8935bd00b8e3cd3705 SHA1 45bd35850f2f2ba8fbc02fba29e6f386adf1799e SHA256 63030c512b3da2b6d3632d4d7c3fc05bbe2a58b51b6eb2d1f94dc1fb87ed6d47
-MD5 90fcbf3a843fe4a0d5277220561bf4c9 ChangeLog 4063
-RMD160 da3d8378f158e985e9d15f8935bd00b8e3cd3705 ChangeLog 4063
-SHA256 63030c512b3da2b6d3632d4d7c3fc05bbe2a58b51b6eb2d1f94dc1fb87ed6d47 ChangeLog 4063
+MISC ChangeLog 4210 RMD160 fddd3c11b3f8a23fcb6c810809a41c2daaaa413c SHA1 da5ab8ce7492bf90fc31a2c08689dfe9f40eb101 SHA256 fac4de1e063e6f3c03863e008d193ded86c77c8af62b5dbd2c8f3ed4d3fb04a7
+MD5 bee5323e21543f694e83bb072ef8c30e ChangeLog 4210
+RMD160 fddd3c11b3f8a23fcb6c810809a41c2daaaa413c ChangeLog 4210
+SHA256 fac4de1e063e6f3c03863e008d193ded86c77c8af62b5dbd2c8f3ed4d3fb04a7 ChangeLog 4210
 MISC metadata.xml 254 RMD160 c42ccca4af4411270b321cd3cc5266b765e182ee SHA1 d8f8ae453bc0886fe06f25cca19d409dcae4f879 SHA256 4c4f1c26f05f433f3231f8fe529a049da897b80aaca3ee4c1bfa30d99a527f1d
 MD5 7a66fef4deb08f29b7cf0de1c2e3a4de metadata.xml 254
 RMD160 c42ccca4af4411270b321cd3cc5266b765e182ee metadata.xml 254
diff --git a/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
index 78cbfbc42b18..1ff097842f52 100644
--- a/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
+++ b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
@@ -1,12 +1,11 @@
-diff -Nru libbtctl-0.6.0.orig/src/Makefile.in libbtctl-0.6.0/src/Makefile.in
---- libbtctl-0.6.0.orig/src/Makefile.in	2005-11-22 00:02:52.000000000 +0200
-+++ libbtctl-0.6.0/src/Makefile.in	2006-04-22 12:11:12.586318250 +0300
-@@ -239,7 +239,7 @@
- btctl.defs btctl.override
- 
+--- src/Makefile.am     2005-08-16 21:18:14.000000000 +0200
++++ src/Makefile.am     2006-08-29 14:45:51.000000000 +0200
+@@ -16,7 +16,7 @@
+
  lib_LTLIBRARIES = libbtctl.la
--@HAVE_PYTHON_TRUE@pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/
-+@HAVE_PYTHON_TRUE@pydir = $(libdir)/python$(PYTHON_VERSION)/site-packages/
- @HAVE_PYTHON_FALSE@pydir = 
- @HAVE_PYTHON_TRUE@py_LTLIBRARIES = btctl.la
- @HAVE_PYTHON_FALSE@py_LTLIBRARIES = 
+ if HAVE_PYTHON
+-pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/
++pydir = $(PYTHON_PREFIX)/$(libdir)/python$(PYTHON_VERSION)/site-packages/
+ py_LTLIBRARIES = btctl.la
+ else
+ pydir =