gentoo resync : 06.08.2019

4 files changed, 4 insertions, 179 deletions

diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 79e5cff7da04..e79f68f49b7e 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,7 +1,3 @@
-DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
-DIST gitg-3.30.1.tar.xz 10555888 BLAKE2B 02e8f957eee82bbf0702ca39b5b336929c131a93a94f5e28a2e4aa7c2c473c5d8bda072eba184cef37d6ad2fa7bfa21c007c86204a0a81b6d401487d752952fd SHA512 0d9241422dda6bf1840632fbcabf6b640554081ba995eba59ce90f893654e42c0ca8953e814533b90f362abb13b002e7a74b5f6841aee1f33c2834d2acab869f
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
-EBUILD gitg-3.26.0.ebuild 1922 BLAKE2B 7b86abf6af11e82908ddabe99737ee663a63b407b80562545b34b6b9252937185e85c9cc2fa7007f33bcbdcfc2865daf30361b77b849c298624cc5ff1e02cf1b SHA512 b99a42a88bc033d5425d7dfb21054f594f1a1255ca77befc387320d33d4df92c54c41d7bf322363fe5b93bb669ba4729e68f9992d382c7e644065dddf1fdc5c4
-EBUILD gitg-3.30.1.ebuild 1942 BLAKE2B 12feca54eaaf676b14aac41a4f4c805a2a2f5df5acab6e4be8e7dc3fe54a8aaea067d8e74e8cba9d3da760edbfbce0e103553380ea5b504ed80c376cd95f4988 SHA512 090749745016a612ad59308ffe1d80507f81e4cc4170fd1bfacbcb061a5572215592d2378734bf00426c9cb0171396a62517c93f0671fa2be3346cb170081540
-EBUILD gitg-3.32.1.ebuild 1931 BLAKE2B 83b768bd55b676e5b9783663ab30afadea233cb4d738592920ddca57f6b10c37015df233b4347b2510502103305f73431bc52a98c24f950fc8ec008e54ffb847 SHA512 6b1aa1008563a6a31a3be45ad63eeb11200ddc6706c8cdc69f99ac94f169b6181842a35f8e17139e8f9474cfb9a0d110fa5c876b17982fd80a940bdacc9d26ca
+EBUILD gitg-3.32.1.ebuild 1956 BLAKE2B 5b2e6dbe5794956e98b08a3e44717b79c2713dbb598978fec46f29eb234107699525d904da0e45d6d08d6eee7bab99fd85be7fc5667025bc114211b89e6e64cd SHA512 f0fcda0136c7c940edc9ae5e787aa3c56243217cfb4b57ac94441cf1d929a217317fbe215d136b586bf0a22693eadf947b28a1e62971193f8513e5dae66fdcb1
 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30
diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild
deleted file mode 100644
index 46818ef6d31e..000000000000
--- a/dev-vcs/gitg/gitg-3.26.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome2 pax-utils python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/libgee:0.8[introspection]
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	net-libs/libsoup:2.4
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-deprecations \
-		$(use_enable glade glade-catalog) \
-		$(use_enable python)
-}
-
-src_install() {
-	# -j1: bug #???
-	gnome2_src_install -j1
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/libgitg-ext/GitgExt.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild
deleted file mode 100644
index 82d402136f84..000000000000
--- a/dev-vcs/gitg/gitg-3.30.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret[vala]
-	>=app-text/gtkspell-3.0.3:3[vala]
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgee:0.8[introspection]
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.26.4[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		# we install the module manually anyway
-		-Dpython=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgitg-ext/GitgExt.py
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/gitg/gitg-3.32.1.ebuild b/dev-vcs/gitg/gitg-3.32.1.ebuild
index 71a425bcce9b..5fee531ed8b8 100644
--- a/dev-vcs/gitg/gitg-3.32.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.32.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
+# vala-0.36 fails to build, https://bugs.gentoo.org/692538
+VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
 
@@ -12,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"