| 1 |
commit: 63c2feb7f522e0615263d2a6d7ffe1b497bf7698 |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 9 11:45:00 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 9 11:45:00 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c2feb7 |
| 7 |
|
| 8 |
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. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild | 51 +++++++----------------- |
| 13 |
1 file changed, 14 insertions(+), 37 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild |
| 16 |
index 19d3b30..77eebb3 100644 |
| 17 |
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild |
| 18 |
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild |
| 19 |
@@ -1,13 +1,11 @@ |
| 20 |
-# Copyright 1999-2014 Gentoo Foundation |
| 21 |
+# Copyright 1999-2016 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
-EAPI=4 |
| 26 |
- |
| 27 |
+EAPI=6 |
| 28 |
GNOME2_LA_PUNT="yes" |
| 29 |
-VIRTUALX_REQUIRED=test |
| 30 |
|
| 31 |
-inherit autotools gnome2 virtualx |
| 32 |
+inherit autotools gnome2 |
| 33 |
|
| 34 |
DESCRIPTION="A simple image viewer widget for GTK" |
| 35 |
HOMEPAGE="https://projects.gnome.org/gtkimageview/" |
| 36 |
@@ -16,57 +14,36 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" |
| 37 |
LICENSE="LGPL-2.1" |
| 38 |
SLOT="0" |
| 39 |
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" |
| 40 |
-IUSE="doc examples static-libs" |
| 41 |
+IUSE="examples static-libs" |
| 42 |
|
| 43 |
-# tests do not work with userpriv |
| 44 |
-RESTRICT="test? ( userpriv )" |
| 45 |
+# tests are severely broken, bug #483952 |
| 46 |
+RESTRICT="test" |
| 47 |
|
| 48 |
RDEPEND="x11-libs/gtk+:2" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
gnome-base/gnome-common |
| 51 |
dev-util/gtk-doc-am |
| 52 |
- doc? ( >=dev-util/gtk-doc-1.8 )" |
| 53 |
- |
| 54 |
-pkg_setup() { |
| 55 |
- DOCS="README" |
| 56 |
- G2CONF="$(use_enable static-libs static)" |
| 57 |
-} |
| 58 |
+" |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
gnome2_src_prepare |
| 62 |
|
| 63 |
# Prevent excessive build failures due to gcc changes |
| 64 |
- sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die "sed 1 failed" |
| 65 |
- |
| 66 |
- # Prevent excessive build failures due to glib/gtk changes |
| 67 |
- sed '/DEPRECATED_FLAGS/d' -i configure.in || die "sed 2 failed" |
| 68 |
+ sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die |
| 69 |
|
| 70 |
# Gold linker fix |
| 71 |
sed -e '/libtest.la/s:$: -lm:g' -i tests/Makefile.am || die |
| 72 |
|
| 73 |
- if use doc; then |
| 74 |
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \ |
| 75 |
- -i gtk-doc.make || die "sed 3 failed" |
| 76 |
- else |
| 77 |
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" \ |
| 78 |
- -i gtk-doc.make || die "sed 4 failed" |
| 79 |
- fi |
| 80 |
+ # Don't rebuild gtk-doc |
| 81 |
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make || die |
| 82 |
|
| 83 |
+ mv configure.in configure.ac || die |
| 84 |
AT_NOELIBTOOLIZE=yes eautoreconf |
| 85 |
} |
| 86 |
|
| 87 |
-src_test() { |
| 88 |
- # the tests are only built, but not run by default |
| 89 |
- local failed="0" |
| 90 |
- Xemake check |
| 91 |
- cd "${S}"/tests |
| 92 |
- for test in ./test-* ; do |
| 93 |
- if [[ -x ${test} ]] ; then |
| 94 |
- VIRTUALX_COMMAND="${test}" |
| 95 |
- virtualmake || failed=$((${failed}+1)) |
| 96 |
- fi |
| 97 |
- done |
| 98 |
- [[ ${failed} -gt 0 ]] && die "${failed} tests failed" |
| 99 |
+src_configure() { |
| 100 |
+ gnome2_src_configure \ |
| 101 |
+ $(use_enable static-libs static) |
| 102 |
} |
| 103 |
|
| 104 |
src_install() { |
Archives