gentoo resync : 28.04.2021

4 files changed, 3 insertions, 61 deletions

diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
index 2aec8822d838..e37dcd3ed70c 100644
--- a/dev-embedded/gpsim/Manifest
+++ b/dev-embedded/gpsim/Manifest
@@ -1,6 +1,3 @@
-AUX gpsim-0.29.0-gui.patch 259 BLAKE2B c22bdbd705d2607caa4330431a64918126dfe4411d56e51de6a00d6839c1b28e9ec6f3addf05cf10e31b339fa9d7927da6c6473a5d5c5ea7f447f893fc16d148 SHA512 983d83627a9ec4ebe350e22890fafc55bea72dbb3f59f75f17abe72760c4ac1df57b29ae01603187d458964399606fcef5bd3b79f0dc6b489ed8890d62a8ec1a
-DIST gpsim-0.29.0.tar.gz 3301050 BLAKE2B e71aec8d3ed5c421a050a2b1c6de4a1ee561c3fdc91abe896aa02de08523e7e0d7e917d1a313cbb6a590a7590748edc9b48f8e04eaeffa86541e0bd4f7b57d06 SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920
 DIST gpsim-0.30.0.tar.gz 3385728 BLAKE2B 05be3672cb31253ef132dd600a39710cb952cef356ebb69d0b09119e578faa05e6f25613a83e076ddca568f0560da25df6361331364e70ff8db8f4f47b8f5de5 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df
-EBUILD gpsim-0.29.0.ebuild 894 BLAKE2B 7a4b87894778c934f8006589507bd35b79e147761d94d92e905bd7c334f923874ccc33298b4a35af8292d908b4d27cea789d12fc03a670fa1f81fa4309422937 SHA512 fe72c9d36d7690f8a85b94a445c4ad25d90e939fe201b0a2b05d33cd1853f6827f7bb2c8d092f59ad587237f532a047a195db7acaa03bb5dd247bcde4a5db609
-EBUILD gpsim-0.30.0.ebuild 824 BLAKE2B 7ea1f570855df419d59ee15f8d9ebd3f11005bfa71a2d939dc066565a3c9fbb52434a889f648e8f56dfcf0f2a9532783f5add574c49a68c7da2ab7161e82a0a3 SHA512 593cab1b15eeb52b5f89f1f4975850e945b7c90b5c5bc5f27c508355ffce335a89193e73b060899ea8cce6ce716d25063f4fb5cfbef76b86e6893f6792d1d07a
+EBUILD gpsim-0.30.0.ebuild 819 BLAKE2B 9583acf4c5306855784abdf71ec8e7faea1900797313ab3795bc02840b74059d6a2db56db2862c0dd4bbd32188906e3132a84862ba525f072b80758409188c4c SHA512 e1a63b0a25e2e9812102fba99dd6a092b7daf568ad3d7e321b06bb98eff2a5a76cd36518d5f889aec0ca9fc07876bbcffa52958d9559c536e7bd44b4d6465a53
 MISC metadata.xml 326 BLAKE2B 894c44eb2da989117a768b9e03fb039b61b4246023c99a43c218fee73d3d6ef98d6e993ac8149266a6ba5fdf5288186e2cee9d4514d6919d66f463e393f78b14 SHA512 73998eee3ecc03e0b524a6cf1f4e4dc4fb670c75fc1c559dc3a1ed327f53ea282a5aca2516af93d1cbf2cc2871970f3b5377a6837204fca07c4ec17080077636
diff --git a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch b/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
deleted file mode 100644
index b055e01b0d8c..000000000000
--- a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gpsim-0.29.0/modules/logic.cc
-+++ gpsim-0.29.0/modules/logic.cc
-@@ -269,8 +269,10 @@
- 
- LogicGate::~LogicGate()
- {
-+#ifdef HAVE_GUI
-   if (pixbuf)
-     g_object_unref(pixbuf);
-+#endif
- }
- 
- //--------------------------------------------------------------
diff --git a/dev-embedded/gpsim/gpsim-0.29.0.ebuild b/dev-embedded/gpsim/gpsim-0.29.0.ebuild
deleted file mode 100644
index 018d9ffbbd81..000000000000
--- a/dev-embedded/gpsim/gpsim-0.29.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils ltprune
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	!dev-embedded/gpsim-lcd
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline:0=
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-gui.patch )
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-
-	prune_libtool_files
-}
diff --git a/dev-embedded/gpsim/gpsim-0.30.0.ebuild b/dev-embedded/gpsim/gpsim-0.30.0.ebuild
index 7c6e310bd228..a14305e6a54f 100644
--- a/dev-embedded/gpsim/gpsim-0.30.0.ebuild
+++ b/dev-embedded/gpsim/gpsim-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc gtk static-libs"
 
 RDEPEND=">=dev-embedded/gputils-0.12