Drop old. Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 9 insertions, 89 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index ac62ed01b0d2..ff31a2a4c99e 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.78 2010/05/04 08:18:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.79 2010/06/06 14:42:12 scarabeus Exp $
+
+*systemsettings-4.4.4 (06 Jun 2010)
+
+  06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -systemsettings-4.4.2-r1.ebuild, -systemsettings-4.4.3.ebuild,
+  +systemsettings-4.4.4.ebuild:
+  Remove old. Version bump.
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   systemsettings-4.4.3.ebuild:
diff --git a/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild b/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
deleted file mode 100644
index 3e6d708bff96..000000000000
--- a/kde-base/systemsettings/systemsettings-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $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 $
-
-EAPI="3"
-
-KMNAME="kdebase-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-IUSE="debug +handbook +usb xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
-	dev-libs/glib:2
-	$(add_kdebase_dep libkworkspace)
-	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? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/kbproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/setxkbmap
-	x11-misc/xkeyboard-config
-"
-
-KMEXTRA="
-	kcontrol/
-"
-KMEXTRACTONLY="
-	krunner/dbus/org.kde.krunner.App.xml
-	krunner/dbus/org.kde.screensaver.xml
-	kwin/
-	libs/
-	plasma/
-"
-
-add_blocker kcontrol '<4.3.98'
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="${KMEXTRA}
-			doc/kcontrol
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-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=(
-		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
-		-DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.4.3.ebuild b/kde-base/systemsettings/systemsettings-4.4.4.ebuild
index 9ccec74510ea..bc195b3ebcad 100644
--- a/kde-base/systemsettings/systemsettings-4.4.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.3.ebuild,v 1.2 2010/05/04 08:18:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.4.4.ebuild,v 1.1 2010/06/06 14:42:12 scarabeus Exp $
 
 EAPI="3"