gentoo resync : 22.12.2021

4 files changed, 2 insertions, 91 deletions

diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 6c38e6a53aa3..fff6f51c72d1 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,8 +1,5 @@
-AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
 AUX sakura-3.8.3-gentoo.patch 479 BLAKE2B b17b1a39e46db6f8f14d59b2bb2f353229c9bfe63461e9447091f1650deb5849276581ff70f9d2646e86cc3efa43b5c21eca7ca8e02ef480d73920187cfa0f74 SHA512 8a7354df38e9968ebc366ef3835f117256bc364ea99ca99541ca6e0d63c0fb2f5768a6e628f3cffceaba8d4a6a1a903683718690e5a315597d3d8989892b95f2
 AUX sakura-3.8.3-opacity.patch 571 BLAKE2B 0641cde4fabdc7d6b39ab82116e7999e03224d7bcd2375487146f9574187758a37113ecfbabb82398a1e4afa89a5e61b54fe7c286af61404006390916617d73c SHA512 0907cc2d9caa2b9e0f42f3e0644d44dcea603584080753db6dd78f4814920ef8a1ad45593d7a4b485392c11e0b7855fd78b7a3134072de2d7bc926e27edda2c6
-DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
 DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e
-EBUILD sakura-3.7.1.ebuild 1311 BLAKE2B 1eb93b0859ff54d1fae7fd017d4ff0a88e8cccaf65c1292cb7eb27b2223619954828705c0a62ef0c902aecaced3fcda8e9e4c0dfc06e44b06f5f51e8292a8fd9 SHA512 0d92b1ea14ddb4a441d3ce89309d01b0cdd262cf3e22a8df2e0590064ca1fc0bf48f2ab599ede7ccb27bab3482194788547b1b3f712c17872c72d9741b0463b0
-EBUILD sakura-3.8.3.ebuild 867 BLAKE2B 8e3fc8086754b10a9519aaf8b6b6b01f714ab28d6dca0f7ebb451653c7bd960277dc88c96c700b237421aea5af1c3b459fc1495d3159be3ef12ca807c6ec470a SHA512 5754ab69546cbec8bc6eec7435045ea546b9521e48b2dca856e434d88c2b53ff05a469158a6e3cf01b924d1f20c3a116a4ad963321acd9d6b1ed156969a64f75
+EBUILD sakura-3.8.3.ebuild 865 BLAKE2B 11d4aff567fd3ab1dd7a3a8be2df654dcd51728c0dc7cb12ed9dc0ee49fd5482a92b61a458745f25d66f21caebeddddab556b6d7346979dc438128bad1096570 SHA512 62ce919e21fe558a0200940e068e0a45ad92f99eb3e0fea6f8e49ba8257443a3604ad28a71a1c2692c9dc975cfa94d5623d932264ca8782b1ced3203a0bcd4b1
 MISC metadata.xml 851 BLAKE2B 823d08b0bc994ef9732b69188f2d6f55bd58709104517313093ee1f5d39fcb40e01a54fe47ab0e80f9b42b523f38129ac2ac0f1fdfb8d08338c3d4bb893914ec SHA512 99c6563360d9326835c2b49d8e77c28c07573c3dc14303f6ed4e1699ddc9ed199cad03ba841556903845a43d245c692ca0909f825c9cbd4a198a56a6b9dee0ae
diff --git a/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch b/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch
deleted file mode 100644
index ab1d8bebc93c..000000000000
--- a/x11-terms/sakura/files/sakura-3.7.0-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,12 +38,6 @@
- ADD_DEFINITIONS (-DDATADIR="${CMAKE_INSTALL_PREFIX}/share")
- ADD_DEFINITIONS (-DBUILDTYPE="${CMAKE_BUILD_TYPE}")
- 
--IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
--	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
--	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
--ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
--
- INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
- LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS} ${X11_LIBRARY_DIRS})
- LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} ${X11_LIBRARIES} m)
-@@ -57,7 +51,6 @@
- IF (POD2MAN)	
- 	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION share/man/man1)	
- ENDIF (POD2MAN)
--INSTALL (FILES INSTALL DESTINATION share/doc/sakura)	
- 
- FILE (GLOB MO_FILES po/*.mo)
- 
diff --git a/x11-terms/sakura/sakura-3.7.1.ebuild b/x11-terms/sakura/sakura-3.7.1.ebuild
deleted file mode 100644
index 25cba9388867..000000000000
--- a/x11-terms/sakura/sakura-3.7.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic strip-linguas 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.bz2"
-
-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_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
-}
diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild
index bb84f11c518d..717bbf73513c 100644
--- a/x11-terms/sakura/sakura-3.8.3.ebuild
+++ b/x11-terms/sakura/sakura-3.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2