gentoo resync : 24.12.2018

3 files changed, 33 insertions, 21 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 4b4ca6ec5135..aa0598ff8ecc 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,8 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.32.tar.bz2 4341296 BLAKE2B c12b5608929d308cd9ff66c04a395a48d7ae05e773f201ebce64b883a8b5da73d6e84b1799cfea35ae2c12b02177cc0d43328924daaf8f485a83305d0d8e763a SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d
 DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
+DIST geany-1.34.tar.bz2 4474601 BLAKE2B 92a2b8343512317ad90cd10bd58b2aca77d7f58dff3548cfdbdab121343b67dcaa7a9d5b57cafd196d599d8bb6a121fa5e49d65a69fa7fd87fe7703be6b8d5fc SHA512 ef506880fbba9acbd2003b207c9897e115d398e716631bc1e164e3455aa9172f34b9955c627fb2f2dd3a3cba0926cce0a774d641517bc94b700d866be00db1a7
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.32.ebuild 1571 BLAKE2B 70377944ac9e0c07aa305fcd23acbd6719c02bef77cb08e5e1fb87a7e8fec9c96b92e027e312a095af16008191c6e947fd5f073cd0c86ee61fe70e543ec64814 SHA512 0eedd429a1fb3241c34c5379c754ee71d1083cf518a59090fc352be6ebf0cb940437e0070a427bea019fdf85526e7c9854ce987c4f7ad9a69a2916c467a0a30f
 EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
-EBUILD geany-9999.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
+EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
+EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.32.ebuild b/dev-util/geany/geany-1.34.ebuild
index 568033fe57d5..f07d539b7273 100644
--- a/dev-util/geany/geany-1.32.ebuild
+++ b/dev-util/geany/geany-1.34.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils gnome2-utils xdg-utils
+
+inherit gnome2-utils xdg-utils
 
 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"
-SRC_URI="https://download.geany.org/${P}.tar.bz2"
-
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	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"
+fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gtk3 +vte"
+
+IUSE="+gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	!gtk3? (
@@ -40,30 +46,36 @@ src_prepare() {
 	# 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() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable gtk3) \
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable gtk3)
 		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index d99d1cea34dd..f07d539b7273 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
 
-IUSE="gtk3 +vte"
+IUSE="+gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	!gtk3? (
@@ -65,7 +65,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_preinst() { gnome2_icon_savelist; }