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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4D3A158086 for ; Mon, 20 Dec 2021 00:02:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ACC02BC02C; Mon, 20 Dec 2021 00:02:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4C5772BC02C for ; Mon, 20 Dec 2021 00:02:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id BD342343128 for ; Mon, 20 Dec 2021 00:02:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D30C6250 for ; Mon, 20 Dec 2021 00:02:43 +0000 (UTC) From: "Sam James" 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" Message-ID: <1639958534.e3fab0acfbb39f126224b70daf1927e3fe1404f8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/scrot/files/scrot-1.7-fix-docdir.patch media-gfx/scrot/scrot-1.7-r1.ebuild media-gfx/scrot/scrot-1.7-r2.ebuild X-VCS-Directories: media-gfx/scrot/files/ media-gfx/scrot/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e3fab0acfbb39f126224b70daf1927e3fe1404f8 X-VCS-Branch: master Date: Mon, 20 Dec 2021 00:02:43 +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: 70559c30-c5cd-44b3-83cf-86786f34e0de X-Archives-Hash: 4df8f7a095733bae483d0f20590311d4 commit: e3fab0acfbb39f126224b70daf1927e3fe1404f8 Author: Sam James gentoo org> AuthorDate: Sun Dec 19 23:58:55 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 20 00:02:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fab0ac media-gfx/scrot: respect docdir Closes: https://bugs.gentoo.org/828928 Signed-off-by: Sam James gentoo.org> media-gfx/scrot/files/scrot-1.7-fix-docdir.patch | 46 ++++++++++++++++++++++ .../{scrot-1.7-r1.ebuild => scrot-1.7-r2.ebuild} | 11 +++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch new file mode 100644 index 000000000000..ebae595ac38f --- /dev/null +++ b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch @@ -0,0 +1,46 @@ +https://github.com/resurrecting-open-source-projects/scrot/pull/175 + +From: Sam James +Date: Sun, 19 Dec 2021 23:59:45 +0000 +Subject: [PATCH] build: respect docdir + +Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream +versioning for patches): +``` +>>> /usr/share/doc/scrot-1.7-r1/ +>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2 +>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2 +>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2 +>>> /usr/share/doc/scrot/ +>>> /usr/share/doc/scrot/scrot.png +>>> /usr/share/doc/scrot/README.md.bz2 +>>> /usr/share/doc/scrot/ChangeLog.bz2 +>>> /usr/share/doc/scrot/AUTHORS.bz2 +``` + +After: +``` +>>> /usr/share/doc/scrot-1.7-r1/scrot.png +>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2 +>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2 +>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2 +``` + +This avoids installing duplicate files & installs them to the +same location but it's overridable by --docdir in ./configure which +helps downstreams. + +Bug: https://bugs.gentoo.org/828928 +Signed-off-by: Sam James +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,8 +34,7 @@ MAINTAINERCLEANFILES = Makefile.in + + man_MANS = man/scrot.1 + +-docs_DATA = README.md AUTHORS ChangeLog doc/scrot.png +-docsdir = $(prefix)/share/doc/scrot ++doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png + + EXTRA_DIST = man/scrot.1 $(docs_DATA) + diff --git a/media-gfx/scrot/scrot-1.7-r1.ebuild b/media-gfx/scrot/scrot-1.7-r2.ebuild similarity index 82% rename from media-gfx/scrot/scrot-1.7-r1.ebuild rename to media-gfx/scrot/scrot-1.7-r2.ebuild index 80d7728667d6..3aa2ef8c7e06 100644 --- a/media-gfx/scrot/scrot-1.7-r1.ebuild +++ b/media-gfx/scrot/scrot-1.7-r2.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit bash-completion-r1 +# Need autotools for docdir patch for now +inherit autotools bash-completion-r1 DESCRIPTION="Screen capture utility using imlib2 library" HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot" @@ -45,10 +46,16 @@ DOCS=( AUTHORS ChangeLog README.md ) +PATCHES=( + "${FILESDIR}"/${PN}-1.7-fix-docdir.patch +) + src_prepare() { default - [[ ${PV} == *9999* ]] && eautoreconf + # Needed for 1.7 for the docdir patch + eautoreconf + #[[ ${PV} == *9999* ]] && eautoreconf } src_install() {