x11-themes/qtcurve: Remove redundant inherit, fix DEPEND, fix pkg_postinst, quoting

svn path=/sunrise/; revision=2665

diff --git a/x11-themes/qtcurve/ChangeLog b/x11-themes/qtcurve/ChangeLog
index 76f1f4530766c60d833f1dd2778681963212752f..1cc316e7c05ad9c2cd59793fd0f153be4a764c17 100644 (file)
--- a/x11-themes/qtcurve/ChangeLog
+++ b/x11-themes/qtcurve/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for x11-themes/qtcurve
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jan 2007; Jakub Moc <jakub@gentoo.org> qtcurve-0.46.ebuild:
+  Remove redundant inherit, fix DEPEND, fix pkg_postinst, quoting
+
   04 Dec 2006; Markus Ullmann <jokey@gentoo.org> -qtcurve-0.45.1.ebuild:
   Remove old
 

diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index d72dbbbefa9da1d068f8e10278aa528b76689262..a26a8df71c27ee77ab2804b7d0686e99d204a0e8 100644 (file)
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,14 +1,14 @@
 DIST QtCurve-Gtk1-0.42.2.tar.gz 370289 RMD160 271fe86c409a9c233082d4d0b1813430ab84d693 SHA1 0a1f8bea25adf023100cef2daf7dc79de18a6b29 SHA256 22f705cfcfcdb70b3247ce66d358ca1d6cf426fa4030b2991b384271822e7fef
 DIST QtCurve-Gtk2-0.46.tar.gz 387476 RMD160 1100abac659374d2859c1cdd736ea0ace6a70d39 SHA1 7d95125b954fb453047fb17bd97db9d4dd2981ba SHA256 fcf77445c7a95d12f9e3815edbe34853c3b22065dd5c438ad9c3cc01bd0c2146
 DIST QtCurve-KDE3-0.46.tar.gz 606947 RMD160 9ee22afeefb0e25c5c0ae3ab1e78ffe767a2b0f2 SHA1 34572ea29a5a76161e52b4783021c9aeddd9a14f SHA256 6de962188e7c2f04da2a236fef2fc0b83a4fd680a2156129dab1e714a296ca27
-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 1644 RMD160 751833978885e229334bf47f47d701b8ec4d2450 SHA1 ae9ca49f3177af54278a328c658775d65364cb94 SHA256 5db2e075b9a7ec70225f00df0ff17ce6be9d8c6ddd3c13c1809011c2eba5c445
-MD5 8580af1bb0c45bbdac70f1f480e07060 ChangeLog 1644
-RMD160 751833978885e229334bf47f47d701b8ec4d2450 ChangeLog 1644
-SHA256 5db2e075b9a7ec70225f00df0ff17ce6be9d8c6ddd3c13c1809011c2eba5c445 ChangeLog 1644
+EBUILD qtcurve-0.46.ebuild 2287 RMD160 2c7a977c0cfd63e6c56ccdf91972d9e2d4629785 SHA1 3f404ad8a88513c6da1abe874f57ae0363966b62 SHA256 72761f46d05aa4116a55887019a0b52a43f9005bfce08b4729993bc4c63441ff
+MD5 4689084f7bfdfb2564bca525b6d9700f qtcurve-0.46.ebuild 2287
+RMD160 2c7a977c0cfd63e6c56ccdf91972d9e2d4629785 qtcurve-0.46.ebuild 2287
+SHA256 72761f46d05aa4116a55887019a0b52a43f9005bfce08b4729993bc4c63441ff qtcurve-0.46.ebuild 2287
+MISC ChangeLog 1776 RMD160 a128ad95091dc1faa5632336f88671db376875fb SHA1 92db029d0155197768a418c8351d2684ae236643 SHA256 802704fe5acbf3956e67fa6fe87751591825e490f196c0d6911087c9bad9e1f7
+MD5 181ba627ecd46eda58fe238460ba7409 ChangeLog 1776
+RMD160 a128ad95091dc1faa5632336f88671db376875fb ChangeLog 1776
+SHA256 802704fe5acbf3956e67fa6fe87751591825e490f196c0d6911087c9bad9e1f7 ChangeLog 1776
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/x11-themes/qtcurve/qtcurve-0.46.ebuild b/x11-themes/qtcurve/qtcurve-0.46.ebuild
index 20adf3b90d93756ce927409f0b0d6147ac5ebbe3..ecdb387dc32ef4b74cc1fb8fc9e9f1eaff692603 100644 (file)
--- a/x11-themes/qtcurve/qtcurve-0.46.ebuild
+++ b/x11-themes/qtcurve/qtcurve-0.46.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit kde-functions
-
 MY_P_GTK1="QtCurve-Gtk1-0.42.2"
 MY_P_GTK2="QtCurve-Gtk2-${PV}"
 MY_P_KDE="QtCurve-KDE3-${PV}"
@@ -18,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk1 gtk kde"
 DEPEND="gtk? ( >=x11-libs/gtk+-2.6 )
-       gtk1? ( >=x11-libs/gtk+-1.2 )
+       gtk1? ( =x11-libs/gtk+-1.2* )
        kde? ( kde-base/kdelibs )"
 
 RDEPEND="${DEPEND}"
@@ -28,17 +26,17 @@ 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}
+               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}
+               cd "${S}"/${MY_P_GTK1}
                econf || die "econf failed"
                emake || die "emake failed"
        fi
        if use gtk ; then
-               cd ${S}/${MY_P_GTK2}
+               cd "${S}"/${MY_P_GTK2}
                econf || die "econf failed"
                emake || die "emake failed"
        fi
@@ -46,37 +44,36 @@ src_compile() {
 
 src_install () {
        for pkg in ${MY_P_GTK1} ${MY_P_GTK2} ${MY_P_KDE} ; do
-               if [[ -d ${S}/$pkg ]] ; then
-                       cd ${S}/$pkg
+               if [[ -d "${S}"/${pkg} ]] ; then
+                       cd "${S}"/${pkg}
                        emake DESTDIR="${D}" install || die "emake install failed"
-                       docinto $pkg
+                       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  " "
+       if use gtk1 ; then
+               elog "For GTK1 copy /usr/share/themes/QtCurve/gtk/gtkrc"
+               elog " to either"
+               elog "     /etc/gtk/gtkrc        To enable this theme for *all* users"
+               elog " or"
+               elog "     ~/.gtkrc              To enable for just yourself."
+               elog " Alternatively, edit ~/.gtkrc so that it looks like:"
+               elog "     include \"/usr/share/themes/QtCurve/gtk/gtkrc\""
+               elog ""
+       fi
+       if use gtk2 ; then
+               elog "For GTK2 edit ~/.gtkrc-2.0 so that it for example looks like:"
+               elog  "     include \"/usr/share/themes/QtCurve/gtk-2.0/gtkrc\""
+               elog  "     style \"user-font\""
+               elog  "     {"
+               elog  "         font_name=\"Helvetica 9\""
+               elog  "     }"
+               elog  "     widget_class \"*\" style \"user-font\""
+               elog  "     gtk-theme-name=\"QtCurve\""
+               elog  "     gtk-font-name=\"Helvetica 9\""
+               elog  " "
+       fi
 }