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

Package-Manager: portage-2.1_pre4-r1

4 files changed, 126 insertions, 17 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/Manifest b/net-wireless/gnome-bluetooth/Manifest
index c185246cc294..81fc1bbceec0 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,16 +1,51 @@
-MD5 bf946bb646b9a6c0fa2f7676cef873ac gnome-bluetooth-0.5.1-r2.ebuild 1382
-MD5 ca8a6d5fd2ddee8e4fcfc2598a0fe5c8 gnome-bluetooth-0.6.0.ebuild 1304
+MD5 fac99c3cec58f30e6e8306deab178a23 ChangeLog 3441
+RMD160 32ec609394eecb797bbe2835a5058aa07ca41170 ChangeLog 3441
+SHA256 e378942b77ca8d75fdc85677b42f3bd10e52694342c8d2e2803a68720f23d43b ChangeLog 3441
+MD5 ff63b2b07eb50db8962f544a45028bee files/digest-gnome-bluetooth-0.4.1 73
+RMD160 dfa9b1abc33648626eb2b2942fb244f8243bd416 files/digest-gnome-bluetooth-0.4.1 73
+SHA256 d89fcec72e90dfbba894026788789abe5a16155ac49687a5198ce8a3cfa3a35a files/digest-gnome-bluetooth-0.4.1 73
+MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1 73
+RMD160 67ca19d93ac157bad99cd5e5b84604a416f20ed1 files/digest-gnome-bluetooth-0.5.1 73
+SHA256 12ef5fc37090312b70009e5b2b46a508b55427d2797ee5dbd8482fc2f379f3ac files/digest-gnome-bluetooth-0.5.1 73
+MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1-r1 73
+RMD160 67ca19d93ac157bad99cd5e5b84604a416f20ed1 files/digest-gnome-bluetooth-0.5.1-r1 73
+SHA256 12ef5fc37090312b70009e5b2b46a508b55427d2797ee5dbd8482fc2f379f3ac files/digest-gnome-bluetooth-0.5.1-r1 73
+MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1-r2 73
+RMD160 67ca19d93ac157bad99cd5e5b84604a416f20ed1 files/digest-gnome-bluetooth-0.5.1-r2 73
+SHA256 12ef5fc37090312b70009e5b2b46a508b55427d2797ee5dbd8482fc2f379f3ac files/digest-gnome-bluetooth-0.5.1-r2 73
+MD5 b81e2da1f32ba9db780ac8fbf3cf848a files/digest-gnome-bluetooth-0.6.0 74
+RMD160 709dae24dc3769c6d8011a3579ccd850de0a3531 files/digest-gnome-bluetooth-0.6.0 74
+SHA256 2b40012cbb295ff0718e36f7be4db729f4437d3979f899e3e47cab6452d11e52 files/digest-gnome-bluetooth-0.6.0 74
+MD5 9c859b033ee9e338893bc5bc3ea21d5a files/gnome-bluetooth-0.4.1-gtk24.patch 2340
+RMD160 59471ec69c77ce211f442df726597df58d48a8a6 files/gnome-bluetooth-0.4.1-gtk24.patch 2340
+SHA256 278dc6857281b3f94e2d99e7c54e5443811a1ba9d824b85f9092c005ada7b7ff files/gnome-bluetooth-0.4.1-gtk24.patch 2340
+MD5 c9cdf6988fe751bbd26baf8b6eba1a34 files/gnome-bluetooth-0.5.1-gnome.patch 602
+RMD160 0b31b612abb5ee4dcac5d7c1e4368b4b2e6749e6 files/gnome-bluetooth-0.5.1-gnome.patch 602
+SHA256 0ccd064487ba8a903e63c4172dbff31d9393da89b68427c3210306f849b2dc99 files/gnome-bluetooth-0.5.1-gnome.patch 602
+MD5 1b075164be0f7aab81714a3efd302a65 files/gnome-bluetooth-0.5.1-gobcrash.patch 1099
+RMD160 8c399cb2be8c85634370cd15ff76477a3095dbc2 files/gnome-bluetooth-0.5.1-gobcrash.patch 1099
+SHA256 a8d9669b3f14bcae9549e575e6f2cdd2aa46367b49a2cefae2abb6d72aba4fac files/gnome-bluetooth-0.5.1-gobcrash.patch 1099
+MD5 a254aa9cdd6ad1e9e5f2e7a78c636b25 files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch 2108
+RMD160 dcf65207e3c2b0af4a5232b6d6039390f42f2c4b files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch 2108
+SHA256 ad76c931c2cb869f06e696abd7efd20ebc01b5b2ff5a8917b9d5c2b2c9228bd0 files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch 2108
+MD5 7a336fcfbc8755f917c623b810172ef5 files/gnome-bluetooth-0.6.0-libdir.patch 3089
+RMD160 d2ee05b37df426790185f0c582672c843ad43327 files/gnome-bluetooth-0.6.0-libdir.patch 3089
+SHA256 3a7660d4e24f2303e06660d9fa64bacd47a3286e880893f7f3ebcf04cc11f010 files/gnome-bluetooth-0.6.0-libdir.patch 3089
 MD5 b8d74ef95f6d4ed18c27eb91772ca760 gnome-bluetooth-0.4.1.ebuild 1258
