1 |
commit: b7f52b07c80d42966ec7e30eb0ad1cfebc4ba74b |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 23 20:12:20 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 23 20:12:20 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f52b07 |
7 |
|
8 |
media-gfx/xsane: update EAPI 6 -> 8 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
media-gfx/xsane/Manifest | 2 +- |
13 |
...xsane-0.999-r3.ebuild => xsane-0.999-r4.ebuild} | 34 +++++++++------------- |
14 |
2 files changed, 15 insertions(+), 21 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest |
17 |
index 126cfe38ffea..9a07937bd68d 100644 |
18 |
--- a/media-gfx/xsane/Manifest |
19 |
+++ b/media-gfx/xsane/Manifest |
20 |
@@ -1,3 +1,3 @@ |
21 |
-DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f |
22 |
+DIST xsane-0.998-patches-3.tar.xz 54480 BLAKE2B 8c77bf0304e60114fa964e337640b61e7c353a6b6f9ad5bc3c87fd5324440b27e58a45aef7df2f16d5faa63692b9f8b22cca7d5dbf21dd6a1cac8572e668cf65 SHA512 e0a85e536502fef66526f12d7607381d07a2a53953f200b298afd1225f85657dfa3550f37b1ee7827739cb2b00333ab926a146c6424ec2543b691f0945300b68 |
23 |
DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed |
24 |
DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5 |
25 |
|
26 |
diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r4.ebuild |
27 |
similarity index 68% |
28 |
rename from media-gfx/xsane/xsane-0.999-r3.ebuild |
29 |
rename to media-gfx/xsane/xsane-0.999-r4.ebuild |
30 |
index a6324b3b8c28..78d35099cfd2 100644 |
31 |
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild |
32 |
+++ b/media-gfx/xsane/xsane-0.999-r4.ebuild |
33 |
@@ -1,15 +1,15 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
+# Copyright 1999-2022 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI=6 |
39 |
+EAPI=8 |
40 |
|
41 |
-inherit autotools desktop epatch strip-linguas toolchain-funcs |
42 |
+inherit autotools desktop strip-linguas toolchain-funcs |
43 |
|
44 |
DESCRIPTION="Graphical scanning frontend" |
45 |
HOMEPAGE="http://www.xsane.org/" |
46 |
SRC_URI=" |
47 |
http://www.xsane.org/download/${P}.tar.gz |
48 |
- https://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz |
49 |
+ https://dev.gentoo.org/~soap/distfiles/${PN}-0.998-patches-3.tar.xz |
50 |
https://dev.gentoo.org/~pacho/${PN}/${PN}-256x256.png |
51 |
" |
52 |
|
53 |
@@ -22,17 +22,15 @@ RDEPEND=" |
54 |
media-gfx/sane-backends |
55 |
x11-libs/gtk+:2 |
56 |
x11-misc/xdg-utils |
57 |
- jpeg? ( virtual/jpeg:0 ) |
58 |
- png? ( media-libs/libpng:0= ) |
59 |
- tiff? ( media-libs/tiff:0 ) |
60 |
+ jpeg? ( media-libs/libjpeg-turbo:= ) |
61 |
+ png? ( media-libs/libpng:= ) |
62 |
+ tiff? ( media-libs/tiff:= ) |
63 |
gimp? ( media-gfx/gimp:0/2 ) |
64 |
lcms? ( media-libs/lcms:2 ) |
65 |
" |
66 |
PDEPEND="ocr? ( app-text/gocr )" |
67 |
- |
68 |
-DEPEND="${RDEPEND} |
69 |
- virtual/pkgconfig |
70 |
-" |
71 |
+DEPEND="${RDEPEND}" |
72 |
+BDEPEND="virtual/pkgconfig" |
73 |
|
74 |
src_prepare() { |
75 |
default |
76 |
@@ -40,25 +38,23 @@ src_prepare() { |
77 |
strip-linguas -i po/ #609672 |
78 |
|
79 |
# Apply multiple fixes from different distributions |
80 |
- # Drop included patch and reuse patchset from prior version |
81 |
- rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die |
82 |
- epatch "${WORKDIR}/${PN}-0.998-patches-2"/*.patch |
83 |
+ eapply "${WORKDIR}/${PN}-0.998-patches-3"/ |
84 |
|
85 |
# Fix compability with libpng15 wrt #377363 |
86 |
sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die |
87 |
|
88 |
# Fix AR calling directly (bug #442606) |
89 |
sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die |
90 |
- tc-export AR |
91 |
|
92 |
# Add support for lcms-2 (from Fedora) |
93 |
eapply "${FILESDIR}/${PN}-0.999-lcms2.patch" |
94 |
|
95 |
- mv configure.in configure.ac || die |
96 |
AT_M4DIR="m4" eautoreconf |
97 |
} |
98 |
|
99 |
src_configure() { |
100 |
+ tc-export AR |
101 |
+ |
102 |
econf \ |
103 |
--enable-gtk2 \ |
104 |
$(use_enable nls) \ |
105 |
@@ -76,15 +72,13 @@ src_install() { |
106 |
|
107 |
# link xsane so it is seen as a plugin in gimp |
108 |
if use gimp; then |
109 |
- local plugindir |
110 |
- local gimptool=( "${EPREFIX}"/usr/bin/gimptool* ) |
111 |
+ local plugindir gimptool=( "${ESYSROOT}"/usr/bin/gimptool* ) |
112 |
if [[ ${#gimptool[@]} -gt 0 ]]; then |
113 |
plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins" |
114 |
else |
115 |
die "Can't find GIMP plugin directory." |
116 |
fi |
117 |
- mkdir -p "${D}${plugindir}" || die |
118 |
- ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die |
119 |
+ dosym -r /usr/bin/xsane "${plugindir}"/xsane |
120 |
fi |
121 |
|
122 |
newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png |