kde-base/kstartupconfig -> kde-plasma/kstartupconfig

6 files changed, 54 insertions, 7 deletions

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 7c7c8df7e5b4..721d4194257d 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
@@ -56,9 +56,9 @@ RDEPEND="
 	$(add_kdebase_dep krunner)
 	$(add_kdebase_dep ksmserver)
 	$(add_kdebase_dep ksplash)
-	$(add_kdebase_dep kstartupconfig)
 	$(add_kdebase_dep plasma-workspace)
 	kde-plasma/kcminit:4
+	kde-plasma/kstartupconfig:4
 	kde-plasma/kwin:4
 	kde-plasma/systemsettings:4
 	x11-apps/mkfontdir
diff --git a/kde-base/kstartupconfig/Manifest b/kde-plasma/kstartupconfig/Manifest
index db5163f83985..db5163f83985 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-plasma/kstartupconfig/Manifest
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild b/kde-plasma/kstartupconfig/kstartupconfig-4.11.22.ebuild
index 2e35f630907d..0b38ac1b9022 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild
+++ b/kde-plasma/kstartupconfig/kstartupconfig-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$
 
@@ -7,6 +7,6 @@ EAPI=5
 KMNAME="kde-workspace"
 inherit kde4-meta
 
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
+DESCRIPTION="Utility to launch applications with special window properties"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
diff --git a/kde-base/kstartupconfig/metadata.xml b/kde-plasma/kstartupconfig/metadata.xml
index 0cf59224b009..2fdbf33d963d 100644
--- a/kde-base/kstartupconfig/metadata.xml
+++ b/kde-plasma/kstartupconfig/metadata.xml
@@ -1,8 +1,8 @@
 <?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>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 36784bd0bd7c..c0065d8334a2 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -37,3 +37,4 @@ move kde-base/libkgreeter kde-plasma/libkgreeter
 move kde-base/liboxygenstyle kde-plasma/liboxygenstyle
 move kde-base/kstyles kde-plasma/kstyles
 move kde-base/ksystraycmd kde-plasma/ksystraycmd
+move kde-base/kstartupconfig kde-plasma/kstartupconfig
diff --git a/x11-libs/libfakekey/@ b/x11-libs/libfakekey/@
new file mode 100644
index 000000000000..90a07a32c607
--- /dev/null
+++ b/x11-libs/libfakekey/@
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# Allow configure to use libtool-2
+	epatch "${FILESDIR}/${P}-ac.patch"
+
+	# Fix underlinking bug #367595
+	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+		tests/Makefile.am || die 'Cannot sed Makefile.am'
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# --with/without-x is ignored by configure script and X is used.
+	econf	--with-x \
+		$(use_enable debug) \
+		$(use_enable doc doxygen-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	use doc && dohtml doc/html/*
+}