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 5140A158086 for ; Mon, 20 Dec 2021 00:06:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F3BC2BC02C; Mon, 20 Dec 2021 00:06:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C39E22BC02C for ; Mon, 20 Dec 2021 00:06:26 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A9F5342E8B for ; Mon, 20 Dec 2021 00:06:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D8E0250 for ; Mon, 20 Dec 2021 00:06:24 +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: <1639958775.ef3989d3e251da2993c981ba8aa7d9fbf068cf02.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/scrot/files/scrot-1.7-fix-docdir.patch X-VCS-Directories: media-gfx/scrot/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef3989d3e251da2993c981ba8aa7d9fbf068cf02 X-VCS-Branch: master Date: Mon, 20 Dec 2021 00:06:24 +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: 970e6d13-8fa8-4fc5-b081-5878806fbdcc X-Archives-Hash: d64ee7085de7b11c3c83d77dfe4e9e9a commit: ef3989d3e251da2993c981ba8aa7d9fbf068cf02 Author: Sam James gentoo org> AuthorDate: Mon Dec 20 00:05:43 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 20 00:06:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3989d3 media-gfx/scrot: tidy up patch Signed-off-by: Sam James gentoo.org> media-gfx/scrot/files/scrot-1.7-fix-docdir.patch | 25 +++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 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 index ebae595ac38f..3e0fb09da85d 100644 --- a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch +++ b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch @@ -2,7 +2,7 @@ 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 +Subject: [PATCH 1/2] build: respect docdir Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream versioning for patches): @@ -34,7 +34,7 @@ Bug: https://bugs.gentoo.org/828928 Signed-off-by: Sam James --- a/Makefile.am +++ b/Makefile.am -@@ -34,8 +34,7 @@ MAINTAINERCLEANFILES = Makefile.in +@@ -34,10 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in man_MANS = man/scrot.1 @@ -42,5 +42,24 @@ Signed-off-by: Sam James -docsdir = $(prefix)/share/doc/scrot +doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png - EXTRA_DIST = man/scrot.1 $(docs_DATA) +-EXTRA_DIST = man/scrot.1 $(docs_DATA) ++EXTRA_DIST = man/scrot.1 + + SUBDIRS = src + +From: Sam James +Date: Mon, 20 Dec 2021 00:03:35 +0000 +Subject: [PATCH 2/2] build: simplify man page installation + +Signed-off-by: Sam James +--- a/Makefile.am ++++ b/Makefile.am +@@ -36,7 +36,7 @@ man_MANS = man/scrot.1 + + doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png + +-EXTRA_DIST = man/scrot.1 ++EXTRA_DIST = $(man_MANS) + + SUBDIRS = src