x11-themes/qtcurve: fix whitespace, make the diff to the previous ebuild cleaner

svn path=/sunrise/; revision=2080

2 files changed, 58 insertions, 60 deletions

diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 106536ecc..ea4e15a71 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -7,10 +7,10 @@ EBUILD qtcurve-0.45.1.ebuild 1513 RMD160 4e7f2f0f4294d5ffe2885d11cb3f56f902f692b
 MD5 749b3de2a77d910cf9c475cf74c6e383 qtcurve-0.45.1.ebuild 1513
 RMD160 4e7f2f0f4294d5ffe2885d11cb3f56f902f692be qtcurve-0.45.1.ebuild 1513
 SHA256 c921a095fe916fa326155fabab6be27cdadd2f5030fa3f83a2a3ccdfb6462579 qtcurve-0.45.1.ebuild 1513
-EBUILD qtcurve-0.46.ebuild 2408 RMD160 c5f1c8746b36071eaf717eb4dff3b874dd0be564 SHA1 edebb7b7cd229c054c7df03d1564f5a9cdcdae6d SHA256 4d1a574bc850904f0e9b171ed527964def37d08b660702885bebb1a3add85ac5
-MD5 c875a74deed6668ddf3f65759163898b qtcurve-0.46.ebuild 2408
-RMD160 c5f1c8746b36071eaf717eb4dff3b874dd0be564 qtcurve-0.46.ebuild 2408
-SHA256 4d1a574bc850904f0e9b171ed527964def37d08b660702885bebb1a3add85ac5 qtcurve-0.46.ebuild 2408
+EBUILD qtcurve-0.46.ebuild 2291 RMD160 814bf8dd0d6e3d0f8c7af266ae02db2f071411cc SHA1 739988f38fe079fe33050e34bf633c670fa4a2f2 SHA256 8a837bc70ab193d8b04bbeadb67cc46df11c28dad12a386bfeb3a8cb90ce2ef1
+MD5 abd42717a8f24f208eee8d10a4674968 qtcurve-0.46.ebuild 2291
+RMD160 814bf8dd0d6e3d0f8c7af266ae02db2f071411cc qtcurve-0.46.ebuild 2291
+SHA256 8a837bc70ab193d8b04bbeadb67cc46df11c28dad12a386bfeb3a8cb90ce2ef1 qtcurve-0.46.ebuild 2291
 MISC ChangeLog 1557 RMD160 10defc376a30f6c752a95c637d442a8dd5d14d92 SHA1 c84f2f36ec06e8985074273944cc6058207a2dc5 SHA256 292ceb50444dc26f8273b783ddc9bab9165f8f8af053f6df2eb501e7454d9cda
 MD5 5724f4ac7377824fc28ff495e0021756 ChangeLog 1557
 RMD160 10defc376a30f6c752a95c637d442a8dd5d14d92 ChangeLog 1557
diff --git a/x11-themes/qtcurve/qtcurve-0.46.ebuild b/x11-themes/qtcurve/qtcurve-0.46.ebuild
index 745a0826e..20adf3b90 100644
--- a/x11-themes/qtcurve/qtcurve-0.46.ebuild
+++ b/x11-themes/qtcurve/qtcurve-0.46.ebuild
@@ -4,81 +4,79 @@
 
 inherit kde-functions
 
-MY_P_KDE="QtCurve-KDE3-${PV}"
-MY_P_GTK2="QtCurve-Gtk2-${PV}"
 MY_P_GTK1="QtCurve-Gtk1-0.42.2"
+MY_P_GTK2="QtCurve-Gtk2-${PV}"
+MY_P_KDE="QtCurve-KDE3-${PV}"
 
 DESCRIPTION="A set of widget styles for KDE, GTK1, and GTK2 based apps."
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
 SRC_URI="kde? ( http://www.cpdrummond.freeuk.com/${MY_P_KDE}.tar.gz )
-	 gtk1? ( http://www.cpdrummond.freeuk.com/${MY_P_GTK1}.tar.gz )
-         gtk? ( http://www.cpdrummond.freeuk.com/${MY_P_GTK2}.tar.gz )"
+		gtk1? ( http://www.cpdrummond.freeuk.com/${MY_P_GTK1}.tar.gz )
+		gtk? ( http://www.cpdrummond.freeuk.com/${MY_P_GTK2}.tar.gz )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk1 gtk kde"
 DEPEND="gtk? ( >=x11-libs/gtk+-2.6 )
-        gtk1? ( >=x11-libs/gtk+-1.2 )
-	kde? ( kde-base/kwin )"
-
-need-kde 3.5
+	gtk1? ( >=x11-libs/gtk+-1.2 )
+	kde? ( kde-base/kdelibs )"
 
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
 src_compile() {
-    use kde || use gtk || use gtk1 || die "one of gtk, gtk1 or kde needs to be selected"
-    if use kde ; then
-	cd ${S}/${MY_P_KDE}
-	econf --without-arts || die "econf failed"
-	emake || die "emake failed"
-    fi
-    if use gtk ; then
-	cd ${S}/${MY_P_GTK2}
-	econf || die "econf failed"
-	emake || die "emake failed"
-    fi
-    if use gtk1 ; then
-	cd ${S}/${MY_P_GTK1}
-	econf || die "econf failed"
-	emake || die "emake failed"
-    fi
+	use kde || use gtk || use gtk1 || die "one of gtk, gtk1 or kde needs to be selected"
+	if use kde ; then
+		cd ${S}/${MY_P_KDE}
+		econf --without-arts || die "econf failed"
+		emake || die "emake failed"
+	fi
+	if use gtk1 ; then
+		cd ${S}/${MY_P_GTK1}
+		econf || die "econf failed"
+		emake || die "emake failed"
+	fi
+	if use gtk ; then
+		cd ${S}/${MY_P_GTK2}
+		econf || die "econf failed"
+		emake || die "emake failed"
+	fi
 }
 
 src_install () {
-    for pkg in ${MY_P_GTK2} ${MY_P_GTK1} ${MY_P_KDE} ; do
-	if [[ -d ${S}/$pkg ]] ; then
-	    cd ${S}/$pkg
-	    emake DESTDIR="${D}" install || die "emake install failed"
-	    docinto $pkg
-	    dodoc ChangeLog README TODO
-	fi
-    done
+	for pkg in ${MY_P_GTK1} ${MY_P_GTK2} ${MY_P_KDE} ; do
+		if [[ -d ${S}/$pkg ]] ; then
+			cd ${S}/$pkg
+			emake DESTDIR="${D}" install || die "emake install failed"
+			docinto $pkg
+			dodoc ChangeLog README TODO
+		fi
+	done
 }
 
 pkg_postinst(){
-    echo
-    einfo "For GTK1:"
-    einfo " Copy"
-    echo  "     /usr/share/themes/QtCurve/gtk/gtkrc"
-    einfo " to either"
-    echo  "     /etc/gtk/gtkrc        To enable this theme for *all* users"
-    einfo " or"
-    echo  "     ~/.gtkrc              To enable for just yourself."
-    einfo " "
-    einfo " Alternatively, edit ~/.gtkrc so that it looks like:"
-    echo  "     include \"/usr/share/themes/QtCurve/gtk/gtkrc\""
-    einfo " "
-    einfo "For GTK2:"
-    einfo " edit ~/.gtkrc-2.0 so that it for example looks like:"
-    echo  "     include \"/usr/share/themes/QtCurve/gtk-2.0/gtkrc\""
-    echo  "     style \"user-font\""
-    echo  "     {"
-    echo  "         font_name=\"Helvetica 9\""
-    echo  "     }"
-    echo  "     widget_class \"*\" style \"user-font\""
-    echo  "     gtk-theme-name=\"QtCurve\""
-    echo  "     gtk-font-name=\"Helvetica 9\""
-    echo  " "
-}
\ No newline at end of file
+	echo
+	einfo "For GTK1:"
+	einfo " Copy"
+	echo  "     /usr/share/themes/QtCurve/gtk/gtkrc"
+	einfo " to either"
+	echo  "     /etc/gtk/gtkrc        To enable this theme for *all* users"
+	einfo " or"
+	echo  "     ~/.gtkrc              To enable for just yourself."
+	einfo " "
+	einfo " Alternatively, edit ~/.gtkrc so that it looks like:"
+	echo  "     include \"/usr/share/themes/QtCurve/gtk/gtkrc\""
+	einfo " "
+	einfo "For GTK2:"
+	einfo " edit ~/.gtkrc-2.0 so that it for example looks like:"
+	echo  "     include \"/usr/share/themes/QtCurve/gtk-2.0/gtkrc\""
+	echo  "     style \"user-font\""
+	echo  "     {"
+	echo  "         font_name=\"Helvetica 9\""
+	echo  "     }"
+	echo  "     widget_class \"*\" style \"user-font\""
+	echo  "     gtk-theme-name=\"QtCurve\""
+	echo  "     gtk-font-name=\"Helvetica 9\""
+	echo  " "
+}