gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 144 deletions

diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
index a1798e4ef37d..afd2cccb499c 100644
--- a/app-misc/gcstar/Manifest
+++ b/app-misc/gcstar/Manifest
@@ -1,7 +1,4 @@
 AUX gcstar-1.4.0-man.patch 902 BLAKE2B 092a745eaa409c8b4c8b44244c99f4012d9eaa25c530b7731ec8e1ee5750b62b25c518917afe112c520f8f38c1ac8d09c88305a4048a34203b4fcb3257194eaf SHA512 eb1f1ec1822927b5885350fd69f26e599afebe240cfdc01adde27894f37ebdfa2fe14fd0e5cda3e0f12acea622d852d5442fef1f08b4ab8e8238b9d1d5b56482
-AUX gcstar-1.7.0-gcstar.desktop.patch 796 BLAKE2B 052d2d3325c04e1d8bb64951cfa43b44d1fa85f7c11326e2d56b04e8c5a57e70dc7b5a6758ae27186b403d27a4fd3d1ffc903c761c7a0a98b7430c4ef3602d56 SHA512 59ef9e55ffd607723b0cf833bf666ea4661db3af14b45425ba4b55de1d6144714eddf4cdbe17caddfa5a2876772c5c387a0fd06354c44fc8f3b26b83bba56150
-DIST gcstar-1.7.0.tar.gz 4506937 BLAKE2B dfc6f53921ecad73676fb9943f87dfb3c465347e4d4783f1efc29ec75c35eb56ecf97f9eba6121eb22740642d186d642a3384c10ea8ef6a8b42664e1c2a056e3 SHA512 9cb22a7ee38bbeae67ffc6f649ef6e988da43a1f353b027bacbf14ffcca8a4c12ef28d64876b2171396315eae95f76708a1307255eabc3eed6776137e2ae7090
 DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
-EBUILD gcstar-1.7.0.ebuild 2983 BLAKE2B 5dea9b2b2e74043d0c015bd975cf2b84cc928862f871c8c0833dfa92ef7db4f13d99de145987aead78281a1936199b3efe7059756a90cb72c1b2ff85c130a69f SHA512 dda33ea7ecd94915c9777448fffca7768f53e12e85af730a1b1e9af343a7596d6319a06b6ba9f58a38cefa0db8d972cbae43f17a0fdb52e238480bf03c523b4c
-EBUILD gcstar-1.7.1.ebuild 2172 BLAKE2B d6b0641fcaa802947c08096c8a4eac18ba7615a7d0a30fdabb048be8dddbb4140355bc4bd5ddef33eb3054b2d08eb08fd86fe0a2a804a4724c3c844ad9ac280f SHA512 99e26e221e53648586be1dacde738076d1a3d434d57d7f83f1183201d504dd3582b8e079595a5ce095368bafa4d1a362a2659d66bc53bdcbf1a09ce28baaec8d
+EBUILD gcstar-1.7.1.ebuild 2167 BLAKE2B cc51012ca9e68c82b96a651e264f8bc3652155570af483c229c5a0c89e0da0d1e11995e376350bae47394aef065c5e7378865a29fdc906c7c76048c0af567cbe SHA512 af3fa39fae4ab45c94a9c0f7dad8c60565479c35c797b5a5d0aecf15553b47e5cddbd0e5b3e3d24e05b915af129ac1ffba2650dc9c64488e30d0a5b01d993d0b
 MISC metadata.xml 878 BLAKE2B 08bd6224a9066bcd47292389f3718d5378934bcf6b76c2d969f0703003ca50b725429dd3c336b4cb9021bd3dd0534d7ec7a5c1b6030f8338b952ae8c187c20b8 SHA512 b086dcfa2d846aab85f413600ba9f8db1bce21d6ff2463d7fd2f4328c10a5343013b049bf5143c0591f52ff111415ddd2863b09d634fa3cf124b384dad4f4dc2
