[gentoo-commits] gentoo-x86 commit in kde-base/kwin: ChangeLog kwin-4.3.5-r1.ebuild kwin-4.3.5.ebuild

[Tomas Chvatal (scarabeus)]

scarabeus    10/02/03 20:32:51

  Modified:             ChangeLog
  Added:                kwin-4.3.5-r1.ebuild
  Removed:              kwin-4.3.5.ebuild
  Log:
  Fix bug #295511. This time proper package.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.187                kde-base/kwin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?r1=1.186&r2=1.187

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog	28 Jan 2010 11:28:27 -0000	1.186
+++ ChangeLog	3 Feb 2010 20:32:51 -0000	1.187
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.186 2010/01/28 11:28:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.187 2010/02/03 20:32:51 scarabeus Exp $
+
+*kwin-4.3.5-r1 (03 Feb 2010)
+
+  03 Feb 2010; Tomáš Chvátal <scarabeus@g.o>
+  +files/4.3.5-magiclamp-minimize.patch, -kwin-4.3.5.ebuild,
+  +kwin-4.3.5-r1.ebuild:
+  Fix bug #295511. This time proper package.
 
   28 Jan 2010; Tomáš Chvátal <scarabeus@g.o> kwin-4.3.5.ebuild:
   Kwin needs opengl patch even for 4.3.5. Per bug #302548



1.1                  kde-base/kwin/kwin-4.3.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/kwin-4.3.5-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/kwin-4.3.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: kwin-4.3.5-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.5-r1.ebuild,v 1.1 2010/02/03 20:32:51 scarabeus Exp $

EAPI="2"

KMNAME="kdebase-workspace"
OPENGL_REQUIRED="optional"
inherit kde4-meta

DESCRIPTION="KDE window manager"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug xcomposite xinerama"

# NOTE disabled for now: captury? ( media-libs/libcaptury )
COMMONDEPEND="
	$(add_kdebase_dep kephal)
	$(add_kdebase_dep libkworkspace)
	x11-libs/libXdamage
	x11-libs/libXfixes
	>=x11-libs/libXrandr-1.2.1
	x11-libs/libXrender
	opengl? ( virtual/opengl )
	xcomposite? ( x11-libs/libXcomposite )
	xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
	x11-proto/damageproto
	x11-proto/fixesproto
	x11-proto/randrproto
	x11-proto/renderproto
	xcomposite? ( x11-proto/compositeproto )
	xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}"

PATCHES=(
	"${FILESDIR}/4.3.3-fix_no_opengl.patch"
	"${FILESDIR}/${PV}-magiclamp-minimize.patch"
)

src_prepare() {
# NOTE uncomment when enabled again by upstream
#	if ! use captury; then
#		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
#			-i kwin/effects/CMakeLists.txt || \
#			die "Making captury optional failed."
#	fi

	kde4-meta_src_prepare
}

src_configure() {
	mycmakeargs=(
		$(cmake-utils_use_with opengl OpenGL)
	)

	kde4-meta_src_configure
}