gentoo resync : 04.05.2019

4 files changed, 2 insertions, 69 deletions

diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index a95ed321143f..b44f4f2f8485 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,8 +1,5 @@
 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
-DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 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
-EBUILD scrot-0.8-r1.ebuild 666 BLAKE2B b91b37a7b8db6a3de2d4685293a32183f58b3ca5b9ec6b630d52597f56e681fd0a808bd9fdc2dbef8a9734c144c307a3fedc8d41e37b9b7ad9c75cddcf56025d SHA512 c43a8d61910df70a0a0a91562ab3fd685fd275e0408ad6b6007cb4a942dd7b4ac18cc343e9396cba16b18e5dc2df9d8efbd628187dae4446aa0dc97df96daed0
-EBUILD scrot-0.8_p13-r1.ebuild 1001 BLAKE2B c203706b7257fad582145bb304dd812417c73339ff6d2094174f12782d1043b3085855c6a2f580a8edc76641553c5728c5b46ed945fbcd1e33a3c9bfcde721f8 SHA512 2b90cc64c342e4ba07e87f55a4457bc2c45edb5cd5271995a72c25c3cbc72befc35d8334dfc3ddfd7869c4cc73d586d2b2769f40dd6f8239646397c3ff52d6e9
-EBUILD scrot-0.8_p13.ebuild 913 BLAKE2B 72da0f29f58047ec05aa001763247bd30471eee27c97373a9646cb55e29d8d33507faa1affd4f4b7e37a3fb25fad4cf6f09e6bab1b8e683c5cf54f7feb764ea1 SHA512 3544e4dd18d3c0686d0e0666adb32f89dd571a504cb6abb7083ca80275d408e0315b25cfabe032ba5c8380365e538357b0482307715652f17699f76f221b0a0e
+EBUILD scrot-0.8_p13-r1.ebuild 1000 BLAKE2B 213b2de3ccfeabb1567be94edcf681f7562a51bb00b065e6d593a4cc83dd7921fbbba796b35506a8e6ab0538290e9a9a6353fa9371ee78e32f0e7cf9be74d322 SHA512 cee4e837e4f64ec495c34409ad7f23bc54422fda88f89fa61f5a6931e0a18faff7290b43a1705faa0b66abc8b0d663b85d14adfad16acc817a8f7122183419ea
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8-r1.ebuild b/media-gfx/scrot/scrot-0.8-r1.ebuild
deleted file mode 100644
index e5f7314290bf..000000000000
--- a/media-gfx/scrot/scrot-0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://www.linuxbrit.co.uk/"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
-	>=media-libs/giblib-1.2.3"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc
-	dodoc AUTHORS ChangeLog
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
-}
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 841368076118..2cc010f584c7 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-0.8_p13.ebuild b/media-gfx/scrot/scrot-0.8_p13.ebuild
deleted file mode 100644
index 3beccb11abbe..000000000000
--- a/media-gfx/scrot/scrot-0.8_p13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/-}
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://scrot.sourcearchive.com/"
-SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
-	http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_${MY_PV}.debian.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
-	>=media-libs/giblib-1.2.3"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-0.8
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc
-	dodoc AUTHORS ChangeLog
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}