+RMD160 2eda2e12fb49dd8b1a28b5ee186a0ba4d3f3356e gnome-bluetooth-0.4.1.ebuild 1258
+SHA256 fc48c0b00888ba0050884ca96a6257031685aa5353a124fdd0160dab7d965d1f gnome-bluetooth-0.4.1.ebuild 1258
 MD5 0abfbaaad5770f268091bab168724d98 gnome-bluetooth-0.5.1-r1.ebuild 1348
+RMD160 af699fd209152fead252c59036902ac8cc6187f4 gnome-bluetooth-0.5.1-r1.ebuild 1348
+SHA256 b489ee527f07834bc31dcadaf48acf2f01bf5ea8ffc9d1e54b6bb026ccdcd7b5 gnome-bluetooth-0.5.1-r1.ebuild 1348
+MD5 bf946bb646b9a6c0fa2f7676cef873ac gnome-bluetooth-0.5.1-r2.ebuild 1382
+RMD160 defccf7ecfca3fd434de3e2435fddf6f16febf71 gnome-bluetooth-0.5.1-r2.ebuild 1382
+SHA256 c826f8aa0c8993a1621080e650631644cbfb37f94a4b06019edafb56102c2aa4 gnome-bluetooth-0.5.1-r2.ebuild 1382
 MD5 8755e05a9e997b1b6c3b273bcf2ff796 gnome-bluetooth-0.5.1.ebuild 1290
-MD5 ef4d4d3f94f83f35facac0e50198b499 ChangeLog 3246
+RMD160 14749fb6f4d6e1170db84e9ee92e8bd074c78194 gnome-bluetooth-0.5.1.ebuild 1290
+SHA256 2c576043063615c35c46d353018f1b8d3d4bdc6138dd183916e4a2221bcc5b09 gnome-bluetooth-0.5.1.ebuild 1290
+MD5 f58fc7b3c05b1613aa40015e86b966d7 gnome-bluetooth-0.6.0.ebuild 1391
+RMD160 a92fbc6eb1c4411ef1a0ae21db41fc363693745a gnome-bluetooth-0.6.0.ebuild 1391
+SHA256 daa4cebf48da5bd4991bf32c9e01063abd2c27f5bd19ced775bdace881d9eaaf gnome-bluetooth-0.6.0.ebuild 1391
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 1b075164be0f7aab81714a3efd302a65 files/gnome-bluetooth-0.5.1-gobcrash.patch 1099
-MD5 9c859b033ee9e338893bc5bc3ea21d5a files/gnome-bluetooth-0.4.1-gtk24.patch 2340
-MD5 a254aa9cdd6ad1e9e5f2e7a78c636b25 files/gnome-bluetooth-0.5.1-obex_xfer_rate.patch 2108
-MD5 c9cdf6988fe751bbd26baf8b6eba1a34 files/gnome-bluetooth-0.5.1-gnome.patch 602
-MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1-r1 73
-MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1-r2 73
-MD5 ff63b2b07eb50db8962f544a45028bee files/digest-gnome-bluetooth-0.4.1 73
-MD5 6da6c9018b79e0077f1a3bb071a01cef files/digest-gnome-bluetooth-0.5.1 73
-MD5 b81e2da1f32ba9db780ac8fbf3cf848a files/digest-gnome-bluetooth-0.6.0 74
+RMD160 fb83fc852c808450a2cc256fa9b9c7c784b884e2 metadata.xml 235
+SHA256 492cfc1c578fed368c8ae0ed98fbf455f9a5fa097235004b6cf3a3981d6fa983 metadata.xml 235
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() {