[x11-themes/qtcurve-qt4] version bump, patch to fix -kde compilation

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

5 files changed, 79 insertions, 3 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/Manifest b/x11-themes/gtk-engines-qtcurve/Manifest
index bc3f321d8e69..aa13b827beaa 100644
--- a/x11-themes/gtk-engines-qtcurve/Manifest
+++ b/x11-themes/gtk-engines-qtcurve/Manifest
@@ -2,9 +2,11 @@ DIST QtCurve-Gtk2-0.65.2.tar.bz2 116014 RMD160 a0c735b7474a9e0bda2747c261f112ca3
 DIST QtCurve-Gtk2-0.69.2.tar.bz2 121654 RMD160 bb64eb8bad6b55f0430bd93debdf1078f27d933a SHA1 825ad56d6b388f56aa8fae09c02bf27410b11f1e SHA256 7e37db61ba70faf8072f9e4a4230f7e330ec656b55de67f3d9ab5f2643992309
 DIST QtCurve-Gtk2-1.0.1.tar.bz2 128308 RMD160 a2ece41daba23f2922e42ec1813a6e8a4433e019 SHA1 2eef18e5378ff57d9cfadfadf545bbc4b5f7d750 SHA256 054cb94651270aadf42585588c8aa1b6e522651d6c279468c56b5b648a2afe5b
 DIST QtCurve-Gtk2-1.0.2.tar.bz2 128261 RMD160 c74689338c898eedc13e325db106ad936ead48ed SHA1 06c80f6833cb33415047cf873d8e6cf8b3c30d8e SHA256 a9d52512d207e96264027aa871cff81ad5f6c9a84e6be65dfdf437ac2242662e
+DIST QtCurve-Gtk2-1.1.0.tar.bz2 129054 RMD160 095733d680dd71f22dea3ac68a309d52047f8cb0 SHA1 b667e622057d831a9387adc3a4329785386cdb0f SHA256 eb229ed5189059dc36e8f7ade17e08f99de80e3b501717e38c604a0e8779e331
 EBUILD gtk-engines-qtcurve-0.65.2.ebuild 1156 RMD160 07fdf86b10c59ec64d32dc3b8fddd21ae308248d SHA1 57fc854675df7052d65a373ae5b46b218af54cd6 SHA256 bbe6f499d8809df6c54c95ab11949f6b509cf2ac7b58600b571f429a22876a89
 EBUILD gtk-engines-qtcurve-0.69.2.ebuild 1109 RMD160 5768e3aa42760a7a0b9a6d3bd8f6a3848bd16c31 SHA1 703346dc21ebe3dd6bc27268b677c8f03af0b131 SHA256 d14c855d4c481a2cedb14223e32c8ea2fdd52b269696bcfd435f5f090e08c52b
 EBUILD gtk-engines-qtcurve-1.0.1.ebuild 1118 RMD160 397a16f0c93061a257bb2fc57dcdc5d18da15302 SHA1 ec0d880b5a9b53abe3414d282e5e2e1579970092 SHA256 1f4bf7761cb685d7d804b254368475746b3dd54e381c34bab2f4ccc78af2ef0c
 EBUILD gtk-engines-qtcurve-1.0.2.ebuild 1117 RMD160 73a9a68641b722cbd27918898477d604204163ca SHA1 9a9696785fe36504010a951193d4acc148102e35 SHA256 bb273a29c236cb09c748d6a96a9b69c4dbf9668d1d028cf9be6d6a721657a846
-MISC ChangeLog 1207 RMD160 2aaef19b4765cd0b952b2dbb96ebaf9b3e65d7f0 SHA1 b3b2679b0d11e1cfb82f51b03ddedc66d13ff10a SHA256 589db4c8a254b4665cd2275e3e407b874612a90ba314fecb575614fc293b8bf0
+EBUILD gtk-engines-qtcurve-1.1.0.ebuild 1117 RMD160 65223d7eb285204553448caaf85f75e03f2585da SHA1 7406ba5f47d053ec236186c0266da6158efcdcf0 SHA256 a5d8a689f094bb74e1c1dc126c9d82062ea805f1f59fcdf6fec316d622ff81bc
+MISC ChangeLog 1351 RMD160 daa79e7414cfc0d7c86a1b602d2b75f27069fd99 SHA1 a554272857063deea43d631cd95a4e9753c96aea SHA256 9e839a376be66cd9145a588854d24986297fd725a49186e6a3a0c372df25bc8e
 MISC metadata.xml 685 RMD160 4e4b2763f110010aaaff31637d2bfb8c4e8513e5 SHA1 aad1f025a5fb2a47283ec4caf8934ffc01aedc9e SHA256 b93e57032df7f9b8756fe6bd77e2b495a075cbbe4cf4655ed2b0fcb6738bdab2
diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index f534f6d0b068..88cfebf3aaea 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.94 2010/02/01 14:41:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.95 2010/02/23 08:08:08 wired Exp $
+
+*qtcurve-qt4-1.1.0 (23 Feb 2010)
+
+  23 Feb 2010; Alex Alexander <wired@gentoo.org> +qtcurve-qt4-1.1.0.ebuild,
+  +files/qtcurve-qt4-1.1.0-no-kde-fail.patch:
+  version bump, patch to fix -kde compilation
 
 *qtcurve-qt4-1.0.2 (01 Feb 2010)
 
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index daccd20a1f32..72f6079fa93d 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,10 +1,13 @@
+AUX qtcurve-qt4-1.1.0-no-kde-fail.patch 940 RMD160 4ee6fdd7c76f44aad1f0ffbf2ecd9fc5c97e7c4c SHA1 5563279892acc46a93a4ef3f16b5d6a7ba511c4a SHA256 569c693f3d56279c90efdf74a7cbe80855b81b263fec696adefa2f135a6fbc50
 DIST QtCurve-KDE4-0.65.2.tar.bz2 141181 RMD160 56b7db88913e522ac4287e50abe029ccac48adff SHA1 95711c4228c1d4bdcb3f480f3398a1db0f26b221 SHA256 59cb5c152e1e173c7d75f5693af49259da41067a077b76d851eff7b497dd3046
 DIST QtCurve-KDE4-0.69.2.tar.bz2 171056 RMD160 3708c453bd85d24eb7fa9270f2119d3fa81d2ccc SHA1 6db0e51ce06fcc3d3f26a5af439517e552ded163 SHA256 8606fd66f6686c2c29e8b8516c0c5a5fe0dce049636d36be037714a55a0d5d5f
 DIST QtCurve-KDE4-1.0.1.tar.bz2 196864 RMD160 401a6829219443512dc7a3cd5aee529559b369b8 SHA1 8f89dd80b3ea4439041216f243caee2a6b4b4aca SHA256 45194e0fca5a681e4288d2b7c1cb75d91d27e9894b4185e9eef1d20ac56369cd
 DIST QtCurve-KDE4-1.0.2.tar.bz2 196978 RMD160 3cc2b0cc966b8d694b238b1f5041a3803cd10ba7 SHA1 851cabe17bfab5e092739c60b783b6727d756d13 SHA256 d694b56af4440a003db57b7b1f5911163c21ea248baa74b269ff1c5bf8426d01
+DIST QtCurve-KDE4-1.1.0.tar.bz2 210893 RMD160 d56903aa1a73f41a24999ed3128f3ec48a6c4434 SHA1 d4aefdd086625022c14e4057c7394082befed5c0 SHA256 9cc20a0aa4c29098e96908021f6896c7bbfe1b646a141c5a3100da9eaca8c74a
 EBUILD qtcurve-qt4-0.65.2.ebuild 793 RMD160 741e5e673dc3f8f5d2f7307bf7a11b4daf61529f SHA1 9f1d560cdeeb7a6f07956c87267714a08027fe87 SHA256 8ccddc83572956d38c791bcef8433fde81fdb4954e385f471ca4a91c85c18f93
 EBUILD qtcurve-qt4-0.69.2.ebuild 951 RMD160 25fe3386ca3db73bdd591f2e9da2867b1eddc575 SHA1 e2f05e2f3223bc531b295ff1b1b3f9db057dbe1f SHA256 9d9eda01afe12ecb164fd8a4a98debdf051fa7151e1970b5a4cc946fae762a0d
 EBUILD qtcurve-qt4-1.0.1-r2.ebuild 1119 RMD160 08228ba4fa8d26ce6ed33e389c0f61426c54de9e SHA1 8b72d9311a998e8489945e10f2eebf36bd8f7a0b SHA256 9fc524ae654308cba5b721168b4372b65e69846e0b9387b46d3304313310f950
 EBUILD qtcurve-qt4-1.0.2.ebuild 1116 RMD160 8184b5724588fbcbc1b4796fad3b06e8d404555b SHA1 62a4c687ff9f89bc732c9213a886995d3d52aa85 SHA256 7b0920659c376f05b23921224134f5f8dec580e0a6ce21113cdcf244171ff8d9
