GTime and time_t are equivalent for bsd, so we cannot define them both. As such we punt the deprecated function.

(Portage version: 2.1.3.15)

3 files changed, 54 insertions, 4 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 168af1bf6e6d..0ff59ccaca90 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.95 2007/10/18 14:47:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.96 2007/10/19 09:17:20 uberlord Exp $
+
+  19 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +files/glibmm-2.14.0-date.patch, glibmm-2.14.0.ebuild:
+  GTime and time_t are equivalent for bsd, so we cannot define them both. As
+  such we punt the deprecated function.
 
   18 Oct 2007; Roy Marples <uberlord@gentoo.org> glibmm-2.14.0.ebuild:
   2.14 fails on x86-fbsd, keyword dropped
diff --git a/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch b/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch
new file mode 100644
index 000000000000..f72d7f6c3b0d
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch
@@ -0,0 +1,42 @@
+diff -ur a/glib/glibmm/date.cc b/glib/glibmm/date.cc
+--- a/glib/glibmm/date.cc	2007-08-13 11:51:09 +0100
++++ b/glib/glibmm/date.cc	2007-10-19 10:02:22 +0100
+@@ -71,16 +71,6 @@
+   g_date_set_parse(&gobject_, str.c_str());
+ }
+ 
+-#ifndef GLIBMM_DISABLE_DEPRECATED
+-
+-void Date::set_time(GTime time)
+-{
+-  //This method, and the C function that it wraps, are deprecated.
+-  g_date_set_time(&gobject_, time);
+-}
+-#endif // GLIBMM_DISABLE_DEPRECATED
+-
+-
+ void Date::set_time(time_t timet)
+ {
+   g_date_set_time_t(&gobject_, timet);
+diff -ur a/glib/glibmm/date.h b/glib/glibmm/date.h
+--- a/glib/glibmm/date.h	2007-08-13 11:51:09 +0100
++++ b/glib/glibmm/date.h	2007-10-19 10:02:08 +0100
+@@ -119,18 +119,6 @@
+    */
+   void set_parse (const Glib::ustring& str);
+ 
+-  #ifndef GLIBMM_DISABLE_DEPRECATED
+-
+-  /** Sets the value of a date from a GTime (time_t) value. 
+-   *
+-   * @param time GTime value to set.
+-   *
+-   * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
+-   */
+-  void set_time(GTime time);
+-  #endif // GLIBMM_DISABLE_DEPRECATED
+-
+-
+   /** Sets the value of a date from a <type>time_t</type> value. 
+    *
+    * @param timet time_t value to set
diff --git a/dev-cpp/glibmm/glibmm-2.14.0.ebuild b/dev-cpp/glibmm/glibmm-2.14.0.ebuild
index 1595720e766d..b1b96b42d171 100644
--- a/dev-cpp/glibmm/glibmm-2.14.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.14.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.0.ebuild,v 1.3 2007/10/18 14:47:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.0.ebuild,v 1.4 2007/10/19 09:17:20 uberlord Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/libsigc++-2.0.11
@@ -28,6 +28,9 @@ src_unpack() {
 		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
 			die "sed Makefile.in failed"
 	fi
+
+	# GTime and time_t are equivalent on fbsd, so we cannot define both
+	use x86-fbsd && epatch "${FILESDIR}/${P}-date.patch"
 }
 
 src_install() {