From 12fbd634ae3ad92ee1b7378089a424767a981ef8 Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Fri, 17 Apr 2009 06:44:54 +0000
Subject: Restore accidentally dropped ~hppa keyword as reported by jer bug
 #266459 (Portage version: 2.2_rc30/cvs/Linux x86_64)

---
 kde-base/solid/ChangeLog          |  9 +++++++-
 kde-base/solid/solid-4.2.1.ebuild | 48 ---------------------------------------
 kde-base/solid/solid-4.2.2.ebuild |  4 ++--
 3 files changed, 10 insertions(+), 51 deletions(-)
 delete mode 100644 kde-base/solid/solid-4.2.1.ebuild

(limited to 'kde-base')

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 862729e7f643..c7cf35b24996 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.26 2009/04/12 06:44:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.27 2009/04/17 06:44:54 alexxy Exp $
+
+  17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> -solid-4.2.1.ebuild,
+  solid-4.2.2:
+  Restore ~hppa keywords
+
+  16 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> -solid-4.2.1.ebuild:
+  Drop KDE 4.2.1
 
 *solid-4.2.2 (11 Apr 2009)
 
diff --git a/kde-base/solid/solid-4.2.1.ebuild b/kde-base/solid/solid-4.2.1.ebuild
deleted file mode 100644
index 46a93c674cf9..000000000000
--- a/kde-base/solid/solid-4.2.1.ebuild
+++ /dev/null
@@ -1,48 +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/solid/solid-4.2.1.ebuild,v 1.4 2009/04/11 16:05:36 armin76 Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2"
-DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug networkmanager"
-
-DEPEND="
-	>=sys-apps/hal-0.5.9
-	bluetooth? (
-		|| (
-			net-wireless/bluez
-			net-wireless/bluez-libs
-		)
-	)
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
-	libs/solid/
-"
-
-PATCHES=( "${DISTDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2" )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with bluetooth BlueZ)
-		$(cmake-utils_use_with networkmanager NetworkManager)"
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	elog "If you want to be notified about new plugged devices by a popup,"
-	elog "install kde-base/soliduiserver"
-
-	kde4-meta_pkg_postinst
-}
diff --git a/kde-base/solid/solid-4.2.2.ebuild b/kde-base/solid/solid-4.2.2.ebuild
index 6058adf26aaf..9a92c20fc3b5 100644
--- a/kde-base/solid/solid-4.2.2.ebuild
+++ b/kde-base/solid/solid-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/solid/solid-4.2.2.ebuild,v 1.1 2009/04/12 06:44:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.2.ebuild,v 1.2 2009/04/17 06:44:54 alexxy Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ inherit kde4-meta
 SRC_URI="${SRC_URI}
 	mirror://gentoo/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2"
 DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth debug networkmanager"
 
 # solid/CMakeLists.txt has an add_subdirectory statement that depends on
-- 
cgit v1.2.3-65-gdbad