gentoo resync : 22.12.2021

5 files changed, 205 insertions, 13 deletions

diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 0f79a40d8551..887b33356526 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,6 +1,10 @@
 AUX ax_prefix_config_h.m4 8195 BLAKE2B d2eb17b7730a216f8fa88585b7dce51d641fb9e801a77d8059329a3838a8ce0d4eac02e1229cd087cdbac9f47c7bcfe99bfe0a14e8c4db233c6c4e066ea09b81 SHA512 cf70c3e909da9379ebed51a66fe94cbd7a068574e0ba0da5690f917523b090f29eb23f0464849d6364adc28411258483b0d773ed3488c9e9328d5a1f732427c4
 AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
+AUX scrot-1.7-fix-docdir.patch 1794 BLAKE2B b55621bbf24cca877c9d50119bb0eeaf40e5372c9ff5b21c0de1620f37deb2c6d6a069b16355c01844387709f475e29a97f66bdc4b1aaea84cbeafc9ff46119b SHA512 4b28c1458bebb22b1d6dfdbfe2478e0e829a73f641b1b7b5b8140bee4d7384f84d3d7b538f0a7b9f89a824bd255af1158611fd7a3f8787797a111641e2dfeaff
+AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
 DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
+DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
 EBUILD scrot-1.4.ebuild 1041 BLAKE2B 102bdca2640dbf9f60dcd2ce84ccb3de19ac324c7c414dc100497330211cf94ef0561196105371d4e693bf14811327f44f180db60439e34998c9e26749f8fbd9 SHA512 497beb7ba0f8d166fc2fba6a56e2b1b5fdda555f6ce61d0710e9f6fdc1f42a8c522312b0b9e7ace764e15c75df116607270e59a2513d7648c8c670a63c4039b6
