version bump, new parentless-dialog-fix use flag

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

6 files changed, 113 insertions, 18 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index 68bb95d956fd..f30666bbcac7 100644
--- a/x11-themes/gtk-engines-qtcurve/ChangeLog
+++ b/x11-themes/gtk-engines-qtcurve/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gtk-engines-qtcurve
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.94 2010/09/16 10:05:09 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.95 2010/10/05 00:17:11 wired Exp $
+
+*gtk-engines-qtcurve-1.6.4 (05 Oct 2010)
+
+  05 Oct 2010; Alex Alexander <wired@gentoo.org>
+  +gtk-engines-qtcurve-1.6.4.ebuild, metadata.xml:
+  version bump, new parentless-dialog-fix use flag
 
 *gtk-engines-qtcurve-1.6.1 (16 Sep 2010)
 
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.6.4.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.6.4.ebuild
new file mode 100644
index 000000000000..6ded506d23b1
--- /dev/null
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.6.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.6.4.ebuild,v 1.1 2010/10/05 00:17:11 wired Exp $
+
+EAPI=1
+inherit eutils cmake-utils
+
+MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
+
+DESCRIPTION="A set of widget styles for GTK2 based apps, also available for KDE3 and Qt4"
+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="mozilla firefox3 parentless-dialog-fix"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/cairo
+	firefox3? ( || ( >=www-client/firefox-3.0
+		>=www-client/firefox-bin-3.0 ) )"
+DEPEND="x11-libs/gtk+:2
+	x11-libs/cairo
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+DOCS="ChangeLog README TODO"
+
+src_compile() {
+	local mycmakeargs=""
+	use mozilla && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=true"
+	use firefox3 && mycmakeargs="-DQTC_MODIFY_MOZILLA=true -DQTC_OLD_MOZILLA=false"
+	mycmakeargs+=" $(cmake-utils_use parentless-dialog-fix QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT)"
+	cmake-utils_src_compile
+}
diff --git a/x11-themes/gtk-engines-qtcurve/metadata.xml b/x11-themes/gtk-engines-qtcurve/metadata.xml
index ffc78ad5492b..d0f2b294f447 100644
--- a/x11-themes/gtk-engines-qtcurve/metadata.xml
+++ b/x11-themes/gtk-engines-qtcurve/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
-  <longdescription>
-    The gtk-engines-qtcurve package offers a cross-toolkit uniform look and
-    feel, together with the qtcurve and qtcurve-qt4 packages, for GTK+, Qt
-    and KDE based applications.
-  </longdescription>
-  <use>
-    <flag name="firefox3">Install GUI theme tweaks for version 3 of
-      <pkg>www-client/firefox</pkg>
-    </flag>
-    <flag name="mozilla">Install GUI theme tweaks for mozilla based
-      browsers, including version 2 of
-      <pkg>www-client/firefox</pkg>
-    </flag>
-  </use>
+	<herd>qt</herd>
+	<longdescription>
+		The gtk-engines-qtcurve package offers a cross-toolkit uniform look and
+		feel, together with the qtcurve and qtcurve-qt4 packages, for GTK+, Qt
+		and KDE based applications.
+	</longdescription>
+	<use>
+		<flag name="firefox3">Install GUI theme tweaks for version 3 of
+			<pkg>www-client/firefox</pkg>
+		</flag>
+		<flag name="mozilla">Install GUI theme tweaks for mozilla based
+			browsers, including version 2 of
+			<pkg>www-client/firefox</pkg>
+		</flag>
+		<flag name='parentless-dialog-fix'>Enable support for the "parent-less dialog
+			fix" option. WARNING: Upstream allows this, but does NOT support it.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 2c9bdc4024f0..9cbd348f5033 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.111 2010/09/16 10:02:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.112 2010/10/05 00:15:53 wired Exp $
+
+*qtcurve-qt4-1.6.4 (05 Oct 2010)
+
+  05 Oct 2010; Alex Alexander <wired@gentoo.org> +qtcurve-qt4-1.6.4.ebuild,
+  metadata.xml:
+  version bump, new parentless-dialog-fix use flag
 
 *qtcurve-qt4-1.6.1 (16 Sep 2010)
 
diff --git a/x11-themes/qtcurve-qt4/metadata.xml b/x11-themes/qtcurve-qt4/metadata.xml
index fc4841c694cf..c8716a4910f9 100644
--- a/x11-themes/qtcurve-qt4/metadata.xml
+++ b/x11-themes/qtcurve-qt4/metadata.xml
@@ -4,8 +4,11 @@
   <herd>qt</herd>
   <use>
     <flag name='kde'>Enable KDE4 support. This adds a QtCurve configuration
-      module to KDE's SystemSettings.
+		module to KDE's SystemSettings.
     </flag>
+	<flag name='parentless-dialog-fix'>Enable support for the "parent-less dialog
+		fix" option. WARNING: Upstream allows this, but does NOT support it.
+	</flag>
 	<flag name='windeco'>Enable window decoration for KWin.</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4.ebuild
new file mode 100644
index 000000000000..7f2ed5ad7021
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4.ebuild
@@ -0,0 +1,41 @@
+# 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.ebuild,v 1.1 2010/10/05 00:15:53 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"
+
+pkg_setup() {
+	confutils_use_depend_all windeco kde
+	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
+		kde4-base_src_configure
+	else
+		mycmakeargs="${mycmakeargs} -DQTC_QT_ONLY=true"
+		cmake-utils_src_configure
+	fi
+}