diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /media-gfx/xsane | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'media-gfx/xsane')
| -rw-r--r-- | media-gfx/xsane/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/xsane/files/xsane-0.999-lcms2.patch | 4 | ||||
| -rw-r--r-- | media-gfx/xsane/xsane-0.999-r3.ebuild (renamed from media-gfx/xsane/xsane-0.999-r2.ebuild) | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest index 1fef601b60db..618de244763c 100644 --- a/media-gfx/xsane/Manifest +++ b/media-gfx/xsane/Manifest @@ -1,6 +1,6 @@ -AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103ba9395d84803a64de75766027bc9f6696e3dc76ccaf0b7e5e84240d328cc3a15106d87d27e7d74ee6cc29409d64 SHA512 4734fd4599e2fed7b86a94836a40725fafb70e9252885faf092495fabfbaa02a7c245b3cacea19e5e1c455a3a74b475ad8cb215fbba3fa64bc066068abddbb29 +AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a6d906323125c084effb9a52720d1a1d38d2a3680986a05787170818011342a7fcde225f4d1f70cdf36c6a9d8a1 SHA512 bdb5f078d7a36702b327b01f8c6d4259d52252968e5d287ce17aed18adb0bb89420049609242ee89048cb8e4012a0dd04ba29fa994570014d3c62b098e33508b DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5 -EBUILD xsane-0.999-r2.ebuild 2187 BLAKE2B fd9e08c5327b3456acfec78efd7f22dc40aec9200989f63e9a351cd80bad042335b5149d3cd22e0ea07e4887da86468e93d87694beafe0309713cbaf38f57a28 SHA512 007a65f4365c17dc5a21d92453032704c1b4d29f181c00ccc46d2eef12f0e1d7187f936f1dd310385d51716e38cd0bee2c8e4606ee55d930cb417a9108b9b27e +EBUILD xsane-0.999-r3.ebuild 2207 BLAKE2B a85c9aaa6cfcb3c47f4ac55502696ce4c286cc89fee10258107a24df204d6614ed4ce71dd20253dca0fbddd22f51ab24063bf78ed3fac53cbef2fd0914d1c484 SHA512 0be6936b17ffb26f2a0970b172d3cc01b25372d9ca8fd1e5560dba33fbf198aa16b28f9a4004cb095a339987d65d804fd6d8720665467bd27653b427b9ad5b55 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f diff --git a/media-gfx/xsane/files/xsane-0.999-lcms2.patch b/media-gfx/xsane/files/xsane-0.999-lcms2.patch index c3d696c28ecf..0a98bc8122bb 100644 --- a/media-gfx/xsane/files/xsane-0.999-lcms2.patch +++ b/media-gfx/xsane/files/xsane-0.999-lcms2.patch @@ -32,10 +32,10 @@ index df7b114..3659c97 100644 + if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then + AC_DEFINE(HAVE_LIBLCMS, 1, [Define if LCMS is to be used.]) + fi -+ if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then ++ if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms2"; then + AC_DEFINE(HAVE_LIBLCMS2, 1, [Define if you have liblcms2.]) + else -+ if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then ++ if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms"; then + AC_DEFINE(HAVE_LIBLCMS1, 1, [Define if you have liblcms.]) + fi + fi diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r3.ebuild index da19a27bb818..08d3756194f8 100644 --- a/media-gfx/xsane/xsane-0.999-r2.ebuild +++ b/media-gfx/xsane/xsane-0.999-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="nls jpeg png tiff gimp lcms ocr" RDEPEND=" @@ -24,7 +24,7 @@ RDEPEND=" jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) - gimp? ( media-gfx/gimp ) + gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 ) " PDEPEND="ocr? ( app-text/gocr )" @@ -76,14 +76,14 @@ src_install() { # link xsane so it is seen as a plugin in gimp if use gimp; then local plugindir - local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1) - if [ -n "${gimptool}" ]; then - plugindir="$(${gimptool} --gimpplugindir)/plug-ins" + local gimptool=( "${EPREFIX}"/usr/bin/gimptool* ) + if [[ ${#gimptool[@]} -gt 0 ]]; then + plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins" else die "Can't find GIMP plugin directory." fi - dodir "${plugindir#${EPREFIX}}" - dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane + mkdir -p "${D}${plugindir}" || die + ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die fi newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png |