Merge updates from master

app-admin/chezmoi/metadata.xml

@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>phil@demona.co</email>
 		<name>Phil DeMonaco</name>
-		</maintainer>
+	</maintainer>
 	<longdescription lang="en">
 			Dotfile management application which provides a configuration
 			and encryption interface ontop of traditional version control
@@ -13,6 +13,6 @@
 			with differing requirements.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">twpane/chezmoi</remote-id>
+		<remote-id type="github">twpayne/chezmoi</remote-id>
 	</upstream>
 </pkgmetadata>

app-crypt/autofirma/autofirma-1.6.5-r1.ebuild

@@ -6,9 +6,14 @@ EAPI=7
 inherit desktop java-utils-2 rpm xdg
 
 DESCRIPTION="Spanish government's electronic signature application for online procedures"
-HOMEPAGE="https://administracionelectronica.gob.es/ctt/clienteafirma"
+HOMEPAGE="
+	https://administracionelectronica.gob.es/ctt/clienteafirma
+	https://github.com/ctt-gob-es/clienteafirma
+"
+#TODO: use ver_split instead of hardcoded 1/6/5
 SRC_URI="https://estaticos.redsara.es/comunes/autofirma/1/6/5/AutoFirma_Linux.zip -> ${P}.zip"
 
+#TODO: investigate and fix licenses https://github.com/ctt-gob-es/clienteafirma/blob/master/license/LICENSE.txt
 LICENSE="|| ( GPL-2+ EUPL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -24,9 +29,11 @@ src_unpack() {
 }
 
 src_install() {
+	#TODO: use $(get_libdir) or mask non ~amd64 arches
 	java-pkg_dojar "usr/lib64/${PN}/${PN}.jar"
 	java-pkg_dolauncher
 	java-pkg_dojar "usr/lib64/${PN}/${PN}Configurador.jar"
+	#TODO: icons in /lib are suspect
 	doicon "usr/lib64/${PN}/${PN}.png"
 	make_desktop_entry "${PN} %u" AutoFirma "${PN}" "Utility" "Comment[es]=Aplicación de firma electrónica de la FNMT\nMimeType=x-scheme-handler/afirma"
 }

app-crypt/autofirma/metadata.xml

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <longdescription lang="es">
+El Cliente @firma es uno de los productos de la Suite @firma de soluciones de identificación y firma electrónica. Se proporciona de a las Administraciones Públicas para que dispongan de los instrumentos necesarios para implementar la autenticación y firma electrónica avanzada de una forma rápida y efectiva.
+
+El cliente de firma es una herramienta de firma electrónica en entornos de escritorio y dispositivos móviles, que funciona en forma de Applet de Java integrado en una página Web mediante JavaScript, como aplicación de escritorio, o como aplicación móvil, dependiendo del entorno del usuario.
+  </longdescription>
   <maintainer type="person">
     <email>gentoo@chuso.net</email>
     <name>Jesus Perez Rey</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ctt/clienteafirma</remote-id>
+    <remote-id type="github">ctt-gob-es/clienteafirma</remote-id>
   </upstream>
 </pkgmetadata>

dev-python/geopy/metadata.xml

@@ -14,8 +14,7 @@ geopy makes it easy for Python developers to locate the coordinates of addresses
 geopy includes geocoder classes for the OpenStreetMap Nominatim, Google Geocoding API (V3), and many other geocoding services. The full list is available on the Geocoders doc section. Geocoder classes are located in geopy.geocoders.
   </longdescription>
   <upstream>
-    <remote-id type="google-code">geopy</remote-id>
-    <remote-id type="pypi">geopy</remote-id>
     <remote-id type="github">geopy/geopy</remote-id>
+    <remote-id type="pypi">geopy</remote-id>
   </upstream>
 </pkgmetadata>

dev-python/pytest-benchmark/metadata.xml

@@ -17,7 +17,7 @@
 This plugin provides a benchmark fixture. This fixture is a callable object that will benchmark any function passed to it.
   </longdescription>
   <upstream>
-    <remote-id type="github">ionelm/pytest-benchmark</remote-id>
+    <remote-id type="github">ionelmc/pytest-benchmark</remote-id>
     <remote-id type="pypi">pytest-benchmark</remote-id>
   </upstream>
 </pkgmetadata>

dev-python/webpy/metadata.xml

@@ -7,7 +7,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">webpy/web.py</remote-id>
+    <remote-id type="github">webpy/webpy</remote-id>
+    <remote-id type="pypi">web.py</remote-id>
     <doc lang="en">https://webpy.org/docs</doc>
     <bugs-to>https://github.com/webpy/webpy/issues</bugs-to>
     <changelog>https://raw.githubusercontent.com/webpy/webpy/master/ChangeLog.txt</changelog>

