[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: 5fad9fdf669acbb9b5715f6d3c02c532df4f90a5
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 28 11:33:12 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 28 11:34:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fad9fdf
media-gfx/scrot: drop 1.7-r3, 1.8-r1
Signed-off-by: Ionen Wolkens gentoo.org>
media-gfx/scrot/Manifest | 2 -
media-gfx/scrot/files/scrot-1.7-fix-docdir.patch | 65 --
media-gfx/scrot/scrot-1.7-r3.ebuild | 68
media-gfx/scrot/scrot-1.8-r1.ebuild | 61 -
4 files changed, 196 deletions(-)
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 8fcf8279c727..e0bcc43cf203 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,3 +1 @@
-DIST scrot-1.7.tar.gz 178463 BLAKE2B
021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a
SHA512
3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
DIST scrot-1.8.1.tar.gz 178856 BLAKE2B
c7c6a5169112d38f1b919c651f5b5d99abd3adcf7bdbffd971c358b3c691297ff3bca6e7d82a0fa4e63323ee50651b477f7daab2ea383eb161446b41cd75516d
SHA512
a93b3ce0fc690687b50d9b06d93b30528c26f3ee0b63d16895280d0df092fea022105a6d1aa60cf58c125a5b63eda841e089123d589354901b3ed6e063b76d86
-DIST scrot-1.8.tar.gz 175453 BLAKE2B
2c6cd9c6d8ea7b2dbdfa4827af52ead01327556565d957c3fc37d8511aed3247b02e61f97e1d4136fc047062fa7ff5c01f2a12b290620d2a8572b813c73413b2
SHA512
64d74da0afb4249687b757206baca704911cab34e15e56e7328d259bdb2daf984c0cd5bcd0764c7688c4340b3453cac9d6af1ce750fa65c8d7a31992dff1fcea
diff --git a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
deleted file mode 100644
index 3e0fb09da85d..
--- a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://github.com/resurrecting-open-source-projects/scrot/pull/175
-
-From: Sam James
-Date: Sun, 19 Dec 2021 23:59:45 +
-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
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
-Date: Mon, 20 Dec 2021 00:03:35 +
-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
-
diff --git a/media-gfx/scrot/scrot-1.7-r3.ebuild
b/media-gfx/scrot/scrot-1.7-r3.ebuild
deleted file mode 100644
index 89432c8217c9..
--- a/media-gfx/scrot/scrot-1.7-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 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} == ** ]] ; then
-
EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN};
- inherit 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"
-
-# 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
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: e3fab0acfbb39f126224b70daf1927e3fe1404f8
Author: Sam James gentoo org>
AuthorDate: Sun Dec 19 23:58:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 20 00:02:14 2021 +
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 ..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 +
+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} == ** ]] && eautoreconf
+ # Needed for 1.7 for the docdir patch
+ eautoreconf
+ #[[ ${PV} == ** ]] && eautoreconf
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: 192e9b063f056d9f66d8e348d52a4d76b77538c7
Author: Luis Davila gmail com>
AuthorDate: Sat Dec 11 01:20:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 11 01:29:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192e9b06
media-gfx/scrot: add 1.7
Closes: https://github.com/gentoo/gentoo/pull/23247
Signed-off-by: Luis Davila gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/scrot/Manifest| 1 +
media-gfx/scrot/files/scrot-1.7.bash-completion | 48 +
media-gfx/scrot/scrot-1.7.ebuild| 47
3 files changed, 96 insertions(+)
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 49ab0ed27cd4..7354016426cb 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1 +1,2 @@
DIST scrot-1.4.tar.gz 157779 BLAKE2B
ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1
SHA512
8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
+DIST scrot-1.7.tar.gz 178463 BLAKE2B
021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a
SHA512
3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
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 ..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.ebuild b/media-gfx/scrot/scrot-1.7.ebuild
new file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: a60996126492871f7f1d76985fb38afebd2a9079 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Aug 7 11:26:35 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Aug 7 11:29:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6099612 media-gfx/scrot: Fix acinclude.m4 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Closes: https://bugs.gentoo.org/726290 Signed-off-by: Jeroen Roovers gentoo.org> media-gfx/scrot/files/ax_prefix_config_h.m4 | 203 media-gfx/scrot/scrot-1.4.ebuild| 3 + media-gfx/scrot/scrot-.ebuild | 3 + 3 files changed, 209 insertions(+) diff --git a/media-gfx/scrot/files/ax_prefix_config_h.m4 b/media-gfx/scrot/files/ax_prefix_config_h.m4 new file mode 100644 index 000..22acbac68d5 --- /dev/null +++ b/media-gfx/scrot/files/ax_prefix_config_h.m4 @@ -0,0 +1,203 @@ +# === +#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 +# #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 +# #else +# #include +# #endif +# #ifndef _testpkg_const +# #define _testpkg_const const +# #endif +# +# LICENSE +# +# Copyright (c) 2014 Reuben Thomas +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2008 Marten Svantesson +# Copyright (c) 2008 Gerald Point +# +# 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: 9bd197af7cd916182acc234ccb2b6aeb8a413f82
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Jun 30 08:07:43 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Jun 30 08:08:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd197af
media-gfx/scrot: Drop accepted patch
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers gentoo.org>
media-gfx/scrot/files/scrot--Xcursor.patch | 18 --
media-gfx/scrot/scrot-.ebuild | 3 ---
2 files changed, 21 deletions(-)
diff --git a/media-gfx/scrot/files/scrot--Xcursor.patch
b/media-gfx/scrot/files/scrot--Xcursor.patch
deleted file mode 100644
index dbb935219b3..000
--- a/media-gfx/scrot/files/scrot--Xcursor.patch
+++ /dev/null
@@ -1,18 +0,0 @@
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,4 +34,4 @@
- bin_PROGRAMS = scrot
- scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \
- options.c options.h debug.h imlib.c structs.h note.c note.h
--scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
-+scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
a/src/scrot.h
-+++ b/src/scrot.h
-@@ -40,7 +40,6 @@
- #include
- #include
- #include
--#include
-
- #include
- #include
diff --git a/media-gfx/scrot/scrot-.ebuild
b/media-gfx/scrot/scrot-.ebuild
index 82d865e83c5..3bf57b1445b 100644
--- a/media-gfx/scrot/scrot-.ebuild
+++ b/media-gfx/scrot/scrot-.ebuild
@@ -31,9 +31,6 @@ DEPEND="
DOCS=(
AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
)
-PATCHES=(
- "${FILESDIR}"/${PN}--Xcursor.patch
-)
src_prepare() {
sed -i -e 's#-g -O3##g' src/Makefile.am || die
[gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
commit: c35534ef9174e6bb9fca609ce671d75c6125d763
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Nov 5 09:26:03 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Nov 5 09:29:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35534ef
media-gfx/scrot: Version 1.2
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=588430
Signed-off-by: Jeroen Roovers gentoo.org>
media-gfx/scrot/Manifest| 1 +
media-gfx/scrot/files/scrot-1.2.bash-completion | 41 +++
media-gfx/scrot/metadata.xml| 3 ++
media-gfx/scrot/scrot-1.2.ebuild| 44 +
4 files changed, 89 insertions(+)
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 59dd502e262..06237c18879 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,2 +1,3 @@
+DIST scrot-1.2.tar.gz 36839 BLAKE2B
26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb
SHA512
b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B
6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75
SHA512
3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B
56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0
SHA512
cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
diff --git a/media-gfx/scrot/files/scrot-1.2.bash-completion
b/media-gfx/scrot/files/scrot-1.2.bash-completion
new file mode 100644
index 000..53c80bc3cd3
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-1.2.bash-completion
@@ -0,0 +1,41 @@
+# 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/metadata.xml b/media-gfx/scrot/metadata.xml
index 19bf1be2581..ed83e476a26 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -5,4 +5,7 @@
graph...@gentoo.org
Gentoo Graphics Project
+
+ j...@gentoo.org
+
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
new file mode 100644
index 000..d61d7a45964
--- /dev/null
+++
