gentoo resync : 18.05.2019

3 files changed, 149 insertions, 2 deletions

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 82a7c090c097..136d7b8decd9 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
+DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.34.ebuild 3357 BLAKE2B 6d4f51391647f7bd94b58178de79e398bcf3e9c0182ca89a9fc02cb60c7d082c635ed47744f61f2e30e85cf9b070b34135e6a76f54926ffe07dd6823de2592f6 SHA512 93e327855595f6ab1522303d87ce90980f030673461f7cb203509868f62ff42162ec92c956178b8f9c8b5304d9870d3282ad0e223a178f47f02a426c8cbea865
+EBUILD geany-plugins-1.34.ebuild 3355 BLAKE2B 7635730a857fe4e94c0935d7f71585ebb45a799cb6307438257dc5bc2cd25c2247dee96eec80b439cfcf859f7f59e3a200687b3b65d10c7075398a01fe4546ed SHA512 b2595fdd7b45ca1c56333a968ad09afc844440402db82d18601c382888bfce9dbecb9d4d8ed5a586791757104abe177c27a8f94252791545c3d769ccc768b23d
+EBUILD geany-plugins-1.35.ebuild 3318 BLAKE2B fa8b8919b8fafdb570e6dcc0fd951b5051fba7f3f02afd02f1fef4798edbba2f44e9e26df59569d877123f3cd4e2125ee6a91b0573001bf73a1f317393a07849 SHA512 8556d21fc5f1130c3ba4f98d1300232a1638c9874548b4787bc139997e07009f316d8ca682f01efbf185e72c8c838b28ce33b00f24c2f23d603cf82e5aadd21c
 MISC metadata.xml 1591 BLAKE2B 33b24731bacbd726ff66b7c8915504c7cd74970d3d59a64f7de32c285d0674a272bae2f35798df90aacacc4c35e05ffc155ddb58d1d7f77f17e48d213dcd4f3e SHA512 b305d755827f8e73df732bead1ebc8af4d93a03958bac3e3b00c6cbcf2335caa51f83619779567b3744e76390b8aaefa71cd6487a3f77b54050963bc61e0ecf7
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
index 5752e298afa2..056115d3bd4d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
diff --git a/dev-util/geany-plugins/geany-plugins-1.35.ebuild b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
new file mode 100644
index 000000000000..9733bb2f8275
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
+REQUIRED_USE="
+	gtk3? ( !debugger !multiterm !python )
+	!gtk3? ( !markdown )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.35[gtk3=]
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? ( x11-libs/vte:0 )
+	enchant? ( app-text/enchant )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	multiterm? (
+		$(vala_depend)
+		>=x11-libs/vte-0.28:0
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	python? (
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+	scope? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-workbench
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}