diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 16 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.34.0.ebuild | 12 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.34.1.ebuild | 238 |
4 files changed, 264 insertions, 10 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 9570a3791a6d..a7640cea9dc4 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.546 2012/10/14 14:53:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.547 2012/10/17 07:37:32 tetromino Exp $ + +*glib-2.34.1 (17 Oct 2012) + + 17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.34.0.ebuild, + +glib-2.34.1.ebuild: + Version bump; fix --enable-modular-tests logic. 14 Oct 2012; Raúl Porcel <armin76@gentoo.org> glib-2.32.4-r1.ebuild: ia64/m68k/s390/sh/sparc stable wrt #436028 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 016b29e0389c..1fef9e77ed19 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -25,18 +25,24 @@ DIST glib-2.30.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e 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.0.tar.xz 6368532 SHA256 f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144 SHA512 b3aa98320b68b6d1aedc5cdbd4e271aa464e933db5741eeda0fb48e950c42c9be5c33166294998be79ea574733d337fc427c89810ea1a3496cfd00ccacd0b703 WHIRLPOOL e8b1f07fc7b9ac86b1a82db827e734c1d3cf5e52be63f9c48e5f00d6dbbc9537005db66025877886e1eb3da0924bcf0065b5e0fcb212f5f16d89ad025bb7059b +DIST glib-2.34.1.tar.xz 6363332 SHA256 6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1 SHA512 a3776f77c6837f37fa42bf337054ac129e705ec913e32a5e17b19e9fe27426600c4667819c4fb51b5f6fc2481d5a63c2ffd0826287890b51e25448670ceaefef WHIRLPOOL 5639623268c05b0e82e24fc4bedba5af34cec539dd413d21b57a5f7a4237ddaff2ed4fc53d12e36d6e3533c530980ab454f731b34ba6ecb41a30b296b8995276 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7 EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54 EBUILD glib-2.30.3.ebuild 8696 SHA256 a507488c385f89b06283a19821dc43a948770aa3b903f736656d41502477a5ef SHA512 03a7eb3a5d1f464f5b5745538db084dec17e1bf24494995da17005367f9bff06aac1b9e2e1588ab34c7a407a9ed94f6f43ad65af1d7ed801fc53d9a3aea3f774 WHIRLPOOL b5e17f9acee124bd1d26218f3b6a2c731d1157a58416dfc98e8d1c26815b4534aac02187e3814f45bf1cd1f5aade825f81fe9dc1c2e84f3c44a3db1bd214b9b0 EBUILD glib-2.32.4-r1.ebuild 8032 SHA256 49f89fa745e33f72ab4c878d8d00a5c6af23f46cbfc278244d139763844b849d SHA512 14bfbc8e12d9de32395192ebcf5dc8b7a1b9524a02c2fc38ad6996cfd9ce01509e2bbb773775602d13e5fb68306b1a2a5a8ef4f744136660d5210df85e31f2bc WHIRLPOOL 96e6453e62a051189187135b4614cc9cf700ac39536ba2116fc05fa4089c18878b628cd2026c3c5c0940806b458ebfc27bcdf6989678b7f03e76f224f8c6eb92 EBUILD glib-2.32.4.ebuild 7994 SHA256 9890de6175c730df9270c21e460a1fd2229770eee42429d354105fd4df93ee72 SHA512 241d23b6aad19b293ed7591ab68291973133f48878eb6ff7cacda86fef2186dee1d2aaf1e12ab369b4f8bc68681ac40605a99f4a497b23acafd67ae9adc42ad8 WHIRLPOOL 2f938a6fd923b7a74c9521097aaa3d6268fda3b592790cf706f2ad6961ee1223242e59515dacc0d6383e02079064e6844e2748f89a46171c7cd6dca1d3f3477f -EBUILD glib-2.34.0.ebuild 8182 SHA256 9f7653313dbed64a36f54396eff3991cb3443f83e7df304bcfd261b45ef038a5 SHA512 3d1e58863e8ad5cb201b12ba97c83b38519b2272045526580c167ca718140363e5031d05d912aaf86647bde780c42670633ff8fdbfff4efdb4a4c44f087ba84f WHIRLPOOL b30aeb5a12c7f94a4c38ed3ab055d6ab63a596149862338fe89ff2596b02598345df4ecbc870a345d6b9fc8a5a3a123e86a24c57a14abbf029a850a3d076d922 -MISC ChangeLog 74688 SHA256 a4943646dc92e9a999ecaa9e7bf1922b9aa15fc4d67b9876f0c170fe27b61670 SHA512 30c5f891d4fb389b328b0b8ec8e25cb24a58fd0d5b02badfef55f9fb8253b4e0e28c4f468cc2347a027a970337932650ec2fb46da49f15fc26403f89aeff3b19 WHIRLPOOL 7791366f858f4a766a1e69a9ef354c20c9f589d9669fa18a412583e42beb5b9fec924ff0e82de8cef74c55c63fd4f8f5098d4bb9ec56b604dcf23e74f0736aa0 +EBUILD glib-2.34.0.ebuild 8250 SHA256 b470f9bda344956ea820c1f02fa059bacf26f8728ba75f1ed632f1004b4b806d SHA512 466e46f9df13a567857be12ecadf004be11666decb90f8b3ba0dd4d908bacbaea4f4df0ca7d9fc3c20adf1a41e5a94a60e8053c6664d2a1a93510327c274fea4 WHIRLPOOL e4b9df50e5deed3ab489e5eaaee596f84d4d49579f64c6d13a3aa3ef8a21f223dade5cb8792bd487c5c57ea2353051c403dab6f5abdb2acdb169d41dde7b9652 +EBUILD glib-2.34.1.ebuild 8250 SHA256 a3cb3572e57e9c2d9024c14bdc5a062c78797bec02673d7cc6e78313027a0c03 SHA512 266f181f363fed1c3e83d862bcc54aea3a215d69600eb5c478e191c4628c3bf4cc8587b9673a3e59cf77eaf14e9e5b7c0882fbb2d0a7a7ff17c752a6b3244da1 WHIRLPOOL cba787a5d4c94358e8a059fd5bfc32bbb2241a96fdb1ba524295891393563a273b6f477cf10d6f4865dd25517c64a3dd6d2749da7123ffb8b1ec89d6c73c0869 +MISC ChangeLog 74871 SHA256 47d703ec0d17dbc60d9c07fcde7a0de6f01c1dbcfb453ec184f8e56db68db014 SHA512 9bebc79a0f33a36bb9e6ba220283f9e37d226b180579a2273462541c6420d1b51935b334fdd9ad49354ab2c35178497d9cde28fb8a7b166cf735f76e5e545e35 WHIRLPOOL 66e6420b86a0521c9d1c79bc6bd8efbdae445aad7bff6a4038e5b800d674bbca91e2f86d31784ee0eeae2d14a686ca9c110c7507af4c6f74c49d846311961ae0 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlB60dwACgkQuQc30/atMkDonwCfdj76HiTEcotfBpxg/gHiOJKR -az4An3r3P7GdahW7iyEc98KbN6o01mfc -=n61e +iQEcBAEBCAAGBQJQfmA9AAoJEJ0WA1zPCt1hG7AH/R6chFkPz99xPwY42BH5UOW7 +FchJretStTN/kRTuH6xxZPKhujpvG5pVlznpNvwCy9RrwFMYLVGI0pdqbJmCNopH +rYxyUf6511Eq+RapWzxHCH/6nydZiw6F/UDZm2OpSuUg+5zADPRkeqPSu8QM5VRU +Str6G59rkBawwOPKWHYaHEYMbxPPiTDyBkX4+zLZuSFZckJaUswI2lWD+Tq+uzbF +1BHZRLRT+od0GfTUQRPuZhVpnBs3Ei5al0ZDNqJDhn7xA//a78uXSqYyN1pFvyd0 +mdVYedBBuGUvi8ENzjM+4in0lhkGFMxDNe5revymJ7JyXMHXJ6Fgozf+nPX8+io= +=IOGK -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.34.0.ebuild b/dev-libs/glib/glib-2.34.0.ebuild index d7dca2cf41f0..9233e3e956d1 100644 --- a/dev-libs/glib/glib-2.34.0.ebuild +++ b/dev-libs/glib/glib-2.34.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.0.ebuild,v 1.3 2012/10/10 07:26:34 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.0.ebuild,v 1.4 2012/10/17 07:37:32 tetromino Exp $ EAPI="4" PYTHON_DEPEND="utils? 2" @@ -139,11 +139,15 @@ src_configure() { # -- compnerd (3/27/06) use debug && myconf="--enable-debug" - # need to build tests if USE=doc for bug #387385 - if use test || [[ ${PV} = 9999 ]] && use doc; then + if use test; then myconf="${myconf} --enable-modular-tests" else - myconf="${myconf} --disable-modular-tests" + 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 diff --git a/dev-libs/glib/glib-2.34.1.ebuild b/dev-libs/glib/glib-2.34.1.ebuild new file mode 100644 index 000000000000..b57ddf812966 --- /dev/null +++ b/dev-libs/glib/glib-2.34.1.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.1.ebuild,v 1.1 2012/10/17 07:37:32 tetromino Exp $ + +EAPI="4" +PYTHON_DEPEND="utils? 2" +# Avoid runtime dependency on python when USE=test + +inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs 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.26.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 ~x86-linux" + +RDEPEND="virtual/libiconv + virtual/libffi + sys-libs/zlib + || ( + >=dev-libs/elfutils-0.142 + >=dev-libs/libelf-0.8.12 ) + xattr? ( sys-apps/attr ) + fam? ( virtual/fam ) + utils? ( >=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 + =dev-lang/python-2* + >=dev-util/gdbus-codegen-${PV} + >=sys-apps/dbus-1.2.14 ) + !<dev-util/gtk-doc-1.15-r2" +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() { + # Needed for gio/tests/gdbus-testserver.py + if use test; then + python_set_active_version 2 + python_pkg_setup + fi + + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + linux-info_pkg_setup + fi +} + +src_prepare() { + mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die + + # Fix gmodule issues on fbsd; bug #184301 + 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 + 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" + + # bashcomp goes in /usr/share/bash-completion + epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" + + # 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.0-testsuite-skip-gdbus-auth-tests.patch" + + # disable pyc compiling + use test && python_clean_py-compile_files + + # 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 + + [[ ${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. + # -- compnerd (3/27/06) + 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 +} + +src_install() { + local f + + # install-exec-hook substitutes ${PYTHON} in glib/gtester-report + emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install + + if ! use utils; then + rm "${ED}usr/bin/gtester-report" + 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 + find "${D}" -name '*.la' -exec rm -f {} + +} + +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 + + # 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_preinst() { + # Only give the introspection message if: + # * The user has gobject-introspection + # * Has glib already installed + # * Previous version was different from new version + if has_version "dev-libs/gobject-introspection" && ! 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 +} + +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 + + 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 +} |