From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A316B138330 for ; Sun, 9 Oct 2016 12:02:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AB34E0B84; Sun, 9 Oct 2016 12:02:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F4A3E0B84 for ; Sun, 9 Oct 2016 12:02:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B36E341602 for ; Sun, 9 Oct 2016 12:02:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 954E3249F for ; Sun, 9 Oct 2016 12:02:00 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1476013500.63c2feb7f522e0615263d2a6d7ffe1b497bf7698.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkimageview/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild X-VCS-Directories: media-gfx/gtkimageview/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 63c2feb7f522e0615263d2a6d7ffe1b497bf7698 X-VCS-Branch: master Date: Sun, 9 Oct 2016 12:02:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec934671-772e-4e67-a253-a23b56caf25b X-Archives-Hash: 136253002088b0706c66ace64f9e1f75 commit: 63c2feb7f522e0615263d2a6d7ffe1b497bf7698 Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 9 11:45:00 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 9 11:45:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c2feb7 media-gfx/gtkimageview: tests are severely broken and not meant to be run (#483952), stop relying on userpriv (#516580), update eapi, don't rebuild gtk-doc. Package-Manager: portage-2.3.1 media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 51 +++++++----------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index 19d3b30..77eebb3 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 - +EAPI=6 GNOME2_LA_PUNT="yes" -VIRTUALX_REQUIRED=test -inherit autotools gnome2 virtualx +inherit autotools gnome2 DESCRIPTION="A simple image viewer widget for GTK" HOMEPAGE="https://projects.gnome.org/gtkimageview/" @@ -16,57 +14,36 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="doc examples static-libs" +IUSE="examples static-libs" -# tests do not work with userpriv -RESTRICT="test? ( userpriv )" +# tests are severely broken, bug #483952 +RESTRICT="test" RDEPEND="x11-libs/gtk+:2" DEPEND="${RDEPEND} gnome-base/gnome-common dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.8 )" - -pkg_setup() { - DOCS="README" - G2CONF="$(use_enable static-libs static)" -} +" src_prepare() { gnome2_src_prepare # Prevent excessive build failures due to gcc changes - sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die "sed 1 failed" - - # Prevent excessive build failures due to glib/gtk changes - sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed" + sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die # Gold linker fix sed -e '/libtest.la/s:$: -lm:g' -i tests/Makefile.am || die - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 3 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" \ - -i gtk-doc.make || die "sed 4 failed" - fi + # Don't rebuild gtk-doc + sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make || die + mv configure.in configure.ac || die AT_NOELIBTOOLIZE=yes eautoreconf } -src_test() { - # the tests are only built, but not run by default - local failed="0" - Xemake check - cd "${S}"/tests - for test in ./test-* ; do - if [[ -x ${test} ]] ; then - VIRTUALX_COMMAND="${test}" - virtualmake || failed=$((${failed}+1)) - fi - done - [[ ${failed} -gt 0 ]] && die "${failed} tests failed" +src_configure() { + gnome2_src_configure \ + $(use_enable static-libs static) } src_install() {