make it adhere multilib-strict; bug 103613

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-wireless/libbtctl/ChangeLog b/net-wireless/libbtctl/ChangeLog
index fea28a9e74ada2a8e82bfa70e481090b5a8903c3..6ef771381d0de4e204d2a98bf1ad7db89f2698eb 100644 (file)
--- a/net-wireless/libbtctl/ChangeLog
+++ b/net-wireless/libbtctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/libbtctl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.17 2005/07/05 23:01:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.18 2005/10/05 12:01:01 blubb Exp $
+
+  05 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  +files/libbtctl-0.4.1-libdir.patch, libbtctl-0.4.1-r1.ebuild:
+  make it adhere multilib-strict; bug 103613
 
   05 Jul 2005; Sven Wegener <swegener@gentoo.org> libbtctl-0.4.1.ebuild,
   libbtctl-0.4.1-r1.ebuild:

diff --git a/net-wireless/libbtctl/Manifest b/net-wireless/libbtctl/Manifest
index ebeb9eef53ae89821fa36762911176a126105111..478d704efc7cb7ba737daaa6ec3b1a124f99c69d 100644 (file)
--- a/net-wireless/libbtctl/Manifest
+++ b/net-wireless/libbtctl/Manifest
@@ -1,9 +1,10 @@
-MD5 c517cc9812a8b9ee6ecdd6feabaad405 ChangeLog 2723
+MD5 69c531c89dc47e3ddbfa5dbcbad3cbe6 ChangeLog 2879
 MD5 b6d146ee15ee1b84bb14b9564b072000 libbtctl-0.3.ebuild 875
-MD5 b066f31c87f259a29f4a351d2103877f libbtctl-0.4.1-r1.ebuild 1043
+MD5 804f2e4b638b0a3048f7134c2a9cc39c libbtctl-0.4.1-r1.ebuild 1134
 MD5 081c4714ae82530b4d88e9f2c672e10e libbtctl-0.4.1.ebuild 1250
 MD5 7a66fef4deb08f29b7cf0de1c2e3a4de metadata.xml 254
 MD5 6fd25ef01add3d4f6b205a586233e783 files/digest-libbtctl-0.3 64
 MD5 89c026311c1c9a92f14e59fe40698804 files/digest-libbtctl-0.4.1 66
 MD5 89c026311c1c9a92f14e59fe40698804 files/digest-libbtctl-0.4.1-r1 66
 MD5 2f18fdc85cff32fc3b1eb5dcf7376b3a files/libbtctl-0.4.1-enable_python.patch 1292
+MD5 8b20bd211db6ab172f04eb2e0a682bf8 files/libbtctl-0.4.1-libdir.patch 467

diff --git a/net-wireless/libbtctl/files/libbtctl-0.4.1-libdir.patch b/net-wireless/libbtctl/files/libbtctl-0.4.1-libdir.patch
new file mode 100644 (file)
index 0000000..5116fb3
--- /dev/null
+++ b/net-wireless/libbtctl/files/libbtctl-0.4.1-libdir.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in    2005-10-05 13:46:36.000000000 +0200
++++ src/Makefile.in    2005-10-05 13:46:50.000000000 +0200
+@@ -234,7 +234,7 @@
+ btctl.defs btctl.override
+ 
+ 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 = 

diff --git a/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild b/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild
index d24664302e4ea4f3b7b5a69e41489e15e6c3d31c..91438c40a525a4bfb328730029cc02421e5a6849 100644 (file)
--- a/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild
+++ b/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild,v 1.4 2005/07/05 23:01:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/libbtctl-0.4.1-r1.ebuild,v 1.5 2005/10/05 12:01:01 blubb Exp $
 
-inherit gnome2 mono
+inherit gnome2 mono multilib eutils
 
 DESCRIPTION="A GObject wrapper for Bluetooth functionality"
 HOMEPAGE="http://usefulinc.com/software/gnome-bluetooth/"
@@ -30,6 +30,12 @@ MAKEOPTS="${MAKEOPTS} -j1"
 DOCS="README NEWS ChangeLog AUTHORS COPYING"
 USE_DESTDIR="yes"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-libdir.patch
+}
+
 src_compile() {
        use sparc || G2CONF="`use_enable mono`"
        gnome2_src_configure