From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 13 Oct 2019 22:19:36 +0100
Subject: gentoo resync : 13.10.2019

---
 dev-python/PyQtWebEngine/Manifest                  |  6 --
 .../PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild      | 73 ----------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild

(limited to 'dev-python/PyQtWebEngine')

diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index ff5422bd6c32..41f41e20d5dd 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,11 +1,5 @@
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-<<<<<<< HEAD
-DIST PyQtWebEngine_gpl-5.13.1.tar.gz 44883 BLAKE2B 1a31e8204dda4754bb5ee73b5e179d2ce92912eb333c0d62251aecc2623ebd0deea7f99a0a6b73a45b34c6ee0f55586daeb618c19039731d64ed6a12b552e551 SHA512 a1c39da5962b754a1ceff26c5baad0c11f0193f90db31ed2e25d8a4fda6ec84b10d6f3c35da0dee5cca938b42d6232620c57b3a62e5e78d274513bf422950dd5
-EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
-EBUILD PyQtWebEngine-5.13.1.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9
-=======
 DIST PyQtWebEngine_gpl-5.13.2.dev1909181828.tar.gz 45197 BLAKE2B 203dacf4322e8293221a59fd9a2f34a42981aefd5861e47141b3cc58770ff9cff2c0922de1f03c0eaff4b0d1c42bf26b172787cb3fbbc9367e9d8b717e927d50 SHA512 ebb1b6de8cba1619c96a4a120b51bfe885b737669f246f4e5c2cd5023320e74f0927a62a0b87586b519ab5767e0bd7b01444e7298381ffecc036682b4f1fcaae
 EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
 EBUILD PyQtWebEngine-5.13.2_pre1909181828.ebuild 1713 BLAKE2B 085effbbb3c43dcd9cd18d08ddf35b4e26dd5c1bcb80e298e422bc6c432aa157026043473612a81f6a6a37cd3c96a649da443b236cebcf49141a690dfb7d49c6 SHA512 b81e603090920d6e2da7ca11d3d8e851be160344282ec6cf25f9ccc621ef1c915ae9f3fddd2032b04b2fa522999fe5d5afe016832dd7c879aa18e739c0e636b9
->>>>>>> next
 MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild
deleted file mode 100644
index 2492f56e0e0e..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_PN=PyQtWebEngine
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
-- 
cgit v1.2.3