From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E789E15810F for ; Sun, 11 Jun 2023 08:22:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8596E08EC; Sun, 11 Jun 2023 08:22:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6E77E08E0 for ; Sun, 11 Jun 2023 08:22:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DBFF340F90 for ; Sun, 11 Jun 2023 08:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D2BBA92 for ; Sun, 11 Jun 2023 08:22:32 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1686471745.4ae3b44ff52ccf75f617f9dcb7fa4b2d72a23673.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/scrot/scrot-1.9.ebuild media-gfx/scrot/scrot-9999.ebuild X-VCS-Directories: media-gfx/scrot/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 4ae3b44ff52ccf75f617f9dcb7fa4b2d72a23673 X-VCS-Branch: master Date: Sun, 11 Jun 2023 08:22:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37a1e8a6-c82b-44e8-919f-3a48b26915b9 X-Archives-Hash: 865b36f80ee250a9ba2a64fc8f05be8f commit: 4ae3b44ff52ccf75f617f9dcb7fa4b2d72a23673 Author: NRK disroot org> AuthorDate: Sun Jun 4 15:20:23 2023 +0000 Commit: Joonas Niilola gentoo 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 disroot.org> Signed-off-by: Joonas Niilola 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}