Fix configure error when build against >=dev-libs/openobex-1.1 (#122262).

(Portage version: 2.0.54)

5 files changed, 119 insertions, 11 deletions

diff --git a/app-mobilephone/gnome-phone-manager/ChangeLog b/app-mobilephone/gnome-phone-manager/ChangeLog
index 5f0b18f68b03..7d9fb1754ce9 100644
--- a/app-mobilephone/gnome-phone-manager/ChangeLog
+++ b/app-mobilephone/gnome-phone-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gnome-phone-manager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.7 2006/02/25 15:03:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.8 2006/04/23 17:18:52 mrness Exp $
+
+*gnome-phone-manager-0.6-r1 (23 Apr 2006)
+
+  23 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/gnome-phone-manager-0.6-aclocal_openobex.patch,
+  +gnome-phone-manager-0.6-r1.ebuild:
+  Fix configure error when build against >=dev-libs/openobex-1.1 (#122262).
 
   25 Feb 2006; Alin Nastac <mrness@gentoo.org>
   -files/gnome-phone-manager-0.4-gcc3.patch,
diff --git a/app-mobilephone/gnome-phone-manager/Manifest b/app-mobilephone/gnome-phone-manager/Manifest
index ea7e10349e79..0ae13761d2b4 100644
--- a/app-mobilephone/gnome-phone-manager/Manifest
+++ b/app-mobilephone/gnome-phone-manager/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 42bd50735fff8258a5a9b461ba62ab25 ChangeLog 1288
 MD5 596786c32d3fc69b6689d77546e49a52 files/digest-gnome-phone-manager-0.6 76
+MD5 596786c32d3fc69b6689d77546e49a52 files/digest-gnome-phone-manager-0.6-r1 76
+MD5 b09bbed39c8250ebe5016d17d2a2c3a8 files/gnome-phone-manager-0.6-aclocal_openobex.patch 2464
+MD5 5be18acf275a70e726342aadd40aad8b gnome-phone-manager-0.6-r1.ebuild 1114
 MD5 fdaf673a63683d861ecce4cd68546d6c gnome-phone-manager-0.6.ebuild 1015
 MD5 8e68d11b191a36c6430cb32308a182c4 metadata.xml 735
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEAHHYjG8pv1lIUX4RAgiXAKCBz5jOc2f7DwnmuTLiZyDtJrvb0wCgvDUa
-9Sq4wIUszzSsK2e2HEprynE=
-=otS9
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.6-r1 b/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.6-r1
new file mode 100644
index 000000000000..917d8152eecd
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.6-r1
@@ -0,0 +1 @@
+MD5 b9c0fd3cdba4a6eb92bfad823f602fe4 gnome-phone-manager-0.6.tar.bz2 650105
diff --git a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.6-aclocal_openobex.patch b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.6-aclocal_openobex.patch
new file mode 100644
index 000000000000..f2b00d652cfe
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.6-aclocal_openobex.patch
@@ -0,0 +1,67 @@
+diff -Nru gnome-phone-manager-0.6.orig/aclocal.m4 gnome-phone-manager-0.6/aclocal.m4
+--- gnome-phone-manager-0.6.orig/aclocal.m4	2005-09-09 12:51:56.000000000 +0300
++++ gnome-phone-manager-0.6/aclocal.m4	2006-04-23 19:49:36.254216750 +0300
+@@ -6801,63 +6801,6 @@
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+-dnl Check for openobex library
+-dnl Written by Pontus Fuchs 2000-08-18
+-dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
+-
+-AC_DEFUN([AM_PATH_OPENOBEX], [
+-	AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
+-
+-	if test "$OPENOBEX_CONFIG" = "no" ; then
+-		AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.)
+-	fi
+-
+-	min_obex_version=ifelse([$1], ,0.9.6,$1)
+-	AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
+-
+-	OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
+-	OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
+-
+-	obex_config_version=`$OPENOBEX_CONFIG --version`
+-
+-	obex_config_major_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-	obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-	obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-	obex_req_major_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-	obex_req_minor_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-	obex_req_micro_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-
+-	if test $obex_req_major_version -lt $obex_config_major_version ; then
+-       		obex_config_version_ok="yes"
+-       	fi
+-	if test $obex_req_major_version -eq $obex_config_major_version ; then
+-		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
+-       			obex_config_version_ok="yes"
+-	       	fi
+-		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
+-			if test $obex_req_micro_version -le $obex_config_micro_version ; then
+-				obex_config_version_ok="yes"
+-			fi
+-		fi
+-	fi
+-	
+-	if test "$obex_config_version_ok" != "yes" ; then
+-		AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
+-	fi
+-
+-	AC_SUBST(OPENOBEX_CFLAGS)
+-	AC_SUBST(OPENOBEX_LIBS)
+-	AC_MSG_RESULT(yes)
+-])
+-
+ 
+ dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+ dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6-r1.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6-r1.ebuild
new file mode 100644
index 000000000000..bd6bf5cebd94
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6-r1.ebuild,v 1.1 2006/04/23 17:18:52 mrness Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop"
+HOMEPAGE="http://usefulinc.com/software/phonemgr/"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2 "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=gnome-base/libgnomeui-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	>=dev-libs/glib-2
+	=dev-libs/libsigc++-1.2.5
+	>=gnome-base/orbit-2
+	>=dev-libs/openobex-1
+	>=app-mobilephone/gnokii-0.6.12
+	>=net-wireless/bluez-libs-2.25
+	>=gnome-extra/evolution-data-server-1.2.3
+	>=net-wireless/gnome-bluetooth-0.7.0-r1"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+DOCS="README NEWS AUTHORS ChangeLog"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+	eautoreconf
+}