Version bump, add kde4-base inherit to fix kdeprefix install

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 42 insertions, 2 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 1978d26de645..742eeb7de0c2 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.55 2009/02/25 07:02:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.56 2009/03/02 13:55:08 yngwin Exp $
+
+*qtcurve-qt4-0.61.4 (02 Mar 2009)
+
+  02 Mar 2009; Ben de Groot <yngwin@gentoo.org> +qtcurve-qt4-0.61.4.ebuild:
+  Version bump. Add inherit kde4-base to fix kdeprefix, see bug 260270.
 
   25 Feb 2009; Ben de Groot <yngwin@gentoo.org> qtcurve-qt4-0.61.2:
   Add fix for compilation with Qt 4.5, thanks to Alex Alexander. Move sedding
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 7f63ae1e434c..17887edb2846 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -3,11 +3,13 @@ DIST QtCurve-KDE4-0.59.6.tar.bz2 105358 RMD160 acc810f45f9cbfa247954a0debff69304
 DIST QtCurve-KDE4-0.60.0.tar.bz2 111661 RMD160 525f169438dddc27d090f3d5ba7af2ccd982e850 SHA1 9dd7090884d75e8bc2562095c54fcc728253f04a SHA256 153cb3a3965894d41db9032e52c43759bf7d2a7544de32c4562fac40af08a8bd
 DIST QtCurve-KDE4-0.61.1.tar.bz2 115685 RMD160 5222606717f625589d1ea27c614ec93469dd1ce5 SHA1 da389397824575b8631d354097a0bfb2d9464811 SHA256 d37e5d3d507a6b70592ecbb43a7f715a007507853702e527d88f9d5436c8ebe2
 DIST QtCurve-KDE4-0.61.2.tar.bz2 115924 RMD160 a95381f52105121b655d166b202c4237338492e0 SHA1 8c4cd57deb1e0f6a042dac63f7bff1fdf9b5eaa6 SHA256 6ca1ff17bd86e74c898a57be867bf74cfc470aa9972a62b94e1c02c6b2ea8e13
+DIST QtCurve-KDE4-0.61.4.tar.bz2 116100 RMD160 c7229a9f94d43c1f7ade77497580a06fcb96f70a SHA1 60900329de6ddc01111d0716a069f526a8e247bb SHA256 9fd0cbd38df10e51b8385aa61151969b05c36222caa66931ffa159ad2218be27
 EBUILD qtcurve-qt4-0.59.3-r1.ebuild 903 RMD160 cc347d116ee41a1085e54d1acf8f3ace45d66c4c SHA1 25111c3d9d55a3eaaf2de7c3f3264e49b8f0f793 SHA256 933e4820803436a21d787a55b240fdc37789672342ffd769fcc619b8d3733ff4
 EBUILD qtcurve-qt4-0.59.6-r1.ebuild 1108 RMD160 5cb1397e358e9141e779766c79e130d68c4b2405 SHA1 fcde74201bcdced9863ad0e75c4d45deaf16b003 SHA256 78462eb0261a1ead67d1925fb046210005021a8981016007064a2e0a7e049d6a
 EBUILD qtcurve-qt4-0.59.6.ebuild 906 RMD160 7802c2f6c3714bc1dcf0779911a236937d2b2137 SHA1 f7e6dc3b09e7ca952200188f18a0412ceff8a572 SHA256 bd55fa7a4348cacc75bdc0529b2712ad940b311202db182a40c74ff84a7a17a5
 EBUILD qtcurve-qt4-0.60.0.ebuild 971 RMD160 91e1431937294a2edf1b7cc69e385cd6881acda9 SHA1 727a3c30d70dceea76fd3367b12354d150c3f022 SHA256 2cbc14aab216d0ce6cc6fd59ab25460648b06d4180ea2e9a33d42a1734804003
 EBUILD qtcurve-qt4-0.61.1.ebuild 971 RMD160 ba61864df7b94d623c9f946ad4f6fd6df6117bf9 SHA1 356987ac3683e0647c887ad7d3e9537518d93334 SHA256 d92c2efeb4a15eff6b44c5b8a76a002976f5faf2648cf3da1976a5501ede9a72
 EBUILD qtcurve-qt4-0.61.2.ebuild 1077 RMD160 c3fe9ed751ae839d30a13a7987072c68434efd5d SHA1 96e0c13bd6055c2633e827e00cc04936a8f93a33 SHA256 d0f233e93fc7ca1e313e5bdbc287880ebecdc12af533eeb0307d615911f8adb4
-MISC ChangeLog 8495 RMD160 ad0eff43c9efb04a9da61a713af295e5b2fbdca8 SHA1 67284ab6820cfd9ff6c7b6e613b59c62f644523e SHA256 f0057bef6a742bed4cb89966eabac7c755c74d439dd42dc4b813146d1ac2165f
+EBUILD qtcurve-qt4-0.61.4.ebuild 1087 RMD160 3903c6226a75c60531bc09fccddc56e9e0fdf8d5 SHA1 b90d805b999a3f01d7886a4a80277c1d210e6ba5 SHA256 88cf1e9c9e722a0e585f8adac24434d30e35812c371dd7f62e5882e97de478a0
+MISC ChangeLog 8679 RMD160 ad4e0d57412f887edc70f5c8c322616da9308dd5 SHA1 1bc24dc1827294abda965101b604cc63f3872f7b SHA256 8d32e2dee9d6a39b8831dc7e53268d43f7457a2f2b6ef35a7c7fcafa924f3ec5
 MISC metadata.xml 408 RMD160 d14e2e25aad4cb4eb93661caf199a8c1eccc48c2 SHA1 aee2e1f5d8ab8bddfa6eaaa7516cf92ced698c81 SHA256 5d88cffd9d81f495104cdea9a4036e448d06c35387ef9c034cd009ba2639db3d
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.4.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.4.ebuild
new file mode 100644
index 000000000000..015516f6eee2
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.4.ebuild,v 1.1 2009/03/02 13:55:08 yngwin Exp $
+
+EAPI="2"
+inherit flag-o-matic cmake-utils kde4-base
+
+MY_P="${P/qtcurve-qt4/QtCurve-KDE4}"
+DESCRIPTION="A set of widget styles for Qt4 based apps, also available for KDE3 and GTK2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://home.freeuk.com/cpdrummond/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kde"
+
+DEPEND="x11-libs/qt-gui:4[dbus]
+	kde? ( >=kde-base/kwin-4.1.0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="ChangeLog README TODO"
+
+src_prepare() {
+	if has_version '>=x11-libs/qt-gui-4.5.0_rc1'; then
+		sed -i "s/QStyleOptionTabV2/QStyleOptionTabV3/" "${S}"/style/qtcurve.cpp
+	fi
+	if use !kde ; then
+		append-cppflags "-DQTC_NO_KDE4_LINKING=true -DQTC_DISABLE_KDEFILEDIALOG_CALLS=true";
+		sed -i "s/find_package(KDE4)/#&/" "${S}"/CMakeLists.txt
+	fi
+}