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>.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 92 insertions, 7 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/Manifest b/x11-themes/qtcurve-qt4/Manifest
index cc0b0830c73f..e14d8e67e132 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,19 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX qtcurve-qt4_kde49-kwin_decoration-macro.patch 463 SHA256 cf276ccea05115d28e50bc91e01bd12833c7814d0a7baa6459cfb063744c4cbe SHA512 1a24350abe8474442a7ba0f5778e4c27688a3da73a2cc960a04d5e15a250ec61512e7298b398b1c82c8067cdbd4b1c6d5d1167f67332f90e494c322c6a0068bd WHIRLPOOL 54a1d4157586cb720da62bf97322d67f71b76e8c6b138b4ba8a4c525a9af3bbcc796898ef25c2bc9951776553107b16aad575c1514f3d9907cdcfb050e047ca8
 AUX qtcurve-qt4_kwin_automagic_fix.patch 1556 SHA256 f1023b308bb44c19f5d60847f3e8187627b9c459d8902b14c6d2dd7584fcd39e SHA512 7e971a14329f175412b472f49ea9bd0b391f762268b361f7550c5e3574a1feaa2d1c8cf9588c0c5976e7c7e6ec9bc8594e3ee8b67d4060043e7b15224797a444 WHIRLPOOL eaa39821c15c33fa154365a267a8df4fd4ef5e98123b230c507302e5e62053a6fba40cb3fb3db16063bc8f48f95382df8ba0b8dd222aa1a92d8031dcf7cf6c84
 DIST QtCurve-KDE4-1.6.4.tar.bz2 308223 SHA256 14a534d54fdae63582d94535f46c2d11019ad27b1462c97867ce73fcabbe138f
 DIST QtCurve-KDE4-1.8.12.tar.bz2 383523 SHA256 6956805f3f8603a79445728bf73bd1e642b7a8de723196d364f1ceeea3575d64 SHA512 eab297070fc6af3b1b594d541985b2a3fef27e7d2610f9e308e0e1e5cc666bc628c32b7f47126d6c1b3a1e44b4c26e11e9ea90ebb45d1659c449baaac42a7df2 WHIRLPOOL 7f923fb435c9c2d37349c71487814ce251b196abb309aae575b9eb5c1cbe4d83a97eecf6df16ab622593c84405b5e81a005923c515f834d966083e9f0acb0b70
 DIST QtCurve-KDE4-1.8.13.tar.bz2 383239 SHA256 2c3b65c09bedb02258a4dd1562d9168d6fcffca22c5339de7dc25a3c0dd70855 SHA512 ae02ca126ed3c81b077e671b80869c2731aab69e4f64832ae213ca313bca3e07300ded2aac0cef02ccb8cf32d020db4151ab102cda8d8e6bd90d1f0509f4dc4e WHIRLPOOL a62753dde585ef73d5a72f6134f925ba57c885feb88bbbf846b34c6a6017a440f889926b12d78bd25d0a5676ad0bad3d0aafddf03cd2e25bbbb0f3cc0ab3803e
 EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1347 SHA256 958fd6ec5f6b334349ac28d30aa4a872a27e7a718588090a7e6e4e2551f2e760 SHA512 6e94263999ed6f6c71ad94f39c621a1b2f838beabe4d99dac34cc8db20cfb8c6dc58541908f2705b437e9fa3231a9b9681b6321e9501f0fc394cf486f0539b7e WHIRLPOOL f443b703b8726370140ddded70868e966d8c8b50975a80cb809eddcf1b3058240564cadde23b87189f404130b1164090afad9119e580a5f801e1143255d30b7b
 EBUILD qtcurve-qt4-1.8.12.ebuild 1215 SHA256 502be9ca24af1252171c3724ae8145622c6ca580db351df141f75c080455172a SHA512 86ecfcd8341895383bbc940dd6dadeb1080826f731dd9fb1ac2a5f195f35fd7924ece5f086340fe2cc41bacdff0e7c290cd3d04016c58e2cf26229306eb97326 WHIRLPOOL 566ddc16778f73171927a585aaf59511ccae23624ca9db7848fbcf188b79f8ac094d482710c927697d686b7ea35ad59fdb011107eb92bbb4d104577cd83bfcdf
