diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-03-14 01:58:34 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-03-14 01:58:34 +0000 |
commit | 7732ed7c14267708dff56ec29f282efebddaf42a (patch) | |
tree | de7ebd3e16ef5381988598a6f5f20b08ce3a5ba8 /dev-libs | |
parent | Version bump. (diff) | |
download | gentoo-2-7732ed7c14267708dff56ec29f282efebddaf42a.tar.gz gentoo-2-7732ed7c14267708dff56ec29f282efebddaf42a.tar.bz2 gentoo-2-7732ed7c14267708dff56ec29f282efebddaf42a.zip |
Drop old.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/glib/glib-2.30.1-r2.ebuild | 240 |
2 files changed, 5 insertions, 241 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 71731d399b06..055f09221e93 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # 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.504 2012/03/14 01:40:28 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.505 2012/03/14 01:58:34 tetromino Exp $ + + 14 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -glib-2.30.1-r2.ebuild: + Drop old. *glib-2.30.3 (14 Mar 2012) diff --git a/dev-libs/glib/glib-2.30.1-r2.ebuild b/dev-libs/glib/glib-2.30.1-r2.ebuild deleted file mode 100644 index 6eaa8d5f9716..000000000000 --- a/dev-libs/glib/glib-2.30.1-r2.ebuild +++ /dev/null @@ -1,240 +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.30.1-r2.ebuild,v 1.2 2011/12/31 21:26:59 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 multilib pax-utils python virtualx - -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 doc fam selinux +static-libs systemtap test utils xattr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" - -RDEPEND="virtual/libiconv - virtual/libffi - sys-libs/zlib - xattr? ( sys-apps/attr ) - fam? ( virtual/fam ) - utils? ( >=dev-util/gdbus-codegen-${PV} )" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.11 - >=dev-util/gtk-doc-am-1.15 - doc? ( - >=dev-libs/libxslt-1.0 - >=dev-util/gtk-doc-1.15 - ~app-text/docbook-xml-dtd-4.1.2 ) - systemtap? ( >=dev-util/systemtap-1.3 ) - test? ( - sys-devel/gdb - =dev-lang/python-2* - >=dev-util/gdbus-codegen-${PV} - >=sys-apps/dbus-1.4.16-r2 ) - !<dev-util/gtk-doc-1.15-r2 - !<sys-apps/dbus-1.4.16-r2" -PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions 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 -} - -src_prepare() { - mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die - - 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 - - # 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 - - # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368 - epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.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" - - if ! use test; then - # don't waste time building tests - sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die - else - # 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:2' ; then - ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2" - 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.30.1-external-gdbus-codegen.patch" - - # Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568 - epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch" - - # Fix hardcoded path to machine-id wrt #390143 - sed -i -e '/g_file_get_contents/s:/var/lib/dbus/machine-id:/etc/machine-id:' gio/gdbusprivate.c || die - - # disable pyc compiling - echo '#!/bin/sh' > py-compile - - # 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 - if ! has_version dev-util/pkgconfig; 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" - - # 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) \ - $(use_enable systemtap dtrace) \ - $(use_enable systemtap systemtap) \ - --enable-regex \ - --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 - - insinto /usr/share/bash-completion - for f in gdbus gsettings; do - newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} - done - rm -rf "${ED}/etc" - - # Completely useless with or without USE static-libs, people need to use - # pkg-config - find "${D}" -name '*.la' -exec rm -f {} + -} - -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" - export XDG_DATA_HOME="${T}" - unset GSETTINGS_BACKEND # bug 352451 - - # 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 -} |