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

(Portage version: 2.2_rc30/cvs/Linux x86_64)

4 files changed, 12 insertions, 194 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 9bdb2af1bc30..189b5e921cbc 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.19 2009/04/14 15:38:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.20 2009/04/17 06:42:19 alexxy Exp $
+
+  17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -plasma-workspace-4.2.1.ebuild, -plasma-workspace-4.2.1-r1.ebuild,
+  plasma-workspace-4.2.2:
+  Restore ~hppa keywords
+
+  16 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -plasma-workspace-4.2.1.ebuild, -plasma-workspace-4.2.1-r1.ebuild:
+  Drop KDE 4.2.1
 
   14 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml:
   Update metadata.
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
deleted file mode 100644
index f25f415612c3..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,98 +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/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild,v 1.3 2009/04/11 19:31:11 armin76 Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-KMMODULE="plasma"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug google-gadgets python rss xcomposite xinerama"
-
-COMMONDEPEND="
-	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libplasmaclock-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libtaskmanager-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/soliduiserver-${PV}:${SLOT}[kdeprefix=]
-	x11-libs/libXau
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	google-gadgets? ( >=x11-misc/google-gadgets-0.10.5[qt4] )
-	python? (
-		>=dev-python/PyQt4-4.4.0
-		>=dev-python/sip-4.7.1
-		>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
-	)
-	rss? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
-	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	!kdeprefix? ( !kde-base/plasma[-kdeprefix] )
-	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kde-menu-icons-${PV}:${SLOT}[kdeprefix=]
-"
-
-KMEXTRA="
-	libs/nepomukquery/
-	libs/nepomukqueryclient/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	libs/kworkspace/
-	libs/taskmanager/
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
-
-PATCHES=(
-	"${FILESDIR}/4.2.1-panelview-crash-fix.patch"
-	"${FILESDIR}/4.2-fix-quicklaunch.patch"
-)
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		$(cmake-utils_use_with rss KdepimLibs)
-		-DWITH_Xmms=OFF"
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	python_version
-	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co]
-	rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	python_mod_optimize \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	python_mod_cleanup
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild
deleted file mode 100644
index e75f039d8d0e..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.1.ebuild
+++ /dev/null
@@ -1,93 +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/plasma-workspace/plasma-workspace-4.2.1.ebuild,v 1.2 2009/03/08 19:37:47 scarabeus Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-KMMODULE="plasma"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug google-gadgets python xcomposite xinerama"
-
-COMMONDEPEND="
-	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libplasmaclock-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libtaskmanager-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/soliduiserver-${PV}:${SLOT}[kdeprefix=]
-	x11-libs/libXau
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	google-gadgets? ( >=x11-misc/google-gadgets-0.10.5[qt4] )
-	python? (
-		>=dev-python/PyQt4-4.4.0
-		>=dev-python/sip-4.7.1
-		kde-base/pykde4:${SLOT}
-	)
-	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	!kde-base/plasma:${SLOT}
-	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kde-menu-icons-${PV}:${SLOT}[kdeprefix=]
-"
-
-KMEXTRA="
-	libs/nepomukquery/
-	libs/nepomukqueryclient/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	libs/kworkspace/
-	libs/taskmanager/
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
-
-PATCHES=( "${FILESDIR}/4.2.1-panelview-crash-fix.patch" )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PyKDE4)
-		-DWITH_Xmms=OFF"
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	python_version
-	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co]
-	rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	python_mod_optimize \
-		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
-		"${PREFIX}"/share/apps/plasma_scriptengine_python
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	python_mod_cleanup
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
index c6a6c9937a03..ec7bef34b70a 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-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/plasma-workspace/plasma-workspace-4.2.2.ebuild,v 1.1 2009/04/12 06:41:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild,v 1.2 2009/04/17 06:42:19 alexxy Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ KMMODULE="plasma"
 inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc google-gadgets python rss xcomposite xinerama"
 
 COMMONDEPEND="