Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/
Date: Sun, 15 Oct 2017 16:42:19
Message-Id: 1508085731.f6654ad73d925e2ecd77969740321eea9bf0fa0e.johu@gentoo
1 commit: f6654ad73d925e2ecd77969740321eea9bf0fa0e
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 15 16:41:48 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 15 16:42:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6654ad7
7
8 app-admin/calamares: Remove 3.1.4
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 app-admin/calamares/Manifest | 1 -
13 app-admin/calamares/calamares-3.1.4.ebuild | 80 ------------------------------
14 2 files changed, 81 deletions(-)
15
16 diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
17 index 8d1f7ecd3a4..ade563741b0 100644
18 --- a/app-admin/calamares/Manifest
19 +++ b/app-admin/calamares/Manifest
20 @@ -1,3 +1,2 @@
21 -DIST calamares-3.1.4.tar.gz 4958385 SHA256 8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2 WHIRLPOOL 622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
22 DIST calamares-3.1.5.tar.gz 2266110 SHA256 02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06 WHIRLPOOL 74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
23 DIST calamares-3.1.6.tar.gz 2266993 SHA256 d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85 WHIRLPOOL 3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
24
25 diff --git a/app-admin/calamares/calamares-3.1.4.ebuild b/app-admin/calamares/calamares-3.1.4.ebuild
26 deleted file mode 100644
27 index 780fcfe4fd0..00000000000
28 --- a/app-admin/calamares/calamares-3.1.4.ebuild
29 +++ /dev/null
30 @@ -1,80 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -PYTHON_COMPAT=( python{3_4,3_5} )
37 -inherit kde5 python-r1
38 -
39 -DESCRIPTION="Distribution-independent installer framework"
40 -HOMEPAGE="https://calamares.io"
41 -if [[ ${KDE_BUILD_TYPE} == live ]] ; then
42 - EGIT_REPO_URI="https://github.com/${PN}/${PN}"
43 -else
44 - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
45 - KEYWORDS="~amd64"
46 -fi
47 -
48 -LICENSE="GPL-3"
49 -IUSE="+networkmanager pythonqt +upower"
50 -
51 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
52 -
53 -DEPEND="${PYTHON_DEPS}
54 - $(add_frameworks_dep kcoreaddons)
55 - $(add_frameworks_dep kparts)
56 - $(add_frameworks_dep kservice)
57 - $(add_qt_dep qtdbus)
58 - $(add_qt_dep qtdeclarative)
59 - $(add_qt_dep qtgui)
60 - $(add_qt_dep qtnetwork)
61 - $(add_qt_dep qtsvg)
62 - $(add_qt_dep qtwebengine 'widgets')
63 - $(add_qt_dep qtwidgets)
64 - >=dev-cpp/yaml-cpp-0.5.1
65 - >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
66 - sys-apps/dbus
67 - sys-apps/dmidecode
68 - sys-auth/polkit-qt[qt5(+)]
69 - >=sys-libs/kpmcore-3.0.3:5=
70 - pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
71 -"
72 -
73 -RDEPEND="${DEPEND}
74 - app-admin/sudo
75 - dev-libs/libatasmart
76 - net-misc/rsync
77 - >=sys-block/parted-3.0
78 - || ( sys-boot/grub:2 sys-boot/systemd-boot )
79 - sys-boot/os-prober
80 - sys-fs/squashfs-tools
81 - virtual/udev
82 - networkmanager? ( net-misc/networkmanager )
83 - upower? ( sys-power/upower )
84 -"
85 -
86 -src_prepare() {
87 - python_setup
88 - export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
89 - PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
90 - PYTHON_CFLAGS="$(python_get_CFLAGS)"\
91 - PYTHON_LIBS="$(python_get_LIBS)"
92 -
93 - eapply_user
94 -}
95 -
96 -src_configure() {
97 - local mycmakeargs=(
98 - -DWEBVIEW_FORCE_WEBKIT=OFF
99 - -DWITH_PYTHONQT=$(usex pythonqt)
100 - )
101 -
102 - kde5_src_configure
103 - sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
104 - sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
105 -}
106 -
107 -src_install() {
108 - kde5_src_install
109 - dobin "${FILESDIR}"/calamares-pkexec
110 -}