gentoo resync : 25.04.2020

5 files changed, 2 insertions, 237 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 0d952b7bc6a3..8d043cff3aa3 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,10 +1,4 @@
-DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
-DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
-EBUILD geany-1.30.1.ebuild 1489 BLAKE2B f0784cdb5dfd21690102b6846b61da6d8660c8c9bbf634faa734ad50edbc9105007cc18db0bec86a166ec9dce4e992cfb35b1ee18052fa32a59e29f79a4f7136 SHA512 fb82ed450b0fae73dfd7051eaf8d260a74f0276c72fa4a68d72ac96cd5a8d61491bf7dec395b3e77fe2c8aecd53ed4c0813c9b807ed57b8d9071e717c6992cdc
-EBUILD geany-1.34.1.ebuild 1680 BLAKE2B 2dc3754c1e7aa9cfe0e9a809f3b6b0ef72af9a33f3593bca1a859f52bbc848c7022ae5decca4a4119f6d8462f3b4ec2880e3212d6074df234bb8bd9a38e9a962 SHA512 2e202c6d74b6aae785b2a1a62ccd53ffbc7f030a4e2246efdb8b8706ffc9e1b0f1a6d5e47316e3ededd4dd5a9d602b4501f35e8697525e315737f415c7c06e3d
-EBUILD geany-1.35.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
-EBUILD geany-1.36.ebuild 1696 BLAKE2B 0bcc4976766c82e966a30072cd4fa453f09b509b90a4d6ed6a7dbc7408a06b604f8b2363ea99ca014ce9e1285644961e0363be6b7823d06485c3b77aeec05422 SHA512 f965f0aa0ec721fe2168847136b8f010f4de2e2f5bb74382c4c9302f8e738f82bae4d59169c5a0265f450078cecca88038cd23cb7929e32a3f352dab8f4ca711
+EBUILD geany-1.36.ebuild 1690 BLAKE2B 5ce4cc4e24de8e0e8aa738912558fadd6aba5e5d7d9588d412ab941bfa16497d78450d1aaf5244ff8af65b2eb77adb01e2e19d82ef72471af2e68bfd9b17f31d SHA512 29f31f63d8187082d9d4be721ff96774380e7196b342dd1d9fd25be7b7e39a37bd93bc9b6d2d14e0fa2f3012433d3f68a72e7637797dbe1e44234d003795ac98
 EBUILD geany-9999.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
deleted file mode 100644
index 3786c41ed1cd..000000000000
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils ltprune
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-SRC_URI="https://download.geany.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk3) \
-		$(use_enable vte)
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
deleted file mode 100644
index dee55101743f..000000000000
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
deleted file mode 100644
index f8bb6955d661..000000000000
--- a/dev-util/geany/geany-1.35.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# eutils required for strip-linguas
-inherit eutils xdg
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	[[ "${PV}" == *_pre* ]] && inherit autotools
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	xdg_src_prepare #588570
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
index 9e7bd814556a..c9a5abee51e9 100644
--- a/dev-util/geany/geany-1.36.ebuild
+++ b/dev-util/geany/geany-1.36.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" = 9999* ]] ; then
 else
 	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"