gentoo resync : 15.01.2020

4 files changed, 4 insertions, 133 deletions

diff --git a/x11-misc/xplanetFX/Manifest b/x11-misc/xplanetFX/Manifest
index 41752baf6c9a..a574bb17ad50 100644
--- a/x11-misc/xplanetFX/Manifest
+++ b/x11-misc/xplanetFX/Manifest
@@ -1,8 +1,4 @@
 AUX xplanetFX-2.6.4-gentoo-path.patch 1525 BLAKE2B b36d03fa5b1222e0ce16d83f2d17b20378e1cbda23467f738d9b4c3996ec4687631f8feedcd011fd9c18cc13eaa632541055ccef4fa4a173497f81fd3d50e20d SHA512 73b479936ec210e80c9e15e9a963ab41526b4da879ddc67d4083a710cc5aeb89929d261644131fe3a169aa4d65b297201eb1c08b674219a770cf9c1182b5d143
-DIST xplanetfx-2.6.12_all.tar.gz 36874773 BLAKE2B 12a3fb093584a978f559c64ca64ec567ebbb25faf081ca2b2bb4365aa187693b1dd5f1a3d88a57aa6c901b1c812c19fd6f717ca096093b02760af62d8a8f0fcc SHA512 b2d76f9a8341ab5098a3b09f27f7844673850275f4c577cef344199cdc72f93060eb05786a9111a1fb9f120d747f12cc5793dba6a249141e284a3bff59d4e0fe
-DIST xplanetfx-2.6.13_all.tar.gz 36874849 BLAKE2B 276fbb61d6f90e5e0ed13eb7292d8f853eee8a8d92691d1b5502de6e51e526b36f916f5469eddf411ac8c8b876787c0989d82e8685d6374b36f385b1cb11f47b SHA512 dddc3666dd0f802cafd7b917eb513dd662b94617701622eabaaff18cf9277e3faf206eb602eb2af7c117a212b14e1cdbc4a8c11bded8243571ae4afa86f3fe72
 DIST xplanetfx-2.6.14_all.tar.gz 36874844 BLAKE2B ee02daa55fe2e0a64b4691c95e8bac1b95d99d0ddd1e83036d723d46140b54be8d859619815929e205bc386fd5dbe5ffdc8ca3995da73497e93ee79cccee1dfe SHA512 479c297906785f304178cd3ff41eaf955be6b6a50437c02528528f2328cc726bdcc54fedc107df02b346144c2f06a4325a40b94f03f7923081bed48baf0238b5
