| 1 |
commit: 5340918136b3c065747b22dd6eb015082ec9470a |
| 2 |
Author: Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org> |
| 3 |
AuthorDate: Thu Mar 3 13:01:55 2022 +0000 |
| 4 |
Commit: Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org> |
| 5 |
CommitDate: Thu Mar 3 13:01:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=53409181 |
| 7 |
|
| 8 |
media-gfx/nsxiv: add v29, drop v27.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Nickolas Raymond Kaczynski <nrk <AT> disroot.org> |
| 12 |
|
| 13 |
media-gfx/nsxiv/Manifest | 2 +- |
| 14 |
.../nsxiv/{nsxiv-27.1.ebuild => nsxiv-29.ebuild} | 33 +++++++++++----------- |
| 15 |
media-gfx/nsxiv/nsxiv-9999.ebuild | 17 ++++++----- |
| 16 |
3 files changed, 26 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/nsxiv/Manifest b/media-gfx/nsxiv/Manifest |
| 19 |
index 92958780b..6969ab8c5 100644 |
| 20 |
--- a/media-gfx/nsxiv/Manifest |
| 21 |
+++ b/media-gfx/nsxiv/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST nsxiv-27.1.tar.gz 54242 BLAKE2B baed35787874b02e0051e0b19b2cb9670a66ce01de1ca3446a8ca5f99fcebd785232a5b3715f0f3dd733314096e3a46a6ebcc8960417abfc1a6e5e09224f15d2 SHA512 08a250a43a92a08258e2a6e871d6d5f596206af344fe3896505c0e85bdf556d02f13b1dbc9b365ce7c597770425d0e3635878b3fceb37f324957674ccc1b1eb0 |
| 24 |
DIST nsxiv-28.tar.gz 60699 BLAKE2B d52d5933005492c55b0133b594a2b9613443324aca22ffe48dff90bdc62afc6cd48eac14ed578db9fcff5d147b5b6020edaf538335f9b26499232d0670935a3e SHA512 a1d61dc57f41e5b50225dd1e8120b8f1e31b042d43f7443ec27d2fc227e8eb98e96116357e8329011b7ca9aac10e7f0f2259bad3b57fbb1b2951a8fe4d8930bf |
| 25 |
+DIST nsxiv-29.tar.gz 64012 BLAKE2B 1b964736619a56cc8fb4092979f12749389fa347e3fda7a40fcfdc1b07a72e101c61d99fb12b10f4ea7ab6459c8068d5c64d754e3e988ec6bfd4504813bcc485 SHA512 d891fc0885f280a622401e105dc1ed9ba39e40f3e760e3e0cd34ae79fdb32187b1d3dc15590bbefd68a18db2aa12795433907e6e744561cc891fc03e7a1f1e94 |
| 26 |
|
| 27 |
diff --git a/media-gfx/nsxiv/nsxiv-27.1.ebuild b/media-gfx/nsxiv/nsxiv-29.ebuild |
| 28 |
similarity index 67% |
| 29 |
rename from media-gfx/nsxiv/nsxiv-27.1.ebuild |
| 30 |
rename to media-gfx/nsxiv/nsxiv-29.ebuild |
| 31 |
index f53c57016..615ed9c70 100644 |
| 32 |
--- a/media-gfx/nsxiv/nsxiv-27.1.ebuild |
| 33 |
+++ b/media-gfx/nsxiv/nsxiv-29.ebuild |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2021 Gentoo Authors |
| 36 |
+# Copyright 1999-2022 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=7 |
| 40 |
@@ -18,25 +18,23 @@ HOMEPAGE="https://github.com/nsxiv/nsxiv" |
| 41 |
|
| 42 |
LICENSE="GPL-2" |
| 43 |
SLOT="0" |
| 44 |
-IUSE="exif +gif +jpeg +png webp tiff +inotify" |
| 45 |
+IUSE="+statusbar exif +inotify +gif +jpeg +png webp tiff" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
+ statusbar? ( x11-libs/libXft ) |
| 49 |
exif? ( media-libs/libexif ) |
| 50 |
gif? ( media-libs/giflib:0= ) |
| 51 |
+ webp? ( media-libs/libwebp ) |
| 52 |
media-libs/imlib2[X,gif?,jpeg?,png?,webp?,tiff?] |
| 53 |
x11-libs/libX11 |
| 54 |
- x11-libs/libXft |
| 55 |
" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
pkg_setup() { |
| 59 |
if use inotify; then |
| 60 |
- nsxiv_autoreload="inotify" |
| 61 |
CONFIG_CHECK+=" ~INOTIFY_USER" |
| 62 |
ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." |
| 63 |
linux-info_pkg_setup |
| 64 |
- else |
| 65 |
- nsxiv_autoreload="nop" |
| 66 |
fi |
| 67 |
} |
| 68 |
|
| 69 |
@@ -47,23 +45,26 @@ src_prepare() { |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
- sed -i \ |
| 74 |
- -e '/-include config.mk/d' \ |
| 75 |
- -e '/\$(OBJS): / s|config.mk||' \ |
| 76 |
- -e '/^install: / s|: all|:|' \ |
| 77 |
+ sed -i -e '/^install: / s|: all|:|' \ |
| 78 |
+ -e 's|^CFLAGS =|CFLAGS +=|' \ |
| 79 |
Makefile || die "sed failed" |
| 80 |
} |
| 81 |
|
| 82 |
src_compile() { |
| 83 |
- emake CC="$(tc-getCC)" \ |
| 84 |
- HAVE_LIBEXIF=$(usex exif 1 0) \ |
| 85 |
- HAVE_LIBGIF=$(usex gif 1 0) \ |
| 86 |
- AUTORELOAD="${nsxiv_autoreload}" |
| 87 |
+ emake CC="$(tc-getCC)" OPT_DEP_DEFAULT=0 \ |
| 88 |
+ HAVE_INOTIFY="$(usex inotify 1 0)" \ |
| 89 |
+ HAVE_LIBFONTS="$(usex statusbar 1 0)" \ |
| 90 |
+ HAVE_LIBGIF="$(usex gif 1 0)" \ |
| 91 |
+ HAVE_LIBWEBP="$(usex webp 1 0)" \ |
| 92 |
+ HAVE_LIBEXIF="$(usex exif 1 0)" |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
| 96 |
- emake DESTDIR="${ED}" PREFIX=/usr install |
| 97 |
- emake -C icon DESTDIR="${ED}" PREFIX=/usr install |
| 98 |
+ emake \ |
| 99 |
+ DESTDIR="${ED}" \ |
| 100 |
+ PREFIX="/usr" \ |
| 101 |
+ EGPREFIX="/usr/share/doc/${P}/examples" \ |
| 102 |
+ install install-icon |
| 103 |
dodoc README.md |
| 104 |
domenu nsxiv.desktop |
| 105 |
|
| 106 |
|
| 107 |
diff --git a/media-gfx/nsxiv/nsxiv-9999.ebuild b/media-gfx/nsxiv/nsxiv-9999.ebuild |
| 108 |
index 6c5bd08ad..615ed9c70 100644 |
| 109 |
--- a/media-gfx/nsxiv/nsxiv-9999.ebuild |
| 110 |
+++ b/media-gfx/nsxiv/nsxiv-9999.ebuild |
| 111 |
@@ -1,4 +1,4 @@ |
| 112 |
-# Copyright 1999-2021 Gentoo Authors |
| 113 |
+# Copyright 1999-2022 Gentoo Authors |
| 114 |
# Distributed under the terms of the GNU General Public License v2 |
| 115 |
|
| 116 |
EAPI=7 |
| 117 |
@@ -45,8 +45,8 @@ src_prepare() { |
| 118 |
} |
| 119 |
|
| 120 |
src_configure() { |
| 121 |
- sed -i -e '/^install: / s|: all|:|' \ |
| 122 |
- -e 's|^CFLAGS ?=|CFLAGS +=|' \ |
| 123 |
+ sed -i -e '/^install: / s|: all|:|' \ |
| 124 |
+ -e 's|^CFLAGS =|CFLAGS +=|' \ |
| 125 |
Makefile || die "sed failed" |
| 126 |
} |
| 127 |
|
| 128 |
@@ -60,12 +60,11 @@ src_compile() { |
| 129 |
} |
| 130 |
|
| 131 |
src_install() { |
| 132 |
- export DESTDIR="${ED}" |
| 133 |
- export PREFIX="/usr" |
| 134 |
- export EGPREFIX="${PREFIX}/share/doc/${P}/examples" |
| 135 |
- |
| 136 |
- emake install |
| 137 |
- emake install-icon |
| 138 |
+ emake \ |
| 139 |
+ DESTDIR="${ED}" \ |
| 140 |
+ PREFIX="/usr" \ |
| 141 |
+ EGPREFIX="/usr/share/doc/${P}/examples" \ |
| 142 |
+ install install-icon |
| 143 |
dodoc README.md |
| 144 |
domenu nsxiv.desktop |
Archives