commit: 4ae3b44ff52ccf75f617f9dcb7fa4b2d72a23673 Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Sun Jun 4 15:20:23 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Jun 11 08:22:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae3b44f
media-gfx/scrot: minor license and dependency fixes * drop "LGPL-2+" licencse. this was due to a GNU getopt implementation that scrot used to use. but those files have been dropped from upstream for quite some time now [0] * drop libbsd from deps. v1.9 doesn't need libbsd on glibc, on musl `sys/queue.h` is being provided via `sys-libs/queue-standalone`. * require imlib2 to be built with png support. otherwise, many basic commands would break as scrot defaults to PNG. [0]: https://github.com/resurrecting-open-source-projects/scrot/commit/92869db668d345a694289b1f80ba83b89694cf07 Signed-off-by: NRK <nrk <AT> disroot.org> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-gfx/scrot/scrot-1.9.ebuild | 13 +++++-------- media-gfx/scrot/scrot-9999.ebuild | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/media-gfx/scrot/scrot-1.9.ebuild b/media-gfx/scrot/scrot-1.9.ebuild index 6be000c3bcad..85fb69e81443 100644 --- a/media-gfx/scrot/scrot-1.9.ebuild +++ b/media-gfx/scrot/scrot-1.9.ebuild @@ -15,24 +15,21 @@ else KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86" fi -LICENSE="feh LGPL-2+" +LICENSE="feh" SLOT="0" # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582 +# imlib2[png] not technically requried, but it's the default format used by +# scrot, so unconditionally depend on it to avoid breaking basic commands which +# don't specify an output format. RDEPEND=" - dev-libs/libbsd media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama - || ( - media-libs/imlib2[gif] - media-libs/imlib2[jpeg] - media-libs/imlib2[png] - media-libs/imlib2[tiff] - ) + media-libs/imlib2[png] " DEPEND=" ${RDEPEND} diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild index 4cde5c2086b1..f03c9dc8cd96 100644 --- a/media-gfx/scrot/scrot-9999.ebuild +++ b/media-gfx/scrot/scrot-9999.ebuild @@ -15,24 +15,21 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -LICENSE="feh LGPL-2+" +LICENSE="feh" SLOT="0" # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582 +# imlib2[png] not technically requried, but it's the default format used by +# scrot, so unconditionally depend on it to avoid breaking basic commands which +# don't specify an output format. RDEPEND=" - dev-libs/libbsd media-libs/imlib2[X,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama - || ( - media-libs/imlib2[gif] - media-libs/imlib2[jpeg] - media-libs/imlib2[png] - media-libs/imlib2[tiff] - ) + media-libs/imlib2[png] " DEPEND=" ${RDEPEND}
