diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:08 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:08 +0000 |
| commit | 5905ff632f7de8ade47d1aa5b2a7c66c85185ce7 (patch) | |
| tree | 9c83ec95483b8325cf2bde5acd17eef9e2821267 | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-5905ff632f7de8ade47d1aa5b2a7c66c85185ce7.tar.gz gentoo-2-5905ff632f7de8ade47d1aa5b2a7c66c85185ce7.tar.bz2 gentoo-2-5905ff632f7de8ade47d1aa5b2a7c66c85185ce7.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/systemsettings/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild | 79 |
2 files changed, 86 insertions, 1 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index 5e07ccb26687..6d01b0b12c41 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.23 2009/03/08 21:00:07 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.24 2009/03/15 14:44:08 scarabeus Exp $ + +*systemsettings-4.2.1-r1 (15 Mar 2009) + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + +systemsettings-4.2.1-r1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -systemsettings-4.2.0.ebuild, -systemsettings-4.2.0-r1.ebuild: diff --git a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild new file mode 100644 index 000000000000..b31bdfa6c7f9 --- /dev/null +++ b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:44:08 scarabeus Exp $ + +EAPI="2" + +KMNAME="kdebase-workspace" +OPENGL_REQUIRED="optional" +inherit kde4-meta + +DESCRIPTION="System settings utility" +IUSE="debug +usb xinerama" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +COMMONDEPEND=" + >=dev-libs/glib-2 + media-libs/fontconfig + >=media-libs/freetype-2 + >=x11-libs/libxklavier-3.2 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXrandr + x11-libs/libXtst + opengl? ( virtual/opengl ) + usb? ( dev-libs/libusb ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${COMMONDEPEND} + x11-proto/kbproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) +" +RDEPEND="${COMMONDEPEND} + >=kde-base/kcontrol-${PV}:${SLOT}[kdeprefix=] + x11-apps/setxkbmap + || ( + x11-misc/xkbdata + x11-misc/xkeyboard-config + ) +" + +KMEXTRA=" + kcontrol/ +" +KMEXTRACTONLY=" + krunner/dbus/org.kde.krunner.App.xml + krunner/dbus/org.kde.screensaver.xml + kwin/ + libs/ + plasma/ +" + +PATCHES=( "$FILESDIR/20_use_dejavu_as_default_font.patch" ) + +src_prepare() { + sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \ + systemsettings/CMakeLists.txt \ + || die "Failed to fix systemsettingsrc install location" + + kde4-meta_src_prepare +} + +# FIXME: is have_openglxvisual found without screensaver +src_configure() { + # Old keyboard-detection code is unmaintained, + # so we force the new stuff, using libxklavier. + mycmakeargs="${mycmakeargs} + -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON + -DWITH_GLIB2=ON -DWITH_GObject=ON + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with usb USB) + $(cmake-utils_use_with xinerama X11_Xinerama)" + + MAKEOPTS="${MAKEOPTS} -j1" + + kde4-meta_src_configure +} |