summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-06-11 15:04:18 +0000
committerPacho Ramos <pacho@gentoo.org>2011-06-11 15:04:18 +0000
commit1b0584b3fe396dded3db515e59d32576cf4cf0ac (patch)
tree403308be4daa101815aba45bb8fbe7a384780646 /dev-libs/glib
parentChange HOMEPAGE thanks to David (bug #371111). (diff)
downloadhistorical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.tar.gz
historical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.tar.bz2
historical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.zip
Remove old.
Package-Manager: portage-2.1.9.50/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog10
-rw-r--r--dev-libs/glib/Manifest25
-rw-r--r--dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch22
-rw-r--r--dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch43
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch21
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch64
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch33
-rw-r--r--dev-libs/glib/glib-2.26.1-r1.ebuild185
8 files changed, 13 insertions, 390 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3053d89abbe2..55135a8e132a 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.470 2011/06/11 03:05:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.471 2011/06/11 15:04:18 pacho Exp $
+
+ 11 Jun 2011; Pacho Ramos <pacho@gentoo.org>
+ -files/glib-2.25-skip-tests-with-dbus-keyring.patch, -glib-2.26.1-r1.ebuild,
+ -files/glib-2.26.1-deprecation-tests.patch,
+ -files/glib-2.26.1-gdatetime-test.patch,
+ -files/glib-2.26.1-gdbus-flushes.patch,
+ -files/glib-2.26.1-gsettings-rules.patch:
+ Remove old.
11 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -glib-2.28.7.ebuild,
glib-2.28.8.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index af97961fdcd7..f9ded4131ef4 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -10,40 +10,23 @@ AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363
AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
-AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
AUX glib-2.26.0-disable-locale-sensitive-test.patch 1256 RMD160 2754468a420189f6e8d7ea215b53069a21c14dd0 SHA1 f3008b5db6774b6c9d5a04a4bdbed4a9f553a63e SHA256 f0db01f4198ca3688ece382819d320f39d6b722381e28611df59c880f4d18e02
AUX glib-2.26.0-disable-volumemonitor-broken-test.patch 1181 RMD160 c99e2969a3cab244dc39c81f2dd32bc42677c6e8 SHA1 cc30a7223108fb7fbe1a1c063d9546ffc457b94f SHA256 aa3075f22a9125551fbce6909645fb6b5c5b74282e6fed2ee1d06853b15437d3
-AUX glib-2.26.1-deprecation-tests.patch 1396 RMD160 2cda39fa239d9eeb83d179260cfda8ec54b68cab SHA1 0e1eda5351e47feaf249c98aa6988f0608e80a17 SHA256 9d95d7f361900116821f79e2122df4a794af648c0ff9661a937805a5aced2f7a
AUX glib-2.26.1-gatomic-header.patch 269 RMD160 668ded743e0004b671e79d1ee5918c42cc78163d SHA1 db7808b0dfc39d8b415dce071b6a1805cad1a850 SHA256 81046ce8bdb7b1c863aba9cb457443e92b792807b304d0ee8e7dfd2b6fb7b122
-AUX glib-2.26.1-gdatetime-test.patch 760 RMD160 05b81043d5bfb0ff54806f4ac96ec135cf7f2898 SHA1 461d462f2d4509d07a70913f1268bd49847608ea SHA256 5f3569050c1fffbb5f312d0a00db9a43ff80446f510ab5d5116220406dfc61e7
-AUX glib-2.26.1-gdbus-flushes.patch 2270 RMD160 1bb9668f0df08ce54c16cf476102ca099754af96 SHA1 191e2034fa5eb2097657a82af92680c50509b1a9 SHA256 1adee16f5013695aaab38b8a9130c3ac2f3b8b802405cfa3c7d2ed4767873a07
-AUX glib-2.26.1-gsettings-rules.patch 1414 RMD160 8593654837d8cdd4f01990fdba9ada3c2d7e5c7c SHA1 ec1a9fac96b4e05cd02d2a9ad51a6198af2d8b16 SHA256 9f8d431cd0c7f1ab7559089500baabe275fee85f3b86b0645aeef1b0e913fb74
DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731
DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f
-DIST glib-2.26.1.tar.bz2 6704686 RMD160 e8b00fce55aa539ee00588500c0162a8877dc060 SHA1 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0 SHA256 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
DIST glib-2.28.6.tar.bz2 6955725 RMD160 5858c29829352c0c59fe12dbd6dceba81aabe5f6 SHA1 51996339c823cf36ba28c774c4afad933d5f5744 SHA256 557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578
DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9 SHA1 9b11968fedf4da45bcd10c4a8c50012d41b3af50 SHA256 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
-EBUILD glib-2.26.1-r1.ebuild 6043 RMD160 2ee2ee629bd983a44e8f086838343ee73bd97748 SHA1 a1f5bb2a567a583241b5d262ddbe32bb5d3cf515 SHA256 a82428b2be2220ca2a9aa2bf10084812482b5dd2a85b600cfa3e84d83983a2ef
EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e
EBUILD glib-2.28.8.ebuild 7035 RMD160 ad566ef14597538910230603fc41cc5eb246cd77 SHA1 723e036976c7533e046500f22bbaee54cee3b042 SHA256 6e48d022b84ea6f4628eac544943ae6e1393be2e811463c2414b5da435f78ab6
-MISC ChangeLog 61326 RMD160 01c4c3d8f8c6372fbd04ac9c067c4f8945194517 SHA1 5b29279a5dda9561d70ed1413720937f434ec0e2 SHA256 604ed26908695d0e8b9a43e745b3486c2623f923be539bb9268149a95918d8be
+MISC ChangeLog 61638 RMD160 53cf09684998da13254de00f8ce7df6c1f526e20 SHA1 237d9e7ec21f03ce53dfeb7c7c4a9e7c3ed01d5e SHA256 4c4953fd03d48c189a4ccb5c53be3541768aa5c7acf3980947a86dfb154966f1
MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJN8ttpAAoJEO/kOhxWD91kILkP/06NPKiWde+LM8nI667dl/zS
-++jaBgjy8Uqyo13JsWBiYcD67DW8+/2Ex+oyp06DJtf5NmGonGy+9KMLkmdWhhaz
-sRk70ok0x/cBfF1OlDjCvwrAwNRdfybfY3UfJMDKsfJof7M7agrNKLiTgS0kV2qV
-2gyjhsqJIevMggtNu7+fh2aqMVVk/yF9HN7ORIDe2I8tSHc3BKBO0ZPLQnCm6A2L
-kwvYc4aJdMPq0x1E9c63tY1AxRwAKWL13FfEmS3/r321vGP7AV1ZheEtNwo2rp4E
-f+BC7nVuAdxhJX4oVDUPDiMIpxiIhDc70KKYdopo7y3ZQKDNzLiLZfBOCaivaQ37
-ZdKkdwMZSQxDpKg9T2cOJCTmBIB5v77WyvY3tF8iWdaI/9DVjNx4fAoVvvJA2gny
-WkCcVViNBOT8SrYM2nCU+tP5QFPdxfOkkbYa+30Eb+kY3F+tZ4PpL3RgxuqQWS9R
-WNLG4B5owczdF/GQXg0wbPr8QGkQ58Dms7EpRXL1dZoGsArhFkrDsoagU+s39qIB
-ICJugcoBW3fndb88FLIopjzxbQimFa7ZfYq3gdix/ZAr4Afe9InMtBBthf3KAOpY
-AW7IbNcduTe4gRzOYdPI2WRXc8yB0IE7zXz/XeyYohphyFDMyiw3t4KC/NQtxIWC
-dY8yjC0PUEcE5Am78bEq
-=Dq0a
+iEYEARECAAYFAk3zg/gACgkQCaWpQKGI+9Qv/ACfRsa4T8qvAftF1Wy8LBnj/ogk
+zTgAnAp3BPBDGCXQxwa8jG9OmQ0i9DHG
+=mBKL
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
deleted file mode 100644
index baca1eca86fa..000000000000
--- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
-+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
-@@ -1448,7 +1448,7 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
- g_test_add_func ("/gdbus/credentials", test_credentials);
- g_test_add_func ("/gdbus/overflow", test_overflow);
-
---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
-+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
-@@ -336,7 +336,7 @@
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
diff --git a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch b/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
deleted file mode 100644
index c4085aee7169..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Tue, 30 Nov 2010 02:28:00 +0000
-Subject: Bug635093: Deprecation check in tests/testglib.c
-
-The Relation API in glib/grel.h has been marked as
-deprecated (G_DISABLE_DEPRECATED), so added check for
-that macro in this source file and added label to indicate
-deprecation
----
-diff --git a/tests/testglib.c b/tests/testglib.c
-index b4e29f0..158808a 100644
---- a/tests/testglib.c
-+++ b/tests/testglib.c
-@@ -1038,6 +1038,7 @@ hash_table_tests (void)
- g_hash_table_destroy (hash_table);
- }
-
-+#ifndef G_DISABLE_DEPRECATED
- static void
- relation_test (void)
- {
-@@ -1110,6 +1111,7 @@ relation_test (void)
-
- relation = NULL;
- }
-+#endif
-
- static void
- gstring_tests (void)
-@@ -1539,7 +1541,9 @@ main (int argc,
- g_test_add_func ("/testglib/GTree", binary_tree_test);
- g_test_add_func ("/testglib/Arrays", test_arrays);
- g_test_add_func ("/testglib/GHashTable", hash_table_tests);
-- g_test_add_func ("/testglib/Relation", relation_test);
-+#ifndef G_DISABLE_DEPRECATED
-+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
-+#endif
- g_test_add_func ("/testglib/File Paths", test_paths);
- g_test_add_func ("/testglib/File Functions", test_file_functions);
- g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch b/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
deleted file mode 100644
index 054f311f7535..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3f059a6a123dd62257f224b9af7701078783060e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 22 Jan 2011 04:41:12 +0000
-Subject: Remove a test that seems to fail depending on time of day
-
----
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
-index 01f08de..619bb02 100644
---- a/glib/tests/gdatetime.c
-+++ b/glib/tests/gdatetime.c
-@@ -804,7 +804,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
- TEST_PRINTF_TIME (13, 13, 13, "%r", "01:13:13 PM");
- TEST_PRINTF ("%R", "00:00");
- TEST_PRINTF_TIME (13, 13, 31, "%R", "13:13");
-- TEST_PRINTF ("%s", t_str);
-+ //TEST_PRINTF ("%s", t_str);
- TEST_PRINTF ("%S", "00");
- TEST_PRINTF ("%t", " ");
- TEST_PRINTF ("%W", "42");
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch b/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
deleted file mode 100644
index 5ae2d72cf357..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001
-From: Ted Gould <ted@gould.cx>
-Date: Mon, 13 Dec 2010 18:33:15 +0000
-Subject: Bug 635626 – GDBus message idle can execute while flushes are pending
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635626
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index dd9d58a..228c28c 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -431,6 +431,7 @@ struct GDBusWorker
- gint num_writes_pending;
- guint64 write_num_messages_written;
- GList *write_pending_flushes;
-+ gboolean flush_pending;
- };
-
- /* ---------------------------------------------------------------------------------------------------- */
-@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject *source_object,
- if (error != NULL)
- g_error_free (error);
-
-+ /* Make sure we tell folks that we don't have additional
-+ flushes pending */
-+ g_mutex_lock (data->worker->write_lock);
-+ data->worker->flush_pending = FALSE;
-+ g_mutex_unlock (data->worker->write_lock);
-+
- /* OK, cool, finally kick off the next write */
- maybe_write_next_message (data->worker);
-
-@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker,
- worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l);
- }
- }
-+ if (flushers != NULL)
-+ {
-+ worker->flush_pending = TRUE;
-+ }
- g_mutex_unlock (worker->write_lock);
-
- if (flushers != NULL)
-@@ -1344,7 +1355,7 @@ static gboolean
- write_message_in_idle_cb (gpointer user_data)
- {
- GDBusWorker *worker = user_data;
-- if (worker->num_writes_pending == 0)
-+ if (worker->num_writes_pending == 0 && !worker->flush_pending)
- maybe_write_next_message (worker);
- return FALSE;
- }
-@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream *stream,
- worker->stream = g_object_ref (stream);
- worker->capabilities = capabilities;
- worker->cancellable = g_cancellable_new ();
-+ worker->flush_pending = FALSE;
-
- worker->frozen = initially_frozen;
- worker->received_messages_while_frozen = g_queue_new ();
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch b/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
deleted file mode 100644
index 01ce2265ecaf..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 04 Nov 2010 19:23:22 +0000
-Subject: gsettings.m4: Fix rules to work when there are no schemas
-
-If there are no schemas, don't try to install "" at install time.
-(In particular, automake conditionals don't work properly with
-@-expanded rules, so if you conditionally build a schema, you'll
-still unconditionally get the install rule.)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=633381
----
-diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
-index 4e4352f..f0ed838 100644
---- a/m4macros/gsettings.m4
-+++ b/m4macros/gsettings.m4
-@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas
-
- install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
- @$(NORMAL_INSTALL)
-- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-+ if test -n "$^"; then \
-+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-+ fi
-
- uninstall-gsettings-schemas:
- @$(NORMAL_UNINSTALL)
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/glib-2.26.1-r1.ebuild b/dev-libs/glib/glib-2.26.1-r1.ebuild
deleted file mode 100644
index 3999ee5f98bd..000000000000
--- a/dev-libs/glib/glib-2.26.1-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.26.1-r1.ebuild,v 1.9 2011/03/22 18:51:01 ranger Exp $
-
-EAPI="3"
-
-inherit autotools gnome.org libtool eutils flag-o-matic pax-utils
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam +introspection selinux +static-libs test xattr"
-
-RDEPEND="virtual/libiconv
- sys-libs/zlib
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.16
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.13
- doc? (
- >=dev-libs/libxslt-1.0
- >=dev-util/gtk-doc-1.13
- ~app-text/docbook-xml-dtd-4.1.2 )
- test? ( >=sys-apps/dbus-1.2.14 )"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )"
-
-# eautoreconf needs gtk-doc-am
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
-
-src_prepare() {
- if use ia64 ; then
- # Only apply for < 4.1
- local major=$(gcc-major-version)
- local minor=$(gcc-minor-version)
- if (( major < 4 || ( major == 4 && minor == 0 ) )); then
- epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
- fi
- fi
-
- # gsettings.m4: Fix rules to work when there are no schemas, bug #350020
- epatch "${FILESDIR}/${PN}-2.26.1-gsettings-rules.patch"
-
- # Fix compilation on several arches, bug #351387
- epatch "${FILESDIR}/${PN}-2.26.1-gatomic-header.patch"
-
- # Remove a test that seems to fail depending on time of day
- epatch "${FILESDIR}/${PN}-2.26.1-gdatetime-test.patch"
-
- # Deprecation check in tests/testglib.c, upstream bug #635093
- epatch "${FILESDIR}/${P}-deprecation-tests.patch"
-
- # Can't read GSettings:backend property, upstream bug #636100
- epatch "${FILESDIR}/${P}-gsettings-read.patch"
-
- # Cannot send a locked message with PRESERVE_SERIAL flag, upstream bug #632544
- epatch "${FILESDIR}/${P}-locked-message.patch"
-
- # GDBus message idle can execute while flushes are pending, upstream bug #635626
- epatch "${FILESDIR}/${P}-gdbus-flushes.patch"
-
- # Don't fail gio tests when ran without userpriv, upstream bug 552912
- # This is only a temporary workaround, remove as soon as possible
- epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
- # Fix gmodule issues on fbsd; bug #184301
- epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
- # Don't check for python, hence removing the build-time python dep.
- # We remove the gdb python scripts in src_install due to bug 291328
- epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
-
- # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
- epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-
- # skip tests that require writing to /root/.dbus, upstream bug ???
- epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
-
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
- # Disable failing tests, upstream bug #???
- epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
- epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
-
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
- || die "sed failed"
- fi
-
- # Needed for the punt-python-check patch.
- # Also needed to prevent croscompile failures, see bug #267603
- eautoreconf
-
- [[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
- epunt_cxx
-}
-
-src_configure() {
- local myconf
-
- # Building with --disable-debug highly unrecommended. It will build glib in
- # an unusable form as it disables some commonly used API. Please do not
- # convert this to the use_enable form, as it results in a broken build.
- # -- compnerd (3/27/06)
- # disable-visibility needed for reference debug, bug #274647
- use debug && myconf="--enable-debug --disable-visibility"
-
- # Always use internal libpcre, bug #254659
- econf ${myconf} \
- $(use_enable xattr) \
- $(use_enable doc man) \
- $(use_enable doc gtk-doc) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- --enable-regex \
- --with-pcre=internal \
- --with-threads=posix \
- --disable-dtrace \
- --disable-systemtap
-}
-
-src_install() {
- local f
- emake DESTDIR="${D}" install || die "Installation failed"
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
- dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-
- insinto /usr/share/bash-completion
- for f in gdbus gsettings; do
- newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
- done
- rm -rf "${ED}/etc"
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export XDG_DATA_HOME="${T}"
- unset GSETTINGS_BACKEND # bug 352451
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- emake check || die "tests failed"
-}
-
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has it enabled
- # * Has glib already installed
- # * Previous version was different from new version
- if use introspection && has_version "${CATEGORY}/${PN}"; then
- if ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
- fi
-}
-
-pkg_postinst() {
- # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
- if has_version dev-libs/dbus-glib; then
- ewarn "If you experience a breakage after updating dev-libs/glib try"
- ewarn "rebuilding dev-libs/dbus-glib"
- fi
-}