commit: d191afafe5add0980f7b45174f9fb1b28cf03811 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Apr 22 18:20:50 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 18:20:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=d191afaf
dev-libs/gobject-introspection: in tree version works. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA ...gobject-introspection-1.36.0-detect-clang.patch | 27 ------- .../gobject-introspection-1.36.0-r99.ebuild | 82 ---------------------- dev-libs/gobject-introspection/metadata.xml | 9 --- 3 files changed, 118 deletions(-) diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch deleted file mode 100644 index d89b4ed..0000000 --- a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 863ceb7f5a5b5f6accfea23dcd47b5c74a53f68b Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <eba...@gnome.org> -Date: Thu, 02 May 2013 01:49:01 +0000 -Subject: Do not misdetect clang as the Microsoft C compiler - -Just because they both start with 'cl'. - -https://bugzilla.gnome.org/show_bug.cgi?id=698090 ---- -diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index f5346a4..1ef1f4b 100644 ---- a/giscanner/dumper.py -+++ b/giscanner/dumper.py -@@ -89,8 +89,9 @@ class DumpCompiler(object): - # Enable the --msvc-syntax pkg-config flag when - # the Microsoft compiler is used - # (This is the other way to check whether Visual C++ is used subsequently) -- if 'cl' in self._compiler_cmd: -- self._pkgconfig_msvc_flags = '--msvc-syntax' -+ if 'clang' not in self._compiler_cmd: -+ if 'cl' in self._compiler_cmd: -+ self._pkgconfig_msvc_flags = '' - self._uninst_srcdir = os.environ.get( - 'UNINSTALLED_INTROSPECTION_SRCDIR') - self._packages = ['gio-2.0 gmodule-2.0'] --- -cgit v0.9.2 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r99.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r99.ebuild deleted file mode 100644 index b46aab7..0000000 --- a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r99.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild,v 1.2 2013/11/30 18:48:21 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit eutils gnome2 python-single-r1 toolchain-funcs - -DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages" -HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"; - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="cairo doctool test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - test? ( cairo ) -" - -RDEPEND=" - >=dev-libs/gobject-introspection-common-${PV} - >=dev-libs/glib-2.36:2 - doctool? ( dev-python/mako ) - virtual/libffi:= - !<dev-lang/vala-0.20.0 -" -# Wants real bison, not virtual/yacc -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.15 - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -# PDEPEND to avoid circular dependencies, bug #391213 -PDEPEND="cairo? ( x11-libs/cairo[glib] )" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - # Do not misdetect clang as the Microsoft C compiler (from 'master) - epatch "${FILESDIR}/${PN}-1.36.0-detect-clang.patch" - - # To prevent crosscompiling problems, bug #414105 - CC=$(tc-getCC) - - DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO" - gnome2_src_prepare - - # avoid GNU-isms - sed -i -e 's/\(if test .* \)==/\1=/' configure || die - - if ! has_version "x11-libs/cairo[glib]"; then - # Bug #391213: enable cairo-gobject support even if it's not installed - # We only PDEPEND on cairo to avoid circular dependencies - export CAIRO_LIBS="-lcairo -lcairo-gobject" - export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo" - fi -} - -src_configure(){ - gnome2_src_configure \ - --disable-static \ - YACC=$(type -p yacc) \ - $(use_with cairo) \ - $(use_enable doctool) -} - -src_install() { - gnome2_src_install - - # Prevent collision with gobject-introspection-common - rm -v "${ED}"usr/share/aclocal/introspection.m4 \ - "${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die - rmdir "${ED}"usr/share/aclocal || die -} diff --git a/dev-libs/gobject-introspection/metadata.xml b/dev-libs/gobject-introspection/metadata.xml deleted file mode 100644 index d1585c3..0000000 --- a/dev-libs/gobject-introspection/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>gnome</herd> -<use> - <flag name="doctool">Install g-ir-doc-tool for generating documentation - from introspected data</flag> -</use> -</pkgmetadata>
