Version bump. Drop older. Cleanup mozilla useflag handling.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

5 files changed, 28 insertions, 85 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index 62fd1ae268ea..25283990a3b4 100644
--- a/x11-themes/gtk-engines-qtcurve/ChangeLog
+++ b/x11-themes/gtk-engines-qtcurve/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-qtcurve
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.103 2011/01/29 13:44:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.104 2011/01/29 17:44:33 scarabeus Exp $
+
+*gtk-engines-qtcurve-1.8.5 (29 Jan 2011)
+
+  29 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -gtk-engines-qtcurve-0.65.2.ebuild, -gtk-engines-qtcurve-1.7.2.ebuild,
+  -gtk-engines-qtcurve-1.8.1.ebuild, +gtk-engines-qtcurve-1.8.5.ebuild,
+  metadata.xml:
+  Version bump. Drop older. Cleanup mozilla useflag handling.
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org>
   gtk-engines-qtcurve-1.6.4.ebuild:
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild
deleted file mode 100644
index 3376939fc384..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.65.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-0.65.2.ebuild,v 1.7 2010/07/25 19:11:46 nirbheek 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://home.freeuk.com/cpdrummond/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86"
-IUSE="mozilla firefox3"
-
-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_MODIFY_MOZILLA_USER_JS=true"
-	use firefox3 && mycmakeargs="-DQTC_NEW_MOZILLA=true -DQTC_MODIFY_MOZILLA=true -DQTC_MODIFY_MOZILLA_USER_JS=true"
-	cmake-utils_src_compile
-}
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild
deleted file mode 100644
index 288a0fd90879..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.8.1.ebuild,v 1.1 2010/12/05 22:49:54 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"
-
-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"
-	cmake-utils_src_compile
-}
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.7.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
index 17cb37f7a5dd..4f1e6070a123 100644
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.7.2.ebuild
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.7.2.ebuild,v 1.1 2010/11/17 08:49:21 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild,v 1.1 2011/01/29 17:44:33 scarabeus Exp $
 
-EAPI=1
-inherit eutils cmake-utils
+EAPI=4
+inherit cmake-utils
 
 MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
 
@@ -14,12 +14,16 @@ 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"
+IUSE="mozilla"
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
-	firefox3? ( || ( >=www-client/firefox-3.0
-		>=www-client/firefox-bin-3.0 ) )"
+	mozilla? (
+		|| (
+			>=www-client/firefox-3.0
+			>=www-client/firefox-bin-3.0
+		)
+	)"
 DEPEND="x11-libs/gtk+:2
 	x11-libs/cairo
 	dev-util/pkgconfig"
@@ -27,9 +31,11 @@ DEPEND="x11-libs/gtk+:2
 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"
-	cmake-utils_src_compile
+src_configure() {
+	local mycmakeargs=(
+		"-DQTC_OLD_MOZILLA=OFF"
+		"-QTC_USE_CAIRO_FOR_ARROWS=ON"
+		$(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
+	)
+	cmake-utils_src_configure
 }
diff --git a/x11-themes/gtk-engines-qtcurve/metadata.xml b/x11-themes/gtk-engines-qtcurve/metadata.xml
index b2bba161f0eb..53b16f8cad0a 100644
--- a/x11-themes/gtk-engines-qtcurve/metadata.xml
+++ b/x11-themes/gtk-engines-qtcurve/metadata.xml
@@ -12,8 +12,7 @@
 			<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>
+			browsers <pkg>www-client/firefox</pkg>
 		</flag>
 	</use>
 </pkgmetadata>