summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2006-09-23 14:33:44 +0000
committerAlastair Tse <liquidx@gentoo.org>2006-09-23 14:33:44 +0000
commite85e67ace693ae80fe9ffa35713d7c9dcc65d491 (patch)
tree9371e3aae4c16b6010c0ba15722d4f886a2f32d7 /net-wireless
parentVersion bump. (diff)
downloadgentoo-2-e85e67ace693ae80fe9ffa35713d7c9dcc65d491.tar.gz
gentoo-2-e85e67ace693ae80fe9ffa35713d7c9dcc65d491.tar.bz2
gentoo-2-e85e67ace693ae80fe9ffa35713d7c9dcc65d491.zip
fix bad python libdir patch (#148636). cleanup old ebuilds
(Portage version: 2.1.1)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/libbtctl/ChangeLog8
-rw-r--r--net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch2
-rw-r--r--net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild5
3 files changed, 11 insertions, 4 deletions
diff --git a/net-wireless/libbtctl/ChangeLog b/net-wireless/libbtctl/ChangeLog
index 1e53a5ff1cc0..2b1c2a05baff 100644
--- a/net-wireless/libbtctl/ChangeLog
+++ b/net-wireless/libbtctl/ChangeLog
@@ -1,6 +1,12 @@
# 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.27 2006/08/29 12:50:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.28 2006/09/23 14:33:44 liquidx Exp $
+
+ 23 Sep 2006; Alastair Tse <liquidx@gentoo.org>
+ files/libbtctl-0.6.0-libdir.patch, -libbtctl-0.3.ebuild,
+ -libbtctl-0.4.1-r1.ebuild, -libbtctl-0.6.0.ebuild,
+ libbtctl-0.6.0-r1.ebuild:
+ fix bad python libdir patch (#148636). cleanup old ebuilds
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
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 1ff097842f52..7a8eb85d8e2c 100644
--- a/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
+++ b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
@@ -5,7 +5,7 @@
lib_LTLIBRARIES = libbtctl.la
if HAVE_PYTHON
-pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/
-+pydir = $(PYTHON_PREFIX)/$(libdir)/python$(PYTHON_VERSION)/site-packages/
++pydir = $(PYTHON_PREFIX)/@@GENTOO_LIBDIR@@/python$(PYTHON_VERSION)/site-packages/
py_LTLIBRARIES = btctl.la
else
pydir =
diff --git a/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild b/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild
index 77cea260723c..3267a0ec6acb 100644
--- a/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild
+++ b/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild,v 1.4 2006/07/18 21:54:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild,v 1.5 2006/09/23 14:33:44 liquidx Exp $
-inherit gnome2 mono multilib eutils autotools
+inherit gnome2 eutils autotools multilib mono
DESCRIPTION="A GObject wrapper for Bluetooth functionality"
HOMEPAGE="http://usefulinc.com/software/gnome-bluetooth/"
@@ -41,6 +41,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-libdir.patch"
epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+ sed -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):" -i src/Makefile.am
eautoreconf
}