gentoo resync : 21.05.2019

4 files changed, 3 insertions, 115 deletions

diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index f42c5a1ea82d..2dffc56d5272 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,9 +1,5 @@
 AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
 AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
-DIST golly-2.7-src.tar.gz 3881882 BLAKE2B 1989ff56049b7a182cbca35e33ac287c279ebac69acc5d07ac5122e8ccffef978a2e063c0587813d177a6311c854c6d52c2e80a5919107f9c6b17947a5e5f1ab SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
-DIST golly-2.8-src.tar.gz 4087191 BLAKE2B 4029b9bd30624cf2253dc5524c998f7e50648d39bc8dccf23b5c6b586989a641dde17b9fe35f16043d0f0d4a60da46729b31a9715b5d07950d610ea41a93a7a5 SHA512 bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
 DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
-EBUILD golly-2.7-r1.ebuild 1016 BLAKE2B f4d11a14b186a071c7c4e3d22fed0f86ba01b60cf05594e5fa5d36b92efbdb88791130cca30b5b53509357521cac6c8e38714e6ce7eb29892dacf23d948abcc0 SHA512 28c118e5bd8542699bd89517e301a169dcb0961920fe66958329bf4570c3e6a53446069850d24553ac6f9ab69b99445a51888281edcb34d83a54f79497428216
-EBUILD golly-2.8-r1.ebuild 1132 BLAKE2B d7e03271c35d155f163fa54f2c0264cd4ad651248cd80f64b93ab832f2e647371134783ff77f543d80b8dabf3e05aab781777051e13ebe625370df3a5290efb3 SHA512 3f162769d8940a0eed7d227fca60675fc430ee285beae0c5f6dfb19c94414f4eec61f758b506c107ca79f45981bdbfdfc7ee51889c7e8859c0307f451ef4035f
-EBUILD golly-3.2.ebuild 1150 BLAKE2B 353b5ed9260c8b8b594cf3fa4804b62eb3207aafa90d71892b240ab658d9adc625cba8e5b9e80cc484d349d1d8644ef2da67075b530f5eeefa72f4fffee04fb4 SHA512 560377816c32ced370653be76cba7c18855803e348733e94476ca0ee367af62412ac4021d6a583b7576f93486171cbd6ef3c4b43076745210a071281dd185a72
+EBUILD golly-3.2.ebuild 1148 BLAKE2B a753b5b303d6d59ea2cb9f596367c473896328947b64214cecb53d59082292c9f38e553127142b25ca6e0f52ab379f25a52ccd95d54c258ccdbe6a831877f4ac SHA512 5192b0c80ea964422fb49e607af8e0ac68a8dced02182a38cea1c0fea5583a07784ff8ffc6f47f56c5b9f41d217717e9dab776920c1872b0b137f8c3fb07bc43
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-2.7-r1.ebuild b/app-misc/golly/golly-2.7-r1.ebuild
deleted file mode 100644
index b07bc8262aab..000000000000
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-src_configure() {
-	econf --with-perl-shlib="libperl.so"
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/golly/golly-2.8-r1.ebuild b/app-misc/golly/golly-2.8-r1.ebuild
deleted file mode 100644
index 0dda2847e7e9..000000000000
--- a/app-misc/golly/golly-2.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-lang/perl
-	virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-src
-ECONF_SOURCE=gui-wx/configure
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_configure() {
-	append-libs -lGL -ldl
-	econf \
-		--with-perl-shlib="libperl.so" \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
index 6000a64174e4..733fce4ccb93 100644
--- a/app-misc/golly/golly-3.2.ebuild
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"