commit:     7c5b613db1533be856794e771522e78beee221fc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 12:53:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 12:59:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b613d

app-crypt/kencfs: Revert pkgmove to app-crypt/kencfs-plasma

This reverts commit 0d714555c42423bc49ee751e83f8e4e01d69ec45.

 app-crypt/kencfs-plasma/Manifest                              |  1 -
 app-crypt/kencfs/Manifest                                     |  1 +
 .../{kencfs-plasma => kencfs}/files/kencfs-1.4.0-encfs5.patch |  0
 .../files/kencfs-1.6.2-desktop.patch                          |  0
 .../kencfs-plasma-1.6.4.ebuild => kencfs/kencfs-1.6.4.ebuild} | 11 ++++-------
 app-crypt/kencfs/metadata.xml                                 |  8 ++++++++
 profiles/updates/4Q-2017                                      |  1 -
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
index 809497c429f..c37c0e97296 100644
--- a/app-crypt/kencfs-plasma/Manifest
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -1,2 +1 @@
-DIST kencfs-1.6.4.tar.gz 221386 SHA256 
3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 
44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d
 WHIRLPOOL 
8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
 DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 
8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 
a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac
 WHIRLPOOL 
146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6

diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
new file mode 100644
index 00000000000..b4eeda38bc3
--- /dev/null
+++ b/app-crypt/kencfs/Manifest
@@ -0,0 +1 @@
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 
3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 
44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d
 WHIRLPOOL 
8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b

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
similarity index 100%
rename from app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
rename to app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch

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
similarity index 100%
rename from app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
rename to app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch

diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild 
b/app-crypt/kencfs/kencfs-1.6.4.ebuild
similarity index 73%
rename from app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
rename to app-crypt/kencfs/kencfs-1.6.4.ebuild
index 3661c4b1d3f..8f8da5d243d 100644
--- a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
+++ b/app-crypt/kencfs/kencfs-1.6.4.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=6
 
-MY_PN="${PN/-plasma/}"
 inherit qmake-utils
 
 DESCRIPTION="GUI frontend for encfs"
 HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003";
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${MY_PN}-${PV}.tar.gz";
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -26,16 +25,14 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-       "${FILESDIR}/${MY_PN}-1.4.0-encfs5.patch"
-       "${FILESDIR}/${MY_PN}-1.6.2-desktop.patch"
+       "${FILESDIR}/${PN}-1.4.0-encfs5.patch"
+       "${FILESDIR}/${PN}-1.6.2-desktop.patch"
 )
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_prepare() {
        default
 
-       sed -i ${MY_PN}.pro -e "/^doc.path =/s/${MY_PN}/${MY_PN}-${PVR}/" \
+       sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
                || die "sed docdir failed"
 }
 

diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
new file mode 100644
index 00000000000..2fdbf33d963
--- /dev/null
+++ b/app-crypt/kencfs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="project">
+               <email>k...@gentoo.org</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
+</pkgmetadata>

diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index 45464e70bb2..32f7dbdcecc 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -1,3 +1,2 @@
 move dev-ml/ocaml-dns dev-ml/dns
 move dev-perl/HTML-Format dev-perl/HTML-Formatter
-move app-crypt/kencfs app-crypt/kencfs-plasma

Reply via email to