Revision bump adds chakra patch which fixes loading of windeco wrt bug #429796. Set KDE_MINIMAL version to 4.9. Dropp ppc/ppc64 keywords as KDE 4.9 is not keyworded yet. Thanks to Franz Fellner <alpine.art.de@googlemail.com>.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 80 insertions, 1 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 6181ea821702..8e5b3be673ad 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.142 2012/07/29 16:32:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.143 2012/08/04 13:20:03 johu Exp $
+
+*qtcurve-qt4-1.8.13-r1 (04 Aug 2012)
+
+  04 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/qtcurve-qt4_kde49-kwin_decoration-macro.patch,
+  +qtcurve-qt4-1.8.13-r1.ebuild:
+  Revision bump adds chakra patch which fixes loading of windeco wrt bug
+  #429796. Set KDE_MINIMAL version to 4.9. Dropp ppc/ppc64 keywords as KDE 4.9
+  is not keyworded yet. Thanks to Franz Fellner <alpine.art.de@googlemail.com>.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> qtcurve-qt4-1.8.12.ebuild:
   alpha/sparc stable wrt #411845
diff --git a/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kde49-kwin_decoration-macro.patch b/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kde49-kwin_decoration-macro.patch
new file mode 100644
index 000000000000..6202e7b87ab2
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kde49-kwin_decoration-macro.patch
@@ -0,0 +1,15 @@
+diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp
+--- a/kwin/qtcurvehandler.cpp	2012-08-02 13:36:58.811347708 +0000
++++ b/kwin/qtcurvehandler.cpp	2012-08-02 13:38:03.240996792 +0000
+@@ -489,6 +489,11 @@
+ 
+ extern "C"
+ {
++    KWIN_EXPORT int decoration_version()
++    {
++        return KWIN_DECORATION_API_VERSION;
++    }
++
+     KDE_EXPORT KDecorationFactory *create_factory()
+     {
+         KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.13-r1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.13-r1.ebuild
new file mode 100644
index 000000000000..9f89dbc816d6
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.13-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.13-r1.ebuild,v 1.1 2012/08/04 13:20:03 johu Exp $
+
+EAPI=4
+KDE_REQUIRED="optional"
+KDE_MINIMAL="4.9"
+inherit kde4-base
+
+MY_P="${P/qtcurve-qt4/QtCurve-KDE4}"
+
+DESCRIPTION="A set of widget styles for Qt4 based apps, also available for GTK2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
+IUSE="kde windeco"
+REQUIRED_USE="windeco? ( kde )"
+
+DEPEND="x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-svg:4
+	kde? (
+		$(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) )
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}_kwin_automagic_fix.patch"
+	"${FILESDIR}/${PN}_kde49-kwin_decoration-macro.patch"
+)
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+	if use kde; then
+		mycmakeargs=(
+			$(cmake-utils_use windeco QTC_KWIN)
+		)
+		kde4-base_src_configure
+	else
+		mycmakeargs=(
+			"-DQTC_QT_ONLY=true"
+		)
+		cmake-utils_src_configure
+	fi
+}