[gentoo-commits] proj/kde:master commit in: kde-misc/bekwinfx/, profiles/updates/, kde-misc/bekwinfx/files/

[gentoo-commits] proj/kde:master commit in: kde-misc/bekwinfx/, profiles/updates/, kde-misc/bekwinfx/files/

[David Heidelberger]

commit:     807b6da6a3e467c753cd702d197ead4e464495f5
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu Jun  6 21:51:46 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu Jun  6 21:51:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=807b6da6

[kde-misc/bekwinfx] change slot from 0 to 4, QA updates, updated version 0-p20130606

---
 ...nfx-9999.ebuild => bekwinfx-0_p20130606.ebuild} | 34 +++++++++++-----------
 kde-misc/bekwinfx/bekwinfx-9999.ebuild             | 34 +++++++++++-----------
 kde-misc/bekwinfx/files/fix-array.diff             | 11 -------
 profiles/updates/2Q-2013                           |  1 +
 4 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/kde-misc/bekwinfx/bekwinfx-9999.ebuild b/kde-misc/bekwinfx/bekwinfx-0_p20130606.ebuild
similarity index 76%
copy from kde-misc/bekwinfx/bekwinfx-9999.ebuild
copy to kde-misc/bekwinfx/bekwinfx-0_p20130606.ebuild
index 5ccdb6b..d45c701 100644
--- a/kde-misc/bekwinfx/bekwinfx-9999.ebuild
+++ b/kde-misc/bekwinfx/bekwinfx-0_p20130606.ebuild
@@ -4,36 +4,37 @@
 
 EAPI=5
 
-if [ ${PV} == "9999" ]; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/bekwinfx/code"
-	KEYWORDS=""
-	GIT_ECLASS="git-2"
-else
-	GIT_REVISION="11f4c0f639bee99039ff4d3bd1d947313104b1a7"
-	SRC_URI="http://sourceforge.net/code-snapshots/git/b/be/${PN}/code.git/${PN}-code-${GIT_REVISION}.zip
+if [ ${PV} != "9999" ]; then
+	GIT_REV="8a4ec9bae5880fcc5177c7846b50698f6e6a5c7b"
+	SRC_URI="http://sourceforge.net/code-snapshots/git/b/be/${PN}/code.git/${PN}-code-${GIT_REV}.zip
 			-> ${P}.zip"
 	KEYWORDS="~amd64 ~x86"
 fi
+
 KDE_MINIMAL="4.10"
+OPENGL_REQUIRED=always
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit kde4-base
 
-OPENGL_REQUIRED=always
-KDE_HANDBOOK=optional
+if [ ${PV} == "9999" ]; then
+	EGIT_REPO_URI="http://git.code.sf.net/p/bekwinfx/code"
+	KEYWORDS=""
+fi
 
 DESCRIPTION="BE::KWinFW Several 3rd party plugins for the KDE KWin compositor."
 HOMEPAGE="http://sourceforge.net/projects/bekwinfx/"
 
-DEPEND="${DEPEND}
+DEPEND="
+	$(add_kdebase_dep kwin)
 	xrandr? ( kde-base/kephal )
 	gles? ( kde-base/kwin[gles] )"
+RDEPEND="
+	${DEPEND}"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="4"
 IUSE="+beclock +beanimated +befaded bereflected bedistorted debug gles +xrandr"
 
