Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/systemsettings: ChangeLog systemsettings-4.4.2-r1.ebuild systemsettings-4.4.2.ebuild
Date: Mon, 03 May 2010 19:38:02
Message-Id: 20100503193800.12AB12C37F@corvid.gentoo.org
1 reavertm 10/05/03 19:37:59
2
3 Modified: ChangeLog
4 Added: systemsettings-4.4.2-r1.ebuild
5 Removed: systemsettings-4.4.2.ebuild
6 Log:
7 Fix Xinerama automagic, bug 312513, thanks for Andreas K. Huettel (dilfridge)
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.75 kde-base/systemsettings/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.75&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.75&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/systemsettings/ChangeLog?r1=1.74&r2=1.75
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v
20 retrieving revision 1.74
21 retrieving revision 1.75
22 diff -u -r1.74 -r1.75
23 --- ChangeLog 3 May 2010 05:45:33 -0000 1.74
24 +++ ChangeLog 3 May 2010 19:37:59 -0000 1.75
25 @@ -1,6 +1,14 @@
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.74 2010/05/03 05:45:33 aballier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.75 2010/05/03 19:37:59 reavertm Exp $
30 +
31 +*systemsettings-4.4.2-r1 (03 May 2010)
32 +
33 + 03 May 2010; Maciej Mrozowski <reavertm@g.o>
34 + -systemsettings-4.4.2.ebuild, +systemsettings-4.4.2-r1.ebuild,
35 + +files/systemsettings-4.4.2-xinerama_cmake_automagic.patch:
36 + Fix Xinerama automagic, bug 312513, thanks for Andreas K. Huettel
37 + (dilfridge)
38
39 03 May 2010; Alexis Ballier <aballier@g.o>
40 systemsettings-4.4.2.ebuild:
41
42
43
44 1.1 kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: systemsettings-4.4.2-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2010 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild,v 1.1 2010/05/03 19:37:59 reavertm Exp $
54
55 EAPI="3"
56
57 KMNAME="kdebase-workspace"
58 OPENGL_REQUIRED="optional"
59 inherit kde4-meta
60
61 DESCRIPTION="System settings utility"
62 IUSE="debug +handbook +usb xinerama"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
64
65 COMMONDEPEND="
66 dev-libs/glib:2
67 $(add_kdebase_dep libkworkspace)
68 media-libs/fontconfig
69 >=media-libs/freetype-2
70 >=x11-libs/libxklavier-3.2
71 x11-libs/libXcursor
72 x11-libs/libXext
73 x11-libs/libXfixes
74 x11-libs/libXft
75 x11-libs/libXrandr
76 x11-libs/libXtst
77 opengl? ( virtual/opengl )
78 usb? ( =virtual/libusb-0* )
79 xinerama? ( x11-libs/libXinerama )
80 "
81 DEPEND="${COMMONDEPEND}
82 x11-proto/kbproto
83 x11-proto/xextproto
84 xinerama? ( x11-proto/xineramaproto )
85 "
86 RDEPEND="${COMMONDEPEND}
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
104 PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
105
106 src_unpack() {
107 if use handbook; then
108 KMEXTRA="${KMEXTRA}
109 doc/kcontrol
110 "
111 fi
112
113 kde4-meta_src_unpack
114 }
115
116 src_prepare() {
117 sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
118 systemsettings/CMakeLists.txt \
119 || die "Failed to fix systemsettingsrc install location"
120
121 kde4-meta_src_prepare
122 }
123
124 # FIXME: is have_openglxvisual found without screensaver
125 src_configure() {
126 # Old keyboard-detection code is unmaintained,
127 # so we force the new stuff, using libxklavier.
128 mycmakeargs=(
129 -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
130 -DWITH_GLIB2=ON -DWITH_GObject=ON
131 $(cmake-utils_use_with opengl OpenGL)
132 $(cmake-utils_use_with usb)
133 $(cmake-utils_use_with xinerama X11_Xinerama)
134 )
135
136 kde4-meta_src_configure
137 }