gentoo resync : 28.04.2021

3 files changed, 14 insertions, 81 deletions

diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index f00de8420a87..c777c43ca106 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,6 +1,4 @@
 AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
-DIST sakura-3.7.0.tar.gz 64728 BLAKE2B 637d8c9a393fe2823943190ec3c1676d3dd900b574f58fc3f6d61709ac3b70081736f0804c0e7d8ec5a1409cc2651aa1c3bee04a04c5d3df4ac1432fa2a5c41b SHA512 1018ea952d491f68a05ee3b3d8ac70cbfb485687f76224f9a395ff6508e0e75ff58bfd12dcb534c86430da54803a3016619f441d8bd14e496df32f81e00ca72e
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
-EBUILD sakura-3.7.0.ebuild 1314 BLAKE2B 325c2e3d4072343dad837cebc180b7aa1322164b5a4f89945ae6f4e9ee780f65462deedc769eb36cc9ea7dc4ab1a1b929cffa08792bfafca89660dccb613db55 SHA512 066332356e27dd198600deef6ba976d539b7db4782dfd5bc98a2b035905b405d7c6e8c3aca4e91a8c9d782b6bee3dc726cec237250a77630bffef441490a1f21
 EBUILD sakura-3.7.1.ebuild 1303 BLAKE2B b89e1fc1bd46dbebf14b56675738597d8bb78f71e3fbeae026543aeeee5bcd6b19ad1e517dedb3eb71803fe340521cbf95c412044414faf9d3130ac337b440fa SHA512 4e310ac97a923613c52ecb0dd65dff1289f6079377221e8c1480bd65a44c0eedd5086082fb424e161290052e581b2679b4a8b2f0bf32a564230a5ea6dd955eb5
-MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
+MISC metadata.xml 779 BLAKE2B cc8a0feadbc92e64a47c0d7c1b80c1211fc9f0cfed2d7e386d2225143b51e1d03d32eaef68ddf67525cec3ba409cd86cd652af1fdb4bb733e03b278eccad3c92 SHA512 c091185594b457e8e803b65d5a85cad5e9454fba6ce762350d7156fc8ab2b8e1168d21583e7093534f414a4cf5607b1355d4dae6ee7c353d6b90edbe4f036ca1
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
index 9825940be72b..2605c5211b94 100644
--- a/x11-terms/sakura/metadata.xml
+++ b/x11-terms/sakura/metadata.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <longdescription>
-    sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
-    with few dependencies, so you don't need a full GNOME desktop installed to
-    have a decent terminal emulator. Current terminal emulators based on VTE are
-    gnome-terminal, XFCE Terminal, TermIt and a small sample program included
-    in the vte sources. Sakura differences from the last one is that it uses a
-    notebook to provide several terminals in one window and adds a contextual
-    menu with some basic options. No more no less.
-  </longdescription>
-  <upstream>
-    <remote-id type="launchpad">sakura</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<longdescription>
+sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
+with few dependencies, so you don't need a full GNOME desktop installed to
+have a decent terminal emulator. Current terminal emulators based on VTE are
+gnome-terminal, XFCE Terminal, TermIt and a small sample program included
+in the vte sources. Sakura differences from the last one is that it uses a
+notebook to provide several terminals in one window and adds a contextual
+menu with some basic options. No more no less.
+	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">sakura</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/sakura/sakura-3.7.0.ebuild b/x11-terms/sakura/sakura-3.7.0.ebuild
deleted file mode 100644
index 222315196c74..000000000000
--- a/x11-terms/sakura/sakura-3.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils eutils flag-o-matic xdg-utils
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="https://www.pleyades.net/david/projects/sakura"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	>=x11-libs/gtk+-3.20:3[X]
-	x11-libs/libX11
-	>=x11-libs/vte-0.50:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.0-gentoo.patch
-)
-DOCS=(
-	AUTHORS
-)
-
-src_prepare() {
-	strip-linguas -i po/
-	local lingua
-	for lingua in po/*.po; do
-		lingua="${lingua/po\/}"
-		lingua="${lingua/.po}"
-		if ! has ${lingua} ${LINGUAS}; then
-			rm po/${lingua}.po || die
-		fi
-	done
-
-	cmake-utils_src_prepare
-	# sakura.c:1740:3: warning: implicit declaration of function ‘readlink’
-	# [-Wimplicit-function-declaration]
-	append-cppflags -D_DEFAULT_SOURCE
-
-	# sakura.c:1348:9: error: ‘for’ loop initial declarations are only allowed
-	# in C99 or C11 mode
-	append-cflags -std=c99
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}