gentoo auto-resync : 15:07:2022 - 19:43:32

6 files changed, 7 insertions, 299 deletions

diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index dd9e023e607f..36469eef627a 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,10 +1,6 @@
-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-1.7-r2.ebuild 1339 BLAKE2B a89b13cb14e4b4f783ca99a427e70b3f3057a666f53580333e544a2c91f5ca8c5d4f376b19c40963a57164efa8e32d1476deafe1fa8383f3755f1498cba1a4ac SHA512 8bc8912dd47924d85f3021af2bd8de9f1e122cf1803b27ca65de2b2d17cfc1ed592863f7238789374cad0dfaa70098e20e4821fbfaab11ee0d9d53587f2c62c6
-EBUILD scrot-9999.ebuild 1185 BLAKE2B 34b75c4161a6779ba2c6ee4feab4746b9014969cad9a1b91c60dec6b54d718a3abb1ab690996eb3b87ef95e9a44c3feac8f91a4b2e3b327bb422512cb3129543 SHA512 ecd6ac7653c734327e20022dfe0e3841708356a833b47a8b211abea541a7b5e01212a4be99b6fe6f1e190e3d621d6150fb76943a6239e28db1d163ab8b7984dc
+EBUILD scrot-1.7-r3.ebuild 1420 BLAKE2B 7be9689b2c7da17bdca5d3947d16c64a8355dd501175c5cf56ce3015f1ba47d2c9e2233359ded22d58bb0523d2026c45096ea496ce764de39bb6c9a5fc18c9a8 SHA512 77bec0b350ed47c2e3ff178af374ed22074d45f2225647c6cebc3820a686fec101a9cd6958cefffd8576109cf646b880a66a4836924339d6bbf78fe137c42f3d
+EBUILD scrot-9999.ebuild 1276 BLAKE2B d5c6fdcf669205334e274a3785016c2b0c78ecf9404c511d4289d08df61d48069ec2d8a6aa184b82132349789b40ee40a1c70adbcc253df12449eebc6d38313d SHA512 c2eb6beeb7a8b6b8209df6b79e943a1ed28a9e5c8196a8a72eefa42ea027e21641f7a5c8cf1230bd6a12f1a86ce429bf8f65a8f35ebafffbadf6f7b047f7f28d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/scrot/files/ax_prefix_config_h.m4 b/media-gfx/scrot/files/ax_prefix_config_h.m4
deleted file mode 100644
index 22acbac68d5e..000000000000
--- a/media-gfx/scrot/files/ax_prefix_config_h.m4
+++ /dev/null
@@ -1,203 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])]
-#
-# DESCRIPTION
-#
-#   Generate an installable config.h.
-#
-#   A package should not normally install its config.h as a system header,
-#   but if it must, this macro can be used to avoid namespace pollution by
-#   making a copy of config.h with a prefix added to all the macro names.
-#
-#   Each "#define SOMEDEF" line of the configuration header has the given
-#   prefix added, in the same case as the first character of the macro name.
-#
-#   Defaults:
-#
-#     OUTPUT-HEADER = $PACKAGE-config.h
-#     PREFIX = $PACKAGE
-#     ORIG-HEADER, from AM_CONFIG_HEADER(config.h)
-#
-#   Your configure.ac script should contain both macros in this order.
-#
-#   Example:
-#
-#     AC_INIT(config.h.in)        # config.h.in as created by "autoheader"
-#     AM_INIT_AUTOMAKE(testpkg, 0.1.1)    # makes #undef VERSION and PACKAGE
-#     AM_CONFIG_HEADER(config.h)          # prep config.h from config.h.in
-#     AX_PREFIX_CONFIG_H(mylib/_config.h) # prep mylib/_config.h from it..
-#     AC_MEMORY_H                         # makes "#undef NEED_MEMORY_H"
-#     AC_C_CONST_H                        # makes "#undef const"
-#     AC_OUTPUT(Makefile)                 # creates the "config.h" now
-#                                         # and also mylib/_config.h
-#
-#   If the argument to AX_PREFIX_CONFIG_H would have been omitted then the
-#   default output file would have been called simply "testpkg-config.h",
-#   but even under the name "mylib/_config.h" it contains prefix-defines
-#   like
-#
-#     #ifndef TESTPKG_VERSION
-#     #define TESTPKG_VERSION "0.1.1"
-#     #endif
-#     #ifndef TESTPKG_NEED_MEMORY_H
-#     #define TESTPKG_NEED_MEMORY_H 1
-#     #endif
-#     #ifndef _testpkg_const
-#     #define _testpkg_const _const
-#     #endif
-#
-#   and this "mylib/_config.h" can be installed along with other header
-#   files, which is most convenient when creating a shared library (that has
-#   some headers) whose functionality depends on features detected at
-#   compile-time. No need to invent some "mylib-confdefs.h.in" manually.
-#
-#   Note that some AC_DEFINEs that end up in the config.h file are actually
-#   self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the AC_TYPE_OFF_T
-#   say that they "will define inline|const|off_t if the system does not do
-#   it by itself". You might want to clean up about these - consider an
-#   extra mylib/conf.h that reads something like:
-#
-#     #include <mylib/_config.h>
-#     #ifndef _testpkg_const
-#     #define _testpkg_const const
-#     #endif
-#
-#   and then start using _testpkg_const in the header files. That is also a
-#   good thing to differentiate whether some library-user has starting to
-#   take up with a different compiler, so perhaps it could read something
-#   like this:
-#
-#     #ifdef _MSC_VER
-#     #include <mylib/_msvc.h>
-#     #else
-#     #include <mylib/_config.h>
-#     #endif
-#     #ifndef _testpkg_const
-#     #define _testpkg_const const
-#     #endif
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Reuben Thomas <rrt@sc3d.org>
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2008 Marten Svantesson
-#   Copyright (c) 2008 Gerald Point <Gerald.Point@labri.fr>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 16
-
-AC_DEFUN([AX_PREFIX_CONFIG_H],[dnl
-AC_PREREQ([2.62])
-AC_BEFORE([AC_CONFIG_HEADERS],[$0])dnl
-AC_CONFIG_COMMANDS(m4_default([$1], [$PACKAGE-config.h]),[dnl
-AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
-AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
-AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl
-AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl
-AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl
-AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl
-m4_pushdef([_script],[conftest.prefix])dnl
-m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
-_OUT=`echo m4_default([$1], [$PACKAGE-config.h])`
-_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
-_PKG=`echo m4_default([$2], [$PACKAGE])`
-_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
-_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
-_INP=`echo "$3" | sed -e 's/ *//'`
-if test ".$_INP" = "."; then
-   for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
-     case "$ac_file" in
-        *.h) _INP=$ac_file ;;
-        *)
-     esac
-     test ".$_INP" != "." && break
-   done
-fi
-if test ".$_INP" = "."; then
-   case "$_OUT" in
-      */*) _INP=`basename "$_OUT"`
-      ;;
-      *-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"`
-      ;;
-      *) _INP=config.h
-      ;;
-   esac
-fi
-if test -z "$_PKG" ; then
-   AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
-else
-  if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
-     _INP="$srcdir/$_INP"
-  fi fi
-  AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
-  if test -f $_INP ; then
-    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/"]) > _script
-    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/"]) >> _script
-    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1\\"]) >> _script
-    AS_ECHO(["@%:@def[]ine $_UPP""_\\1\\2\\"]) >> _script
-    AS_ECHO(["@%:@endif/"]) >> _script
-    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1\\"]) >> _script
-    AS_ECHO(["@%:@define $_LOW""_\\1\\2\\"]) >> _script
-    AS_ECHO(["@%:@endif/"]) >> _script
-    # now executing _script on _DEF input to create _OUT output file
-    echo "@%:@ifndef $_DEF"      >$tmp/pconfig.h
-    echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h
-    echo ' ' >>$tmp/pconfig.h
-    echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-
-    sed -f _script $_INP >>$tmp/pconfig.h
-    echo ' ' >>$tmp/pconfig.h
-    echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h
-    echo "@%:@endif" >>$tmp/pconfig.h
-    if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then
-      AC_MSG_NOTICE([$_OUT is unchanged])
-    else
-      ac_dir=`AS_DIRNAME(["$_OUT"])`
-      AS_MKDIR_P(["$ac_dir"])
-      rm -f "$_OUT"
-      mv $tmp/pconfig.h "$_OUT"
-    fi
-  else
-    AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
-  fi
-  rm -f conftest.*
-fi
-m4_popdef([_symbol])dnl
-m4_popdef([_script])dnl
-AS_VAR_POPDEF([_INP])dnl
-AS_VAR_POPDEF([_UPP])dnl
-AS_VAR_POPDEF([_LOW])dnl
-AS_VAR_POPDEF([_PKG])dnl
-AS_VAR_POPDEF([_DEF])dnl
-AS_VAR_POPDEF([_OUT])dnl
-],[PACKAGE="$PACKAGE"])])
diff --git a/media-gfx/scrot/files/scrot-1.2.bash-completion b/media-gfx/scrot/files/scrot-1.2.bash-completion
deleted file mode 100644
index 53c80bc3cd36..000000000000
--- a/media-gfx/scrot/files/scrot-1.2.bash-completion
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-	"
-
-	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}")) ;;
-	esac
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
deleted file mode 100644
index 11c9a2db3274..000000000000
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools 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}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=media-libs/giblib-1.2.3
-	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
-"
-DOCS=(
-	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
-)
-
-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
-}
-
-src_install() {
-	default
-
-	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.7-r2.ebuild b/media-gfx/scrot/scrot-1.7-r3.ebuild
index 43d345d6e260..89432c8217c9 100644
--- a/media-gfx/scrot/scrot-1.7-r2.ebuild
+++ b/media-gfx/scrot/scrot-1.7-r3.ebuild
@@ -10,7 +10,7 @@ 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
+	inherit git-r3
 else
 	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
 
@@ -20,8 +20,10 @@ fi
 LICENSE="feh LGPL-2+"
 SLOT="0"
 
+# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 RDEPEND="
 	dev-libs/libbsd
+	media-libs/imlib2[X]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 1052ef88647a..a99487cdc4e9 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -19,8 +19,10 @@ fi
 LICENSE="feh LGPL-2+"
 SLOT="0"
 
+# imlib2[X] needed for imlib_create_image_from_drawable, bug #835582
 RDEPEND="
 	dev-libs/libbsd
+	media-libs/imlib2[X]
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite