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

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 10 insertions, 36 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/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
-}