diff --git a/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch b/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
deleted file mode 100644
index 62b6a7b47401..000000000000
--- a/app-misc/gcstar/files/gcstar-1.7.0-gcstar.desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e78617436de63141cd4ff6e42fc0391a9a00d80a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 8 Sep 2012 18:14:40 -0400
-Subject: [PATCH] gcstar.desktop: MimeType list must be terminated with ';'
-
-Needed for gcstar.desktop to pass validation with desktop-file-utils-0.20
----
- gcstar/share/applications/gcstar.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcstar/share/applications/gcstar.desktop b/gcstar/share/applications/gcstar.desktop
-index aa6a46d..c7a146e 100644
---- a/gcstar/share/applications/gcstar.desktop
-+++ b/gcstar/share/applications/gcstar.desktop
-@@ -15,4 +15,4 @@ Terminal=false
- StartupNotify=true
- Type=Application
- Categories=Office;
--MimeType=application/x-gcstar
-+MimeType=application/x-gcstar;
--- 
-1.7.12
-
diff --git a/app-misc/gcstar/gcstar-1.7.0.ebuild b/app-misc/gcstar/gcstar-1.7.0.ebuild
deleted file mode 100644
index 0eb9c9eb8cc6..000000000000
--- a/app-misc/gcstar/gcstar-1.7.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Manage your collections of movies, games, books, music and more"
-HOMEPAGE="http://www.gcstar.org/"
-# Gna permanently shut down in May 2017
-# Original SRC_URI was http://download.gna.org/gcstar/${P}.tar.gz
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cddb gnome mp3 spell stats tellico vorbis"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Archive-Zip
-	dev-perl/DateTime-Format-Strptime
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-Parser
-	dev-perl/XML-Simple
-	virtual/perl-Archive-Tar
-	virtual/perl-Encode
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-IO-Compress
-	virtual/perl-libnet
-	virtual/perl-Storable
-	virtual/perl-Time-Piece
-
-	cddb? ( dev-perl/Net-FreeDB )
-	gnome? ( dev-perl/gnome2-vfs-perl )
-	mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag )
-	spell? ( dev-perl/gtk2-spell )
-	stats? ( dev-perl/Date-Calc
-		dev-perl/GD[png,truetype] )
-	tellico? ( virtual/perl-Digest-MD5
-		virtual/perl-MIME-Base64 )
-	vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.0-man.patch"
-	epatch "${FILESDIR}/${P}-gcstar.desktop.patch"
-}
-
-src_install() {
-	if [[ -n ${LINGUAS+set} ]]; then
-		# LINGUAS is set, let's try to respect it.
-		pushd lib/gcstar/GCLang > /dev/null
-
-		mkdir tmp || die "mkdir failed"
-		mv ?? ZH_CN tmp || die "mv 1 failed"
-		# English version should be always available so we will keep it
-		mv tmp/EN . || die "mv 2 failed"
-
-		for x in ${LINGUAS}; do
-			if [[ ${x} = "zh_CN" ]]; then
-				mv "tmp/ZH_CN" . || die "mv 3 failed"
-			else
-				# GCstar uses upper-case, 2-letter language codes
-				d=$(echo ${x} | tr '[:lower:]' '[:upper:]' | sed -e 's:_.*::')
-				if [[ -d "tmp/${d}" ]]; then
-					mv "tmp/${d}" . || die "mv 5 failed"
-				fi
-			fi
-		done
-
-		rm -rf tmp
-		popd > /dev/null
-	fi
-
-	# Yes, ED *is* needed here. gcstar's install lacks any concept of DESTDIR.
-	./install --prefix="${ED}usr" \
-		--noclean --nomenu || die "install script failed"
-
-	domenu share/applications/gcstar.desktop
-	for size in 16 22 24 32 36 48 64 72 96 128 256
-	do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins share/gcstar/icons/gcstar_${size}x${size}.png gcstar.png
-	done
-	insinto /usr/share/icons/hicolor/scalable/apps
-	newins share/gcstar/icons/gcstar_scalable.svg gcstar.svg
-	insinto /usr/share/mime/packages
-	doins share/applications/gcstar.xml
-
-	dodoc CHANGELOG README README.fr
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/gcstar/gcstar-1.7.1.ebuild b/app-misc/gcstar/gcstar-1.7.1.ebuild
index afc8b8f716ae..0406723f3796 100644
--- a/app-misc/gcstar/gcstar-1.7.1.ebuild
+++ b/app-misc/gcstar/gcstar-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/gcstar/1.7/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb gnome mp3 spell stats tellico vorbis"
 
 RDEPEND="dev-lang/perl