gentoo resync : 25.11.2020

5 files changed, 180 insertions, 8 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 8d043cff3aa3..696b482db216 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,4 +1,8 @@
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
+DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
+DIST geany-1.37.tar.bz2 4689385 BLAKE2B b726fffc18cc780fb399472a93a1787ec06ec47caf5dfe9a89f88e5939f071bdb90f337c7dbb9f8681c8383a89fa9d4a8c42d9361771a3e8bb7103cab4629f21 SHA512 ffaa906eaa6198d24e91e21dafc4acc0811c8d90f714a36f646d70aa9f4eee7c53c29a063c39db41857de3c7729282ca7f88419ddc6b67b73ac35e91a376ea62
 EBUILD geany-1.36.ebuild 1690 BLAKE2B 5ce4cc4e24de8e0e8aa738912558fadd6aba5e5d7d9588d412ab941bfa16497d78450d1aaf5244ff8af65b2eb77adb01e2e19d82ef72471af2e68bfd9b17f31d SHA512 29f31f63d8187082d9d4be721ff96774380e7196b342dd1d9fd25be7b7e39a37bd93bc9b6d2d14e0fa2f3012433d3f68a72e7637797dbe1e44234d003795ac98
-EBUILD geany-9999.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
-MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
+EBUILD geany-1.37.1.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+EBUILD geany-1.37.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+EBUILD geany-9999.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+MISC metadata.xml 2032 BLAKE2B 54b3618b43f780191a7beac778aaf9663fbd5f9c92053db9d0be5fe9f15762be554b5e3cd2f3fd474af947dbe4b24eb8b010aefb564cd99a28c323fb0bc08401 SHA512 e7c85e1609236337edba5c321cde1e7d816e672c84cd55bcc98cf76231b04b3c2419d95ea9a040f5f28784a6016cff7f0e75d8b24c1f7fcfe8dc20a60e6c90bf
diff --git a/dev-util/geany/geany-1.37.1.ebuild b/dev-util/geany/geany-1.37.1.ebuild
new file mode 100644
index 000000000000..2dde606ada78
--- /dev/null
+++ b/dev-util/geany/geany-1.37.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 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 ku 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 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="gtk2 +vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.32:2
+	gtk2? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	!gtk2? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	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-pdf-docs
+		--disable-static
+		$(use_enable gtk2)
+		$(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-1.37.ebuild b/dev-util/geany/geany-1.37.ebuild
new file mode 100644
index 000000000000..2dde606ada78
--- /dev/null
+++ b/dev-util/geany/geany-1.37.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 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 ku 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 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="gtk2 +vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.32:2
+	gtk2? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	!gtk2? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	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-pdf-docs
+		--disable-static
+		$(use_enable gtk2)
+		$(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 f8bb6955d661..2dde606ada78 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -6,7 +6,7 @@ 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"
+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 ku 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"
@@ -22,19 +22,19 @@ fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
 
-IUSE="+gtk3 +vte"
+IUSE="gtk2 +vte"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
+	gtk2? (
 		>=x11-libs/gtk+-2.24:2
 		vte? ( x11-libs/vte:0 )
 	)
-	gtk3? (
+	!gtk2? (
 		>=x11-libs/gtk+-3.0:3
 		vte? ( x11-libs/vte:2.91 )
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext"
 
@@ -58,7 +58,8 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-pdf-docs
-		$(use_enable gtk3)
+		--disable-static
+		$(use_enable gtk2)
 		$(use_enable vte)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 36e14323b610..044b068dfd6d 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -35,6 +35,7 @@
 		symboles.
 	</longdescription>
 	<use>
+		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
 		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
 	</use>