Restore accidentally dropped ~hppa keyword as reported by jer bug #266459

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 12 insertions, 153 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 71098ca0808e..a3f0f5fcbc25 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,15 @@
 # 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.29 2009/04/14 15:55:43 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.30 2009/04/17 06:48:47 alexxy Exp $
+
+  17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -systemsettings-4.2.1.ebuild, -systemsettings-4.2.1-r1.ebuild,
+  systemsettings-4.2.2:
+  Restore ~hppa keywords
+
+  16 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -systemsettings-4.2.1.ebuild, -systemsettings-4.2.1-r1.ebuild:
+  Drop KDE 4.2.1
 
   14 Apr 2009; Gordon Malm <gengor@gentoo.org>
   -files/systemsettings-4.0.2-opengl.patch,
diff --git a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild b/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
deleted file mode 100644
index ce0b2de96640..000000000000
--- a/kde-base/systemsettings/systemsettings-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.4 2009/04/13 22:56:02 gengor Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug +usb xinerama"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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"
-
-	if ! version_is_at_least 4.1.2 "$(gcc-fullversion)" ; then
-		ewarn
-		ewarn "The kxkb module will be built without keyboard hot-plugging"
-		ewarn "support.  GCC version 4.1.2 or greater is required to build"
-		ewarn "kxkb's keyboard hot-plugging code."
-		ewarn
-		ebeep 5
-		epatch "$FILESDIR/${P}-kxkb-strip-hot_plugging-support.patch"
-	fi
-
-	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
-}
diff --git a/kde-base/systemsettings/systemsettings-4.2.1.ebuild b/kde-base/systemsettings/systemsettings-4.2.1.ebuild
deleted file mode 100644
index c16e0d2f8c8d..000000000000
--- a/kde-base/systemsettings/systemsettings-4.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.ebuild,v 1.1 2009/03/04 23:01:30 alexxy 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/xextproto
-	x11-proto/kbproto
-	xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${COMMONDEPEND}
-	>=kde-base/kcontrol-${PV}:${SLOT}
-	|| ( x11-misc/xkeyboard-config
-		x11-misc/xkbdata )
-	x11-apps/setxkbmap"
-
-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" )
-
-# 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)"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.2.2.ebuild b/kde-base/systemsettings/systemsettings-4.2.2.ebuild
index 7a34d4105f74..806f95fc9a4c 100644
--- a/kde-base/systemsettings/systemsettings-4.2.2.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2009/04/14 15:55:43 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.2.ebuild,v 1.3 2009/04/17 06:48:47 alexxy Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="System settings utility"
 IUSE="debug doc +usb xinerama"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 COMMONDEPEND="
 	>=dev-libs/glib-2