Fix glib-2.31 building, bug #409081 by Bjoern Thorwirth; also drop static stuff.

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

4 files changed, 275 insertions, 10 deletions

diff --git a/net-libs/meanwhile/ChangeLog b/net-libs/meanwhile/ChangeLog
index 0f8cd1ec4b1a..3fecd891820c 100644
--- a/net-libs/meanwhile/ChangeLog
+++ b/net-libs/meanwhile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/meanwhile
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.54 2011/02/06 12:24:36 leio Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/ChangeLog,v 1.55 2012/03/24 11:38:04 pacho Exp $
+
+*meanwhile-1.0.2-r1 (24 Mar 2012)
+
+  24 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/meanwhile-1.0.2-glib2.31.patch, +meanwhile-1.0.2-r1.ebuild:
+  Fix glib-2.31 building, bug #409081 by Bjoern Thorwirth; also drop static
+  stuff.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> meanwhile-1.0.2.ebuild:
   Drop to ~mips
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index c96b2962de06..c3d9b81c4b02 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX meanwhile-1.0.2-glib2.31.patch 6461 RMD160 89650a4a67ee6bf66e0f817dd9bd362d193b613b SHA1 768e456bfce25d48e638cbfdf2b183f8e41f829a SHA256 d69f828a4ae918ba1860804e427fd1302c745d643f24902fcc94e49c823b6c0a
 AUX meanwhile-1.0.2-presence.patch 1163 RMD160 aa91821aec8d4016624e0786d1485faff95026c0 SHA1 1f20957ed41cb5fdb39dae8aa824ad94a3967f42 SHA256 7c1e2bd33f7531b84e8d401266d81b8315986f3ff916e451c40da0e25d0b1467
 DIST meanwhile-1.0.2.tar.gz 479325 RMD160 2ae78a2f5586c1a106c462c19018872308dd6af0 SHA1 e0e9836581da3c4a569135cb238eaa566c324540 SHA256 38a8059eaa549cbcb45ca0a5b453e9608ceadab360db2ae14581fb22ddabdf23
+EBUILD meanwhile-1.0.2-r1.ebuild 1127 RMD160 ccc43fc9007840a4d8041fabe37d896fc8e46985 SHA1 78dd3e7bc623cb4afbc6d868eb9ecaa310dd61bd SHA256 4338176b49280d4e3d1ae59c4a7494f612e6464d189ff131292a114b8c1438ad
 EBUILD meanwhile-1.0.2.ebuild 1057 RMD160 14209be3595b42f9502485f3a0b9c1c52e2b650f SHA1 a32bcbad7961a6d7b560fbd3757062db28daa464 SHA256 da02d02183a9c3952245ca98a82405f6b1e73ec8a0d2c8d7e9a511ee064eebc9
