Fix bug 108880 and 113460; thanks to Octavio Ruiz for providing patches

(Portage version: 2.1_pre4-r1)

3 files changed, 79 insertions, 5 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 0e739dfe3dbe..8365957b2461 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnome-bluetooth
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.21 2005/12/22 01:06:59 allanonjl Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.22 2006/02/01 11:51:44 blubb Exp $
+
+  01 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +files/gnome-bluetooth-0.6.0-libdir.patch, gnome-bluetooth-0.6.0.ebuild:
+  Fix bug 108880 and 113460; thanks to Octavio Ruiz for providing patches
 
   22 Dec 2005; John N. Laliberte <allanonjl@gentoo.org> metadata.xml:
   remove gnome from metadata
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.6.0-libdir.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.6.0-libdir.patch
new file mode 100644
index 000000000000..65a1054073e6
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-0.6.0-libdir.patch
@@ -0,0 +1,67 @@
+diff -ur gnome-bluetooth-0.6.0.orig/acinclude.m4 gnome-bluetooth-0.6.0/acinclude.m4
+--- gnome-bluetooth-0.6.0.orig/acinclude.m4     2006-01-24 01:45:57.000000000 -0600
++++ gnome-bluetooth-0.6.0/acinclude.m4  2006-01-24 01:47:15.000000000 -0600
+@@ -103,7 +103,7 @@
+   dnl then the old $(pythondir) was pretty useless.
+
+   AC_SUBST(pythondir)
+-  pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
++  pythondir=$libdir"/python"$PYTHON_VERSION/site-package
+
+   dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+   dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+@@ -117,7 +117,7 @@
+   dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
+
+   AC_SUBST(pyexecdir)
+-  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
++  pyexecdir=$libdir"/python"$PYTHON_VERSION/site-packages
+
+   dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+   dnl   Maybe this should be put in python.am?
+diff -ur gnome-bluetooth-0.6.0.orig/aclocal.m4 gnome-bluetooth-0.6.0/aclocal.m4
+--- gnome-bluetooth-0.6.0.orig/aclocal.m4       2006-01-24 01:45:57.000000000 -0600
++++ gnome-bluetooth-0.6.0/aclocal.m4    2006-01-24 01:58:45.000000000 -0600
+@@ -110,7 +110,7 @@
+   dnl then the old $(pythondir) was pretty useless.
+
+   AC_SUBST(pythondir)
+-  pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
++  pythondir=$libdir"/python"$PYTHON_VERSION/site-package
+
+   dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+   dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+@@ -124,7 +124,7 @@
+   dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
+
+   AC_SUBST(pyexecdir)
+-  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
++  pyexecdir=$libdir"/python"$PYTHON_VERSION/site-packages
+
+   dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+   dnl   Maybe this should be put in python.am?
+diff -ur gnome-bluetooth-0.6.0.orig/python/Makefile.am gnome-bluetooth-0.6.0/python/Makefile.am
+--- gnome-bluetooth-0.6.0.orig/python/Makefile.am       2006-01-24 01:45:57.000000000 -0600
++++ gnome-bluetooth-0.6.0/python/Makefile.am    2006-01-24 01:47:38.000000000 -0600
+@@ -1,7 +1,7 @@
++libdir = @libdir@
+
+-pythondir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/gnomebt
++pythondir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gnomebt
+ pkgpythondir = $(pythondir)
+-libdir = $(pkgpythondir)
+
+ python_LTLIBRARIES = iconlist.la
+
+diff -ur gnome-bluetooth-0.6.0.orig/src/Makefile.am gnome-bluetooth-0.6.0/src/Makefile.am
+--- gnome-bluetooth-0.6.0.orig/src/Makefile.am  2006-01-24 01:45:57.000000000 -0600
++++ gnome-bluetooth-0.6.0/src/Makefile.am       2006-01-24 01:47:38.000000000 -0600
+@@ -118,7 +118,7 @@
+                --override $(srcdir)/gnomebt-chooser.override \
+                $(srcdir)/gnomebt-chooser.defs > $@
+
+-pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/gnomebt/
++pydir = $(libdir)/python$(PYTHON_VERSION)/site-packages/gnomebt/
+
+ controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
+ controller_la_LIBADD =  libgnomebt.la
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild
index 55bf0264b4be..d44a520f5346 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild,v 1.2 2005/11/01 14:03:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-0.6.0.ebuild,v 1.3 2006/02/01 11:51:44 blubb Exp $
 
 inherit distutils gnome2 eutils
 
@@ -41,9 +41,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-0.5.1-obex_xfer_rate.patch
+	epatch ${FILESDIR}/${P}-libdir.patch
+	export WANT_AUTOMAKE="1.5"
 	libtoolize --force --copy || die
 	aclocal || die
-	automake || die
+	automake -a || die
+	autoconf || die
 }
 
 pkg_postinst() {