gentoo resync : 15.11.2017

2 files changed, 0 insertions, 82 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index ec8b9390cf13..ed1f3bafbed2 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,7 +1,5 @@
 AUX calamares-pkexec 43 SHA256 1a9c278c085bcb7cb3b1027bf6ad19d153492667730afd2b94c8736387355168 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb WHIRLPOOL bda196e8adb3b9207e9f98677dff5a4664504c114ab72bd0879d8518b74b95b558a2c90bcc612dd6f570b04c9f21fd5b46a51d55dd0f73b4fa288b3482d61f4d
-DIST calamares-3.1.6.tar.gz 2266993 SHA256 d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85 WHIRLPOOL 3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
 DIST calamares-3.1.7.tar.gz 2275893 SHA256 91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760 WHIRLPOOL 71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d
-EBUILD calamares-3.1.6.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 EBUILD calamares-3.1.7.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 MISC ChangeLog 7327 SHA256 06876264cef6e8962030c803f3add9300544f649cd1b76266580629be569e897 SHA512 66c97585da7e7083117bd87828614f7f003e87ef90fd5f232153b7de58bb44573dacb648ebd697b92765ac081b84667601c636c3d33b33c5293a8e5887e5a5b7 WHIRLPOOL 6a131253a3cd20cd043be6c32be5acd737c7e74760efca0237a06f514e9a58c92e18703fd20ad47ccf5d8b5137eea7cdf1f05b72087f7ff485114ee2e57c7182
 MISC ChangeLog-2015 671 SHA256 0e30b76881788f8c37df34e842750d456934309aa7e72026870766986f94f978 SHA512 707ea2c09d816d98ffce58fe26b62d85cfdabe4b8967208fc4e870cc12162381a335646be30a9bdfb16f17a90f359f3168dd9bf0d85513368f8707de06a935d2 WHIRLPOOL ccef8a153f1546f1ffc2f5a4433f87703715e86555445add9d75542550ecf62b9074117977fc3761c85b5205bbef3b168a8032069826b4335d756694fdd26faa
diff --git a/app-admin/calamares/calamares-3.1.6.ebuild b/app-admin/calamares/calamares-3.1.6.ebuild
deleted file mode 100644
index 780fcfe4fd0f..000000000000
--- a/app-admin/calamares/calamares-3.1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	>=sys-block/parted-3.0
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	python_setup
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-	       PYTHON_LIBS="$(python_get_LIBS)"
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}