gentoo resync : 15.01.2020

3 files changed, 3 insertions, 46 deletions

diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 11fb2b46abcc..db11534e9c12 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,5 +1,3 @@
-DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3 SHA512 f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
 DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
-EBUILD entangle-0.6.0.ebuild 989 BLAKE2B f122100e8892a4ee256e0e2cda1b3c243a20c68058b6778ebb20509b53395998cd8b6c273131289690408f28b1bc04767a023dbfce404eecf6cb9272eca7cd5e SHA512 cc78f9327578e7ef13d29d0547bb76144f4d4a4b2698a7457014441a044dd2afbf1dbf157185cd9c681a7d486935369c099fcc2a04e8ce871892f4a1b34e5d2b
-EBUILD entangle-2.0.ebuild 1402 BLAKE2B 0a8e798f96b75d095ef95dfb313fb7980bc84d964f5bc630352d5d09cfbdf76207f8bf0dcb4c1e8bac4ba2f24b7a133ea0462de946a4a14455eda28819f93fc9 SHA512 38073a2dd304e40a10d4be4f2f06651632268eac42645ccd323d65ec5882da1bf3239bff5250b395dcfa0be7bf51d24e71bc0953ad7e003ed75f952df4635c50
+EBUILD entangle-2.0.ebuild 1400 BLAKE2B 75268e384d7d12a4521b79032571366c6fb14ba04bcfc10ec0ea2164f5a043936aa2ef727a54d1e80c6e8e4f30171eb2cf886013c0b4ef16655f0269716e79b1 SHA512 ed8528f959d585ee1619eefe1bbcddf100be7508ffbb794e921bd23222ec5f6198ef7a03774f9fea6030752f00c931a7000e642bc83f820251083af18836c38e
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild b/media-gfx/entangle/entangle-0.6.0.ebuild
deleted file mode 100644
index 70933e3d62fe..000000000000
--- a/media-gfx/entangle/entangle-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome2 eutils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="http://entangle-photo.org/"
-SRC_URI="http://entangle-photo.org/download/sources/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gdk-pixbuf-2.12.0:2
-	>=x11-libs/gtk+-3.3.18:3[introspection]
-	dev-libs/libgudev:=
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/gobject-introspection-0.9.3
-	>=media-libs/libgphoto2-2.4.11:=
-	media-libs/lcms:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=media-libs/gexiv2-0.4[introspection]
-	>=x11-libs/libXext-1.3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.0.0
-	>=media-libs/libraw-0.9.0"
-RDEPEND="${DEPEND}"
-DEPEND+="
-	virtual/pkgconfig"
-
-G2CONF+="
-	--disable-maintainer-mode
-	--docdir=/usr/share/doc/${PF}
-	--htmldir=/usr/share/doc/${PF}/html
-	--disable-werror
-	--disable-static"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index 00fd3649f7ac..a8563923bc55 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"