gentoo resync : 30.05.2020

3 files changed, 2 insertions, 59 deletions

diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index 6c3f858c2058..fd7bea886492 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,5 +1,3 @@
-DIST xcowsay-1.4.tar.gz 100014 BLAKE2B 59a82449bdefcfdb9f1fcf159e21374e36fb1e5af7db5bc61eb10166e5746bb0ce13f4321c904354f8e5b3bc8ae4625b0b12b339dd8013016e644c908f4b6ef0 SHA512 53370ba287ed2bf7d41cbf1bb8631e8da6933575956b38ee02f5aedae5bb49aede7e5e641fa7f93241f078a1a044920b387288ffbe2a10dd04fbe02932c67ca9
 DIST xcowsay-1.5.tar.gz 100878 BLAKE2B 0763648cb808c44cf519c1e77506e8c35f8a71584f81eee406736e52322b7317937f558b4a6931ec293ea334ca45c8085a51dfc49803754bb734d96d7df04dbe SHA512 13b297a675ec02af6f5617db19abe05979be7137ff37437a64cb079749a69551d453f1a584cf3ca2be62ed0dc6363ebac4986b1f93807bba66b21d0e2ba8cf2c
-EBUILD xcowsay-1.4.ebuild 917 BLAKE2B b57fde2fda0a2b4fe2b8e5a5aaadacd693493ab3a31a7059c1d33da60118163a82b468ef5e14591573c1abb0d3387efd5ffcb1c09af5de30ac9deb6849cb08bb SHA512 adf557c335ad0d706a88dfd730fd7c449325c605ba53c65a2e692906569e4467cfedd46312f840b49d3ee4cb515283364d50a06ab2bf0f79f93e3d45931ba8e5
-EBUILD xcowsay-1.5.ebuild 899 BLAKE2B 82ee169f5301f6803d5d0a801415699fe4d9ad203d2a2aa63c382445a330018174b8df63877ea0856b5f1eda18914f1fb24cb14c6cd60ddc6300a4bafe276b7a SHA512 52d615cd78bc71ed5b1914566c63f6c94a0c9512788634825545e4c42d1edb3a973dc48cd9ff9d203540e8502c987e26272ca26b6570ccfbf90f448db913114c
+EBUILD xcowsay-1.5.ebuild 897 BLAKE2B 80870624a36a1ebc4feb897d2f8088eb18b2f3c8bdb97df6aecd81cca3b8571da7620cce387419fb5a4d9962f1a1e472802e68c2d162fa1cb5236824ec8662c6 SHA512 4817163a078de8f13921ac21d91bbc6dfafe5186ef1d9f64e7b39f438ec2204e4eda0c468d2cfd05318406f748641cc680ef68148f1374851e3a3d92cdf96446
 MISC metadata.xml 1070 BLAKE2B 5d5e324cb4d67d225cb064b46beadd2b0983a5237636de22f18c06aa35d297bed264889fee2246fceacf7c828fdfc5c3a0213733944960072f92b63b0405ce69 SHA512 014335d121bad3fba29d63b860495231223cba25beffcc2c28fc9c55fc1d97a35fc396986763434e345a4217aa84b1c180280aa255ca3c4f89460a5e0b35840d
diff --git a/games-misc/xcowsay/xcowsay-1.4.ebuild b/games-misc/xcowsay/xcowsay-1.4.ebuild
deleted file mode 100644
index 373471250a7c..000000000000
--- a/games-misc/xcowsay/xcowsay-1.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Displays a cute cow and message on your desktop"
-HOMEPAGE="
-	https://github.com/nickg/xcowsay
-	https://www.doof.me.uk/xcowsay/
-"
-SRC_URI="https://github.com/nickg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus fortune nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	virtual/awk
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	dbus? (	dev-libs/dbus-glib )
-	fortune? ( games-misc/fortune-mod )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	if ! use fortune; then
-		sed -e 's/xcowfortune//g' -i src/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable dbus)
-		$(use_enable nls)
-	)
-
-	econf ${myeconfargs[@]}
-}
diff --git a/games-misc/xcowsay/xcowsay-1.5.ebuild b/games-misc/xcowsay/xcowsay-1.5.ebuild
index 8010b4b29015..c1706db5b89b 100644
--- a/games-misc/xcowsay/xcowsay-1.5.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nickg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus fortune nls"
 
 RDEPEND="