Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, app-crypt/kencfs-plasma/, app-crypt/kencfs/, ...
Date: Sun, 29 Oct 2017 13:00:22
Message-Id: 1509281997.7c5b613db1533be856794e771522e78beee221fc.asturm@gentoo
1 commit: 7c5b613db1533be856794e771522e78beee221fc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 29 12:53:00 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 29 12:59:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b613d
7
8 app-crypt/kencfs: Revert pkgmove to app-crypt/kencfs-plasma
9
10 This reverts commit 0d714555c42423bc49ee751e83f8e4e01d69ec45.
11
12 app-crypt/kencfs-plasma/Manifest | 1 -
13 app-crypt/kencfs/Manifest | 1 +
14 .../{kencfs-plasma => kencfs}/files/kencfs-1.4.0-encfs5.patch | 0
15 .../files/kencfs-1.6.2-desktop.patch | 0
16 .../kencfs-plasma-1.6.4.ebuild => kencfs/kencfs-1.6.4.ebuild} | 11 ++++-------
17 app-crypt/kencfs/metadata.xml | 8 ++++++++
18 profiles/updates/4Q-2017 | 1 -
19 7 files changed, 13 insertions(+), 9 deletions(-)
20
21 diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
22 index 809497c429f..c37c0e97296 100644
23 --- a/app-crypt/kencfs-plasma/Manifest
24 +++ b/app-crypt/kencfs-plasma/Manifest
25 @@ -1,2 +1 @@
26 -DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
27 DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac WHIRLPOOL 146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6
28
29 diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
30 new file mode 100644
31 index 00000000000..b4eeda38bc3
32 --- /dev/null
33 +++ b/app-crypt/kencfs/Manifest
34 @@ -0,0 +1 @@
35 +DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
36
37 diff --git a/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
38 similarity index 100%
39 rename from app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
40 rename to app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
41
42 diff --git a/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch b/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
43 similarity index 100%
44 rename from app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
45 rename to app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
46
47 diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild b/app-crypt/kencfs/kencfs-1.6.4.ebuild
48 similarity index 73%
49 rename from app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
50 rename to app-crypt/kencfs/kencfs-1.6.4.ebuild
51 index 3661c4b1d3f..8f8da5d243d 100644
52 --- a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
53 +++ b/app-crypt/kencfs/kencfs-1.6.4.ebuild
54 @@ -3,12 +3,11 @@
55
56 EAPI=6
57
58 -MY_PN="${PN/-plasma/}"
59 inherit qmake-utils
60
61 DESCRIPTION="GUI frontend for encfs"
62 HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
63 -SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${MY_PN}-${PV}.tar.gz"
64 +SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz"
65
66 LICENSE="LGPL-2.1"
67 SLOT="0"
68 @@ -26,16 +25,14 @@ RDEPEND="${DEPEND}
69 "
70
71 PATCHES=(
72 - "${FILESDIR}/${MY_PN}-1.4.0-encfs5.patch"
73 - "${FILESDIR}/${MY_PN}-1.6.2-desktop.patch"
74 + "${FILESDIR}/${PN}-1.4.0-encfs5.patch"
75 + "${FILESDIR}/${PN}-1.6.2-desktop.patch"
76 )
77
78 -S="${WORKDIR}/${MY_PN}-${PV}"
79 -
80 src_prepare() {
81 default
82
83 - sed -i ${MY_PN}.pro -e "/^doc.path =/s/${MY_PN}/${MY_PN}-${PVR}/" \
84 + sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
85 || die "sed docdir failed"
86 }
87
88
89 diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
90 new file mode 100644
91 index 00000000000..2fdbf33d963
92 --- /dev/null
93 +++ b/app-crypt/kencfs/metadata.xml
94 @@ -0,0 +1,8 @@
95 +<?xml version="1.0" encoding="UTF-8"?>
96 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
97 +<pkgmetadata>
98 + <maintainer type="project">
99 + <email>kde@g.o</email>
100 + <name>Gentoo KDE Project</name>
101 + </maintainer>
102 +</pkgmetadata>
103
104 diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
105 index 45464e70bb2..32f7dbdcecc 100644
106 --- a/profiles/updates/4Q-2017
107 +++ b/profiles/updates/4Q-2017
108 @@ -1,3 +1,2 @@
109 move dev-ml/ocaml-dns dev-ml/dns
110 move dev-perl/HTML-Format dev-perl/HTML-Formatter
111 -move app-crypt/kencfs app-crypt/kencfs-plasma