gentoo resync : 13.10.2019

6 files changed, 93 insertions, 8 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 442b81a7f2b6..9712aca56bae 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,10 @@
 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
-EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.34.1.ebuild 1761 BLAKE2B a505b602d4a87225b58e47e8836f0c661bed0767cec33b29cd351582c7f0c2518fc80a0a642ce8678f3b3d9c565c6d71374ea97e528d5ca5fe73f53eef78314d SHA512 8fb31c0d0c468bbff814526138c07ee6702e06c40a5c7639f391675553daf901cea1e14f08738ac3a03116a0dad8ba775e6f2417058eec3e91268d79a61324f4
-EBUILD geany-1.35.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
-EBUILD geany-9999.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
+DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
+EBUILD geany-1.30.1.ebuild 1562 BLAKE2B c2df6ed87dc009a743022b751c01dacbf9d71a13ab365f5d880d959a61501feb91a7584d2e0e99fb30d2ddf6d7813879b43e378da5762b2917658ee41e859faa SHA512 ea58946bbe21fafc79acb47599a12fbdd5c8d069b5f78292570ac9b9ac0088f08db8d5a3f4c0a019678f185c117702464b39f553b2d97744457c439dd0a1fc39
+EBUILD geany-1.34.1.ebuild 1751 BLAKE2B ec272871621dd59d71a33da420ecfe60930c642b16f0d224405fb7cf80bee2b12012f25da2152383abd0f6fb56f682c8f65f7d176d330eebbf17d84f47073ce2 SHA512 e4782ad4dd2235aca5379f2c92f09c523a74a20ff1ad3767673b10a3ee8d3526e9f51a7fb32bb27b6d2997d81c522bd491bdd79f464fdc35e270afb2d5605afa
+EBUILD geany-1.35.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
+EBUILD geany-1.36.ebuild 1728 BLAKE2B c45634623adc46c21598b59812a3cc5ffe20dd2edb5a19a766bbc57c96a9fa197076c4be5ce6b3263b3f6b64f9cf73161e0ad660058e6610501b3c188bf6bd1d SHA512 d96e54bf3236d66f7bf1883739be215a532078975c2ba1b395335448f3fdb9feb379d98dcccd28343f08e69b42701805284ed434f27a7b4afba91b913af71ead
+EBUILD geany-9999.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
 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
index bf2f886d080a..011757a46796 100644
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ b/dev-util/geany/geany-1.30.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 04d361cf4ef7..7b58fc075ade 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	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 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
index 9d0c528efc2b..93548e681af7 100644
--- a/dev-util/geany/geany-1.35.ebuild
+++ b/dev-util/geany/geany-1.35.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 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/geany/geany-1.36.ebuild b/dev-util/geany/geany-1.36.ebuild
new file mode 100644
index 000000000000..1f26201787ef
--- /dev/null
+++ b/dev-util/geany/geany-1.36.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 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 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-dependency-tracking
+		--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-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 9d0c528efc2b..93548e681af7 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.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 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"