gentoo resync : 07.10.2018

3 files changed, 3 insertions, 68 deletions

diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 2e16fad1b7c2..710a5317d18c 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -2,6 +2,5 @@ AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999
 AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1619 BLAKE2B f836bc702eafe72bdacae41fd2bdea9767f82f925862b7157175c701927f6e1704ea5fcf51d11193c888464f59887e83e690538ffbd7120ab81b7590d095a107 SHA512 810e92b8dc510b127adcc6cd87cc64e4de65096e16c27b7f1c5f1325bc244a9bc01c8225f4773cb3ebbb8f328f42416f2898afed95856014c790a8f594a08aaf
-EBUILD wmSpaceWeather-1.04_p19.ebuild 1744 BLAKE2B a50f25070cef9f86cde7af708cc5549f064f6d2bf0ca2c5889d9bde24ab847a238b767f819d3e813baeddc9d8315257fef85aa511aa33f06dbc868962c4b28f9 SHA512 a918147033cb30022ab49c7121531fc14c5dad791d79f156cd220f9ef573fd51e30a903a9465d28b1395d9366d2d5fb1c2bc4dd17339db4e53c20f32490442bd
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1615 BLAKE2B 14fe0fcfbd5c1f97d41544d5da48a40c38c017c097c925dd164166bb7c20bf6538f814d2d87eb1a9f87f7393b15f4c7af4859f37e36a72052abf2506e6d5f6d6 SHA512 22994e3a83bb5b196e2815d42991dc2231e3cbe998125a32078e886d3c48b24e6121061a67daafd13a222416d42e637a18ac94dcf3e340abb20abd24b9ce638c
 MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 21f8049f3673..568c3f7524fb 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
 
 DOCS=( ../{BUGS,CHANGES,HINTS,README} )
 
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
deleted file mode 100644
index 8a6964c62500..000000000000
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN="wmspaceweather"
-MY_PV_ORIG="${PV/_p*}"
-MY_PV_PATCH="${PV/_p/-}"
-MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig"
-MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff"
-
-DESCRIPTION="dockapp showing weather at geosynchronous orbit"
-HOMEPAGE="https://www.dockapps.net/wmspaceweather"
-SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
-	    mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-CDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${CDEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${CDEPEND}
-	net-misc/curl
-	dev-lang/perl"
-
-S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
-
-src_unpack() {
-	unpack ${MY_P_ORIG}.tar.gz
-	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-
-	# need to apply patches from Debian first, do NOT change the order
-	cd "${S}"
-	mv ../debian/patches "${WORKDIR}"/patch
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-getkp.patch
-}
-
-src_compile() {
-	emake clean || die "make clean failed"
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die install failed
-	dodoc ../{BUGS,CHANGES,HINTS,README}
-}
-
-pkg_postinst() {
-	elog "You need to emerge www-client/firefox or www-client/firefox-bin"
-	elog "to use the -url functionality - see man ${PN} for more info."
-	elog
-	elog "This version uses curl instead of wget. You may edit /usr/share/wmspaceweather/GetKp"
-	elog "if you don't like it."
-}