| 1 |
commit: 128d253494c94840403eb5688f501f5a090e2989 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 15 15:02:45 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 30 21:07:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128d2534 |
| 7 |
|
| 8 |
games-puzzle/sgt-puzzles: EAPI-7 bump, drop IUSE=gtk3, fix menu entry |
| 9 |
|
| 10 |
Use desktop.eclass, xdg-utils.eclass |
| 11 |
|
| 12 |
Thanks-to: Simon <sur3 <AT> gmx.de> |
| 13 |
Bug: https://bugs.gentoo.org/656490 |
| 14 |
Bug: https://bugs.gentoo.org/769167 |
| 15 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
.../sgt-puzzles/sgt-puzzles-20190415.ebuild | 29 ++++++++++------------ |
| 19 |
1 file changed, 13 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild |
| 22 |
index 2988d396d97..902b9c92892 100644 |
| 23 |
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild |
| 24 |
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild |
| 25 |
@@ -1,9 +1,9 @@ |
| 26 |
# Copyright 1999-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI=6 |
| 30 |
+EAPI=7 |
| 31 |
|
| 32 |
-inherit eutils gnome2-utils toolchain-funcs autotools |
| 33 |
+inherit autotools desktop toolchain-funcs xdg-utils |
| 34 |
|
| 35 |
if [[ ${PV} == "99999999" ]] ; then |
| 36 |
inherit git-r3 |
| 37 |
@@ -22,16 +22,17 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/" |
| 38 |
|
| 39 |
LICENSE="MIT" |
| 40 |
SLOT="0" |
| 41 |
-IUSE="+doc gtk3" |
| 42 |
+IUSE="+doc" |
| 43 |
|
| 44 |
COMMON_DEPEND=" |
| 45 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 46 |
- gtk3? ( x11-libs/gtk+:3 )" |
| 47 |
+ x11-libs/gtk+:3" |
| 48 |
|
| 49 |
RDEPEND="${COMMON_DEPEND} |
| 50 |
x11-misc/xdg-utils" # Used by builtin help patch |
| 51 |
|
| 52 |
-DEPEND="${COMMON_DEPEND} |
| 53 |
+DEPEND="${COMMON_DEPEND}" |
| 54 |
+ |
| 55 |
+BDEPEND=" |
| 56 |
dev-lang/perl |
| 57 |
virtual/pkgconfig |
| 58 |
doc? ( >=app-doc/halibut-1.2 )" |
| 59 |
@@ -67,7 +68,7 @@ src_prepare() { |
| 60 |
src_configure() { |
| 61 |
econf \ |
| 62 |
--program-prefix="${PN}_" \ |
| 63 |
- --with-gtk=$(usex gtk3 3 2) |
| 64 |
+ --with-gtk=3 |
| 65 |
} |
| 66 |
|
| 67 |
src_compile() { |
| 68 |
@@ -86,12 +87,12 @@ src_install() { |
| 69 |
name=$(awk -F: '/exe:/ { print $3 }' "${file}") |
| 70 |
file=${file%.R} |
| 71 |
newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png |
| 72 |
- make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};" |
| 73 |
+ make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "LogicGame;X-${PN};" |
| 74 |
done |
| 75 |
|
| 76 |
if use doc ; then |
| 77 |
- DOCS=( puzzles.{pdf,ps,txt} ) |
| 78 |
- HTML_DOCS=( *.html ) |
| 79 |
+ local DOCS=( puzzles.{pdf,ps,txt} ) |
| 80 |
+ local HTML_DOCS=( *.html ) |
| 81 |
einstalldocs |
| 82 |
doinfo puzzles.info{,-1,-2,-3} |
| 83 |
fi |
| 84 |
@@ -102,14 +103,10 @@ src_install() { |
| 85 |
doins "${FILESDIR}/${PN}.directory" |
| 86 |
} |
| 87 |
|
| 88 |
-pkg_preinst() { |
| 89 |
- gnome2_icon_savelist |
| 90 |
-} |
| 91 |
- |
| 92 |
pkg_postinst() { |
| 93 |
- gnome2_icon_cache_update |
| 94 |
+ xdg_icon_cache_update |
| 95 |
} |
| 96 |
|
| 97 |
pkg_postrm() { |
| 98 |
- gnome2_icon_cache_update |
| 99 |
+ xdg_icon_cache_update |
| 100 |
} |
Archives