gentoo resync : 04.05.2019

4 files changed, 90 insertions, 3 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index a20f6734602a..e10390b73bc2 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,6 +1,8 @@
 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 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
-EBUILD geany-9999.ebuild 1705 BLAKE2B 33a6aaecba29847f556b2e7282f49ad773ff07820b001b131db918932ba05ffcdad200b4ce2996c5d65f106c48153380255a60975e454c00ca887b06ab2671bf SHA512 5d649bed1d8de7a17d7c082fef1bfd11438ef5cfc5c20e685991e93bf3b60238689fb9cb33b7239f71a4359a73ef94f8932682ce10661658e487d0bdb928882e
+EBUILD geany-1.34.1.ebuild 1764 BLAKE2B 849bb385cb3ad8dbb0af76f515903a80865446eee99a4e1c78c0b35a492ea750ac8255fcb0b4653e1f232d837ed7342512cb0ae01f8c8ea17431dd31badd1062 SHA512 f04a579e01b2a021255c7453a15b41d174244d5925bd4d84bb09410aef89357b5cf9b61fe7b26fd1d30c8654cb09b1f58ebe46f968d634d2b72e5a9128704756
+EBUILD geany-1.35.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
+EBUILD geany-9999.ebuild 1726 BLAKE2B 032a836e7c4c2f29f6e2220627e21457dc42469293e041946b2ab669013d894d9d179cd8121e677a9f4e80674d6bc380e0be6b88a5be9913e4fd089b9eb95713 SHA512 0273728a66b6a4429d216cbfbd07124419a77a897533817b91b4df8037196cea680da1fb31911055c6f57e1b045743c8e1e5671569651afc03c61da02996993a
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 416007a6e5ed..86401e2a402b 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 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
@@ -56,6 +56,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
+		--disable-pdf-docs
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable gtk3)
 		$(use_enable vte)
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
new file mode 100644
index 000000000000..9d0c528efc2b
--- /dev/null
+++ b/dev-util/geany/geany-1.35.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 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 ~x86-fbsd ~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-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 79034d53feb2..9d0c528efc2b 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -58,6 +58,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
+		--disable-pdf-docs
 		$(use_enable gtk3)
 		$(use_enable vte)
 	)