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