commit: 18be03a4de2124d1a312f2156f2aadfd3dd4349b Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Wed Mar 26 08:06:00 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Wed Mar 26 18:16:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18be03a4
media-gfx/scrot: add v1.12, drop v1.10 Signed-off-by: NRK <nrk <AT> disroot.org> Closes: https://github.com/gentoo/gentoo/pull/41302 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> media-gfx/scrot/Manifest | 2 +- media-gfx/scrot/files/scrot-1.7.bash-completion | 48 ---------------------- .../scrot/{scrot-1.10.ebuild => scrot-1.12.ebuild} | 21 +++++----- 3 files changed, 11 insertions(+), 60 deletions(-) diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest index 1e7abddd6265..91cd90b3823e 100644 --- a/media-gfx/scrot/Manifest +++ b/media-gfx/scrot/Manifest @@ -1,2 +1,2 @@ -DIST scrot-1.10.tar.bz2 156519 BLAKE2B ca1441823521d14559afe49ed36853bb5448cc5c2ee345ddb617324b63e8f599678cbdc94b862938017a62d2f5ceea3cae03f80e473e86cafc76dd34144d41bb SHA512 7a72b6d7ae350b0ec27b949934ff67cb8800f731f3dfc783bfdf66c4316b318118b8b46d98aca05543144b757c659791f4a9aeae43364277501238a405eda57d DIST scrot-1.11.1.tar.bz2 158007 BLAKE2B e0c8f166444bfdfbed41a5588036b861973c90d057e302f7bd35cf9630a9f0311735977632ba068c1b3542baed251a3d682da7d8f56c114880a425b3056a0692 SHA512 6a6435c6e0562a367d895f2d1c7a03b050f6588a5843376c5e33a5b8ef1b0b684390530f8c61c340b3f0928caeefb95d9df1f8fe0b145768c336685b1c8d8deb +DIST scrot-1.12.tar.bz2 158561 BLAKE2B 264b9a04bdccc1905998d8812c60e0ce25cd6395abf31bd4982601008ef2b6a269652ab8a12e24e1c34294358e7651fec464dd304fc085c5d1a07d06ea65f3d9 SHA512 6edc065048b0d4172b8fe7221583760cd1aa7a9f383f3f29de89a35f093ed66bb6c0847bb8a037ebd65a60cf750424574c8b8abb593ea29e3ae8e50677597686 diff --git a/media-gfx/scrot/files/scrot-1.7.bash-completion b/media-gfx/scrot/files/scrot-1.7.bash-completion deleted file mode 100644 index 06bc7ac7fad3..000000000000 --- a/media-gfx/scrot/files/scrot-1.7.bash-completion +++ /dev/null @@ -1,48 +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 -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.10.ebuild b/media-gfx/scrot/scrot-1.12.ebuild similarity index 70% rename from media-gfx/scrot/scrot-1.10.ebuild rename to media-gfx/scrot/scrot-1.12.ebuild index 81c77df2463a..7e9593120861 100644 --- a/media-gfx/scrot/scrot-1.10.ebuild +++ b/media-gfx/scrot/scrot-1.12.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit bash-completion-r1 +inherit shell-completion 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 + LIVE_BDEPEND="dev-build/autoconf-archive" else SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.bz2"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="feh" @@ -20,29 +21,26 @@ SLOT="0" # imlib2[X] needed for imlib_create_image_from_drawable, bug #835582 # imlib2[png] not technically requried, but it's the default format used by -# scrot, so unconditionally depend on it to avoid breaking basic commands which -# don't specify an output format. +# scrot, so unconditionally depend on it to avoid breaking basic commands. RDEPEND=" - media-libs/imlib2[X,filters(+),text(+)] + media-libs/imlib2[X,png,filters(+),text(+)] x11-libs/libXext x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama - media-libs/imlib2[png] " DEPEND=" ${RDEPEND} x11-base/xorg-proto - elibc_musl? ( sys-libs/queue-standalone ) " BDEPEND=" - dev-build/autoconf-archive + ${LIVE_BDEPEND} virtual/pkgconfig " DOCS=( - AUTHORS ChangeLog README.md + AUTHORS ChangeLog README.md FAQ.md ) src_prepare() { @@ -54,5 +52,6 @@ src_prepare() { src_install() { default - newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN} + dozshcomp etc/zsh-completion/_scrot + dobashcomp etc/bash-completion/scrot }
