summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-11-20 15:48:34 +0100
committerJohannes Huber <johu@gentoo.org>2016-11-20 15:48:57 +0100
commit2b40b901fd89257ad0b835206201464d77943f92 (patch)
treec18a96177519b654b6d66fca53f5f9d409bcf535 /kde-base
parentnet-mail/notmuch: Bump version (diff)
downloadgentoo-2b40b901fd89257ad0b835206201464d77943f92.tar.gz
gentoo-2b40b901fd89257ad0b835206201464d77943f92.tar.bz2
gentoo-2b40b901fd89257ad0b835206201464d77943f92.zip
kde-base/kcheckpass -> kde-plasma/kcheckpass
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kcheckpass/Manifest1
-rw-r--r--kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch15
-rw-r--r--kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild37
-rw-r--r--kde-base/kcheckpass/metadata.xml8
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild2
-rw-r--r--kde-base/kdm/kdm-4.11.22.ebuild4
-rw-r--r--kde-base/krunner/krunner-4.11.22.ebuild2
-rw-r--r--kde-base/kscreensaver/kscreensaver-4.11.22.ebuild4
8 files changed, 6 insertions, 67 deletions
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
deleted file mode 100644
index db5163f8398..00000000000
--- a/kde-base/kcheckpass/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch b/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
deleted file mode 100644
index 78520d4acc4..00000000000
--- a/kde-base/kcheckpass/files/kcheckpass-4.4.2-no-SUID-no-GUID.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kcheckpass/CMakeLists.txt
-===================================================================
---- kcheckpass/CMakeLists.txt (revision 1112521)
-+++ kcheckpass/CMakeLists.txt (working copy)
-@@ -23,10 +23,6 @@
- macro_add_compile_flags(kcheckpass -U_REENTRANT)
- target_link_libraries(kcheckpass ${KDE4_KDEFAKES_LIBS} ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
- install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
--install(CODE "
-- set(KCP_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/kcheckpass\")
-- EXECUTE_PROCESS(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
--")
-
- install_pam_service(kcheckpass)
-
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
deleted file mode 100644
index f241e7affd9..00000000000
--- a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-DEPEND="
- pam? ( virtual/pam )
-"
-RDEPEND="${DEPEND}
- pam? ( || (
- >=kde-base/kdebase-pam-7
- kde-plasma/kscreenlocker
- <kde-plasma/plasma-workspace-5.4.50
- ) )
-"
-
-src_prepare() {
- kde4-meta_src_prepare
-
- use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with pam)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kcheckpass/metadata.xml b/kde-base/kcheckpass/metadata.xml
deleted file mode 100644
index 0cf59224b00..00000000000
--- a/kde-base/kcheckpass/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 6bacc7890b9..1865b974ad4 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -72,7 +72,6 @@ RDEPEND="
handbook? ( kde-apps/khelpcenter:* )
!minimal? (
$(add_kdeapps_dep kdepasswd)
- $(add_kdebase_dep kcheckpass)
$(add_kdebase_dep kdebase-cursors)
$(add_kdebase_dep klipper)
$(add_kdebase_dep kstyles)
@@ -84,6 +83,7 @@ RDEPEND="
$(add_kdebase_dep libtaskmanager)
$(add_kdebase_dep qguiplatformplugin_kde)
kde-plasma/freespacenotifier:4
+ kde-plasma/kcheckpass:4
kde-plasma/kephal:4
kde-plasma/khotkeys:4
kde-plasma/kinfocenter:4
diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild
index 917b713ac07..e4eac9b02b0 100644
--- a/kde-base/kdm/kdm-4.11.22.ebuild
+++ b/kde-base/kdm/kdm-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ DEPEND="
)
kerberos? ( virtual/krb5 )
pam? (
- $(add_kdebase_dep kcheckpass)
+ kde-plasma/kcheckpass:4
virtual/pam
)
systemd? ( sys-apps/systemd )
diff --git a/kde-base/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index aba8071643e..bee1ceed810 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.ebuild
@@ -14,10 +14,10 @@ IUSE="debug"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
DEPEND="
- $(add_kdebase_dep kcheckpass)
$(add_kdebase_dep ksmserver)
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep libplasmagenericshell)
+ kde-plasma/kcheckpass:4
kde-plasma/kephal:4
kde-plasma/ksysguard:4
!aqua? (
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
index 38e0b1b64c0..f976c9577d3 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
@@ -7,12 +7,12 @@ EAPI=5
KMNAME="kde-workspace"
inherit kde4-meta
-DESCRIPTION="KDE screensaver framework"
+DESCRIPTION="KDE Plasma screensaver framework"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
- $(add_kdebase_dep kcheckpass)
+ kde-plasma/kcheckpass:4
x11-libs/libX11
"
DEPEND="${RDEPEND}"