gentoo resync : 22.01.2019

3 files changed, 150 insertions, 1 deletions

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 51ac8b34ccd5..331254d8fb2b 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.33.tar.gz 4671123 BLAKE2B 33471215480597b34e2733b7dc292e94ff12985b645fda76b2e25492573bb866766a3ea5a4598c4f643e9528f8062ffb9bf6ccabbb9be04aecbf23650d9c776d SHA512 d046eb0b7bd3c704b62c84b05564b973203ddabf6c09b94bf3008955735d672077bff1a7cda27d4eba97824231483f3e64b3b0f0234a97a1a2727d535fb28718
+DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
 EBUILD geany-plugins-1.33.ebuild 3166 BLAKE2B 3e6beb940b81bd921424b6d1310c2fe402675a86815c6743483d7d9b5c05b4f4cdd1818bf92086430a03bc44b3a5c4bdaf58fb7e71af5da286dcfe2d71ee11a2 SHA512 7d3ac36a212e1deeeff6256aaf6593a65c0ade96e6da40fafe28a3672d46c4b3960c9c5b68c026acfe8c1bd8bed930a5aab9707168f3e7c4fbfdc9dbcb405d93
-MISC metadata.xml 1533 BLAKE2B 33a794171fd9b6a50ea6669c4bc782f40144d7efcf3145c742f4b427c1a2389d9370085ba2661498800324c17b3bfd5608b70c7e1f24892134e338108ae08354 SHA512 7c469c01a2afc24631d1260ca010c59031d61c63c903ce13ccc5147d960f0299c5cad02f4a839df8bef1f5566a49ef443bfdd0b40eea0a4401c8fa6625f532da
+EBUILD geany-plugins-1.34.ebuild 3358 BLAKE2B 9b786c3c6d919ed684661d6ae137d3b0358a8345eced9558653f35feb9878dac508f92b76496619cc3f13fa0f387785033fbcb8cbd685f75a804b951066219fe SHA512 4bc298324fde9550241e3f7bdda73139af8d9d1812f2a5e10a1e782a8f95e79a073e195eff4f4704daf74ecdad11d1dcc8fbe67b3bf81ad59e04543270f390b0
+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
new file mode 100644
index 000000000000..da4dedf3d9f9
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -0,0 +1,146 @@
+# 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} )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.34[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
+		)
+	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="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )
+"
+DEPEND="${COMMON_DEPEND}"
+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
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index ba173350cebd..aeeda37fe23e 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -20,6 +20,7 @@
 		<flag name="enchant">Enable spell checking using enchant</flag>
 		<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
+		<flag name="markdown">Enable the markdown plugin</flag>
 		<flag name="multiterm">Enable the multiterm plugin</flag>
 		<flag name="overview">Enable overview plugin</flag>
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>