+EBUILD qtcurve-qt4-1.8.13-r1.ebuild 1270 SHA256 1a85d56ebec24177c53315e4d629fdea0ddb0dcd32e191ba6c91b2e6d408f587 SHA512 6ac456dc933de10c97eb287f22f4586e3db9c22929c871e2abc22caddf4e53950f11e1d0fec93aaa062169f37817e8dac2d2825c6a4d4185aa8277c6df556187 WHIRLPOOL 2a526054d56976071d761992efc393d111240da03756c41a3650a90927e7a28162f6aa768beccfb0ff70b8b7a947722520203ed8e56aaa98df25405ad4aa24db
 EBUILD qtcurve-qt4-1.8.13.ebuild 1217 SHA256 5fa3060c5716159a9c0f67b589d5c7625454338bc0f85a259c5f227fd9086429 SHA512 08dcb07fad900621fee18eeaedcfd2d5d8f10abf3d321481bb59beae60b316e25fd603f5a2db8d7c715e7e6f65f07fe8ab16dfd4d964e2ca4e63e479e7dc334b WHIRLPOOL c18933018a50c4cf697e743f4b21d67959c4c2cfd3a780d3fb07dc8ff86b32e1735533c6074ed3b1d41a1c503cbb11dcc205fdb76a02d71adee571a5633228ed
-MISC ChangeLog 21968 SHA256 b115c83f67917fd3a5e836eab51520dd38417c4adb74aa6b798bb5213d8245ce SHA512 3b34a2e555d1e50e9d0439a173bd2b69d3d9a5a7fff1ae5893e98709b77703e9c194d4c49c82f2e6aedc8cc8e0fde6fde0204b1e07f84884dae5330ae2de65b5 WHIRLPOOL f183373958c6502b0d7aaa73ba12ec0524446f8f24bea1be13d911317463afaef0183069c1f444a33a4ce8cc288c0f795421a5a08168322eff3b50c363a3e9ce
+MISC ChangeLog 22373 SHA256 f65d1dc502d7e5fb272d0474013d8333e017a162582352065cefd5beb5ccda73 SHA512 f7826cc6c3e51f9010faa9127db29af358b46b6673b246db78b02c8e183fec69598a0716ce38a7f325f1dcdd37e4ac1145bed2868c4270ff1229b7a78b9a0c6a WHIRLPOOL c6378199008d9895d47e8892f88574c7c6c2faba6be6e9c16e10b0e1aeb77721332702b28d6f956bd2efbfb5e739f9e88561707bd41d9f0d766eea98a4851f2b
 MISC metadata.xml 360 SHA256 a9b23f37afbe82447385ea144cdde15b54cbb7a5fef3daeb24ed18bc275a5b8c SHA512 e253f17494ff1530e63c6b7e5729b7dd93b43b3b71e1f2c40004631b91c2d318fcbab20297fd9251915523ca607b38ee01fe4b7bbb802b913708c0c956d67400 WHIRLPOOL 857640224009d730fc5429a213fe63a2b08b101517680d7702f6b5febd84d5d9c0e65e12b7768fa4e0588bffc2dee39945b7174d03cac05d1c6861d22d07d583
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVZaYACgkQuQc30/atMkCK6gCfSYhPdRLU3EqArrrd8fX9KcBw
-mtYAoJbFBuhTrDWWsBU1FOf0W2D4v35A
-=zgsX
+iQEcBAEBCAAGBQJQHSF5AAoJEO+t9ga+3I3aeBkH/3pt+eIjqquiLFAmJvQaIGLj
+k85HyR4lnA70dbBU6I2FbatTJQU9JgfgiX4ccPXViiosJf1UarywYVxzUJfk5lnT
+qcKSJxnSdscgm3GPb79F9VeAeWfeW9zg5Q/I3/FrtpmI6gn4vj+lRx6rUACri5xb
+HCLyGSL0QIrHH/VU14h/6TzumwKMBJAk9LCvhRph+wNsxYdPJSyXpjbikfionqp2
+W6qXW55QkXS5Cwcp1xffyH4g/yA9CBzvCWApexhGmpB4A9L6wyFaJIUXziN4HEH4
+ANl9LAscaMyS5O6MZFByec4QFlcyL1hgJY0TeA9Y+YCdwAXCqFWDV6BUWEmc4zg=
+=TOx5
 -----END PGP SIGNATURE-----
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
+}