games-emulation/melonds/melonds-0.9.1.ebuild

@@ -9,7 +9,10 @@ MY_P="${MY_PN}-${PV}"
 inherit xdg cmake
 
 DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="http://melonds.kuribo64.net/"
+HOMEPAGE="
+	http://melonds.kuribo64.net
+	https://github.com/Arisotura/melonDS
+"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3

games-emulation/melonds/melonds-0.9.2.ebuild

@@ -9,7 +9,10 @@ MY_P="${MY_PN}-${PV}"
 inherit xdg cmake
 
 DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="http://melonds.kuribo64.net/"
+HOMEPAGE="
+	http://melonds.kuribo64.net
+	https://github.com/Arisotura/melonDS
+"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3

games-emulation/melonds/melonds-9999.ebuild

@@ -9,7 +9,10 @@ MY_P="${MY_PN}-${PV}"
 inherit xdg cmake
 
 DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="http://melonds.kuribo64.net/"
+HOMEPAGE="
+	http://melonds.kuribo64.net
+	https://github.com/Arisotura/melonDS
+"
 
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3

games-emulation/melonds/metadata.xml

@@ -6,6 +6,6 @@
         <name>Maciej Barć</name>
     </maintainer>
     <upstream>
-        <remote-id type="gitlab">Arisotura/melonDS</remote-id>
+        <remote-id type="github">Arisotura/melonDS</remote-id>
     </upstream>
 </pkgmetadata>

net-misc/megasync/megasync-4.3.8.0.ebuild

@@ -6,7 +6,10 @@ EAPI=7
 inherit autotools desktop qmake-utils xdg cmake
 
 DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="http://mega.co.nz"
+HOMEPAGE="
+	https://mega.io
+	https://github.com/meganz/MEGAsync
+"
 
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3

net-misc/megasync/megasync-9999.ebuild

@@ -6,7 +6,10 @@ EAPI=7
 inherit autotools desktop qmake-utils xdg cmake
 
 DESCRIPTION="The official Qt-based program for syncing your MEGA account in your PC"
-HOMEPAGE="http://mega.co.nz"
+HOMEPAGE="
+	https://mega.io
+	https://github.com/meganz/MEGAsync
+"
 
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3

net-misc/megasync/metadata.xml

@@ -6,6 +6,9 @@
 		<name>Samuel Bernardo</name>
 		<description>megasync client from mega.nz</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">meganz/MEGAsync</remote-id>
+	</upstream>
 	<use>
 		<flag name='dolphin'>Upload your files to your Mega account from Dolphin file manager.</flag>
 		<flag name='nautilus'>Upload your files to your Mega account from nautilus.</flag>

sys-apps/rogdrv/metadata.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
-		<remote-id type="github">https://github.com/kyokenn/rogdrv</remote-id>
+		<remote-id type="github">kyokenn/rogdrv</remote-id>
 	</upstream>
 	<maintainer type="person">
 		<email>ahvenas@gmail.com</email>

www-client/browsh/browsh-1.6.4_p1.ebuild

@@ -199,7 +199,10 @@ COMMIT="540882ec8c9e40414de54d6c43f72f861c4e89d9"
 MY_PV=$(ver_cut 1-3)
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="A fully-modern text-based browser, rendering to TTY and browsers"
-HOMEPAGE="https://brow.sh"
+HOMEPAGE="
+	https://brow.sh
+	https://github.com/browsh-org/browsh
+"
 SRC_URI="
 	https://github.com/browsh-org/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 	https://github.com/browsh-org/${PN}/releases/download/v${MY_PV}/${MY_P}-an.fx.xpi
@@ -207,7 +210,27 @@ SRC_URI="
 "
 S="${WORKDIR}/${PN}-${COMMIT}/interfacer"
 
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-3.0 ISC LGPL-2.1 MIT MPL-2.0"
+BUNDLED_NODE_MODULES_LICENSES="
+	0BSD
+	Apache-2.0
+	BSD
+	BSD-2
+	CC0-1.0
+	CC-BY-3.0
+	ISC
+	MIT
+	MPL-2.0
+	PSF-2
+	Unlicense
+	ZLIB
+	|| ( AFL-2.1 BSD )
+	|| ( BSD-2 MIT Apache-2.0 )
+	|| ( BSD GPL-2 )
+	|| ( LGPL-2 MIT )
+	|| ( MIT GPL-3 )
+	|| ( WTFPL-2 MIT )
+"
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-3.0 ISC LGPL-2.1 MIT MPL-2.0 ${BUNDLED_NODE_MODULES_LICENSES}"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"