Gentoo Archives: gentoo-commits

From: "Alexey Shvetsov (alexxy)" <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/systemsettings: ChangeLog systemsettings-4.5.4.ebuild
Date: Thu, 02 Dec 2010 21:34:08
Message-Id: 20101202211753.3F17620047@flycatcher.gentoo.org
1 alexxy 10/12/02 21:17:53
2
3 Modified: ChangeLog
4 Added: systemsettings-4.5.4.ebuild
5 Log:
6 [kde-base] Add KDE SC 4.5.4
7
8 (Portage version: 2.2.0_alpha6_p10/cvs/Linux x86_64, RepoMan options: --force)
9
10 Revision Changes Path
11 1.94 kde-base/systemsettings/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.94&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.94&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?r1=1.93&r2=1.94
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v
20 retrieving revision 1.93
21 retrieving revision 1.94
22 diff -u -r1.93 -r1.94
23 --- ChangeLog 13 Nov 2010 22:01:27 -0000 1.93
24 +++ ChangeLog 2 Dec 2010 21:17:53 -0000 1.94
25 @@ -1,6 +1,12 @@
26 # ChangeLog for kde-base/systemsettings
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.93 2010/11/13 22:01:27 dilfridge Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.94 2010/12/02 21:17:53 alexxy Exp $
30 +
31 +*systemsettings-4.5.4 (02 Dec 2010)
32 +
33 + 02 Dec 2010; Alexey Shvetsov <alexxy@g.o>
34 + +systemsettings-4.5.4.ebuild:
35 + Version bump KDE SC 4.5.4
36
37 13 Nov 2010; Andreas K. Huettel <dilfridge@g.o>
38 systemsettings-4.5.3.ebuild:
39
40
41
42 1.1 kde-base/systemsettings/systemsettings-4.5.4.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/systemsettings-4.5.4.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/systemsettings-4.5.4.ebuild?rev=1.1&content-type=text/plain
46
47 Index: systemsettings-4.5.4.ebuild
48 ===================================================================
49 # Copyright 1999-2010 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.5.4.ebuild,v 1.1 2010/12/02 21:17:53 alexxy Exp $
52
53 EAPI="3"
54
55 KDE_HANDBOOK="optional"
56 KMNAME="kdebase-workspace"
57 OPENGL_REQUIRED="optional"
58 inherit kde4-meta
59
60 DESCRIPTION="System settings utility"
61 IUSE="debug +usb xinerama"
62 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
63
64 COMMONDEPEND="
65 dev-libs/glib:2
66 $(add_kdebase_dep libkworkspace)
67 media-libs/fontconfig
68 >=media-libs/freetype-2
69 >=x11-libs/libxklavier-3.2
70 x11-libs/libXcursor
71 x11-libs/libXext
72 x11-libs/libXfixes
73 x11-libs/libXft
74 x11-libs/libXrandr
75 x11-libs/libXtst
76 opengl? ( virtual/opengl )
77 usb? ( =virtual/libusb-0* )
78 xinerama? ( x11-libs/libXinerama )
79 "
80 DEPEND="${COMMONDEPEND}
81 x11-proto/kbproto
82 x11-proto/xextproto
83 xinerama? ( x11-proto/xineramaproto )
84 "
85 RDEPEND="${COMMONDEPEND}
86 sys-libs/timezone-data
87 x11-apps/setxkbmap
88 x11-misc/xkeyboard-config
89 "
90
91 KMEXTRA="
92 kcontrol/
93 "
94 KMEXTRACTONLY="
95 krunner/dbus/org.kde.krunner.App.xml
96 krunner/dbus/org.kde.screensaver.xml
97 kwin/
98 libs/
99 plasma/
100 "
101
102 add_blocker kcontrol '<4.3.98'
103 add_blocker konqueror '<4.4.70'
104
105 PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
106
107 src_unpack() {
108 if use handbook; then
109 KMEXTRA+="
110 doc/kcontrol
111 doc/kfontview
112 "
113 fi
114
115 kde4-meta_src_unpack
116 }
117
118 src_prepare() {
119 sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
120 systemsettings/CMakeLists.txt \
121 || die "Failed to fix systemsettingsrc install location"
122
123 kde4-meta_src_prepare
124 }
125
126 # FIXME: is have_openglxvisual found without screensaver
127 src_configure() {
128 # Old keyboard-detection code is unmaintained,
129 # so we force the new stuff, using libxklavier.
130 mycmakeargs=(
131 -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
132 -DWITH_GLIB2=ON -DWITH_GObject=ON
133 $(cmake-utils_use_with opengl OpenGL)
134 $(cmake-utils_use_with usb)
135 $(cmake-utils_use_with xinerama X11_Xinerama)
136 )
137
138 kde4-meta_src_configure
139 }