gentoo resync : 09.06.2018

4 files changed, 3 insertions, 107 deletions

diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 40916695941d..aae1c5b93d04 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,8 +1,4 @@
 AUX sakura-3.1.3-flags.patch 626 BLAKE2B 5d0d19c134e0dca10d564049e8b988616e5d84d8bf88c8ab6469bdf3e504b9d528a7754cb02d171fd71497eac2363bfd41f1b26551a9e2dc5a39f262ff3e92d6 SHA512 007a2f2ab722bd991cee0da708efba301b3c69bb86eff25a14519008ad485e8e6ed1c8e2ded6fcd88ff7066528ff539eced4d105a84d6774aa952150beddc57f
-DIST sakura-3.3.4.tar.bz2 52839 BLAKE2B 8fbab050b6983625dd77a6ef52a56cbcd854d40c1f22a10e845171bab78b49263d5dc6a7e2e2a00d0ffc0140995b453755009fdc85e1f6d950336201873bc155 SHA512 a84849e2fa7b45da513ff05a1e1636eb8d331b7c632f18605d6aa01463e44d877c057f2f628bfdc27e9f6ff29b0441ba248885d92341ed3a9b5eb281d02e34d7
-DIST sakura-3.4.0.tar.bz2 54907 BLAKE2B c31d757e9467240d8455cbc7189f2104b0620f208ffbf7815fd834da08beeb59218931621656e4c920cadadca41bf682f321fe935151887cf99c1afe0800c980 SHA512 5d8f62638bd826a294b240960f2bd696583f8cad4799ab5862796b6210320f94ee11e64847c36ca6765f9281fb8fabb7a699db6fcf1de41c5e7f82bb281e9512
 DIST sakura-3.5.0.tar.bz2 55432 BLAKE2B 9accd09eac359b64637ff5c318e50e32f5bfa27cf7fb5d4a99c91391e14f145020bd19077e20585b78149e5ac5f281abaf1098dbbaf111e54fd5ad5fbb2f4887 SHA512 20c691342c68a2a6f7397da754c83b19c7622e25984ae9fe9fef47492e19cd7589dd9d1bd2ccb82bd9c6ab82f92c97c1b742795434a101a0e169c6f901f40d9e
-EBUILD sakura-3.3.4.ebuild 906 BLAKE2B 86511b6ae84ca633739ceaccdb7c2e623c15f2e6f60d5975578c67400cb9a791b3acf2cf41af84ba6b33ae78bc9355a3d38dbdce19981ed0c417f240c56fb5c0 SHA512 5461559e63d9eaf5ae4d3bd9da90228fb96cc1dea8a588f9297ed071222de6d799e6712671c41f15420b1b5851448bbbe22dd39457d77c236d8bea8a3964f2d1
-EBUILD sakura-3.4.0.ebuild 1216 BLAKE2B 34a478cb128992ec67e938f60360144a0c6693fc9f9190ff13db90f8aa95034de0ccf30df4026cd73d507082382813b0cee0565975339bcbb8b639e9e9b6d324 SHA512 0bcedeb6b85b5499bcbc1ea73508af9ad12cdcb87f6807076368873f2880f6b945e8300327c7aa25d9808ce753438a269267dd6c1d81c40f8d4ac797dad6d5f2
-EBUILD sakura-3.5.0.ebuild 1387 BLAKE2B 39f1c4ea60cb52052388a2b6701a552796912b2098de398fa9bd2d1f8af2ebed6e473776406664e819ece3072b0216a1716269737d5b2538def617ad54e07eed SHA512 c9842e1c0e4103071573cb8541609ab9ee9646e8847ae38decc980cdff44e7823d897ab4e63ee17e0dcf2d5b48014997c65902e8d67befe1806e03a083b85209
+EBUILD sakura-3.5.0.ebuild 1385 BLAKE2B c1e944d9d370676d704b61746af06132f537fed3b3a05ea9235d1b736e830b26df75c0dc03f46809faf367779c50c9cf2b176dae2d59291383012c7792f70450 SHA512 9365ba8e924643daa84b8769fbb2f20eee6ec470fbae656d4655dd48aee6dc325209155c3011de155fb2057ac6de50516e6002bbe53a7cecddd304d735e3b6c2
 MISC metadata.xml 928 BLAKE2B 91926b81400896fef6be017fe1d0dacc25bb2331e84b7604223464c2f0862b0935aadf944dcd272a989ae9de5b180f3576725f30fa2a161ba24f27c5ba1884e0 SHA512 95be972f218e92365f8084f3a796199c3f7a182bc42c098761096f2146323afcdb2fc45e6c4ec975f03decdac05b9c01083c768162bf97c88c61dab892419ffb
diff --git a/x11-terms/sakura/sakura-3.3.4.ebuild b/x11-terms/sakura/sakura-3.3.4.ebuild
deleted file mode 100644
index f55472bc7960..000000000000
--- a/x11-terms/sakura/sakura-3.3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://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 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.3-flags.patch )
-
-DOCS=( AUTHORS )
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	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
-}
diff --git a/x11-terms/sakura/sakura-3.4.0.ebuild b/x11-terms/sakura/sakura-3.4.0.ebuild
deleted file mode 100644
index 315f2a8ec16e..000000000000
--- a/x11-terms/sakura/sakura-3.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
-HOMEPAGE="http://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 ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/vte:2.91
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-lang/perl-5.10.1
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.3-flags.patch
-)
-
-DOCS=(
-	AUTHORS
-)
-
-src_prepare() {
-	sed -i "/FILES INSTALL/d" CMakeLists.txt || die
-
-	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
-}
diff --git a/x11-terms/sakura/sakura-3.5.0.ebuild b/x11-terms/sakura/sakura-3.5.0.ebuild
index ea31dcb86d1b..00b1ee1846b3 100644
--- a/x11-terms/sakura/sakura-3.5.0.ebuild
+++ b/x11-terms/sakura/sakura-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2