fixed automagic kwin dep, bug #338628. warn the user instead of dying if use windeco && ! use kde.

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

4 files changed, 111 insertions, 15 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 9cbd348f5033..6e553b3abb43 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,13 @@
 # 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.112 2010/10/05 00:15:53 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.113 2010/10/19 10:08:41 wired Exp $
+
+*qtcurve-qt4-1.6.4-r1 (19 Oct 2010)
+
+  19 Oct 2010; Alex Alexander <wired@gentoo.org>
+  +files/qtcurve-qt4_kwin_automagic_fix.patch, +qtcurve-qt4-1.6.4-r1.ebuild:
+  fixed automagic kwin dep, bug #338628. warn the user instead of dying if
+  use windeco && ! use kde.
 
 *qtcurve-qt4-1.6.4 (05 Oct 2010)
 
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 42ae88de129a..caab4d60f1e8 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX qtcurve-qt4-1.1.0-no-kde-fail.patch 940 RMD160 4ee6fdd7c76f44aad1f0ffbf2ecd9fc5c97e7c4c SHA1 5563279892acc46a93a4ef3f16b5d6a7ba511c4a SHA256 569c693f3d56279c90efdf74a7cbe80855b81b263fec696adefa2f135a6fbc50
 AUX qtcurve-qt4-1.1.1-no-kde-fail.patch 998 RMD160 dbd12c631e66cd0736f751c728720e1efbbebc59 SHA1 bb25b959d47465c4b14d3327337932693048d226 SHA256 907e1141b6e00ba0066c6e14405889f96fb05b21358edd6e5090e023427eafd7
+AUX qtcurve-qt4_kwin_automagic_fix.patch 1556 RMD160 0322e218b9f2ff8327c536e8abad1186030d54b4 SHA1 ef992eb5ec10d42cdff0db5882dec62c7e5e24b3 SHA256 f1023b308bb44c19f5d60847f3e8187627b9c459d8902b14c6d2dd7584fcd39e
 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.4.3.tar.bz2 238415 RMD160 9968c6fd3c6b4233c9c5112fd5175590c5c56e07 SHA1 cd3adfa083f44ff5c679e8b9ea63b48eba0f8465 SHA256 f1206aacdd37a8dcc939e031828e26959ed4dbae50d9d9d7e3debae373fea51f
@@ -20,23 +21,24 @@ EBUILD qtcurve-qt4-1.5.1.ebuild 1102 RMD160 e043deb9b2890ee40adbd156aa95cf10a39c
 EBUILD qtcurve-qt4-1.5.2.ebuild 1102 RMD160 cd10696786464d77fe7bf1079d3fc25d975fcd5f SHA1 f4a5e895ac25b22f96209197604f2025f737aa65 SHA256 1b44c0a1f2efee28f3c2a00aa11854a9ab565956b358238e545e52e64e3bb8d7
 EBUILD qtcurve-qt4-1.6.0.ebuild 1098 RMD160 430fca0e4edfee0d40f7255307869d32c2b4d3c9 SHA1 0330f001bbcfa4c996653e79ac2273cb2b2eb4ce SHA256 626e5cc77074d59ad4b38333e9f7a580c08066b0e97dc29c0c63c6260910dd1c
 EBUILD qtcurve-qt4-1.6.1.ebuild 1098 RMD160 c09092361dd2fcd23c4593b0b58070b4ff4c23b0 SHA1 ebc8ee7e9036769f56306cc8cd258ff3143a1c4b SHA256 d995332847fdb7278ba1956bef0c4de5104e50016bd8986c588bb621957ac5db
+EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1519 RMD160 0439fbf6cbbe2ac51be547d0250c74384849eafe SHA1 c058ed4bb6bcf05c54dbc397ca0981041771fd70 SHA256 c5c94b4ac5d3f20d86ba18d89c13231d4215dea4fa9f84e4e9255d5f0631f1dc
 EBUILD qtcurve-qt4-1.6.4.ebuild 1232 RMD160 b74761b9b2812a0c0728c8135229c13f75ecd0f5 SHA1 7dfaf6080d621fe5caf3b382805525c2fb7e28f1 SHA256 e3ef543900f02d67351fb496f7fa146c006d77d5f3b2198f32a2fe23224d534b
