Version bump. Drop older.

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

8 files changed, 32 insertions, 140 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index 0878051f6375..f597f91fb17c 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-themes/qtcurve-qt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.121 2011/01/29 14:02:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.122 2011/01/29 18:12:52 scarabeus Exp $
+
+*qtcurve-qt4-1.8.4 (29 Jan 2011)
+
+  29 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -qtcurve-qt4-0.65.2.ebuild, qtcurve-qt4-0.69.2.ebuild,
+  -files/qtcurve-qt4-1.1.0-no-kde-fail.patch,
+  -files/qtcurve-qt4-1.1.1-no-kde-fail.patch, qtcurve-qt4-1.6.4-r1.ebuild,
+  -qtcurve-qt4-1.7.2.ebuild, -qtcurve-qt4-1.8.1.ebuild,
+  +qtcurve-qt4-1.8.4.ebuild:
+  Version bump. Drop older.
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org> qtcurve-qt4-1.6.4-r1.ebuild:
   alpha stable wrt #339424
diff --git a/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch b/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch
deleted file mode 100644
index 717288725248..000000000000
--- a/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- style/qtcurve.cpp.old	2010-02-23 00:15:27.000000000 +0200
-+++ style/qtcurve.cpp	2010-02-23 10:04:39.547860699 +0200
-@@ -7445,7 +7445,8 @@
- 
-                 opt.state=State_Horizontal|State_Enabled|State_Raised|(active ? State_Active : State_None);
- 
--#if KDE_IS_VERSION(4, 3, 0)
-+#ifndef QTC_QT_ONLY
-+	#if KDE_IS_VERSION(4, 3, 0)
-                 QPainterPath path(opts.round<ROUND_SLIGHT
-                                     ? QPainterPath()
-                                     : buildPath(QRectF(state&QtC_StateKWinNoBorder ? r : r.adjusted(1, 1, -1, 0)),
-@@ -7454,6 +7455,9 @@
-                                                 (opts.round>ROUND_SLIGHT /*&& kwin*/
-                                                     ? 6.0
-                                                     : 2.0)-(state&QtC_StateKWinNoBorder ? 0.0 : 1.0)));
-+	#else
-+                QPainterPath path;
-+	#endif
- #else
-                 QPainterPath path;
- #endif
diff --git a/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch b/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch
deleted file mode 100644
index 92651019f7f0..000000000000
--- a/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- style/qtcurve.cpp.old	2010-02-26 16:06:50.280829619 +0200
-+++ style/qtcurve.cpp	2010-02-26 16:07:31.224827593 +0200
-@@ -7451,9 +7451,8 @@
- 
-                 opt.state=State_Horizontal|State_Enabled|State_Raised|(active ? State_Active : State_None);
- 
--#ifdef QTC_QT_ONLY
--                QPainterPath path;
--#elif KDE_IS_VERSION(4, 3, 0)
-+#ifndef QTC_QT_ONLY
-+	#if KDE_IS_VERSION(4, 3, 0)
-                 QPainterPath path(opts.round<ROUND_SLIGHT
-                                     ? QPainterPath()
-                                     : buildPath(QRectF(state&QtC_StateKWinNoBorder ? r : r.adjusted(1, 1, -1, 0)),
-@@ -7462,6 +7461,9 @@
-                                                 (opts.round>ROUND_SLIGHT /*&& kwin*/
-                                                     ? 6.0
-                                                     : 2.0)-(state&QtC_StateKWinNoBorder ? 0.0 : 1.0)));
-+	#else
-+                QPainterPath path;
-+	#endif
- #else
-                 QPainterPath path;
- #endif
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.65.2.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.65.2.ebuild
deleted file mode 100644
index 857f396406dc..000000000000
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.65.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.65.2.ebuild,v 1.6 2009/10/21 17:15:58 jer Exp $
-
-EAPI="2"
-inherit flag-o-matic cmake-utils
-
-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=""
-
-DEPEND="x11-libs/qt-gui:4[dbus]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-DOCS="ChangeLog README TODO"
-
-src_configure() {
-	mycmakeargs="-DQTC_QT_ONLY=true"
-	cmake-utils_src_configure
-}
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild
index 031e4099c95f..9f2b098c3841 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild
@@ -1,8 +1,8 @@
-# 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/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild,v 1.9 2010/08/09 12:46:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.69.2.ebuild,v 1.10 2011/01/29 18:12:52 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 KDE_REQUIRED="optional"
 inherit flag-o-matic cmake-utils kde4-base
 
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
index f533cd129f5c..03b6ac3dbe9c 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.7 2011/01/29 14:02:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.6.4-r1.ebuild,v 1.8 2011/01/29 18:12:52 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 KDE_REQUIRED="optional"
 inherit confutils cmake-utils kde4-base
 
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.7.2.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.7.2.ebuild
deleted file mode 100644
index 6247280465ce..000000000000
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.7.2.ebuild
+++ /dev/null
@@ -1,48 +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/qtcurve-qt4/qtcurve-qt4-1.7.2.ebuild,v 1.1 2010/11/17 08:48:29 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 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() {
-	if use kde; then
-		mycmakeargs="$(use windeco && echo "-DQTC_KWIN=true")"
-		kde4-base_src_configure
-	else
-		mycmakeargs="-DQTC_QT_ONLY=true"
-		cmake-utils_src_configure
-	fi
-}
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.4.ebuild
index b44adbd05f97..9a8a61fc6acd 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.1.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.4.ebuild
@@ -1,8 +1,8 @@
-# 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/qtcurve-qt4/qtcurve-qt4-1.8.1.ebuild,v 1.1 2010/12/05 22:49:10 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.4.ebuild,v 1.1 2011/01/29 18:12:52 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 KDE_REQUIRED="optional"
 inherit confutils cmake-utils kde4-base
 
@@ -18,8 +18,10 @@ IUSE="kde 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} ) )"
+	kde? (
+	$(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) )
+	)"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -27,22 +29,23 @@ DOCS="ChangeLog README TODO"
 
 PATCHES=( "${FILESDIR}/${PN}_kwin_automagic_fix.patch" )
 
+REQUIRED_USE="windeco? ( kde )"
+
 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() {
+	local mycmakeargs
 	if use kde; then
-		mycmakeargs="$(use windeco && echo "-DQTC_KWIN=true")"
+		mycmakeargs=(
+			$(cmake-utils_use windeco QTC_KWIN)
+		)
 		kde4-base_src_configure
 	else
-		mycmakeargs="-DQTC_QT_ONLY=true"
+		mycmakeargs=(
+			"-DQTC_QT_ONLY=true"
+		)
 		cmake-utils_src_configure
 	fi
 }