diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 18 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch | 62 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.34.3-r1.ebuild | 243 |
4 files changed, 324 insertions, 9 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 1c63d6dc9e33..763c2cb9dc96 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.570 2013/08/15 01:24:32 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.571 2013/08/15 13:01:15 tetromino Exp $ + +*glib-2.34.3-r1 (15 Aug 2013) + + 15 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + +glib-2.34.3-r1.ebuild, + +files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch: + Update ebuild for python-r1.eclass in preparation for stabilization. Skip + another failing test (fixed in 2.36). 15 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.36.3-r2.ebuild: diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 06746f9fb9b9..39f3f94c50cb 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -13,6 +13,7 @@ AUX glib-2.32.4-bashcomp.patch 843 SHA256 262a3689dc030712eea1349ee96cbf21123b03 AUX glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch 1784 SHA256 00ff3dd00872158eaf5a9e622d0877b8003c16880af07ceb9fed4d4bdfba69a1 SHA512 1001f6b24033187db50568a24bfaea9cdd0e70721a9cba988f3a64e75725ded31d23fe7d6d7dbb81678632a44770639ee36c6ab7a79bae0fa764a8b467d6e104 WHIRLPOOL 211ad59497093b34c313f22884b0a29a7a9973167e6a56f4737962d590b30ae7fd2dd9b1d9843c6d247cba8ee0d866cb1981a30c363aa19c711d32145a15e345 AUX glib-2.34.0-testsuite-skip-thread4.patch 1312 SHA256 65ed09251a66b096df38431fde13335038e26c4fa973534af68948757801a3a5 SHA512 d64799f42d269e33295a2aca3728a762508ab06bf8cc20c399ab926095a884a73795fc0b5d3806c16c0f579472d06e945f332df96be0b4307b7d5c289e03591f WHIRLPOOL 8da1696ce6fd7fac83bef9563baf71e2b67b3e194ab3e631d238dc6e0a2d5493dc7a7f3af61bfa64a2023b0554ecaf3c523e7d9edea30e22f3615186e63f14cc AUX glib-2.34.3-automake-1.13.patch 645 SHA256 a8f4bd4bfa03e2d4014af5e3ce899188bd935bfb4917444c2b09f1a493ebfacb SHA512 cfe6b0a99af00837fb78ac6171491a5a98756d84f63a3f1b27e510325d158940437ee65cbb60691bb13e2867fd0bce11ffb2f3274eb88810fa63a8827ec5089a WHIRLPOOL 585cd5ee5cb1a52f62a4db7056f7fe3d6c3886e77870637f25ef52386330e544cf8590a05a72d095cca9ed0bf1bae86e1fae99c886039736b4ba7b06dff15429 +AUX glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch 1764 SHA256 361845ce7dc980642e018713834aa6b143d6c0cea4256bd16c2f79387c8a6bea SHA512 e2ed8bc809bccb19caa8ab1378f22e50d9a262b7c386256f7864e916bc61b51e70e836dd8ecd5ce79a89b2c62fb4cb7ab3026022051aca6b7406b9d2536201f7 WHIRLPOOL b8049eba35e60d2e1b5e0daed244a61892b31dfe9123f7de26ef07b116388147f8d6c0c32cdf496b284df3363bd13e4b9f1b61418a318e49fbb24812d5e0b7fd AUX glib-2.35.x-external-gdbus-codegen.patch 4567 SHA256 b8b699317836af2673a428b39bf4077ee9c99ee81bcda4d06a05f608b474b11c SHA512 ad1bf670e8fa25c18cd94a9add7b1ae0bf4a3d696bfdc89708d1a1edb8ba923b702bd98be9eb2b439ca1efbe9f2d123f18119b859c8080a6638d61a8f16525de WHIRLPOOL c2faa0d89d5bfb2372865cfe1d43679d7721b55091aa680dea9a686e40d006522d37d66ce3b7a4214af2940c012d6bd4ec3644508ed88887ec06bb85abcde893 AUX glib-2.36.3-revert-ext34.patch 1397 SHA256 5e71f9a59f434f8850fb2474d3f8022ea36c7e254283db3437ae72f52b0690bd SHA512 e24c5ba741403ca0cf932b2bc238e16223fb4d0c1a17d3bb9010a09e07f24d404de466322eec0e241b56dbfb31109de96146e4f4c277aaf9524af9a6a929d461 WHIRLPOOL 591756857d6ab906c052188ee7947bc153f086851f19719fbe6a4fbb378c9690a6bc5ac05c95612eeb1fd27c2651f4d767fc584dc74ef3d4b2d372763689f6b2 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341 @@ -25,20 +26,21 @@ DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45 EBUILD glib-2.32.4-r1.ebuild 8355 SHA256 2c7bed6e3df8f29a6fc03d3c627ac6ddedb62d5624be324063ef3494186d45f4 SHA512 bee7e53b3ad42e5dcc36f75c9a30b7c7bb6e09803064a953982a07d88852ee414987964abfd1acab27dc8b08946c769dc12f8167cbcbf934cc9b66e009286793 WHIRLPOOL cd9bd78ae8d8ed4cb0fbeadc7d1a91937ed056d68b90e4a321412c812ba27edca6c753a87b3fbe8a4d75d4ddd88e66fa8312ca16d88843242ad0365287a6aed6 +EBUILD glib-2.34.3-r1.ebuild 8406 SHA256 86cf31557fe3ea88b66c881d7036334f21fd288e8ccf02a81de3c39fbb4f8150 SHA512 70e51bebc12f086a9f8d9ca71085e4ef30599b4ab94ef7d68cea95ffe5d91b7d27648272503767bd4ed0f87ee16facfc9b2b85db427da01e2fdb393cd20acf59 WHIRLPOOL 0ac2cc024009d5c9b4123cb5e1724ec7899082604949d59b1fdcd48c6a593459f208225c7d4d08ce509870eb7838bed8d5d62011ad2047d038daa08c563f6636 EBUILD glib-2.34.3.ebuild 8631 SHA256 37970835f0f70e6318b3dc9c4de67c8365a106a60c25e9abe9ff53129b002ff8 SHA512 c197e526247e0b386bc440dc67d01dfed644bc5cf3c30931075d2dce8cf36a7cf78fe7903e083b83b6922906338e237ec32f8f2c8224b927069b09be9aa4ee74 WHIRLPOOL 5da1cb9a91189a58f701595a83dcdab589468287923998ba3418e09457e9d5d2f10f815ee6fa9977c55abbef0068ce353016055f573931b1d1bf415b18b6f887 EBUILD glib-2.36.3-r1.ebuild 8535 SHA256 c8dca3602e2b9f6e45bea4fb695570824fd92c760aabd4f15f65375b95e014b9 SHA512 7bb9cab2f414993181fa45a6bfc3215e412a55dab230091e44551662fcac2899bdd0179966d9ff58c67c77212864dfa02fd181f83bbc23a4b1d728cd0d4a4dab WHIRLPOOL dccda73b292adc59fd643ae7e99f3531f392585d734772d4b95e0341e1a3d9825115d11560a74c84d6878b90bc6ef23d8a9164ff52356b6f67809c084adbeaaf EBUILD glib-2.36.3-r2.ebuild 9460 SHA256 94943f021ce9ca89d128de65fe1736a89a3ac8d43403c107611468175977b299 SHA512 8418bb0514813eaf6dd2557e1874f08cc05d524f78d04cfa2c3b0db0698b6fc48ceb074a7d617e863731bba683af4086782878eff242576a2f219c6ae9aa2401 WHIRLPOOL 5ae2cbcbc3ca67064b37e30561344a7a9a755fc4ecc2e75344861c2db1083e6aeac30e0bc98a48bcc922090448bdedf4392fc5c47d3d9340a2b59495f7f97ddc EBUILD glib-2.36.3.ebuild 9274 SHA256 b16d8b916691777ac32f72eebe59f67138b0bebe5aae7ad7c40a8d74facddca6 SHA512 7a3e7fbbd7048732976e51642f72d02e6adb4f13b504a36cf32539f542895feeafa46a8474ac8914f37de78b02b63ccf11bbce178bcc4a98b2a9c80fef828fc5 WHIRLPOOL abfd6351be76e1b0f8c65218a754c8cdc91370a2c756eede804bc999f18faa1f14abb43553c618edb34f42f6466f8a38d93562cf166680cba38b9da2bb9304c3 -MISC ChangeLog 79702 SHA256 16e141241408d1e8a253442083300808a73852869d19693b80fd7a91a2b0f77b SHA512 0c86c794d5438cc2236291e0e17e5a269bcfbba42e162932f64adaaca57c1c076dedbff73efb7ea307dfd4551e2bf6ce2f881f82d11e233f7966408c833227e7 WHIRLPOOL c1369dc6e399ab6f2b2cc1291eb55b1c18d563f4ff60a5422834c7c547fd2ece3056e5058eaf5d3c7aca31c00cbb381422616f6ba12daf4e34ceb56bc6e54675 +MISC ChangeLog 79995 SHA256 7de10c1196f46340e891f94973faca02b40be07c9a60b7ec24a32c353b07d532 SHA512 dae21a68aeb2a96fd9903e60a155032bf538a3cf61f959c91ac523f9e90811d8c10ec8edc465278040bf8198e5ab04be8b62cf844130318331247e6eed86222a WHIRLPOOL 3a9ec93c2f0a217e1b0e20af328fac77618193ca16dbdd1808b086d579ca611a7a3ba52a0d8a8232f30af8567bce221d720ab446bed4633ff1e862a7d24003be MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJSDC3eAAoJEJ0WA1zPCt1hhG4IAJobL913ijLoCvZB4WJt03W1 -d7eWwhxINusqbTmhdVbE8Qbwcs6xYYcgLHOHiRKIQElXrN7sQNlHnPbM3qB1HVL2 -3adfFGOTmdEVBI0WxnPb4RAZHKHNyVojcknfv1LGbWTJt0XXYmLBEIBxpczADVud -TIm2u+u8XCcvW7IXy5E/aG2hraEecA8SiC5vGuZFYAkZEzAMS6kHQxn5k0M7Kk5O -fRZPKwtSyLl2cF0b66sLwnyIT6hQCZmO662eJEEKPjiK78DGKamceHnj5UDHqcUd -hS+Cq6K3i8/Dq7oBl2GlxzNWLzVzWg1tfMi6/h78w+WTXdn2e66qAqczcPZi1X0= -=XbIv +iQEcBAEBCAAGBQJSDNEqAAoJEJ0WA1zPCt1hgCkH/2mi5h2+HTlGlWC2GiLYngXX +dW81Vzk22rHOxhevGfHmIYhNu1GEReeh7P4CQDjgKYBZbQ7YyBfv7tfrCbRsNQb/ +RIMgisvph1XTsSMRdX5kwDe2GXhULlOJ9onYfYmXUOi934WJvy+4fb0bWu+47DAm +8oGzL+dwPLDPixo2T9pZOS0xheevzWLM9jWbHhwJusAnEDx3jvsIAwg/6prQGs1b +HmenO2jump5QbECYSV5Z7mRmQFSSSBRWQ5pWJEER5ZkvevHwQwqmBy31Mq0ZF9Yp +wC5TMeobja9pYI6beff7ndsdrM6p5rGkSUALovVAmfedBQB7lDgzZXhs0Qj+AMU= +=CSXq -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch new file mode 100644 index 000000000000..c7c3f3364f4f --- /dev/null +++ b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch @@ -0,0 +1,62 @@ +From 86bc94d3783ba53a944451f4eba4c78130eeef3b Mon Sep 17 00:00:00 2001 +From: Priit Laes <plaes@plaes.org> +Date: Tue, 3 Jul 2012 12:50:44 +0300 +Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1 + tests + +https://bugzilla.gnome.org/show_bug.cgi?id=679308 +--- + gio/tests/gdbus-auth.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c +index 737770e..d528c6b 100644 +--- a/gio/tests/gdbus-auth.c ++++ b/gio/tests/gdbus-auth.c +@@ -89,11 +89,14 @@ auth_client_external (void) + auth_client_mechanism ("EXTERNAL"); + } + ++#if 0 ++// https://bugzilla.gnome.org/show_bug.cgi?id=679308 + static void + auth_client_dbus_cookie_sha1 (void) + { + auth_client_mechanism ("DBUS_COOKIE_SHA1"); + } ++#endif + + /* ---------------------------------------------------------------------------------------------------- */ + +@@ -250,11 +253,13 @@ auth_server_external (void) + auth_server_mechanism ("EXTERNAL"); + } + ++#if 0 + static void + auth_server_dbus_cookie_sha1 (void) + { + auth_server_mechanism ("DBUS_COOKIE_SHA1"); + } ++#endif + + /* ---------------------------------------------------------------------------------------------------- */ + +@@ -272,10 +277,14 @@ main (int argc, + session_bus_up (); + + g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); ++#if 0 + g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1); ++#endif + g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous); ++#if 0 + g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external); + g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1); ++#endif + + ret = g_test_run(); + +-- +1.8.3.2 + diff --git a/dev-libs/glib/glib-2.34.3-r1.ebuild b/dev-libs/glib/glib-2.34.3-r1.ebuild new file mode 100644 index 000000000000..b0071af3f19a --- /dev/null +++ b/dev-libs/glib/glib-2.34.3-r1.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3-r1.ebuild,v 1.1 2013/08/15 13:01:15 tetromino Exp $ + +EAPI="5" +PYTHON_COMPAT=( python2_{5,6,7} ) +# Avoid runtime dependency on python when USE=test + +inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs versionator virtualx linux-info + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2+" +SLOT="2" +IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +RDEPEND="virtual/libiconv + virtual/libffi + sys-libs/zlib + || ( + >=dev-libs/elfutils-0.142 + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + selinux? ( sys-libs/libselinux ) + xattr? ( sys-apps/attr ) + fam? ( virtual/fam ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV} + ) +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=dev-libs/libxslt-1.0 + >=sys-devel/gettext-0.11 + >=dev-util/gtk-doc-am-1.15 + systemtap? ( >=dev-util/systemtap-1.3 ) + test? ( + sys-devel/gdb + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV} + >=sys-apps/dbus-1.2.14 ) + !<dev-libs/gobject-introspection-1.$(get_version_component_range 2) + !<dev-util/gtk-doc-1.15-r2 +" +# gobject-introspection blocker to ensure people don't mix +# different g-i and glib major versions + +PDEPEND="x11-misc/shared-mime-info + !<gnome-base/gvfs-1.6.4-r990" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# Earlier versions of gvfs do not work with glib + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + linux-info_pkg_setup + fi +} + +src_prepare() { + # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 + mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die + + # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626 + epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch + + if use test; then + # 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 tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die + sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die + sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die + fi + + # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 + if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then + ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" + ewarn "not being present on your system, think on installing them to get these tests run." + sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die + sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die + sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die + sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die + sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die + sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die + sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die + # needed to prevent gdbus-threading from asserting + ln -sfn $(type -P true) gio/tests/gdbus-testserver.py + fi + fi + + # gdbus-codegen is a separate package + epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" + + # leave python shebang alone + sed -e '/${PYTHON}/d' \ + -i glib/Makefile.{am,in} || die + + # Gentoo handles completions in a different directory + sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ + gio/Makefile.am || die + + # https://bugzilla.gnome.org/show_bug.cgi?id=679306 + epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=679308 + epatch "${FILESDIR}/${PN}-2.34.3-testsuite-skip-gdbus-auth-tests.patch" + + # build failure with automake-1.13; fixed upstream in 2.36 + epatch "${FILESDIR}/${PN}-2.34.3-automake-1.13.patch" + + epatch_user + + # Needed for the punt-python-check patch, disabling timeout test + # Also needed to prevent croscompile failures, see bug #267603 + # Also needed for the no-gdbus-codegen patch + eautoreconf + + [[ ${CHOST} == *-freebsd* ]] && elibtoolize + + epunt_cxx +} + +src_configure() { + # Avoid circular depend with dev-util/pkgconfig and + # native builds (cross-compiles won't need pkg-config + # in the target ROOT to work here) + if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then + if has_version sys-apps/dbus; then + export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" + export DBUS1_LIBS="-ldbus-1" + fi + export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" + export LIBFFI_LIBS="-lffi" + fi + + 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. + use debug && myconf="--enable-debug" + + if use test; then + myconf="${myconf} --enable-modular-tests" + else + if [[ ${PV} = 9999 ]] && use doc; then + # need to build tests if USE=doc for bug #387385 + myconf="${myconf} --enable-modular-tests" + else + myconf="${myconf} --disable-modular-tests" + fi + fi + + # Always use internal libpcre, bug #254659 + econf ${myconf} \ + $(use_enable xattr) \ + $(use_enable fam) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_enable systemtap dtrace) \ + $(use_enable systemtap systemtap) \ + --enable-man \ + --with-pcre=internal \ + --with-threads=posix \ + --with-xml-catalog="${EPREFIX}/etc/xml/catalog" +} + +src_install() { + default + + if use utils ; then + python_replicate_script "${ED}"/usr/bin/gtester-report + else + rm "${ED}usr/bin/gtester-report" + rm "${ED}usr/share/man/man1/gtester-report.1" + fi + + # 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 + + # Completely useless with or without USE static-libs, people need to use + # pkg-config + prune_libtool_files --modules +} + +src_test() { + gnome2_environment_reset + + unset DBUS_SESSION_BUS_ADDRESS + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + unset GSETTINGS_BACKEND # bug 352451 + export LC_TIME=C # bug #411967 + python_export_best + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + # 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 + + # Need X for dbus-launch session X11 initialization + Xemake check +} + +pkg_postinst() { + # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483 + # TODO: add a subslotted virtual to trigger this automatically + 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 + + if has_version '<x11-libs/gtk+-3.0.12:3'; then + # To have a clear upgrade path for gtk+-3.0.x users, have to resort to + # a warning instead of a blocker + ewarn + ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes." + ewarn "You should upgrade to a newer version of gtk+:3 immediately." + fi +} |