Version bump (#132833). Remove unneeded dependency on libsig++ (#132827). Add patch which fixes linkage & runtime problems when LDFLAGS contains --as-needed.

Package-Manager: portage-2203-svn

8 files changed, 108 insertions, 80 deletions

diff --git a/app-mobilephone/gnome-phone-manager/ChangeLog b/app-mobilephone/gnome-phone-manager/ChangeLog
index 7d9fb1754ce9..922da830e73b 100644
--- a/app-mobilephone/gnome-phone-manager/ChangeLog
+++ b/app-mobilephone/gnome-phone-manager/ChangeLog
@@ -1,6 +1,17 @@
 # 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.8 2006/04/23 17:18:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.9 2006/05/11 18:40:35 mrness Exp $
+
+*gnome-phone-manager-0.7 (11 May 2006)
+
+  11 May 2006; Alin Nastac <mrness@gentoo.org>
+  -files/gnome-phone-manager-0.6-aclocal_openobex.patch,
+  +files/gnome-phone-manager-0.7-as-needed.patch,
+  +files/gnome-phone-manager-0.7-pixmaps.patch,
+  -gnome-phone-manager-0.6-r1.ebuild, +gnome-phone-manager-0.7.ebuild:
+  Version bump (#132833). Remove unneeded dependency on libsig++ (#132827).
+  Add patch which fixes linkage & runtime problems when LDFLAGS contains
+  --as-needed.
 
 *gnome-phone-manager-0.6-r1 (23 Apr 2006)
 
diff --git a/app-mobilephone/gnome-phone-manager/Manifest b/app-mobilephone/gnome-phone-manager/Manifest
index 36218e276a32..4d843c66e7dc 100644
--- a/app-mobilephone/gnome-phone-manager/Manifest
+++ b/app-mobilephone/gnome-phone-manager/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0493eb8b4e4f2283f0dfb0fec82d2550 ChangeLog 1550
+MD5 b8143392007cf3f0509b19c887d9df1b ChangeLog 2028
 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 dba9ef5414cffd5ed4e9748f280e4731 gnome-phone-manager-0.6-r1.ebuild 1124
+MD5 8b6f3ed78e9842269e0a21ccf72258d1 files/digest-gnome-phone-manager-0.7 76
+MD5 f2cac74142fe9c7eb73da341fc7e9886 files/gnome-phone-manager-0.7-as-needed.patch 2980
+MD5 8e5ac58c297ecfe0770df57de5cba23d files/gnome-phone-manager-0.7-pixmaps.patch 264
 MD5 fdaf673a63683d861ecce4cd68546d6c gnome-phone-manager-0.6.ebuild 1015
+MD5 1208f208545b2173bdf3bbee30930752 gnome-phone-manager-0.7.ebuild 1125
 MD5 8e68d11b191a36c6430cb32308a182c4 metadata.xml 735
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFES7cIjG8pv1lIUX4RAnNEAJ9UzhabFfU5+xDW+EB7p9EoIaeOgACfRJL0
-2f9ffvA6aQ2e3izLTB4kxg0=
-=Sbo6
+iD8DBQFEY4UzjG8pv1lIUX4RArCyAKC0/7ciWDxStDNDLkSUxk/Y/Tm0+ACgwI8L
+5RrCoas9an+4NaiuLZfnwgw=
+=3jdD
 -----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
deleted file mode 100644
index 917d8152eecd..000000000000
--- a/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9c0fd3cdba4a6eb92bfad823f602fe4 gnome-phone-manager-0.6.tar.bz2 650105
diff --git a/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.7 b/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.7
new file mode 100644
index 000000000000..794db51cc54c
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/digest-gnome-phone-manager-0.7
@@ -0,0 +1 @@
+MD5 951471bf5d6fe93fe550c60b6bdf58f9 gnome-phone-manager-0.7.tar.bz2 672618
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
deleted file mode 100644
index f2b00d652cfe..000000000000
--- a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.6-aclocal_openobex.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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/files/gnome-phone-manager-0.7-as-needed.patch b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.7-as-needed.patch
new file mode 100644
index 000000000000..01cadd8715bc
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.7-as-needed.patch
@@ -0,0 +1,74 @@
+diff -Nru gnome-phone-manager-0.7.orig/libegg/libegg/iconlist/Makefile.am gnome-phone-manager-0.7/libegg/libegg/iconlist/Makefile.am
+--- gnome-phone-manager-0.7.orig/libegg/libegg/iconlist/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libegg/libegg/iconlist/Makefile.am	2006-05-11 20:21:39.863014500 +0300
+@@ -11,8 +11,8 @@
+ noinst_LTLIBRARIES = libeggiconlist.la
+ 
+ libeggiconlist_la_LIBADD = \
+-	$(EGG_LIBS) \
+-	$(top_builddir)/libegg/util/libeggutil.la
++	$(top_builddir)/libegg/util/libeggutil.la \
++	$(EGG_LIBS)
+ 
+ libeggiconlist_la_SOURCES = \
+   eggiconlist.c
+diff -Nru gnome-phone-manager-0.7.orig/libegg/libegg/tray/Makefile.am gnome-phone-manager-0.7/libegg/libegg/tray/Makefile.am
+--- gnome-phone-manager-0.7.orig/libegg/libegg/tray/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libegg/libegg/tray/Makefile.am	2006-05-11 20:21:11.909267500 +0300
+@@ -11,8 +11,8 @@
+ noinst_LTLIBRARIES = libeggtray.la
+ 
+ libeggtray_la_LIBADD = \
+-	$(EGG_TRAY_LIBS) \
+-	$(top_builddir)/libegg/util/libeggutil.la
++	$(top_builddir)/libegg/util/libeggutil.la \
++	$(EGG_TRAY_LIBS)
+ 
+ libeggtray_la_SOURCES = \
+   eggtrayicon.c		\
+diff -Nru gnome-phone-manager-0.7.orig/libgsm/Makefile.am gnome-phone-manager-0.7/libgsm/Makefile.am
+--- gnome-phone-manager-0.7.orig/libgsm/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/libgsm/Makefile.am	2006-05-11 20:19:29.078841000 +0300
+@@ -17,10 +17,10 @@
+ 	phonemgr-marshal.c phonemgr-marshal.h
+ 
+ glibgsmtest_SOURCES = glibgsmtest.c
+-glibgsmtest_LDADD = $(LIBGSM_LIBS) libgsmwrap.la
++glibgsmtest_LDADD = libgsmwrap.la $(LIBGSM_LIBS)
+ 
+ gnokii_identify_SOURCES = gnokii-identify.c
+-gnokii_identify_LDADD = $(LIBGSM_LIBS) libgsmwrap.la
++gnokii_identify_LDADD = libgsmwrap.la $(LIBGSM_LIBS)
+ 
+ phones_DATA = phones.xml
+ phonesdir = $(datadir)/$(PACKAGE)
+diff -Nru gnome-phone-manager-0.7.orig/src/Makefile.am gnome-phone-manager-0.7/src/Makefile.am
+--- gnome-phone-manager-0.7.orig/src/Makefile.am	2006-05-11 20:16:31.000000000 +0300
++++ gnome-phone-manager-0.7/src/Makefile.am	2006-05-11 20:34:07.925765500 +0300
+@@ -22,9 +27,9 @@
+ 	$(CLA_FILES)
+ 
+ gnome_phone_manager_LDADD = \
+-	$(PHONEMGR_LIBS) \
+ 	../libegg/libegg/tray/libeggtray.la \
+-	../libgsm/libgsmwrap.la
++	../libgsm/libgsmwrap.la \
++	$(PHONEMGR_LIBS)
+ 
+ EXTRA_DIST = gnome-phone-manager.desktop.in
+ 
+diff -Nru gnome-phone-manager-0.7.orig/configure.in gnome-phone-manager-0.7/configure.in
+--- gnome-phone-manager-0.7.orig/configure.in	2006-05-05 16:16:24.000000000 +0300
++++ gnome-phone-manager-0.7/configure.in	2006-05-11 20:43:41.553615000 +0300
+@@ -54,6 +54,11 @@
+ 	gmodule-2.0
+ )
+ 
++# --as-needed cannot work with this because pkg-config --libs gnome-bluetooth
++# returns "-lgnomebt -lbtctl"; gnomebt library has all the symbols this package needs
++# but as UNDEF! The following line solve the problem.
++PHONEMGR_LIBS="-lbtctl ${PHONEMGR_LIBS}"
++
+ AC_SUBST(PHONEMGR_CFLAGS)
+ AC_SUBST(PHONEMGR_LIBS)
+ 
diff --git a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.7-pixmaps.patch b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.7-pixmaps.patch
new file mode 100644
index 000000000000..c147b403fbdb
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.7-pixmaps.patch
@@ -0,0 +1,9 @@
+--- ui/Makefile.am.old	2005-12-27 19:37:52.000000000 +0100
++++ ui/Makefile.am	2006-05-09 23:58:30.000000000 +0200
+@@ -1,5 +1,5 @@
+ 
+-pixmapsdir = $(datadir)/pixmaps
++pixmapsdir = $(datadir)/$(PACKAGE)
+ pixmaps_DATA = cellphone.png
+ 
+ uidir = $(datadir)/$(PACKAGE)
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.7.ebuild
index bd6bf5cebd94..a4de67d39636 100644
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.6-r1.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.7.ebuild,v 1.1 2006/05/11 18:40:35 mrness Exp $
 
 inherit gnome2 eutils autotools
 
@@ -11,14 +11,13 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2 "
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE=""
 
 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
@@ -35,6 +34,7 @@ DOCS="README NEWS AUTHORS ChangeLog"
 src_unpack() {
 	gnome2_src_unpack
 
-	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+	epatch "${FILESDIR}/${P}-pixmaps.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 	eautoreconf
 }