Version bump. Drop older.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

9 files changed, 37 insertions, 151 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/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 8159749bbc69..a815aea1902d 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,15 +1,9 @@
-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.6.4.tar.bz2 308223 RMD160 711f34d71a4063947f723ed860319eed24602478 SHA1 555032fd72d8540d23ea3f2782140798ff6dbd92 SHA256 14a534d54fdae63582d94535f46c2d11019ad27b1462c97867ce73fcabbe138f
-DIST QtCurve-KDE4-1.7.2.tar.bz2 316010 RMD160 206f43485d85ef3f7e822b84459c4ad15b2e4c18 SHA1 10e7829de2c9bd7737bad54736b1232046dee5ca SHA256 33640af1041aae72b11c4e932b8078604b80b6b94e900fba0ef1859676448903
-DIST QtCurve-KDE4-1.8.1.tar.bz2 319954 RMD160 902c51057998f513ee368c2c5f7b0ee14ed17258 SHA1 53b86461ee32331961e5f34ef1ebe565be192c30 SHA256 f86f95265dd4515bb95506fac97986306986a3fe0e7f352b5b4fb99ffd4c122c
-EBUILD qtcurve-qt4-0.65.2.ebuild 793 RMD160 741e5e673dc3f8f5d2f7307bf7a11b4daf61529f SHA1 9f1d560cdeeb7a6f07956c87267714a08027fe87 SHA256 8ccddc83572956d38c791bcef8433fde81fdb4954e385f471ca4a91c85c18f93
-EBUILD qtcurve-qt4-0.69.2.ebuild 940 RMD160 703e9bb90c7340e8df9ca3b20fac669b1953d554 SHA1 e49570cad182d7f90508f93167690ecc53620f7b SHA256 14a03189ab8597aa1b7f403da20df70edf05e484317012a2270bd80229f6cf90
-EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1367 RMD160 50ae120c48823eb1e05957a2bf8652e82ceff329 SHA1 6586014cb900f3cc51b095a410fc8387286f85d6 SHA256 a0893c3eb6ef1ef1309eed0be3136483d6f733d4fee7de051a7d274de1a3c823
-EBUILD qtcurve-qt4-1.7.2.ebuild 1367 RMD160 ab33f15df15096224b8c4c3289fee8e83ae56c6a SHA1 dd39da64f29b82d35beba008c5c85597cf5761ca SHA256 2941065c2a3dbb2a8c718b431bee6f377515cbcb537c635f4a7053847bcf63ed
-EBUILD qtcurve-qt4-1.8.1.ebuild 1367 RMD160 2259e1089049561b1d89ba6df58f79decc206c7b SHA1 5b1fde42c5163f213e82fff0a1e6edab75f83643 SHA256 2c036e25acbba9eb23b19908f9e29d1e0b61adcca1fc9f7df6c6175c99862946
-MISC ChangeLog 19282 RMD160 dc6482e0798636cfc509fbf53ca5aeba1fac2511 SHA1 492ac67ebe92d8f743d6b95d46515ca1daacc071 SHA256 605250be59429ba26f76c10d183f52202b5ee6bd6ce0995bcb73dd5e838238c1
+DIST QtCurve-KDE4-1.8.4.tar.bz2 360319 RMD160 52b5bf86883db69d927ae1511f7702cfa053d273 SHA1 7a2d77d841ae936d8e1411c572970ba0694b4466 SHA256 68acd929ef3c45631ebc98bb48ad975a2926eff231e687a02edf550004f7a725
+EBUILD qtcurve-qt4-0.69.2.ebuild 939 RMD160 646687e69aec9efa44955d3132104e489bd8aa87 SHA1 6b4793ee73d876609ebdc60a8b2fed719eb3cbfe SHA256 c30b31437d6583140d700fd65e5cc895d2acdce145f1adc2a3ccc4960b11a377
+EBUILD qtcurve-qt4-1.6.4-r1.ebuild 1367 RMD160 ab75203fa9430708dd7e2610894990c0fa72fcc6 SHA1 9d90ef1df7afa60bf6511e757cafd91ab787b035 SHA256 2f9fcb4564b830b55011a9c731ad57b84b029b8c72995adc93f6b49c93439152
+EBUILD qtcurve-qt4-1.8.4.ebuild 1228 RMD160 526104584a985acee9af51685366ede88387cb67 SHA1 0545e1ffef52db385ba6143166e38522703a4020 SHA256 22d6c482816f912a07afe18794d2a5a693a02f13f87a77da064dd09f12290095
+MISC ChangeLog 19665 RMD160 86fb162b012468cb8ac6e2d64c6c9c108d757880 SHA1 46ec8c8a355e9c5ae66a308b7cb82735eda0f06f SHA256 885ed866c51420dedc93af6a0a9db5d101299ee06fd538e2f206e63d4a2e154e
 MISC metadata.xml 360 RMD160 71a731bc331e9846fef348a5a245da9b7f7caee5 SHA1 31471c68178cabf05d833a37ac004091d367a010 SHA256 a9b23f37afbe82447385ea144cdde15b54cbb7a5fef3daeb24ed18bc275a5b8c
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
 }