Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-base/kdebase-startkde/, x11-libs/libfakekey/, profiles/updates/, ...
Date: Mon, 28 Nov 2016 10:11:43
Message-Id: 1480327893.0978999c9e9f59141c39b037946556fcd2429754.johu@gentoo
1 commit: 0978999c9e9f59141c39b037946556fcd2429754
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 10:11:00 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 10:11:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0978999c
7
8 kde-base/kstartupconfig -> kde-plasma/kstartupconfig
9
10 .../kdebase-startkde-4.11.22-r2.ebuild | 2 +-
11 {kde-base => kde-plasma}/kstartupconfig/Manifest | 0
12 .../kstartupconfig/kstartupconfig-4.11.22.ebuild | 4 +-
13 .../kstartupconfig/metadata.xml | 8 ++--
14 profiles/updates/4Q-2016 | 1 +
15 x11-libs/libfakekey/@ | 46 ++++++++++++++++++++++
16 6 files changed, 54 insertions(+), 7 deletions(-)
17
18 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
19 index 7c7c8df..721d419 100644
20 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
21 +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
22 @@ -56,9 +56,9 @@ RDEPEND="
23 $(add_kdebase_dep krunner)
24 $(add_kdebase_dep ksmserver)
25 $(add_kdebase_dep ksplash)
26 - $(add_kdebase_dep kstartupconfig)
27 $(add_kdebase_dep plasma-workspace)
28 kde-plasma/kcminit:4
29 + kde-plasma/kstartupconfig:4
30 kde-plasma/kwin:4
31 kde-plasma/systemsettings:4
32 x11-apps/mkfontdir
33
34 diff --git a/kde-base/kstartupconfig/Manifest b/kde-plasma/kstartupconfig/Manifest
35 similarity index 100%
36 rename from kde-base/kstartupconfig/Manifest
37 rename to kde-plasma/kstartupconfig/Manifest
38
39 diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild b/kde-plasma/kstartupconfig/kstartupconfig-4.11.22.ebuild
40 similarity index 60%
41 rename from kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild
42 rename to kde-plasma/kstartupconfig/kstartupconfig-4.11.22.ebuild
43 index 2e35f63..0b38ac1 100644
44 --- a/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild
45 +++ b/kde-plasma/kstartupconfig/kstartupconfig-4.11.22.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 1999-2015 Gentoo Foundation
48 +# Copyright 1999-2016 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Id$
51
52 @@ -7,6 +7,6 @@ EAPI=5
53 KMNAME="kde-workspace"
54 inherit kde4-meta
55
56 -DESCRIPTION="KDE: Utility to launch applications with special window properties"
57 +DESCRIPTION="Utility to launch applications with special window properties"
58 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
59 IUSE="debug"
60
61 diff --git a/kde-base/kstartupconfig/metadata.xml b/kde-plasma/kstartupconfig/metadata.xml
62 similarity index 55%
63 rename from kde-base/kstartupconfig/metadata.xml
64 rename to kde-plasma/kstartupconfig/metadata.xml
65 index 0cf5922..2fdbf33 100644
66 --- a/kde-base/kstartupconfig/metadata.xml
67 +++ b/kde-plasma/kstartupconfig/metadata.xml
68 @@ -1,8 +1,8 @@
69 <?xml version="1.0" encoding="UTF-8"?>
70 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
71 <pkgmetadata>
72 -<maintainer type="project">
73 - <email>kde@g.o</email>
74 - <name>Gentoo KDE Project</name>
75 -</maintainer>
76 + <maintainer type="project">
77 + <email>kde@g.o</email>
78 + <name>Gentoo KDE Project</name>
79 + </maintainer>
80 </pkgmetadata>
81
82 diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
83 index 36784bd..c0065d8 100644
84 --- a/profiles/updates/4Q-2016
85 +++ b/profiles/updates/4Q-2016
86 @@ -37,3 +37,4 @@ move kde-base/libkgreeter kde-plasma/libkgreeter
87 move kde-base/liboxygenstyle kde-plasma/liboxygenstyle
88 move kde-base/kstyles kde-plasma/kstyles
89 move kde-base/ksystraycmd kde-plasma/ksystraycmd
90 +move kde-base/kstartupconfig kde-plasma/kstartupconfig
91
92 diff --git a/x11-libs/libfakekey/@ b/x11-libs/libfakekey/@
93 new file mode 100644
94 index 00000000..90a07a3
95 --- /dev/null
96 +++ b/x11-libs/libfakekey/@
97 @@ -0,0 +1,46 @@
98 +# Copyright 1999-2015 Gentoo Foundation
99 +# Distributed under the terms of the GNU General Public License v2
100 +# $Id$
101 +
102 +EAPI=5
103 +
104 +inherit eutils autotools
105 +
106 +DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
107 +HOMEPAGE="http://matchbox-project.org/"
108 +SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
109 +LICENSE="GPL-2"
110 +SLOT="0"
111 +
112 +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
113 +IUSE="debug doc"
114 +
115 +RDEPEND="x11-libs/libXtst"
116 +
117 +DEPEND="${RDEPEND}
118 + doc? ( app-doc/doxygen )"
119 +
120 +src_prepare() {
121 + # Allow configure to use libtool-2
122 + epatch "${FILESDIR}/${P}-ac.patch"
123 +
124 + # Fix underlinking bug #367595
125 + sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
126 + tests/Makefile.am || die 'Cannot sed Makefile.am'
127 + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
128 + eautoreconf
129 +}
130 +
131 +src_configure() {
132 + # --with/without-x is ignored by configure script and X is used.
133 + econf --with-x \
134 + $(use_enable debug) \
135 + $(use_enable doc doxygen-docs)
136 +}
137 +
138 +src_install() {
139 + emake DESTDIR="${D}" install
140 +
141 + dodoc AUTHORS ChangeLog INSTALL NEWS README
142 + use doc && dohtml doc/html/*
143 +}