-EBUILD scrot-9999.ebuild 962 BLAKE2B bd263137adf2fa88b029f8b38b92d86219308cdf290b775334fd28bd0f4e51b2a10bb6726b8f6c568a5fa5b309ec7b71199958b7030374bdfb6cb83ede7a0121 SHA512 2eddd1a3086c9b834ead426e1df2c0aa84a85021aa7606d30d92a23ad0e2869a99a9ff248f6af960a28082555f68a823d448837a9f70892c49ec9a8ea5bd9903
+EBUILD scrot-1.7-r2.ebuild 1302 BLAKE2B defeac3087442ab4f00ce5358db0a204f7386f8aade58376a7975a49275798dce76c44ba01247c07a5762b87cae364d1caea31273348db01404cae154d2de871 SHA512 97d7540e3a2249d2974795775271d58784e46d5820a782e0483ee29f6cb49d5976d44625ff35e7eba474d9389b18ffaf91842554693f1c679842ee16dd96f2e9
+EBUILD scrot-9999.ebuild 1142 BLAKE2B a819b2a28a10a06938b17340bb2abe23cb8e0e6723ed1dabac4b1a7ef00c4fbb44776b25ad8621a42e76bffff97727043d13668341fcc264cd8e8f930e2bb6b4 SHA512 eaf6c790a31412eccfed31cbab17941570d75f123b79cf68e6b8c69983f8b09e0bae2369be8f7fbca85ba6feae9afaafab0d87c0a7cdcbc921fe69d0607f9eb5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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..3e0fb09da85d
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
@@ -0,0 +1,65 @@
+https://github.com/resurrecting-open-source-projects/scrot/pull/175
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 19 Dec 2021 23:59:45 +0000
+Subject: [PATCH 1/2] 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 <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,10 +34,9 @@ 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)
++EXTRA_DIST = man/scrot.1
+ 
+ SUBDIRS = src
+ 
+From: Sam James <sam@gentoo.org>
+Date: Mon, 20 Dec 2021 00:03:35 +0000
+Subject: [PATCH 2/2] build: simplify man page installation
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- 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
+ 
diff --git a/media-gfx/scrot/files/scrot-1.7.bash-completion b/media-gfx/scrot/files/scrot-1.7.bash-completion
new file mode 100644
index 000000000000..06bc7ac7fad3
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-1.7.bash-completion
@@ -0,0 +1,48 @@
+# bash-completion script for scrot
+# place this in /etc/bash_completion.d
+
+_scrot() {
+	local cur prev opts
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	opts="
+		-h --help -v --version -a --autoselect -b --border -c --count -d
+		--delay -e --exec -q --quality -m --multidisp -s --select -u --focused
+		-t --thumb -z --silent -p --pointer -f --freeze -o --overwrite -l --line
+		-n --note -C --class -i --ignorekeyboard -F --file -shole --select=hole
+		-shide --select=hide -sblur --select=blur
+	"
+
+	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
+		COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+	fi
+
+	case "${prev}" in
+		-h|--help) COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}")) ;;
+		-v|--version) COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}")) ;;
+		-a|--autoselect) COMPREPLY=($(compgen -W "${opts/-a --autoselect}" -- "${cur}")) ;;
+		-b|--border) COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}")) ;;
+		-c|--count) COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}")) ;;
+		-d|--delay) COMPREPLY=($(compgen -W "${opts/-d --delay}" -- "${cur}")) ;;
+		-e|--exec) COMPREPLY=($(compgen -A command -- "${cur}")) ;;
+		-q|--quality) COMPREPLY=($(compgen -W "${opts/-q --quality}" -- "${cur}")) ;;
+		-m|--multidisp) COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}")) ;;
+		-s|--select) COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}")) ;;
+		-u|--focused) COMPREPLY=($(compgen -W "${opts/-u --focused}" -- "${cur}")) ;;
+		-t|--thumb) COMPREPLY=($(compgen -W "${opts/-t --thumb}" -- "${cur}")) ;;
+		-z|--silent) COMPREPLY=($(compgen -W "${opts/-z --silent}" -- "${cur}")) ;;
+		-p|--pointer) COMPREPLY=($(compgen -W "${opts/-p --pointer}" -- "${cur}")) ;;
+		-f|--freeze) COMPREPLY=($(compgen -W "${opts/-f --freeze}" -- "${cur}")) ;;
+		-o|--overwrite) COMPREPLY=($(compgen -W "${opts/-o --overwrite}" -- "${cur}")) ;;
+		-l|--line) COMPREPLY=($(compgen -W "${opts/-l --line}" -- "${cur}")) ;;
+		-n|--note) COMPREPLY=($(compgen -W "${opts/-n --note}" -- "${cur}")) ;;
+		-C|--class)COMPREPLY=($(compgen -W "${opts/-C --class}" -- "${cur}")) ;;
+		-i|--ignorekeyboard)COMPREPLY=($(compgen -W "${opts/-i --ignorekeyboard}" -- "${cur}")) ;;
+		-F|--file)COMPREPLY=($(compgen -W "${opts/-F --file}" -- "${cur}")) ;;
+		-shole|--select=hole)COMPREPLY=($(compgen -W "${opts/-shole --select=hole}" -- "${cur}")) ;;
+		-shide|--select=hide)COMPREPLY=($(compgen -W "${opts/-shide --select=hide}" -- "${cur}")) ;;
+		-sblur|--select=blur)COMPREPLY=($(compgen -W "${opts/-sblur --select=blur}" -- "${cur}")) ;;
+	esac
+}
+complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-1.7-r2.ebuild b/media-gfx/scrot/scrot-1.7-r2.ebuild
new file mode 100644
index 000000000000..3aa2ef8c7e06
--- /dev/null
+++ b/media-gfx/scrot/scrot-1.7-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+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"
+
+RDEPEND="
+	dev-libs/libbsd
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	|| (
+		media-libs/imlib2[gif]
+		media-libs/imlib2[jpeg]
+		media-libs/imlib2[png]
+		media-libs/imlib2[tiff]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+DOCS=(
+	AUTHORS ChangeLog README.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-fix-docdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for 1.7 for the docdir patch
+	eautoreconf
+	#[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_install() {
+	default
+
+	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+}
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 605a004b7102..80d7728667d6 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -1,19 +1,27 @@
-# 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="
-	>=media-libs/giblib-1.2.3
+	dev-libs/libbsd
+	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
@@ -28,21 +36,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}
 }