gentoo resync : 16.01.2021

3 files changed, 1 insertions, 85 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 15fe588159ff..7899ddc982c6 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,6 @@
-DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
 DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
 DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699
-EBUILD geany-1.36.ebuild 1661 BLAKE2B 050200ef740ec521ea5992702753d2effe2fdca33d8aa623390c9c2abb795fa3859da43c61da6c3a866adbad8fa8b03771036ee67d1ed7d59ef87e3bcbb0a9b4 SHA512 d2fdc3157b4ee473685caef1160041c2ca52b96bee490ec206710809f9047dc21fac4da83c7e4d3b82c1b1c09871f68469f9f4b10c78437d6a7fbf7e820dcdcd
 EBUILD geany-1.37.1.ebuild 1680 BLAKE2B 565a642939279f39f7ac3894da598afc08c0ec4c68535664f52c7625be8197638d2158f683617d034d32d6ba06bcaa79fff5e770bbe05df7d2c49faa1a87b30f SHA512 a44a768db04b6f1e2f94eaf6e6fc7e9391330ea85bf18741a34efff72c823f5a180d49afe92e040cc7116ecb2c3b773d902fa853fad33cf16c98584cfc5c55a9
 EBUILD geany-1.38.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
 EBUILD geany-9999.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
-MISC metadata.xml 2033 BLAKE2B 1e4e6b279c25d089da60902117b40cf6aa937c7d24c90ab4cdcc2c9c1b3b3fa053fb6545ec558c41e1f824fd1b18497f4d2aa020f7e39ffa3bbdba77a8403bea SHA512 2787bfde6a370fd7bf22267e6e0442b8045d4a9bb36b7c8145dc318ab0cacf1dd18d22169aff202f8371efdc9b9d8e273a12e74c1e230f2a126165df3df318c6
+MISC metadata.xml 1979 BLAKE2B f8c9b0a93b7f1aa26aa05d36db0dcd8b77e1ae4472b571a58cf5696866ba27a99bc753bb902b3476f662944d356556132ae3ad15fb947cfb7205153510c819e2 SHA512 04345509acf04bc36dd74ae2fae602c17021374379fe64656059aaaba0482d0ce1da8f3a7e7e5966433aed44cea7e992f4c723c8da0c773887519b28efc93c18
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
deleted file mode 100644
index 9cdbe20aaad9..000000000000
--- a/dev-util/geany/geany-1.36.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit strip-linguas 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 ku 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"
-
-BDEPEND="virtual/pkgconfig"
-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}
-	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/metadata.xml b/dev-util/geany/metadata.xml
index cb6f12f8b099..01d4f7248752 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -36,7 +36,6 @@
 	</longdescription>
 	<use>
 		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
 	</use>
 </pkgmetadata>