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

Package-Manager: portage-2.1.3.15

4 files changed, 66 insertions, 12 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/Manifest b/dev-cpp/glibmm/Manifest
index 3d9d2942731a..504ca25c9b5d 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,3 +1,7 @@
+AUX glibmm-2.14.0-date.patch 1174 RMD160 f6bfa6a824298601294aa9396fff38f372f4fbf6 SHA1 26339e2f5c5576eb1e0652e45bff7e2de6f944b9 SHA256 f5a14c9cbde821285ebebc848d3073db4834283d0b120db4f9b49f48075b4971
+MD5 12f3ddb51bcd7ea731a45548a2834b66 files/glibmm-2.14.0-date.patch 1174
+RMD160 f6bfa6a824298601294aa9396fff38f372f4fbf6 files/glibmm-2.14.0-date.patch 1174
+SHA256 f5a14c9cbde821285ebebc848d3073db4834283d0b120db4f9b49f48075b4971 files/glibmm-2.14.0-date.patch 1174
 DIST glibmm-2.12.10.tar.bz2 2360587 RMD160 9fae22e3d99e9867e22ec19d7d66129e2befb6cb SHA1 361466df6302ec5626a87e75786da4c7c39ffe14 SHA256 21b760b1567f9fcd9ea5244f02fdb0583852f7f4c513ab83726a1a076093320b
 DIST glibmm-2.12.8.tar.bz2 2535582 RMD160 5f6adafcbce591fb51002256881054cfbaa76b6a SHA1 b66714560f8b68cc7715d07dd8c825afcc46bd54 SHA256 9fcedb9318749815053d6e06a0c12bc554ea8b02c2c48feb1c4a1193fdde6922
 DIST glibmm-2.14.0.tar.bz2 9288868 RMD160 270d899c551b1fc07110023b0b00d159605a77a9 SHA1 a512fd9b7ef0b1d315ed9297ca411daacac85da7 SHA256 ab0d170cf919df5f7f1d4d5e006bc5c900f43ec9298fba8c61e7fbb112c5d233
@@ -13,10 +17,10 @@ EBUILD glibmm-2.12.8.ebuild 1073 RMD160 557567aea7472d828c83e3de87a37280bd54e807
 MD5 295dff666352ecd92c96ee08e8c99396 glibmm-2.12.8.ebuild 1073
 RMD160 557567aea7472d828c83e3de87a37280bd54e807 glibmm-2.12.8.ebuild 1073
 SHA256 620b73dab5bc78888a06d4d72ced27cc82a68ba292a0bef876fe28fca3c75973 glibmm-2.12.8.ebuild 1073
-EBUILD glibmm-2.14.0.ebuild 1077 RMD160 a8e673e5bc26bfb6a245857c9baf2e0ae4d6026a SHA1 963d1fea0fb73640843288d3bddc49f638665c5b SHA256 86de585e6fd39e66c2addd165665e800fc219e7e528f187316bf1d0fc9c9ac4e
-MD5 d9c7fa985dcb8941916e951b69301d20 glibmm-2.14.0.ebuild 1077
-RMD160 a8e673e5bc26bfb6a245857c9baf2e0ae4d6026a glibmm-2.14.0.ebuild 1077
-SHA256 86de585e6fd39e66c2addd165665e800fc219e7e528f187316bf1d0fc9c9ac4e glibmm-2.14.0.ebuild 1077
+EBUILD glibmm-2.14.0.ebuild 1218 RMD160 210df0dc50e897db5e43ec1c381e029c2af7a41c SHA1 084aa7f0cd58886c75fdc98bf4f9fb8b480a47f7 SHA256 e36d6d5b3b341e08cdae40c3288d0e41a792b17c3275a947c49f6e8a3093c9f2
+MD5 52b3d54122ec5470a103f79c20744866 glibmm-2.14.0.ebuild 1218
+RMD160 210df0dc50e897db5e43ec1c381e029c2af7a41c glibmm-2.14.0.ebuild 1218
+SHA256 e36d6d5b3b341e08cdae40c3288d0e41a792b17c3275a947c49f6e8a3093c9f2 glibmm-2.14.0.ebuild 1218
 EBUILD glibmm-2.4.7-r1.ebuild 1054 RMD160 74cbe2e065584b5d8d9c0a99e54c743571e1fa4a SHA1 1f189061240266169226ddda01631e232ba55b90 SHA256 5f21cf2809a4038be263cd93a8444eb72759f6db510193ebe97b61e690bb1caa
 MD5 8ce03c33ee4c7715e5f4be86dbe27553 glibmm-2.4.7-r1.ebuild 1054
 RMD160 74cbe2e065584b5d8d9c0a99e54c743571e1fa4a glibmm-2.4.7-r1.ebuild 1054
@@ -33,10 +37,10 @@ EBUILD glibmm-2.9.1.ebuild 1196 RMD160 87a4d7741be2f5d738fe72fc77e97f2ec414db69
 MD5 36d4f012c30e77593027f0290a5476cc glibmm-2.9.1.ebuild 1196
 RMD160 87a4d7741be2f5d738fe72fc77e97f2ec414db69 glibmm-2.9.1.ebuild 1196
 SHA256 1887d21eb77976e4882f3da6cee51826bf2a70300f2e40dc53fed43725d52bc3 glibmm-2.9.1.ebuild 1196
-MISC ChangeLog 10613 RMD160 fdeffc8635f4a8488a6d935a75507ec4a8c2767f SHA1 085a7d335daa390c952f5fe77af12da30adf9711 SHA256 e285e97996ce6e9f7ccb0cbf51fd4be89b2cdc721b9c5eabdfa97c72d543aa53
-MD5 dad89b70c953b09a336905abc8058efc ChangeLog 10613
-RMD160 fdeffc8635f4a8488a6d935a75507ec4a8c2767f ChangeLog 10613
-SHA256 e285e97996ce6e9f7ccb0cbf51fd4be89b2cdc721b9c5eabdfa97c72d543aa53 ChangeLog 10613
+MISC ChangeLog 10837 RMD160 fc714c168edfb8a74cb541d912699af9bdaa1fc4 SHA1 afdad06f20ea4d4b24d6fed9bafed4d3612b495c SHA256 bdd6d402c0434e0d9a757249dd2be0cde35716f0dc6668c85122313e96066ff5
+MD5 33d4c318fb27724597dc685ee2756ee2 ChangeLog 10837
+RMD160 fc714c168edfb8a74cb541d912699af9bdaa1fc4 ChangeLog 10837
+SHA256 bdd6d402c0434e0d9a757249dd2be0cde35716f0dc6668c85122313e96066ff5 ChangeLog 10837
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
 MD5 e1f2511030c19628dbfd68a7b1cd5c82 metadata.xml 162
 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 metadata.xml 162
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() {