-MISC ChangeLog 17855 RMD160 92ba2a33385368d0270e571f59586b0bf3ae01b2 SHA1 9b52e1a442ac3212961047861db5d4dda8f8427e SHA256 100696a180744d237f28b940918dfb44d295e055fec7b7a4eb570d9fa88c974c
+MISC ChangeLog 18122 RMD160 409a741e7f2d6ba2234b59b049cc1e41525201e8 SHA1 82360c6979e678e2c0cc6b75080e0c00b14c16f7 SHA256 a98712dfdaefdd6beaf502257eef6a35822ff18724c1b4695ff38df186fd8743
 MISC metadata.xml 519 RMD160 e3f1593fcd6ae9c3ca1b4c1abd43153e6ddd60ff SHA1 c4ab4bf0d5833eab6689b10bc83b7b4120bb54b1 SHA256 d109561df74166e8b89e04f8d338d7c672b33098a2cac3cd0f90ebdbd388adb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMqm81AAoJEDZF8K7rm0r6Z40P/iF3z4e6FughG2zpHgFp5QTQ
-n7EPYLcJoSCPfyIte2tmBmUn128HPWKWlgJF7P62+qg+gmXw8VLxNtdkNvOiYQTj
-TUKhcVVfQ1gbKaIiqYvOCIqCZD6xlN8LuSz1tWqKuflK//b9q3lJW0t/JX3ujDJN
-kito7HIMncRKrX5IiWgnPQrsLHSOomuPOrDsfiud3yXyCQtONeYtjd4eHnKteRwp
-lF6c56R/kX002kZ5OBhoJyu3itVwjDPgEzyZJMckZSU72eKHjAyBzyFkbksWM8QI
-7IGmXpw7Hmq9fB1+3Q3rX12ibCTRp/pr6Lg24NdmysukKAQv43+t+hdlnbdku461
-3kOeq3w0v3aTbwiXeBnPLy/SsF6eEf3TYY1W+aNAOSNyAIX+vsY1W8bORsHghXFL
-bgQ0PAsyykTngZVrpPa3rwTm+Xf5//etBwIpR60fwIjmLehcFNSrXo39lXqLSisP
-BbO+InOxbApJ5WWdKFWZlMbTYsXg15aDSTAu1mU7W3QB4oKKe6eRSNy9qrqKV3yt
-Ob+7CMRI9guv0rkqvg62o011WgOeUKb8D8iOhpfulji3mM9UbgUuT1hybc4t0GP2
-XncJqyzRVuLQgdSo8tVoABSafIAriYXkvnR0vNppTJjy4DlHzg8G+yNhogT1UXeb
-kd+BqOHhUNFcdrRkVY2n
-=Cn4n
+iQIcBAEBCAAGBQJMvW9IAAoJEDZF8K7rm0r6ExMP/2g13mivqdsHMX3RjDJFHiJ1
+aXN9YTmuUj2xB/Pm/1V3aQ+wy3ylHFpBh5oscjI9MzjrFVVAhSjIrIzbkMn+YKoi
+Tp6QFtXRXEF153povQMZQQVfhjy85aulYHdUci30QAdQvnf/1UWSLL0ATQ0AVymP
+A9x9tAqCYfT43P1G42VYfi5hkDwho/aNFR46VDYPchlC4P+JyQTMBbduKPtydoLW
+PI/ss0EnpSjKb0IwnG5tc7mkkDAlTBzHOxY0Y9uOmyHC2Fbcl62xqPlEuIIZgunH
+o/rbQCrW00bhMD15Hzgr4mDRWVnz2K0HPS0gm7DZPHIvkDeF4kY+Je2BsTm+GbLT
+DnwbIKCodIDBhsrBuJNBw6ngQKjnGz07zfz2k3uvIMFqAFVCFvLvMWKTt6tqd20m
+ksrsmEy/PWPMecK5fbXJL3H8qmTkItQSgs1fJuiMWxzO30MCkYn/csCkSY8uJ5Cx
+pIfdD9aX1FMTK9QrIRxe0NZPMEaYH6lkzMikRP11mj7X8e/iO7HeYhA06dWXWLHs
+hawrkNpEWN4eagK0u1Y5FKh3cZ5lSzwC6leDTrg5A6iHmvgoDIfg3+CoVtToeAHm
+as7H179n5+zmtc2Wi7pC57/+1nreAOJg2FJvR9R0WAxL/4Av+A0cjOeucJNLWp5f
+zUR7FQKz9KKB2mx2tkJr
+=kRm8
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kwin_automagic_fix.patch b/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kwin_automagic_fix.patch
new file mode 100644
index 000000000000..ab20c5bdfa9d
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/files/qtcurve-qt4_kwin_automagic_fix.patch
@@ -0,0 +1,38 @@
+diff -u -r QtCurve-KDE4-1.6.4-old/CMakeLists.txt QtCurve-KDE4-1.6.4/CMakeLists.txt
+--- QtCurve-KDE4-1.6.4-old/CMakeLists.txt	2010-10-19 12:24:18.725632000 +0300
++++ QtCurve-KDE4-1.6.4/CMakeLists.txt	2010-10-19 12:26:30.469632000 +0300
+@@ -88,14 +88,16 @@
+     add_subdirectory(colors)
+     add_subdirectory(po)
+ 
+-    find_file(KWINGLOBALS_H kwinglobals.h ${KDE4_INCLUDES}) # kwinglobals.h is new for KDE4
++    if (QTC_KWIN)
++	find_file(KWINGLOBALS_H kwinglobals.h ${KDE4_INCLUDES}) # kwinglobals.h is new for KDE4
+ 
+-    if (KWINGLOBALS_H)
+-        add_subdirectory(kwin)
+-        add_subdirectory(kwinconfig)
+-    else (KWINGLOBALS_H)
+-        message("** KWin headers not found - KWin decoration will not be built")
+-    endif (KWINGLOBALS_H)
++	if (KWINGLOBALS_H)
++	    add_subdirectory(kwin)
++	    add_subdirectory(kwinconfig)
++	else (KWINGLOBALS_H)
++	    message("** KWin headers not found - KWin decoration will not be built")
++	endif (KWINGLOBALS_H)
++    endif (QTC_KWIN)
+ else (NOT QTC_QT_ONLY)
+     set(CMAKE_INSTALL_PREFIX ${OLD_CMAKE_INSTALL_PREFIX})
+     add_definitions(${QT_DEFINITIONS})
+diff -u -r QtCurve-KDE4-1.6.4-old/config.h.cmake QtCurve-KDE4-1.6.4/config.h.cmake
+--- QtCurve-KDE4-1.6.4-old/config.h.cmake	2010-10-19 12:24:18.725632000 +0300
++++ QtCurve-KDE4-1.6.4/config.h.cmake	2010-10-19 12:24:42.264632000 +0300
+@@ -6,6 +6,7 @@
+ #define KDE4PREFIX        "@KDE4PREFIX@"
+ 
+ #cmakedefine QTC_QT_ONLY
++#cmakedefine QTC_KWIN
+ #cmakedefine QTC_OLD_NVIDIA_ARROW_FIX
+ #cmakedefine QTC_STYLE_SUPPORT
+ #cmakedefine QTC_KWIN_MAX_BUTTON_HACK
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..4872f23165d7
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
@@ -0,0 +1,49 @@
+# 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.6.4-r1.ebuild,v 1.1 2010/10/19 10:08:41 wired Exp $
+
+EAPI="2"
+KDE_REQUIRED="optional"
+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 parentless-dialog-fix 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}/${PN}_kwin_automagic_fix.patch" )
+
+pkg_setup() {
+	if ! use kde && use windeco; then
+		ewarn
+		ewarn "Auto-disabling the windeco USE flag since it requires the kde USE"
+		ewarn "flag. To fix this, please enable the kde USE flag."
+		ewarn
+	fi
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs="$(cmake-utils_use parentless-dialog-fix QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT)"
+	if use kde; then
+		mycmakeargs="${mycmakeargs} $(use windeco && echo "-DQTC_KWIN=true")"
+		kde4-base_src_configure
+	else
+		mycmakeargs="${mycmakeargs} -DQTC_QT_ONLY=true"
+		cmake-utils_src_configure
+	fi
+}