From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1348186-garchives=archives.gentoo.org@lists.gentoo.org>
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 25111158086
for <garchives@archives.gentoo.org>; Sat, 11 Dec 2021 01:29:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5C09D2BC012;
Sat, 11 Dec 2021 01:29:25 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2A1C12BC012
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Dec 2021 01:29:25 +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 110FE343026
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Dec 2021 01:29:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A7D841F2
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Dec 2021 01:29:22 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1639186153.d914d68437908f21641c1a5f941ea8357d7ca67d.sam@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.7.ebuild media-gfx/scrot/scrot-9999.ebuild
X-VCS-Directories: media-gfx/scrot/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d914d68437908f21641c1a5f941ea8357d7ca67d
X-VCS-Branch: master
Date: Sat, 11 Dec 2021 01:29:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 79db6a56-c8d9-466b-a3de-aa27839a704a
X-Archives-Hash: 926cd77619059921a08eab72324219e9
commit: d914d68437908f21641c1a5f941ea8357d7ca67d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 11 01:27:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 01:29:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d914d684
media-gfx/scrot: sync live ebuild
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/scrot/scrot-1.7.ebuild | 16 ++++++++++++++--
media-gfx/scrot/scrot-9999.ebuild | 33 ++++++++++++++++++++++-----------
2 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/media-gfx/scrot/scrot-1.7.ebuild b/media-gfx/scrot/scrot-1.7.ebuild
index 9cad9ff4eae9..05091a934e05 100644
--- a/media-gfx/scrot/scrot-1.7.ebuild
+++ b/media-gfx/scrot/scrot-1.7.ebuild
@@ -7,11 +7,17 @@ inherit bash-completion-r1
DESCRIPTION="Screen capture utility using imlib2 library"
HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
dev-libs/libbsd
@@ -40,6 +46,12 @@ DOCS=(
AUTHORS ChangeLog README.md
)
+src_prepare() {
+ default
+
+ [[ ${PV} == *9999* ]] && eautoreconf
+}
+
src_install() {
default
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 605a004b7102..05091a934e05 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -1,19 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools bash-completion-r1 git-r3
+EAPI=8
+
+inherit bash-completion-r1
DESCRIPTION="Screen capture utility using imlib2 library"
HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
LICENSE="feh LGPL-2+"
SLOT="0"
-KEYWORDS=""
RDEPEND="
+ dev-libs/libbsd
>=media-libs/giblib-1.2.3
+ x11-libs/libXext
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXfixes
@@ -28,21 +37,23 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
+BDEPEND="
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+"
+
DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
+ AUTHORS ChangeLog README.md
)
src_prepare() {
- sed -i -e 's#-g -O3##g' src/Makefile.am || die
- cat "${FILESDIR}"/ax_prefix_config_h.m4 >> acinclude.m4 || die
-
default
- eautoreconf
+ [[ ${PV} == *9999* ]] && eautoreconf
}
src_install() {
default
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
+ newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
}