gentoo resync : 20.03.2022

5 files changed, 114 insertions, 11 deletions

diff --git a/dev-embedded/mcu8051ide/Manifest b/dev-embedded/mcu8051ide/Manifest
index 129d71fb7fab..03b36998bb1b 100644
--- a/dev-embedded/mcu8051ide/Manifest
+++ b/dev-embedded/mcu8051ide/Manifest
@@ -1,3 +1,6 @@
+AUX mcu8051ide-1.4.10-appdata.patch 822 BLAKE2B 61daa80abfcdc207243767decf6dbb6fc772eb1a267645bf305806692bb9d13e900dfb8e34d9a2b8900866c9a78d0d299c8296bd6fd4cb968e6d939246055e8e SHA512 1c0177aff6116d5d2b50dfb0a8ac19a10ade1e59254e0720263d2896e7cb12b0f240b3da864e3abb5fa54506f7be8211e40a816755cb0f2c0efba01f29779ab5
+AUX mcu8051ide-1.4.10-cmake.patch 1175 BLAKE2B d76f0b886709419bdc624a74ad74081282d89234138d52acc36fabbbd50539ac36f8d00258cb3e5026a6085ee1f383958f26a38fd2a4a1374cdf58e691d484bc SHA512 3b4536cfa7b014f802970f873af98a0d52e59c7a34eb83bcdefeb50eb40064a0e0bedd6669cac1a52b8c7e2a718df4a2b70e186cd9bbdb5f1c8f5badac733e9c
+AUX mcu8051ide-1.4.10-desktop-file.patch 696 BLAKE2B 2b3f5178d74f1fbc40406294b282bad6398a864f0ae8274335e40f46fcbf845db3b457e26914924abaebf2ebdc26f57fd8e0104fc1f1d45f711bc14d946d5ee2 SHA512 edd28e49db15ca5be7aee1aaaa2ff3ebed217b0cf2cbe2a37d39a5b1076efce9df859f292e2a39030a73f33722288daf6a362f06e57d52a69dcb7ba2e21b8762
 DIST mcu8051ide-1.4.10.tar.gz 5928583 BLAKE2B 4e8e119790d8130859034f2366ac3372373805dcb173328e61a9a18513cb6b9580e8f3912592888268bfdf694e835032fca3148d9fc00a7aa061660378674f0e SHA512 686c2b7054475aa38bbbe73ef745303141f038e2d6eca86d548317c130febb6b12d7c0e0737a9b15d2c3f4890bcd0238fffae030c689f8367f3b54821ab52866