-MISC ChangeLog 6784 RMD160 bb0531c69fea6cc421b26fac88e1a308a6068782 SHA1 94b5d3417e564444aa1751d30f5b9431ebcbc5c1 SHA256 bbe1613d1cddb9681e3078907e8164673d7b1fd4eec9375cdde00f02921d9237
+MISC ChangeLog 7021 RMD160 f634416c1d2dfb243c26c2c2f34e1ced1998c621 SHA1 d8883094e31de03542dca024085c7c772f66043e SHA256 728d9bce7fec29bf63b9b4b0cdeb608f4ae37ff59b00bb0d07bbcf6cefee972a
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rVQACgkQfXuS5UK5QB2eMAP/VjCzm4sYq7RE9s45lEt+uPHR
-ukgBpHBgAtlhuzpnUdpJDaBRzHN3xaTzL+6lbBj2zqdRKwz3MmfIn105KVZcjAoF
-g8oCvwRtGjTXl3i4HMMk13b131dtj1VOCXDv3wUMxL6FmU04LqvAs9uu7beXDNmm
-UodmfHcRyRvxwCIEwtk=
-=pcs4
+iEYEARECAAYFAk9tsiIACgkQCaWpQKGI+9SiQwCdH+JsaYeN6pBAO5kqhy7RZAxe
+8wMAn0I8b5g84HAbugfP5tTDz0FpA5cy
+=KEvf
 -----END PGP SIGNATURE-----
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
new file mode 100644
index 000000000000..4ffcc3672fc7
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
@@ -0,0 +1,213 @@
+diff -uNr meanwhile-1.0.2/src/channel.c meanwhile-1.0.2-r1/src/channel.c
+--- meanwhile-1.0.2/src/channel.c	2005-12-08 23:04:46.000000000 +0100
++++ meanwhile-1.0.2-r1/src/channel.c	2012-03-20 21:15:03.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/mw_debug.c meanwhile-1.0.2-r1/src/mw_debug.c
+--- meanwhile-1.0.2/src/mw_debug.c	2005-12-03 04:46:10.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_debug.c	2012-03-20 21:12:09.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+ 
+ 
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #include "mw_debug.h"
+ 
+diff -uNr meanwhile-1.0.2/src/mw_message.h meanwhile-1.0.2-r1/src/mw_message.h
+--- meanwhile-1.0.2/src/mw_message.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_message.h	2012-03-20 21:06:28.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+diff -uNr meanwhile-1.0.2/src/mw_srvc_conf.h meanwhile-1.0.2-r1/src/mw_srvc_conf.h
+--- meanwhile-1.0.2/src/mw_srvc_conf.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_conf.h	2012-03-20 21:08:01.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+diff -uNr meanwhile-1.0.2/src/mw_srvc_dir.h meanwhile-1.0.2-r1/src/mw_srvc_dir.h
+--- meanwhile-1.0.2/src/mw_srvc_dir.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_dir.h	2012-03-20 21:08:23.000000000 +0100
+@@ -22,7 +22,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ 
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_srvc_place.h meanwhile-1.0.2-r1/src/mw_srvc_place.h
+--- meanwhile-1.0.2/src/mw_srvc_place.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_place.h	2012-03-20 21:09:51.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+diff -uNr meanwhile-1.0.2/src/mw_srvc_resolve.h meanwhile-1.0.2-r1/src/mw_srvc_resolve.h
+--- meanwhile-1.0.2/src/mw_srvc_resolve.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_resolve.h	2012-03-20 21:10:54.000000000 +0100
+@@ -23,7 +23,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ 
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_st_list.h meanwhile-1.0.2-r1/src/mw_st_list.h
+--- meanwhile-1.0.2/src/mw_st_list.h	2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_st_list.h	2012-03-20 21:11:27.000000000 +0100
+@@ -30,7 +30,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+ 
+ 
+diff -uNr meanwhile-1.0.2/src/mw_util.h meanwhile-1.0.2-r1/src/mw_util.h
+--- meanwhile-1.0.2/src/mw_util.h	2004-12-28 21:41:26.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_util.h	2012-03-20 21:06:54.000000000 +0100
+@@ -23,8 +23,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ 
+ 
+ #define map_guint_new() \
+diff -uNr meanwhile-1.0.2/src/srvc_aware.c meanwhile-1.0.2-r1/src/srvc_aware.c
+--- meanwhile-1.0.2/src/srvc_aware.c	2005-12-08 23:02:11.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_aware.c	2012-03-20 21:07:22.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_conf.c meanwhile-1.0.2-r1/src/srvc_conf.c
+--- meanwhile-1.0.2/src/srvc_conf.c	2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_conf.c	2012-03-20 21:07:42.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_dir.c meanwhile-1.0.2-r1/src/srvc_dir.c
+--- meanwhile-1.0.2/src/srvc_dir.c	2005-09-15 22:30:20.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_dir.c	2012-03-20 21:08:44.000000000 +0100
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_ft.c meanwhile-1.0.2-r1/src/srvc_ft.c
+--- meanwhile-1.0.2/src/srvc_ft.c	2005-09-15 22:30:37.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_ft.c	2012-03-20 21:09:05.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_im.c meanwhile-1.0.2-r1/src/srvc_im.c
+--- meanwhile-1.0.2/src/srvc_im.c	2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_im.c	2012-03-20 21:09:31.000000000 +0100
+@@ -19,7 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_place.c meanwhile-1.0.2-r1/src/srvc_place.c
+--- meanwhile-1.0.2/src/srvc_place.c	2005-12-03 03:00:29.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_place.c	2012-03-20 21:10:05.000000000 +0100
+@@ -19,8 +19,7 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_resolve.c meanwhile-1.0.2-r1/src/srvc_resolve.c
+--- meanwhile-1.0.2/src/srvc_resolve.c	2005-10-27 02:10:06.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_resolve.c	2012-03-20 21:10:21.000000000 +0100
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_store.c meanwhile-1.0.2-r1/src/srvc_store.c
+--- meanwhile-1.0.2/src/srvc_store.c	2005-11-19 02:52:42.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_store.c	2012-03-20 21:11:13.000000000 +0100
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+diff -uNr meanwhile-1.0.2/src/st_list.c meanwhile-1.0.2-r1/src/st_list.c
+--- meanwhile-1.0.2/src/st_list.c	2005-12-08 23:01:27.000000000 +0100
++++ meanwhile-1.0.2-r1/src/st_list.c	2012-03-20 21:11:44.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #include "mw_debug.h"
+ #include "mw_util.h"
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..201228115725
--- /dev/null
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild,v 1.1 2012/03/24 11:38:04 pacho Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Meanwhile (Sametime protocol) library"
+HOMEPAGE="http://meanwhile.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+IUSE="doc debug"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2:2"
+
+DEPEND="${RDEPEND}
+	dev-libs/gmp
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare(){
+	epatch "${FILESDIR}/${P}-presence.patch" #239144
+	epatch "${FILESDIR}/${P}-glib2.31.patch" #409081
+
+	#241298
+	sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in || die
+}
+
+src_configure() {
+	local myconf
+	use doc || myconf="${myconf} --enable-doxygen=no"
+
+	econf ${myconf} \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}