Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/geeqie/
Date: Wed, 29 Dec 2021 18:25:31
Message-Id: 1640802317.2931aee66499cd3d05bf0b1c69fbf892950ada51.voyageur@gentoo
1 commit: 2931aee66499cd3d05bf0b1c69fbf892950ada51
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 18:25:02 2021 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 18:25:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2931aee6
7
8 media-gfx/geeqie: drop USE=gtk3 in stable 1.6
9
10 For gtk3 support, use newer 1.6_p20211016
11
12 Bug: https://bugs.gentoo.org/829471
13 Bug: https://bugs.gentoo.org/830232
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 RepoMan-Options: --force
16 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
17
18 .../geeqie/{geeqie-1.6.ebuild => geeqie-1.6-r1.ebuild} | 17 ++++++-----------
19 1 file changed, 6 insertions(+), 11 deletions(-)
20
21 diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild
22 similarity index 83%
23 rename from media-gfx/geeqie/geeqie-1.6.ebuild
24 rename to media-gfx/geeqie/geeqie-1.6-r1.ebuild
25 index 5784fd2b760f..39c6dc86cac5 100644
26 --- a/media-gfx/geeqie/geeqie-1.6.ebuild
27 +++ b/media-gfx/geeqie/geeqie-1.6-r1.ebuild
28 @@ -13,20 +13,17 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
29 LICENSE="GPL-2"
30 SLOT="0"
31 KEYWORDS="amd64 ~ppc x86"
32 -IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
33 +IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp"
34
35 RDEPEND="
36 virtual/libintl
37 + x11-libs/gtk+:2
38 doc? ( app-text/gnome-doc-utils )
39 ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
40 - gpu-accel? ( media-libs/clutter-gtk )
41 - gtk3? ( x11-libs/gtk+:3 )
42 - !gtk3? ( x11-libs/gtk+:2 )
43 jpeg? ( virtual/jpeg:0 )
44 lcms? ( media-libs/lcms:2 )
45 lirc? ( app-misc/lirc )
46 lua? ( ${LUA_DEPS} )
47 - map? ( media-libs/libchamplain:0.12 )
48 pdf? ( >=app-text/poppler-0.62[cairo] )
49 tiff? ( media-libs/tiff:0 )
50 xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
51 @@ -38,9 +35,7 @@ BDEPEND="
52 virtual/pkgconfig
53 nls? ( sys-devel/gettext )"
54
55 -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
56 - gpu-accel? ( gtk3 )
57 - map? ( gpu-accel )"
58 +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
59
60 PATCHES=( "${FILESDIR}"/${P}-yelp.patch )
61
62 @@ -58,13 +53,13 @@ src_configure() {
63 --with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
64 $(use_enable debug debug-log)
65 $(use_enable ffmpegthumbnailer)
66 - $(use_enable gpu-accel)
67 - $(use_enable gtk3)
68 + --disable-gpu-accel
69 + --disable-gtk3
70 $(use_enable jpeg)
71 $(use_enable lcms)
72 $(use_enable lua)
73 $(use_enable lirc)
74 - $(use_enable map)
75 + --disable-map
76 $(use_enable nls)
77 $(use_enable pdf)
78 $(use_enable tiff)