-EBUILD mcu8051ide-1.4.10.ebuild 731 BLAKE2B 0e70859b5fc13069616b0507daeb018ada6a21bad478c78df05487466393c67f81f4b934eb9ffc2d630246e55032c38522e73436c99eed6abc2787b3d7909871 SHA512 9d04c6e19cddae5491505003958c396bc85b89ac13a99c533af99af4a985309a72bb6befed7bf3e6761aedf9eef93509d3b76f06a50f1f7d4ebf13ac05ef7539
+EBUILD mcu8051ide-1.4.10-r1.ebuild 1043 BLAKE2B 2778a7ce914da53a1af005beefb720745303ecfe47c6fa799fa12bf17d5d73d2e8164e30bf1aeb1540a806907e73841057f00bd40e1fb2ca4081735e2167552c SHA512 2892678e3f4b5b15230c52c37d7f46b8382a7b2990f0140bd0efc96ad83fe020b63d999e7b4e3ceee5b4d5564edc0ce5b7a891f375308c7af835db40927448ee
 MISC metadata.xml 331 BLAKE2B 6b2e20496984a9ad1e555acaf553d88074cf9c23592d94be0d2d5e0a1e768e08eb9b955fb4a2b17311ca7328eda7032de928920cb00931516eedd004d7a19a1c SHA512 2cb83b210af5018060697a53495202b3ab2d079a41400f447901297db2b41dfc7506471f9ad6bfbbb9125efbe0897aea9f6af91d7e7f082e82dca9ba96498568
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch
new file mode 100644
index 000000000000..c92f5aedfd4a
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-appdata.patch
@@ -0,0 +1,22 @@
+From: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Subject: Update the appdata file to comply with the new standard
+Last-Update: 2020-06-27
+
+--- a/mcu8051ide.appdata.xml
++++ b/mcu8051ide.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Martin Ošmera <martin.osmera@moravia-microsystems.com> -->
+-<application>
+- <id type="desktop">mcu8051ide.desktop</id>
++<component type="desktop-application">
++ <id>mcu8051ide.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>MCU 8051 IDE</name>
+@@ -19,4 +19,4 @@
+  <url type="homepage">https://sourceforge.net/projects/mcu8051ide/</url>
+  <updatecontact>martin.osmera@gmail.com</updatecontact>
+  <project_group>Development</project_group>
+-</application>
++</component>
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch
new file mode 100644
index 000000000000..04b24f4c1e87
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-cmake.patch
@@ -0,0 +1,36 @@
+From: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Subject: Remove unneeded files installation and update appstream location
+Last-Update: 2020-06-27
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,10 +53,6 @@
+ 	ENDFOREACH(ext)
+ ENDFOREACH(subdir)
+ 
+-# Install manual page(s)
+-FILE(GLOB man doc/man/*)
+-INSTALL(FILES ${man} DESTINATION share/man/man1)
+-
+ # Install demonstration project files
+ FILE(GLOB demo demo/*)
+ INSTALL(FILES ${demo} DESTINATION ${target_installation_directory}/demo)
+@@ -72,7 +68,7 @@ INSTALL(FILES ${translations} DESTINATIO
+ # Install .desktop spec and application icon
+ INSTALL(FILES mcu8051ide.png DESTINATION share/pixmaps/)
+ INSTALL(FILES mcu8051ide.desktop DESTINATION share/applications/)
+-INSTALL(FILES mcu8051ide.appdata.xml DESTINATION share/appdata/)
++INSTALL(FILES mcu8051ide.appdata.xml DESTINATION share/metainfo/)
+ INSTALL(FILES application-x-mcu8051ide.xml DESTINATION share/mime/packages/)
+ 
+ # Install launcher
+@@ -84,9 +80,3 @@ INSTALL(
+ 		OWNER_WRITE OWNER_READ OWNER_EXECUTE
+ 		GROUP_EXECUTE GROUP_READ
+ )
+-
+-# Install misc. files
+-INSTALL(
+-	FILES ChangeLog LICENSE
+-	DESTINATION ${target_installation_directory}
+-)
diff --git a/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch
new file mode 100644
index 000000000000..00dde9bdef96
--- /dev/null
+++ b/dev-embedded/mcu8051ide/files/mcu8051ide-1.4.10-desktop-file.patch
@@ -0,0 +1,23 @@
+Subject: Add Keywords and Field code to Exec field
+ Fabricio added some keywords and Carlos added the Field code.
+
+Author: Fabricio Alcalde <f@lcald.com.ar>
+Author: Carlos Henrique Lima Melara <charlesmelara@outlook.com>
+Last-Update: 2020-06-27
+
+--- a/mcu8051ide.desktop
++++ b/mcu8051ide.desktop
+@@ -2,7 +2,7 @@
+ Categories=Development;
+ Comment=Graphical IDE for MCS-51 based microcontrollers
+ Comment[en_US]=Graphical IDE for MCS-51 based microcontrollers
+-Exec=mcu8051ide
++Exec=mcu8051ide %f
+ GenericName=MCU 8051 IDE
+ GenericName[en_US]=MCU 8051 IDE
+ Icon=mcu8051ide
+@@ -17,3 +17,4 @@ Version=1.0
+ X-DCOP-ServiceType=
+ X-KDE-SubstituteUID=false
+ X-KDE-Username=
++Keywords=mcu8051ide;8051;ide
diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10-r1.ebuild
index 0ea0c430b591..25736dcc3994 100644
--- a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
+++ b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils xdg
+EAPI=8
+
+inherit cmake xdg
 
 DESCRIPTION="Graphical IDE for microcontrollers based on 8051"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://sourceforge.net/projects/mcu8051ide/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -14,17 +15,35 @@ KEYWORDS="~amd64"
 
 # The doxygen dependency is suspect, but it appears to be used at runtime.
 RDEPEND="
-	>=dev-embedded/sdcc-2.5[mcs51]
 	>=app-doc/doxygen-1.7
-	>=dev-util/indent-2.2
 	>=app-text/hunspell-1.3
+	>=dev-embedded/sdcc-2.5[mcs51]
+	>=dev-lang/tcl-8.5.9:*
+	>=dev-lang/tk-8.5.9:*
 	>=dev-tcltk/bwidget-1.8
 	>dev-tcltk/itcl-3.3
-	>=dev-lang/tcl-8.5.9:*
-	>=dev-tcltk/tdom-0.8
 	>=dev-tcltk/tcllib-1.11
-	>=dev-lang/tk-8.5.9:*
-	>=dev-tcltk/tkimg-1.4
 	>=dev-tcltk/tclx-8.4
+	>=dev-tcltk/tdom-0.8
+	>=dev-tcltk/tkimg-1.4
+	>=dev-util/indent-2.2
 "
 DEPEND="${RDEPEND}"
+BDEPEND="app-arch/gzip"
+
+PATCHES=(
+	# Patches thanks to Debian
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-appdata.patch
+	"${FILESDIR}"/${P}-desktop-file.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	gunzip doc/man/mcu8051ide.1.gz || die
+}
+
+src_install() {
+	cmake_src_install
+	doman doc/man/mcu8051ide.1
+}