Avoid linking with libusb and libbluetooth when usb respectively bluetooth USE flags are disabled (#285040).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 251 insertions, 4 deletions

diff --git a/dev-libs/openobex/ChangeLog b/dev-libs/openobex/ChangeLog
index 1317abe74f2c..7873c673b169 100644
--- a/dev-libs/openobex/ChangeLog
+++ b/dev-libs/openobex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openobex
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/ChangeLog,v 1.60 2009/08/29 18:05:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/ChangeLog,v 1.61 2009/09/20 10:56:26 mrness Exp $
+
+  20 Sep 2009; Alin Năstac <mrness@gentoo.org> openobex-1.5.ebuild,
+  +files/openobex-1.5-use-flags.patch:
+  Avoid linking with libusb and libbluetooth when usb respectively bluetooth
+  USE flags are disabled (#285040).
 
   29 Aug 2009; nixnut <nixnut@gentoo.org> openobex-1.5.ebuild:
   ppc stable #274854
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index bf89ba48c7f4..eb60e4faf5ba 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openobex-1.3-as-needed.patch 419 RMD160 1a8b9bd45c0bc99cd1f2b46da4d3f49a0d062948 SHA1 4db191db8bdb9a74d860a8d701e9475bc405bf54 SHA256 eac0326c9a4e7ba372188deac6c846cd53b0f0a6d33ec8d45ad91716403cbd9b
+AUX openobex-1.5-use-flags.patch 5818 RMD160 abb82a2e5a4a307667956551587ecaa8fdebbcbc SHA1 16f8a5c8a0205d52e89e4a0992359b598cac8428 SHA256 f33ec6c7aa58532dabd7c498e60e07c9b8394991c56fd61c0ae79c9ae1b8db32
 DIST openobex-1.3.tar.gz 337614 RMD160 f38474e17aaff1799ecb5f45de6ab23c3bdc8de0 SHA1 a6fbb5991bc14b90ba6c42faf026bf6bfa325d7f SHA256 3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
 DIST openobex-1.4.tar.gz 393756 RMD160 e1934af9b58744f526e63527554b6960efde8803 SHA1 eb48eb0897f4cc8c674a782c5516fbfcbb541f40 SHA256 79265309e2320beb03910fccf27fd04aefb18ba47a900947d2de8e88fae05cd8
 DIST openobex-1.5.tar.gz 400876 RMD160 9c57faabd6e63ff809e27ab90ed5db788802c45c SHA1 ff5fc07287d67fa73ec55998f76ed73787a2ddb1 SHA256 e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65
 EBUILD openobex-1.3.ebuild 1114 RMD160 6c7dbfa92847671fe40c8c537de43004e2a70808 SHA1 ac071a8af409e65d6f9fcd2ad6c30320f542a55f SHA256 365b9f576b3e4e86f520840832c832a8f06f0ff7d22153e5559391d9383ed9a3
 EBUILD openobex-1.4.ebuild 952 RMD160 eb556b33ed4e0de1c49e1e00f306494e4ec7a627 SHA1 25b35772084503f487c6ebb90839346a34f4d521 SHA256 00e8f1ac58075d7bb774fda546c1136a343015570d0d4babb4420a1b397390e4
-EBUILD openobex-1.5.ebuild 1013 RMD160 64fbe8569f11ae1ebfb9d952ad9a9d63a0831c1c SHA1 911d1bdc4c9731bac480f53a3f66a9ccb11f0551 SHA256 344e7f0577291dfec7ef3240cf47ee676472d382254ca09181be5554df0ca6e4
-MISC ChangeLog 6857 RMD160 8d806ac84033184ba4174033f2cf2a0d8fe847dd SHA1 09c19cc5986ec33c3fed17eea3a68eaccffd5afc SHA256 f2714084295f286f3d12129ad1930695b35bf701956b200f7330aaa96aa68c0e
+EBUILD openobex-1.5.ebuild 1114 RMD160 ebb55f072fd462ae516b72632eda38aab562fa0f SHA1 45308da265c962ce19471c2b11518e09307065b0 SHA256 6f9fb2425982574edfd95853e04dee7a2cb00f0135d50148822b37285dd9a5f3
+MISC ChangeLog 7079 RMD160 86b13d616e5459289050e68065ea05c319902894 SHA1 b25169b9a368112f3189167fa3cc533e2e8392f4 SHA256 c58f3e49a084a768f41edf05e360861b6aa3878353aa3bf57cb0a85c95741f27
 MISC metadata.xml 384 RMD160 214e42ec3995bbfcb257cf0bf9611c11e26f9c5b SHA1 afd12c3efbe072d597fd39b37d085613a7486595 SHA256 112a031f6277bd706719da61d254c722351c100c991f768daf0ac4fa4bcc6799
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq2CmQACgkQ9A5kJBGSrsuTfgCeMSwY6qlvUmMGrKc1DVzk0PvV
+hhcAn0My/rwFltoB8WYftRh0Ux7nds6+
+=5gd6
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openobex/files/openobex-1.5-use-flags.patch b/dev-libs/openobex/files/openobex-1.5-use-flags.patch
new file mode 100644
index 000000000000..c2907752e839
--- /dev/null
+++ b/dev-libs/openobex/files/openobex-1.5-use-flags.patch
@@ -0,0 +1,224 @@
+diff -Nru openobex-1.5.orig/acinclude.m4 openobex-1.5/acinclude.m4
+--- openobex-1.5.orig/acinclude.m4	2009-09-20 12:13:44.000000000 +0200
++++ openobex-1.5/acinclude.m4	2009-09-20 12:18:38.000000000 +0200
+@@ -42,6 +42,52 @@
+ 	fi
+ 
+ 	AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}", [Directory for the configuration files])
++
++	fortify_enable=yes
++	irda_enable=yes
++	bluetooth_enable=yes
++	usb_enable=yes
++	glib_enable=no
++	apps_enable=no
++	debug_enable=no
++	syslog_enable=no
++	dump_enable=no
++
++	AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
++		fortify_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(irda, AC_HELP_STRING([--disable-irda], [disable IrDA support]), [
++		irda_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], [disable Bluetooth support]), [
++		bluetooth_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb], [disable USB support]), [
++		usb_enable=${enableval}
++	])
++
++	dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
++	dnl 	glib_enable=${enableval}
++	dnl ])
++
++	AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
++		apps_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
++		debug_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(syslog, AC_HELP_STRING([--enable-syslog], [enable debugging to the system logger]), [
++		syslog_enable=${enableval}
++	])
++
++	AC_ARG_ENABLE(dump, AC_HELP_STRING([--enable-dump], [enable protocol dumping for debugging]), [
++		dump_enable=${enableval}
++	])
+ ])
+ 
+ AC_DEFUN([AC_PATH_WIN32], [
+@@ -78,19 +124,21 @@
+ ])
+ 
+ AC_DEFUN([AC_PATH_IRDA], [
+-	case $host in
+-	*-*-linux*)
+-		AC_PATH_IRDA_LINUX
+-		;;
+-	*-*-mingw32*)
+-		AC_PATH_IRDA_WIN32
+-		;;
+-	*)
+-		irda_found=no;
+-		AC_MSG_CHECKING([for IrDA support])
+-		AC_MSG_RESULT([$irda_found])
+-		;;
+-	esac
++	if (test "$irda_enable" = 'yes'); then
++		case $host in
++		*-*-linux*)
++			AC_PATH_IRDA_LINUX
++			;;
++		*-*-mingw32*)
++			AC_PATH_IRDA_WIN32
++			;;
++		*)
++			irda_found=no;
++			AC_MSG_CHECKING([for IrDA support])
++			AC_MSG_RESULT([$irda_found])
++			;;
++		esac
++	fi
+ ])
+ 
+ AC_DEFUN([AC_PATH_WINBT], [
+@@ -130,45 +178,48 @@
+ ])
+ 
+ AC_DEFUN([AC_PATH_BLUETOOTH], [
+-	case $host in
+-	*-*-linux*)
+-		AC_PATH_BLUEZ
+-		;;
+-	*-*-freebsd*)
+-		AC_PATH_FREEBSDBT
+-		;;
+-	*-*-netbsd*)
+-		AC_PATH_NETBSDBT
+-		;;
+-	*-*-mingw32*)
+-		AC_PATH_WINBT
+-		;;
+-	esac
++	if (test "$bluetooth_enable" = 'yes'); then
++		case $host in
++		*-*-linux*)
++			AC_PATH_BLUEZ
++			;;
++		*-*-freebsd*)
++			AC_PATH_FREEBSDBT
++			;;
++		*-*-netbsd*)
++			AC_PATH_NETBSDBT
++			;;
++		*-*-mingw32*)
++			AC_PATH_WINBT
++			;;
++		esac
++	fi
+ 	AC_SUBST(BLUETOOTH_CFLAGS)
+ 	AC_SUBST(BLUETOOTH_LIBS)
+ ])
+ 
+ AC_DEFUN([AC_PATH_USB], [
+ 	usb_lib_found=no
+-	case $host in
+-	*-*-mingw32*)
+-		USB_CFLAGS=""
+-		USB_LIBS="-lusb"
+-		usb_lib_found=yes
+-		;;
+-	*)
+-		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
+-		;;
+-	esac
+-	AC_SUBST(USB_CFLAGS)
+-	AC_SUBST(USB_LIBS)
+-
+ 	usb_get_busses=no
+-	AC_CHECK_LIB(usb, usb_get_busses, usb_get_busses=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
+-
+ 	usb_interrupt_read=no
+-	AC_CHECK_LIB(usb, usb_interrupt_read, usb_interrupt_read=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
++	if (test "$usb_enable" = 'yes'); then
++		case $host in
++		*-*-mingw32*)
++			USB_CFLAGS=""
++			USB_LIBS="-lusb"
++			usb_lib_found=yes
++			;;
++		*)
++			PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
++			AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++			;;
++		esac
++
++		AC_CHECK_LIB(usb, usb_get_busses, usb_get_busses=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
++		AC_CHECK_LIB(usb, usb_interrupt_read, usb_interrupt_read=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
++	fi
++	AC_SUBST(USB_CFLAGS)
++	AC_SUBST(USB_LIBS)
+ 
+ 	if (test "$usb_lib_found" = "yes" && test "$usb_get_busses" = "yes" && test "$usb_interrupt_read" = "yes"); then
+ 		usb_found=yes
+@@ -201,52 +252,6 @@
+ ])
+ 
+ AC_DEFUN([AC_ARG_OPENOBEX], [
+-	fortify_enable=yes
+-	irda_enable=yes
+-	bluetooth_enable=yes
+-	usb_enable=yes
+-	glib_enable=no
+-	apps_enable=no
+-	debug_enable=no
+-	syslog_enable=no
+-	dump_enable=no
+-
+-	AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
+-		fortify_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(irda, AC_HELP_STRING([--disable-irda], [disable IrDA support]), [
+-		irda_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], [disable Bluetooth support]), [
+-		bluetooth_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb], [disable USB support]), [
+-		usb_enable=${enableval}
+-	])
+-
+-	dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
+-	dnl 	glib_enable=${enableval}
+-	dnl ])
+-
+-	AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
+-		apps_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
+-		debug_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(syslog, AC_HELP_STRING([--enable-syslog], [enable debugging to the system logger]), [
+-		syslog_enable=${enableval}
+-	])
+-
+-	AC_ARG_ENABLE(dump, AC_HELP_STRING([--enable-dump], [enable protocol dumping for debugging]), [
+-		dump_enable=${enableval}
+-	])
+-
+ 	if (test "${fortify_enable}" = "yes"); then
+ 		CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+ 	fi
diff --git a/dev-libs/openobex/openobex-1.5.ebuild b/dev-libs/openobex/openobex-1.5.ebuild
index ee46fdbe781f..e80b2c67088d 100644
--- a/dev-libs/openobex/openobex-1.5.ebuild
+++ b/dev-libs/openobex/openobex-1.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/openobex-1.5.ebuild,v 1.7 2009/08/29 18:05:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openobex/openobex-1.5.ebuild,v 1.8 2009/09/20 10:56:26 mrness Exp $
 
 EAPI="2"
 
+inherit eutils autotools
+
 DESCRIPTION="An implementation of the OBEX protocol used for transferring data to mobile devices"
 HOMEPAGE="http://sourceforge.net/projects/openobex/"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
@@ -17,6 +19,11 @@ RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-use-flags.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--enable-apps \