-EBUILD xplanetFX-2.6.12.ebuild 1563 BLAKE2B aeb56ee4a438ccd6d571048938bd3106d322cceebad1e82ee1fc273efb5ce74822436d8bc299beba52823219d55dfb0cd3720d9969d9a554112013cbca449e98 SHA512 74c7676caf4c877e1bf3225210e6498ae17cfd65821ab5efd4c385ca6ee9e0ec55b6d140544113270fbff9a875e5a4df0e393d9a423ec7be79fc198dd0b82237
-EBUILD xplanetFX-2.6.13.ebuild 1563 BLAKE2B aeb56ee4a438ccd6d571048938bd3106d322cceebad1e82ee1fc273efb5ce74822436d8bc299beba52823219d55dfb0cd3720d9969d9a554112013cbca449e98 SHA512 74c7676caf4c877e1bf3225210e6498ae17cfd65821ab5efd4c385ca6ee9e0ec55b6d140544113270fbff9a875e5a4df0e393d9a423ec7be79fc198dd0b82237
-EBUILD xplanetFX-2.6.14.ebuild 1563 BLAKE2B c412f7cd73029dec959d83c4110ac12e0d9fa0c07d6ec4f9d1e3e697668131641095ce9c94bd55ced9e4f3f0bebe468db8b7be08f321c235042f11ef38bb9f48 SHA512 2f4213022dd5aa13e3e6265624591b86aac8063de91dc94406cb1f8c4dc68f719b2cde19fdd227a7ca8468c7a79e8da6cfc6ad400b4b5c2a122cc8016baaee26
+EBUILD xplanetFX-2.6.14.ebuild 1536 BLAKE2B 7e7bb87b04ca154cb43f45630d26452b2b403793b144ddd3df819985dde9593c861c18b65ccb573787bdd8f044ecaef85b4f8fa4b1556f0d8d9932c62c285c02 SHA512 62cb5bcd9f571510b055915531ea67425324d8a5a2d3c1e27339ce5edbbc276a127efbe6fed4f4fd612c062168d1c9e9898d364b86562ba5bce6d1d4d6957d55
 MISC metadata.xml 1176 BLAKE2B 873f695dae98cf38ba08a4017205ae2c9b999350782dd20dbcbcd63fc419432a438236670b692f8b6e221ae6bdf2b19d53f76eb4707b173b99a7838c143a623c SHA512 1e81e9920d7407a9cd88b83599282ab1f8079878fdee6739c5a763b0d6781c9dc2dd91c49e7811cd53b32ff6b50db3a77a4ab3d58e296c4f51b478141e61f771
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
deleted file mode 100644
index ef8d834ced6e..000000000000
--- a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
-HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
-SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	sys-devel/bc
-	x11-misc/xplanet
-	libnotify? ( x11-libs/libnotify )"
-#python
-
-S="${WORKDIR}/usr"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-2.6.4-gentoo-path.patch
-	sed -e "s/Application;//" -i share/applications/*desktop || die
-
-	# These will be installed separately
-	mkdir gentoo || die
-	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
-		gentoo || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
-	insinto /usr/share/pixmaps
-	doins share/pixmaps/*
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-
-	exeinto /usr/share/${PN}
-	doexe gentoo/autostart
-
-	dodoc share/doc/${PN}/{changelog,README}
-
-	python_scriptinto /usr/share/${PN}/stars
-	python_foreach_impl python_doscript gentoo/catalog.py
-	python_scriptinto /usr/share/${PN}
-	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
-	python_foreach_impl python_domodule gentoo/flipview.py
-}
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
deleted file mode 100644
index ef8d834ced6e..000000000000
--- a/x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
-HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
-SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	sys-devel/bc
-	x11-misc/xplanet
-	libnotify? ( x11-libs/libnotify )"
-#python
-
-S="${WORKDIR}/usr"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${PN}-2.6.4-gentoo-path.patch
-	sed -e "s/Application;//" -i share/applications/*desktop || die
-
-	# These will be installed separately
-	mkdir gentoo || die
-	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
-		gentoo || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
-	insinto /usr/share/pixmaps
-	doins share/pixmaps/*
-	insinto /usr/share/${PN}
-	doins -r share/${PN}/*
-
-	exeinto /usr/share/${PN}
-	doexe gentoo/autostart
-
-	dodoc share/doc/${PN}/{changelog,README}
-
-	python_scriptinto /usr/share/${PN}/stars
-	python_foreach_impl python_doscript gentoo/catalog.py
-	python_scriptinto /usr/share/${PN}
-	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
-	python_foreach_impl python_domodule gentoo/flipview.py
-}
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
index 5a7eba008ee4..b8f5f2c89686 100644
--- a/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
+++ b/x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-r1
+inherit desktop eutils python-r1
 
 DESCRIPTION="GUI to configure, run or daemonize xplanet with HQ capabilities"
 HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
@@ -42,8 +42,7 @@ src_prepare() {
 
 src_install() {
 	dobin bin/${PN}
-	insinto /usr/share/applications
-	doins share/applications/${PN}.desktop
+	domenu share/applications/${PN}.desktop
 	insinto /usr/share/pixmaps
 	doins share/pixmaps/*
 	insinto /usr/share/${PN}