remove broken patch from 2.14.2, drop x86-fbsd keyword, we should go with 2.16.4, bug #199546.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 20 insertions, 51 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 74d017d9124a..127c69f3eefa 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.116 2008/07/10 15:12:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.117 2008/07/18 09:14:12 aballier Exp $
+
+  18 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/glibmm-2.14.0-date.patch, glibmm-2.14.2.ebuild:
+  remove broken patch from 2.14.2, drop x86-fbsd keyword, we should go with
+  2.16.4, bug #199546.
 
   10 Jul 2008; Rémi Cardona <remi@gentoo.org> glibmm-2.8.4.ebuild,
   glibmm-2.14.2.ebuild, glibmm-2.16.0.ebuild, glibmm-2.16.1.ebuild,
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 168031e6014c..78e770726822 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,15 +1,24 @@
-AUX glibmm-2.14.0-date.patch 1174 RMD160 f6bfa6a824298601294aa9396fff38f372f4fbf6 SHA1 26339e2f5c5576eb1e0652e45bff7e2de6f944b9 SHA256 f5a14c9cbde821285ebebc848d3073db4834283d0b120db4f9b49f48075b4971
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST glibmm-2.14.2.tar.bz2 9268918 RMD160 8b3f93be8c6998188efe554bda005303712af867 SHA1 4edeb23a13b068c3ef93c6f0acfd5decbdd7a91d SHA256 7602068e8ea8e705c3970b5f2f524c7335db4ee0ca630a424690bc4951544851
 DIST glibmm-2.16.0.tar.bz2 11719272 RMD160 88d6bbbd542a07abafff8f2c381b9074207bcb1d SHA1 b24e461c0192092311063cb461178c8f776668ad SHA256 b587b9f88fd6b355857b9ec1a18f4a6a65005b8e9e1f2128c63b646d3937c92b
 DIST glibmm-2.16.1.tar.bz2 12151123 RMD160 e33527f76fdf9b04bb58f1f812fb1ceb00e6170b SHA1 45edd554ccfd9796a94571e3188ceeb0209d7eaf SHA256 71582fa82f4e191be8a0ade34f55c93889b9409a0eb792287496d8799307e174
 DIST glibmm-2.16.3.tar.bz2 6382829 RMD160 3850ef925003c9332808140fceab9cbcb57f81be SHA1 9711cec3951633034cb591e8832c06bcaea452fb SHA256 4bd2724444f125d867849da855239dd8fce3e0fd1249d54007e9b78776765e6c
 DIST glibmm-2.16.4.tar.bz2 6375753 RMD160 48e5b4812d2dcd9af8419aa0a7b72c60065a5ab4 SHA1 5f6790bdafd4963219d5a60a8617c9ca89c98ef5 SHA256 a6d165e61d03e52956a040de4ccd8d35364be22124c6be6d048214aa6d7eae83
 DIST glibmm-2.8.4.tar.bz2 2024815 RMD160 2e774d07533943e80074b52c3ae81a2cb6784e04 SHA1 efc829c97e67230028e9876777fe0f959ad787a8 SHA256 7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
-EBUILD glibmm-2.14.2.ebuild 1200 RMD160 1fe4c4108d0a9c88431760f1bd8e3218f0845452 SHA1 48706f560a9fbb652f94734c404051c38fb49659 SHA256 d8c55c3fe8baf318128d92c7dec7e27622e748bc3ab4a740fea0e1953248e3cc
+EBUILD glibmm-2.14.2.ebuild 1070 RMD160 8da2ec1e473cdf5b60afd8155c3db05db7b921ca SHA1 07f5dfe79415b520aef849de48888b884b8ebecb SHA256 20feb9a2555c62ac066a830eb6d33c055aba1b2dd00e08df4afa92caef4cf84d
 EBUILD glibmm-2.16.0.ebuild 1027 RMD160 f06cb21d1aaaf8c263f671c7a80550dd06a83741 SHA1 2d35f4f6d0c5a20f3d2232755b6f5c0bd59787b0 SHA256 6e3235de730ae169501c674ee9fd6463f9863a3ddfa16089f38b9b314275f70d
 EBUILD glibmm-2.16.1.ebuild 1019 RMD160 18d42efb5da948e8a27b845b1ff9952e6a11d4b5 SHA1 f4bad5ac9d3feba6b84a154fcf63fc62f58a45b1 SHA256 132dc78ef8d3c3caf80bf40024ebd4c6c56efc591055338c9e4f678fb4319a31
 EBUILD glibmm-2.16.3.ebuild 1027 RMD160 d1d3069dcd6e3fced54baa402cd740d5f983b558 SHA1 c44f855d536e2b323cb4444691a0a310af974581 SHA256 269458a09d659017d276ded883e5a62e1bcb2dcd9b752ababa613c037708350f
 EBUILD glibmm-2.16.4.ebuild 1188 RMD160 56528ab2e1c83a0b113d42ddcd8b318a48a4f872 SHA1 cafea0c9d5cff33b5bbcebd249cddc555f8ada7e SHA256 79ba0925d6293d4d655e79ffc5d5960b9b586b5b533452808794f9de9e532937
 EBUILD glibmm-2.8.4.ebuild 1197 RMD160 1d21d4b10bfc05186e26921439f582b5576b5662 SHA1 4dc691ff32562e2c989b32ccf096f31e048920ad SHA256 806f1c6ebc25cf25d61a96425573948f2d10f91dffda36607b27859d491a8ef7
-MISC ChangeLog 14006 RMD160 bcc984f2851387861d8c61924c3688b38f68e101 SHA1 3a078d5cb54c871aa2afad87c2f2b36ab8435c6c SHA256 181ad3090da6643958cd2795d50d82104ee1dcb53c650904f6283bb73629b55a
+MISC ChangeLog 14219 RMD160 2d16be059697ae9ad0aac5951fa2577094c1160f SHA1 88819f81d40ce19be44451d16f022e8b0fc6ddcb SHA256 197a5a223b9f0d6b94f679fc9a8d801e576a0931b04d24fd618954274cf3a8c2
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiAXuwACgkQvFcC4BYPU0riwwCbB09QZRhsSu/gRalA1y2HdDSB
+ALsAn3A3o473nJq3pq3fK24HFUrSqmsF
+=vHFK
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch b/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch
deleted file mode 100644
index f72d7f6c3b0d..000000000000
--- a/dev-cpp/glibmm/files/glibmm-2.14.0-date.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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.2.ebuild b/dev-cpp/glibmm/glibmm-2.14.2.ebuild
index 648fa8602cf3..fc3d19ed9eb3 100644
--- a/dev-cpp/glibmm/glibmm-2.14.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.11 2008/07/10 15:12:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.12 2008/07/18 09:14:12 aballier Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/libsigc++-2.0.11
@@ -28,9 +28,6 @@ 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() {