[gentoo-commits] proj/kde:master commit in: kde-misc/kscreen/

["Johannes Huber" <johu@gentoo.org>]

commit:     f22ab299d331c576588c2640e9d485c8376337d1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 14:02:30 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 14:02:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f22ab299

[kde-misc/kscreen] Moved to tree wrt bug #474106.

Package-Manager: portage-2.2.0_alpha184

---
 kde-misc/kscreen/kscreen-1.0.ebuild  | 34 -------------------------------
 kde-misc/kscreen/kscreen-9999.ebuild | 39 +++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/kde-misc/kscreen/kscreen-1.0.ebuild b/kde-misc/kscreen/kscreen-1.0.ebuild
deleted file mode 100644
index 9dc9013..0000000
--- a/kde-misc/kscreen/kscreen-1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Intelligent KDE screen management"
-HOMEPAGE="https://projects.kde.org/projects/playground/base/kscreen"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/libkscreen-${PV}
-	>=dev-libs/qjson-0.8
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	elog "Disable the old screen management:"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
-	elog "Enable the kded module for the kscreen based screen management:"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
-	elog "Now simply (un-)plugging displays should enable/disable them, while"
-	elog "the last state is remembered."
-
-	kde4-base_pkg_postinst
-}

diff --git a/kde-misc/kscreen/kscreen-9999.ebuild b/kde-misc/kscreen/kscreen-9999.ebuild
index 55f2e45..c07d7e0 100644
--- a/kde-misc/kscreen/kscreen-9999.ebuild
+++ b/kde-misc/kscreen/kscreen-9999.ebuild
@@ -4,15 +4,19 @@
 
 EAPI=5
 
+VIRTUALX_REQUIRED="test"
+DECLARATIVE_REQUIRED="always"
+KDE_LINGUAS="bs cs da de el es et fi fr ga gl lt mr nl pt pt_BR ro ru sk sv tr
+uk zh_CN"
 inherit kde4-base
 
-DESCRIPTION="Intelligent KDE screen management"
+DESCRIPTION="Alternative KDE screen management"
 HOMEPAGE="https://projects.kde.org/projects/playground/base/kscreen"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="4"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
 DEPEND="
 	>=x11-libs/libkscreen-${PV}
@@ -20,14 +24,31 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+DISTPLAY_MESSAGE=false
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		DISPLAY_MESSAGE=true
+	fi
+
+	kde4-base_pkg_preinst
+}
+
 pkg_postinst() {
-	elog "Disable the old screen management:"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
-	elog "Enable the kded module for the kscreen based screen management:"
-	elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
-	elog "Now simply (un-)plugging displays should enable/disable them, while"
-	elog "the last state is remembered."
+	if [[ "${DISPLAY_MESSAGE}" = true ]]; then
+		echo
+		elog "Disable the old screen management:"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
+		elog
+		elog "Enable the kded module for the kscreen based screen management:"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
+		elog
+		elog "Now simply (un-)plugging displays should enable/disable them, while"
+		elog "the last state is remembered."
+		echo
+	fi
+
+	unset DISPLAY_MESSAGE
 
 	kde4-base_pkg_postinst
 }