-MISC ChangeLog 14969 RMD160 5d4d8bd06df409b7434ca314ac14a38a3d6422e6 SHA1 5ff3b7cb440be8c9732b88df6b063bf6737b2379 SHA256 0385c60faf1d274761289dd3778793201d7836b23aa1056ae23eb09cdb4940c8
+EBUILD qtcurve-qt4-1.1.0.ebuild 1166 RMD160 279c2fd42afbd8c365ea1f1e28c676ae94d02e68 SHA1 bb395692644b0140ba23a73cc769bd2cca5ec821 SHA256 2c0aefe3432d01d71ebb4d436c4feebd29d9bede669cf8f15d7145a0721d603b
+MISC ChangeLog 15172 RMD160 ff9af6671bb38db3b64d0e8dbf680ad41743df54 SHA1 bf014845b908eaff2ae0eac178600571a08fd041 SHA256 6cbe78e70a33085f8fb70f1880d95faf7c8cd8c6e729a999b5948cfded69d128
 MISC metadata.xml 364 RMD160 f675a6f801000baeba8948174e3fa294b302dfef SHA1 df345953fedf8b7c1ed7a426619765b73da4804d SHA256 71fd09f777a8111528c40a781e949f94e14d73a1264d5d0a60b25c81a262e32b
diff --git a/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch b/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch
new file mode 100644
index 000000000000..717288725248
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch
@@ -0,0 +1,22 @@
+--- style/qtcurve.cpp.old	2010-02-23 00:15:27.000000000 +0200
++++ style/qtcurve.cpp	2010-02-23 10:04:39.547860699 +0200
+@@ -7445,7 +7445,8 @@
+ 
+                 opt.state=State_Horizontal|State_Enabled|State_Raised|(active ? State_Active : State_None);
+ 
+-#if KDE_IS_VERSION(4, 3, 0)
++#ifndef QTC_QT_ONLY
++	#if KDE_IS_VERSION(4, 3, 0)
+                 QPainterPath path(opts.round<ROUND_SLIGHT
+                                     ? QPainterPath()
+                                     : buildPath(QRectF(state&QtC_StateKWinNoBorder ? r : r.adjusted(1, 1, -1, 0)),
+@@ -7454,6 +7455,9 @@
+                                                 (opts.round>ROUND_SLIGHT /*&& kwin*/
+                                                     ? 6.0
+                                                     : 2.0)-(state&QtC_StateKWinNoBorder ? 0.0 : 1.0)));
++	#else
++                QPainterPath path;
++	#endif
+ #else
+                 QPainterPath path;
+ #endif
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.1.0.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.1.0.ebuild
new file mode 100644
index 000000000000..d0915e4011c0
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 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.1.0.ebuild,v 1.1 2010/02/23 08:08:08 wired Exp $
+
+EAPI="2"
+KDE_REQUIRED="optional"
+KDE_MINIMAL="4.2"
+inherit confutils cmake-utils 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kde windeco"
+
+DEPEND="x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-svg:4
+	kde? ( >=kde-base/systemsettings-${KDE_MINIMAL}
+		windeco? ( >=kde-base/kwin-${KDE_MINIMAL} ) )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS="ChangeLog README TODO"
+
+PATCHES=( "${FILESDIR}/${P}-no-kde-fail.patch" )
+
+pkg_setup() {
+	confutils_use_depend_all windeco kde
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		mycmakeargs="-DQTC_QT_ONLY=true"
+		cmake-utils_src_configure
+	fi
+}