diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2015-06-08 22:45:31 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2015-06-08 22:45:31 +0000 |
commit | 6aa9d9a4a4b9e8122d1fae57171653ac995f808d (patch) | |
tree | f6ba45c44e41f3f4a12c961617c7ffb6e0dcd6c1 /dev-libs | |
parent | Add back ~ppc and ~ppc64 keywords to make repoman happy. (diff) | |
download | historical-6aa9d9a4a4b9e8122d1fae57171653ac995f808d.tar.gz historical-6aa9d9a4a4b9e8122d1fae57171653ac995f808d.tar.bz2 historical-6aa9d9a4a4b9e8122d1fae57171653ac995f808d.zip |
Version bump for Gnome 3.16.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/glib/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/glib/Manifest | 10 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.44.1.ebuild | 270 |
3 files changed, 282 insertions, 5 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 8c4266a2228a..c28dae69df1e 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.649 2015/06/07 10:16:37 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.650 2015/06/08 22:45:27 eva Exp $ + +*glib-2.44.1 (08 Jun 2015) + + 08 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.44.1.ebuild: + Version bump for Gnome 3.16. 07 Jun 2015; Markus Meier <maekke@gentoo.org> glib-2.42.2.ebuild: arm stable, bug #534012 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 9bf6220e62ba..8f0e1e36edc6 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -12,17 +12,19 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472 DIST glib-2.42.2.tar.xz 7002480 SHA256 a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db SHA512 6b46e4ac67d79ca2cc5c32ceb7cc8112140645032cb3c8c9ba2f59a0d3c2aee06707b7573bbd72f6c21ea7798a7351bd205aa57857a58b0be008c75f897ef782 WHIRLPOOL 5c25c5f6d20217cce4f8c34d9d05cd39197b4b36c5a85447943fcab47cd343253879516b722eb0c4895eebae5f3d4e76c820730b9e7f6c890aca9c87dc963564 +DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7 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-1.2.10-r6.ebuild 2054 SHA256 702bf7ddb8bb198f44a63898c7ba71e3988a72fd1820dba7d777cd393ffcb359 SHA512 4182cab3f1c8f34d96d0da2f3740266736d7f7c16c114ad45257f23de701620ccb1778963c4dd76705aa6c897b45dbb58561eed84a390b6155eba013a7bfe17b WHIRLPOOL fe0775e657f0773eb4a888696add091abf19444679acd53be9359ebdd14670361f349e9a6489ea9bb2daed3bd3fdc32f977a793c7a1e8957979b182d46e6cc5f EBUILD glib-2.40.2.ebuild 9618 SHA256 eaf20566544974e97041acd957cbc03e8b9905c73732b9f0c01da38014f2d3ad SHA512 64435aadbd31a5df6bad98b54ad660d6c0aac075069835a93f46cb6cc6b8c3bfa8d2e0300ce60b27bd2b77343e3845f7e05d700ef518f201496d3f142efd34f9 WHIRLPOOL af36d8f486c573d4f6f59314c9daf7e01b898651b9f54fa7c4c72b006ae7e338e3ebc55ad5bc5dc34c24622c5079d0def3102ea95b4b17a1861631b92965fe84 EBUILD glib-2.42.2.ebuild 9483 SHA256 cdd83710782ea56b0fccbf319d57a2b2319d3f9da3c89d20ee608cc69b8f53dc SHA512 922548d3d844154ad0f8755e7047ca94ff95d065619c21f3671dd38add37b7b9a199e4d184f9928c4a540a26bf12ca822f393608e034cc4eb8e0ae54add7d4ad WHIRLPOOL 4d54873b16b75bd051688e039a694834010950c2405a69101ffbe1ff50ac5efa6c1f9cc7986493fba7607126660a1689ca458c77ca6aad8cd5e6f4b9f2959ee3 -MISC ChangeLog 91150 SHA256 304c85c1f8af04d3a059bf6c5e0861eec19eb13295656cadbba67c03fdb5174b SHA512 06f8c87defb3b194f92e11ac74deb7c17ce4ae6742499f4ae5808777da23e9a535fce330069ae1a0d035490278108c93f0de626cde0842262e416202134cdc57 WHIRLPOOL ab99be6f4b49495b3433525c512b10ca359a8fe4b6e57b5c5f5322d1ee08382ac98acc9e6e846cb73645aacb62b864732998a13bcb8c17ca9a5f7b260585b725 +EBUILD glib-2.44.1.ebuild 9486 SHA256 88206c5d82dbb208b1ca1270e0dc8efab25b756c7a9f1950f693602ae28165ab SHA512 b471a5ac3526e44e75aa564aa1c61424c6a85141cdc5749ec84e4a9999fcc52556e49cdd5c344211e3db2f2017dd39e0ba550713724b39b556f3af42ffee63a0 WHIRLPOOL 858e70881c76b74f13b9186e95ac0ff1b4af3e0169498fb90190a467f80bc618722602685f6c1459a6a5e99636d4c86dc7e47915ad5788a9f2f9618f53c68a2b +MISC ChangeLog 91282 SHA256 81f1bb2d23249cefc6c3b657b6cebe0fc0d32063e690709b8e735d9024f7f2a9 SHA512 2ee32963bd184a0b43182168401f6d00338000142c739ec761fd7f7a84776f9dea448754246427fadb34ef6d0aad5afe6a2ad8b1dd743263ad362f6050c498fb WHIRLPOOL d7cf9f8bb253eb91e3a62ddf634b4b2fd221ed65b304081c15343f7a76365d419c6f72ed3d5b06fd3bacda1279acc6888e4ad362895a0f241ae21efc4998e18c MISC metadata.xml 812 SHA256 3c076f78a7fc3cd1101c3b2c2dcb18d438dbd26d26c9058930d07f982c72ea6f SHA512 498d98a9bf6fb3cc36e780f3cf2c1e7c1ea32c810c8dbb4a32c94ecf0912eb5fa565555b351b238a05dc5e9ffd4ac0b2e3f626a22eeacec82b9bfed3e7b4becf WHIRLPOOL 48f59caf43300a0b52815ddb5de392091b16800df6a49f14ebe4d60c3abd11687b75378072a515dec5d4fefca27d89cd17f1bd5f0983ed8febc2d79d82a805cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlV0GgYACgkQkKaRLQcq0GLlHwCgkq8OhtQJSWOZwOqBcqGyApm3 -YpMAn0b6xz8+4g5ITovftf5K118y/zwX -=RwKs +iEYEAREIAAYFAlV2GwgACgkQ1fmVwcYIWAafbwCg3AXglLn1xVgRURbsUdbNSdwV +QjMAn1Joq91XEPcIr7X3+Hc6C9stXahy +=FkC8 -----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild new file mode 100644 index 000000000000..0e675a0efd28 --- /dev/null +++ b/dev-libs/glib/glib-2.44.1.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.44.1.ebuild,v 1.1 2015/06/08 22:45:27 eva Exp $ + +# Until bug #537330 glib is a reverse dependency of pkgconfig and, then +# adding new dependencies end up making stage3 to grow. Every addition needs +# then to be think very closely. + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) +# 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. +GCONF_DEBUG="yes" +# Completely useless with or without USE static-libs, people need to use +# pkg-config +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \ + pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal + +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="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr" +REQUIRED_USE=" + utils? ( ${PYTHON_REQUIRED_USE} ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +RDEPEND=" + !<dev-util/gdbus-codegen-${PV} + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + || ( + >=dev-libs/elfutils-0.142 + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) +" +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.20 + systemtap? ( >=dev-util/systemtap-1.3 ) + test? ( + sys-devel/gdb + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] + >=sys-apps/dbus-1.2.14 ) + !<dev-util/gtk-doc-1.15-r2 +" +# gobject-introspection blocker to ensure people don't mix +# different g-i and glib major versions + +PDEPEND="!<gnome-base/gvfs-1.6.4-r990 + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 +# Earlier versions of gvfs do not work with glib + +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() { + # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 + mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die + + if use test; then + # 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 + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + ewarn "Some tests will be skipped due to missing terminal program" + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.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 + + # Some tests need ipv6, upstream bug #667468 + if [[ -n "${IPV6_DISABLED}" ]]; then + sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die + sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die + sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die + fi + + # thread test fails, upstream bug #679306 + # FIXME: we need to check if it's still failing as upstream thinks something + # is wrong in our setups + #epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" + + # This test is prone to fail, bug #504024, upstream bug #723719 + sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die + fi + + # gdbus-codegen is a separate package + epatch "${FILESDIR}/${PN}-2.40.0-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 + + epatch_user + + # Also needed to prevent cross-compile failures, see bug #267603 + eautoreconf + + gnome2_src_prepare + + epunt_cxx +} + +multilib_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 + + case "${CHOST}" in + *-mingw*) myconf="${myconf} --with-threads=win32" ;; + *) myconf="${myconf} --with-threads=posix" ;; + esac + + # Only used by the gresource bin + multilib_is_native_abi || myconf="${myconf} --disable-libelf" + + # FIXME: Always use internal libpcre, bug #254659 + # (maybe consider going back to system lib + ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ + $(use_enable xattr) \ + $(use_enable fam) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_enable systemtap dtrace) \ + $(use_enable systemtap systemtap) \ + --disable-compile-warnings \ + --enable-man \ + --with-pcre=internal \ + --with-xml-catalog="${EPREFIX}/etc/xml/catalog" + + if multilib_is_native_abi; then + local d + for d in glib gio gobject; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + 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 "${BUILD_DIR}"/tests/.libs/assert-msg-test \ + || die "Hardened adjustment failed" + fi + + # Need X for dbus-launch session X11 initialization + Xemake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog* NEWS* README" + einstalldocs + + 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/" +} + +pkg_postinst() { + gnome2_pkg_postinst + 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 +} |