-S="${WORKDIR}/${PN}-code-${GIT_REVISION}"
-
-PATCHES=("${FILESDIR}/fix-array.diff")
+S="${WORKDIR}/${PN}-code-${GIT_REV}"
 
 src_configure() {
 	local mycmakeargs=(
@@ -43,8 +44,7 @@ src_configure() {
 		$(cmake-utils_use_build bereflected REFLECTED)
 		$(cmake-utils_use_build bedistorted DISTORTED)
 	)
-
-	cmake-utils_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {

diff --git a/kde-misc/bekwinfx/bekwinfx-9999.ebuild b/kde-misc/bekwinfx/bekwinfx-9999.ebuild
index 5ccdb6b..d45c701 100644
--- a/kde-misc/bekwinfx/bekwinfx-9999.ebuild
+++ b/kde-misc/bekwinfx/bekwinfx-9999.ebuild
@@ -4,36 +4,37 @@
 
 EAPI=5
 
-if [ ${PV} == "9999" ]; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/bekwinfx/code"
-	KEYWORDS=""
-	GIT_ECLASS="git-2"
-else
-	GIT_REVISION="11f4c0f639bee99039ff4d3bd1d947313104b1a7"
-	SRC_URI="http://sourceforge.net/code-snapshots/git/b/be/${PN}/code.git/${PN}-code-${GIT_REVISION}.zip
+if [ ${PV} != "9999" ]; then
+	GIT_REV="8a4ec9bae5880fcc5177c7846b50698f6e6a5c7b"
+	SRC_URI="http://sourceforge.net/code-snapshots/git/b/be/${PN}/code.git/${PN}-code-${GIT_REV}.zip
 			-> ${P}.zip"
 	KEYWORDS="~amd64 ~x86"
 fi
+
 KDE_MINIMAL="4.10"
+OPENGL_REQUIRED=always
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit kde4-base
 
-OPENGL_REQUIRED=always
-KDE_HANDBOOK=optional
+if [ ${PV} == "9999" ]; then
+	EGIT_REPO_URI="http://git.code.sf.net/p/bekwinfx/code"
+	KEYWORDS=""
+fi
 
 DESCRIPTION="BE::KWinFW Several 3rd party plugins for the KDE KWin compositor."
 HOMEPAGE="http://sourceforge.net/projects/bekwinfx/"
 
-DEPEND="${DEPEND}
+DEPEND="
+	$(add_kdebase_dep kwin)
 	xrandr? ( kde-base/kephal )
 	gles? ( kde-base/kwin[gles] )"
+RDEPEND="
+	${DEPEND}"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="4"
 IUSE="+beclock +beanimated +befaded bereflected bedistorted debug gles +xrandr"
 
-S="${WORKDIR}/${PN}-code-${GIT_REVISION}"
-
-PATCHES=("${FILESDIR}/fix-array.diff")
+S="${WORKDIR}/${PN}-code-${GIT_REV}"
 
 src_configure() {
 	local mycmakeargs=(
@@ -43,8 +44,7 @@ src_configure() {
 		$(cmake-utils_use_build bereflected REFLECTED)
 		$(cmake-utils_use_build bedistorted DISTORTED)
 	)
-
-	cmake-utils_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {

diff --git a/kde-misc/bekwinfx/files/fix-array.diff b/kde-misc/bekwinfx/files/fix-array.diff
deleted file mode 100644
index 9828a33..0000000
--- a/kde-misc/bekwinfx/files/fix-array.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/be.clock/beclock.cpp	2013-03-29 15:08:52.000000000 +0100
-+++ b/be.clock/beclock.cpp	2013-06-06 21:58:52.904862818 +0200
-@@ -937,7 +937,7 @@
-     return hlo;
- }
- 
--#define SET_BITS(_C_, _EXP_) t = dt.time()._EXP_; for (int i = 0; i <= 4; ++i) matrix[_C_][i] = t & (1<<(3-i))
-+#define SET_BITS(_C_, _EXP_) t = dt.time()._EXP_; for (int i = 0; i < 4; ++i) matrix[_C_][i] = t & (1<<(3-i))
- 
- QImage *
- BeClock::binaryImage( const QDateTime &dt )

diff --git a/profiles/updates/2Q-2013 b/profiles/updates/2Q-2013
index 97b6918..4576267 100644
--- a/profiles/updates/2Q-2013
+++ b/profiles/updates/2Q-2013
@@ -2,3 +2,4 @@ move kde-misc/libmm-qt net-libs/libmm-qt
 move kde-misc/libnm-qt net-libs/libnm-qt
 slotmove x11-libs/libkscreen 0 4
 move kde-misc/libkfbapi net-libs/libkfbapi
+slotmove kde-misc/bekwinfx 0 4