Version bump, #395723 by Ivan S. Titov. Allow www-client/icecat to satisfy the mozilla dependency (bug #370165 by Matija "hook" Šuklje). Remove old.

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

4 files changed, 27 insertions, 93 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index 3f5db7badac0..0eca5b8d87b7 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.108 2011/11/01 04:01:46 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.109 2012/01/01 21:56:46 pesa Exp $
+
+*gtk-engines-qtcurve-1.8.12 (01 Jan 2012)
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org>
+  +gtk-engines-qtcurve-1.8.12.ebuild, -gtk-engines-qtcurve-0.69.2.ebuild,
+  -gtk-engines-qtcurve-1.8.5.ebuild, -gtk-engines-qtcurve-1.8.7.ebuild:
+  Version bump, #395723 by Ivan S. Titov. Allow www-client/icecat to satisfy the
+  mozilla dependency (bug #370165 by Matija "hook" Šuklje). Remove old.
 
   01 Nov 2011; Jeroen Roovers <jer@gentoo.org>
   gtk-engines-qtcurve-0.69.2.ebuild, gtk-engines-qtcurve-1.6.4.ebuild,
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild
deleted file mode 100644
index 97a302ab7ba8..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-0.69.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-0.69.2.ebuild,v 1.11 2011/11/01 04:01:46 jer 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 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.8.5.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild
index 10036ced6d3b..a40f98d7e655 100644
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.5.ebuild
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5.ebuild,v 1.2 2011/11/01 04:01:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.12.ebuild,v 1.1 2012/01/01 21:56:46 pesa Exp $
 
 EAPI=4
 inherit 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"
+DESCRIPTION="A set of widget styles for GTK2 based apps, also available for Qt4/KDE4"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
 SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
 
@@ -16,25 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mozilla"
 
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	mozilla? (
-		|| (
-			>=www-client/firefox-3.0
-			>=www-client/firefox-bin-3.0
-		)
-	)"
-DEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	dev-util/pkgconfig"
+CDEPEND="
+	x11-libs/gtk+:2
+"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	mozilla? ( || (
+		>=www-client/firefox-3.0
+		>=www-client/firefox-bin-3.0
+		>=www-client/icecat-3.0
+	) )
+"
 
 S=${WORKDIR}/${MY_P}
+
 DOCS="ChangeLog README TODO"
 
 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/gtk-engines-qtcurve-1.8.7.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.7.ebuild
deleted file mode 100644
index ec2a83a86360..000000000000
--- a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.8.7.ebuild,v 1.2 2011/11/01 04:01:46 jer Exp $
-
-EAPI=4
-inherit 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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mozilla"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/cairo
-	mozilla? (
-		|| (
-			>=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_configure() {
-	local mycmakeargs=(
-		"-DQTC_OLD_MOZILLA=OFF"
-		"-QTC_USE_CAIRO_FOR_ARROWS=ON"
-		$(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
-	)
-	cmake-utils_src_configure
-}