summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-05-14 22:15:44 +0000
committerPacho Ramos <pacho@gentoo.org>2013-05-14 22:15:44 +0000
commitd1380ca59e07287dd3de51a1766473c16aef0c72 (patch)
treec79c31d15656768bd11c1243a4e247f91b97bbd2 /dev-libs/glib
parentVersion bump, drop old (diff)
downloadhistorical-d1380ca59e07287dd3de51a1766473c16aef0c72.tar.gz
historical-d1380ca59e07287dd3de51a1766473c16aef0c72.tar.bz2
historical-d1380ca59e07287dd3de51a1766473c16aef0c72.zip
Version bump, drop old
Package-Manager: portage-2.1.11.63/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog8
-rw-r--r--dev-libs/glib/Manifest16
-rw-r--r--dev-libs/glib/glib-2.36.2.ebuild (renamed from dev-libs/glib/glib-2.36.0.ebuild)29
3 files changed, 34 insertions, 19 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index b88c038d1ee0..f6a1cabdd3a2 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
# 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.558 2013/04/30 14:29:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.559 2013/05/14 22:15:34 pacho Exp $
+
+*glib-2.36.2 (14 May 2013)
+
+ 14 May 2013; Pacho Ramos <pacho@gentoo.org> +glib-2.36.2.ebuild,
+ -glib-2.36.0.ebuild:
+ Version bump, drop old
30 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
glib-1.2.10-r5.ebuild, glib-2.32.4-r1.ebuild, glib-2.34.3.ebuild,
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 9cc5f30749f0..34092fe98b83 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -19,24 +19,20 @@ DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783
DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
-DIST glib-2.36.0.tar.xz 6508276 SHA256 455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 SHA512 86402c22b3df419112aab82bfe2c2a598992c6eadf941375b6f4f1840f9004491fafcbd95dc372262cddb29064abba54c640b1dbf281ff75c0ea209683876530 WHIRLPOOL 9db755e0a6070a63b78ebc71b6c54279faeffec57f9392c329fdbd105bfe5f74caff134c0aef7c93a542eed71e0465f7c1a42c4277ad7a8d42cf837fdc1f434c
DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
+DIST glib-2.36.2.tar.xz 6615452 SHA256 5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80 SHA512 0030b2d52570c5c72aeed85e1d8611d2354efdb6200be3a4f716bd0f92a34002546c974f65ee1fd8822ac791efce9574b6148b04a88af377108f60ad65220016 WHIRLPOOL 90e2335c37f951145d511e1532e5e2ad1590895f1cbe4c1dcc5ecdd45f5d68719d5cb8204e75afcd207e21fdb207be6f8453d20ef1a8279e93d234957b276219
DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
EBUILD glib-2.32.4-r1.ebuild 8283 SHA256 dd2679288fa2fc9ac701c7e28802ea9cd651e0ecfeb21aba77408fd7f3cad044 SHA512 84dff6719a77eb70d2b80473750521518b49cd353927034192f83e58e5ce81ff7a4333545a300f0ad71e4eb1a4d6b69fa0cf55c1cd85ce603fd47ccdb170373d WHIRLPOOL 8e06ee1377e42d79ab138e5775b6ba86bad3183213a3b6053e8f841019b53c23f3907a1a34a7f2b57e9f83e804c06868d39493ca8bc7abb719cf7190af824e65
EBUILD glib-2.34.3.ebuild 8559 SHA256 f1af100fd9f3ee7723687b8cb62ba4c31c1460f745bf4fd0ab5a61546ca72841 SHA512 b0fde730dab39339c838474b28097a73d7300f4b50dae36544a1dde6b57a22fbdb02e21df2c087f44e14de8d272fdcb77b2fe91b5ea28a4aa922aba860dca00d WHIRLPOOL a3422c3a2c9068fcd45cfd0a1d428ec19760620fe10030f1de4ca19b348f19d4a0eab97dee982f04986d3038413b3fcb980b6846d38d32dec1fd67590d21f0b4
-EBUILD glib-2.36.0.ebuild 8360 SHA256 daabc480ec8f536efa265643b8c3340fa6ce12f30bd800c85d3abf094833d0ea SHA512 5da13a2005614b7ea73add590739cf7412ed04bbf1e077125f99a5c171e9250ee742eb2c75b2ea86c8b8a1e90448c99414a21fe2852887a282243f7b525e8923 WHIRLPOOL 35b4ca1789588ed6217e2a9a6284e8499da5a02e9e87673dc3e668e004b72fafb22a46a7a73f41d1de8ad02f3b6131b7a36783eed363318c6c29fc8e93d9a820
EBUILD glib-2.36.1.ebuild 8904 SHA256 7db1b7613ea8c9e2cf8183b5c2d19084fc5ae820a9c176ce4e3515c5372193de SHA512 38ab00d5f5c9fb8ea2f1a0aa6b270ebd2bd2690fc96b11b2e049fe1b10e0827eb6d50f8f1b97068f1e01bd43a50712e6b61dfc1db3eff61cd0e9d646a1284654 WHIRLPOOL 40793736f6855f58fdce90201232d561a5bea9acf981c55a04c241de67cef894b26fd44d1bdcb5a08de1054cc40cc9328b4e58a06f3d4850d7b7b69cb6358ec4
-MISC ChangeLog 77290 SHA256 c0c5cc9bdabb67e110b25266916e04c1f337687c3ef0e2126887cde32ed61bba SHA512 38bf0dc97a98c8fdfcf503fcfcd3cda3326c0ee1373d3ba3c5af692fa2e298cc33e379a8b63fa0ce1811ae1d48b2b2666c282500d97ed266ce5f62710ceefa8c WHIRLPOOL 64faed582e2cc7e1922b2d1789b42ca1335fbc7df43f13b7fdec546036481c9cec00e1d5f4e6c831f208cf230c1af95edd60679ae4944736be217b1d3e64095c
+EBUILD glib-2.36.2.ebuild 8926 SHA256 8b3b72415c41eee28c05a28c74466cba565c14fd248a263fd4502da8ba4ce687 SHA512 0c5e0d4e98c3f8b5da803a4bf020cbabee465ef00863594a008ffde7b1018fc2eaa9b50b55ff8d9694c9570106828d6a0c2c2c44052a65902a0e06da7265236b WHIRLPOOL f4ed22c4188d72d80c8548396a424524d90cb2b8ed18bd0fcc0a7cc85c6e7d7b2168971ebe6c9666af811678e2b9fd6d45a855fe3ea9e658af7d15e2eefa77ca
+MISC ChangeLog 77430 SHA256 d408254f05fbe3c7258d3de07bc9eb4be420be8e92ef469852b69c024d37331e SHA512 b12bd9ddf6646f15f73f1af4a8c7a4c634c28fc8f6a7bdc91f0b146ada743ec576d41c4543ac90b9f504f32c1a08ecbd506da8bd36032e632b51bc189150310e WHIRLPOOL 45c86b8444d0a6ec1460f249d9448679762443e1bdb8afa1020c0cf6aff412c0eb3665294ec21ad7a457c268e44425a88b58128494601fb6ffecd391e6731723
MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJRf9U6AAoJEJ0WA1zPCt1hdXkIALxZe0ETwAvVzXodw77x6OQX
-WklaUo/SpfENk22UTYUand3H24IB6amkoRNtIy2sjIBkAQqoAeK5WoInsCbn0/cc
-YrhZoP1KMMeryc9JNuaoWb7joXlWjDMeyHznumQSSvs2UNRXHqBG5CBi4TH6gpxq
-WvM5uJ/T/Xyzmx8hEK8njdXf+D1g87tFiAez7483PUGHC6WDLOpS8tFbcNyTpUzY
-p6vsErJHJRNC0OGjroluVNFp1DWFyNSV96RnNKdEDnvyKGW+LmQYyxzVTCYCj6Xw
-jJh9f4Jys9Q9rJHNwg2Y2jImS5VdjWMR1NDWQQ07N6Fwd3MC/B7k1cRa3/9Gk0Y=
-=qRO9
+iEYEAREIAAYFAlGSt4cACgkQCaWpQKGI+9QLXwCfR6Ae6q1glcIU1ZzoHfYFLvQP
+LWsAni0un/1qArEisEpqg1i7JRQWYdwe
+=JIhA
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.36.0.ebuild b/dev-libs/glib/glib-2.36.2.ebuild
index 744199a4d8cd..228dfc57aa1b 100644
--- a/dev-libs/glib/glib-2.36.0.ebuild
+++ b/dev-libs/glib/glib-2.36.2.ebuild
@@ -1,6 +1,6 @@
# 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.36.0.ebuild,v 1.2 2013/04/07 17:33:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.2.ebuild,v 1.1 2013/05/14 22:15:34 pacho Exp $
EAPI="5"
PYTHON_COMPAT=( python2_{5,6,7} )
@@ -10,8 +10,6 @@ inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pa
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2+"
SLOT="2"
@@ -52,14 +50,17 @@ PDEPEND="x11-misc/shared-mime-info
pkg_setup() {
if use kernel_linux ; then
CONFIG_CHECK="~INOTIFY_USER"
+ if use test; then
+ CONFIG_CHECK="~IPV6"
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+ export IPV6_DISABLED="yes"
+ fi
linux-info_pkg_setup
fi
}
src_prepare() {
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
- # Fix gmodule issues on fbsd; bug #184301
+ # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
if use test; then
@@ -67,7 +68,7 @@ src_prepare() {
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
+ # 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."
@@ -99,6 +100,17 @@ src_prepare() {
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
+ # Some tests need ipv6, upstream bug #667468
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+ sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+ fi
+
+ # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+ sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
+
+ # thread test fails, upstream bug #679306
epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
fi
@@ -117,8 +129,9 @@ src_prepare() {
# 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
- AT_M4DIR="${WORKDIR}" eautoreconf
+ eautoreconf
+ # FIXME: Really needed when running eautoreconf before? bug#????
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
epunt_cxx