gentoo resync : 28.04.2019

4 files changed, 12 insertions, 177 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index b9e28d35aa34..a20f6734602a 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,10 +1,6 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
-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.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
 EBUILD geany-1.34.1.ebuild 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
-EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
-EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
+EBUILD geany-9999.ebuild 1705 BLAKE2B 33a6aaecba29847f556b2e7282f49ad773ff07820b001b131db918932ba05ffcdad200b4ce2996c5d65f106c48153380255a60975e454c00ca887b06ab2671bf SHA512 5d649bed1d8de7a17d7c082fef1bfd11438ef5cfc5c20e685991e93bf3b60238689fb9cb33b7239f71a4359a73ef94f8932682ce10661658e487d0bdb928882e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.33.ebuild b/dev-util/geany/geany-1.33.ebuild
deleted file mode 100644
index d99d1cea34dd..000000000000
--- a/dev-util/geany/geany-1.33.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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"
-
-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() {
-	default
-
-	# 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
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-1.34.ebuild b/dev-util/geany/geany-1.34.ebuild
deleted file mode 100644
index f07d539b7273..000000000000
--- a/dev-util/geany/geany-1.34.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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"
-
-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() {
-	default
-
-	# 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
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(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() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	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 f07d539b7273..79034d53feb2 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+# 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"
@@ -14,6 +15,7 @@ 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
@@ -41,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare #588570
 
 	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
@@ -56,7 +58,6 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable gtk3)
 		$(use_enable vte)
 	)
@@ -68,14 +69,14 @@ src_install() {
 	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
+pkg_preinst() {
+	xdg_pkg_preinst
+}
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }