Drop old revisions. Restore kde4-base_pkg_setup which was inadvertently dropped because it was previously implicit.

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

4 files changed, 12 insertions, 39 deletions

diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index f5542d8ae4e0..a3e6e8cafa6b 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,13 @@
 # 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.90 2010/01/12 21:49:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.91 2010/01/16 12:48:16 yngwin Exp $
+
+*qtcurve-qt4-1.0.1-r2 (16 Jan 2010)
+
+  16 Jan 2010; Ben de Groot <yngwin@gentoo.org> -qtcurve-qt4-1.0.1.ebuild,
+  -qtcurve-qt4-1.0.1-r1.ebuild, +qtcurve-qt4-1.0.1-r2.ebuild:
+  Drop old revisions. Restore kde4-base_pkg_setup which was inadvertently
+  dropped because it was previously implicit.
 
 *qtcurve-qt4-1.0.1-r1 (12 Jan 2010)
 
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 3b4c367089e0..228876cb8f43 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -3,7 +3,6 @@ DIST QtCurve-KDE4-0.69.2.tar.bz2 171056 RMD160 3708c453bd85d24eb7fa9270f2119d3fa
 DIST QtCurve-KDE4-1.0.1.tar.bz2 196864 RMD160 401a6829219443512dc7a3cd5aee529559b369b8 SHA1 8f89dd80b3ea4439041216f243caee2a6b4b4aca SHA256 45194e0fca5a681e4288d2b7c1cb75d91d27e9894b4185e9eef1d20ac56369cd
 EBUILD qtcurve-qt4-0.65.2.ebuild 793 RMD160 741e5e673dc3f8f5d2f7307bf7a11b4daf61529f SHA1 9f1d560cdeeb7a6f07956c87267714a08027fe87 SHA256 8ccddc83572956d38c791bcef8433fde81fdb4954e385f471ca4a91c85c18f93
 EBUILD qtcurve-qt4-0.69.2.ebuild 956 RMD160 e341d73cce0baaffa33ff693add62d85d374ad88 SHA1 d7d7c877b4f8eff536bdfa19d065610233ef115b SHA256 08e07929236beaff949984f095e0225198a93b56dd8ed31ed623b0d897b43f89
-EBUILD qtcurve-qt4-1.0.1-r1.ebuild 1069 RMD160 f57cb76f0227cc616e8278e33799b571f2ec24bf SHA1 0e7e9262c83746ca6b429a81d0a762744790f0c5 SHA256 509ed0d976edea39eb52dde30d55a14ec2aabe0b441057b7530ac409ffeefd88
-EBUILD qtcurve-qt4-1.0.1.ebuild 960 RMD160 6c2afb92dbb0ad4e1afcd095f03928cf5312942c SHA1 37a4aca056732ed9b7022af4ab95691f613e58f8 SHA256 d14ed1ae1edf4b1479c2f28f0013c94cb337a05cf26fbc44b5b5d318bf11e496
-MISC ChangeLog 14225 RMD160 1a584f7fc3022cb4895aa23d38525296a67db9a8 SHA1 3b06396c3d2d0b425a38b4fff3aa6d5b915fd5ed SHA256 e2dd711bc1982a0d8a1339331eaa0d8f3e411480ade563c357286ab76825b954
+EBUILD qtcurve-qt4-1.0.1-r2.ebuild 1101 RMD160 91732d8bfa61debeb40a7455e901e00249a1ee6a SHA1 e2669480fadacd73f855c1ead72d6d576c168218 SHA256 64bcc0d9e884605134ba395e6fdbf6732a0f29f76f9f094533ad6aba83ae833a
+MISC ChangeLog 14520 RMD160 4092d8299308b496617fae71a8b008eea3b84623 SHA1 5c52872e6582240ce83aa00d7675a0aee0d22780 SHA256 5404238d3bb58d35aea633083e8d6c1bef2873ec1f50e4a894bd1fa02ab548d4
 MISC metadata.xml 364 RMD160 f675a6f801000baeba8948174e3fa294b302dfef SHA1 df345953fedf8b7c1ed7a426619765b73da4804d SHA256 71fd09f777a8111528c40a781e949f94e14d73a1264d5d0a60b25c81a262e32b
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1-r1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1-r2.ebuild
index 3314e8c1073c..5bd17649b3bc 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1-r1.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1-r1.ebuild,v 1.1 2010/01/12 21:49:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1-r2.ebuild,v 1.1 2010/01/16 12:48:16 yngwin Exp $
 
 EAPI="2"
 KDE_REQUIRED="optional"
@@ -27,6 +27,7 @@ DOCS="ChangeLog README TODO"
 
 pkg_setup() {
 	confutils_use_depend_all windeco kde
+	use kde && kde4-base_pkg_setup
 }
 
 src_configure() {
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1.ebuild
deleted file mode 100644
index c6eca21c8508..000000000000
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +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.0.1.ebuild,v 1.1 2010/01/11 23:17:07 yngwin Exp $
-
-EAPI="2"
-KDE_REQUIRED="optional"
-KDE_MINIMAL="4.2"
-inherit flag-o-matic cmake-utils kde4-base
-
-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://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kde"
-
-DEPEND="x11-libs/qt-gui:4[dbus]
-	kde? ( >=kde-base/kwin-${KDE_MINIMAL} )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS="ChangeLog README TODO"
-
-src_configure() {
-	if use kde ; then
-		kde4-base_src_configure
-	else
-		mycmakeargs="-DQTC_QT_ONLY=true"
-		cmake-utils_src_configure
-	fi
-}