projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5c61056)
Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
authorIngmar Vanhassel <ingmar@gentoo.org>
Mon, 18 Feb 2008 23:13:29 +0000 (23:13 +0000)
committerIngmar Vanhassel <ingmar@gentoo.org>
Mon, 18 Feb 2008 23:13:29 +0000 (23:13 +0000)
Package-Manager: portage-2.1.4.4

kde-misc/kshutdown/ChangeLog patch | blob | history
kde-misc/kshutdown/kshutdown-0.8.2.ebuild patch | blob | history
kde-misc/tellico/ChangeLog patch | blob | history
kde-misc/tellico/tellico-1.2.10.ebuild patch | blob | history
kde-misc/tellico/tellico-1.2.11.ebuild patch | blob | history
kde-misc/tellico/tellico-1.2.14.ebuild patch | blob | history
kde-misc/youtube-servicemenu/ChangeLog patch | blob | history
kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild patch | blob | history

diff --git a/kde-misc/kshutdown/ChangeLog b/kde-misc/kshutdown/ChangeLog
index e8658e4b694e2e01e428f03d5b3ac2f8f62dde26..79b00aab280b3a34067d2287d29d7004d23839ef 100644 (file)
--- a/kde-misc/kshutdown/ChangeLog
+++ b/kde-misc/kshutdown/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for kde-misc/kshutdown
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.12 2008/02/18 22:51:47 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.13 2008/02/18 23:13:29 ingmar Exp $
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kshutdown-1.0.ebuild:
-  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
 *kshutdown-1.0 (23 May 2007)
 
diff --git a/kde-misc/kshutdown/kshutdown-0.8.2.ebuild b/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
index 23d1da8bce384a5e82833d4c38b8910744197427..8d9e38c943279cc0d15c70a8298f5f7a6c26effa 100644 (file)
--- a/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
+++ b/kde-misc/kshutdown/kshutdown-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-0.8.2.ebuild,v 1.3 2006/10/24 10:00:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-0.8.2.ebuild,v 1.4 2008/02/18 23:13:29 ingmar Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ IUSE=""
 KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 
-RDEPEND="|| ( ( kde-base/kdesu kde-base/kcontrol kde-base/kdialog )
-             kde-base/kdebase )"
+RDEPEND="|| ( ( =kde-base/kdesu-3.5* =kde-base/kcontrol-3.5* =kde-base/kdialog-3.5* )
+       =kde-base/kdebase-3.5* )"
 
 need-kde 3.4
diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index 2c72e0a32330be5ee30c786a6cc45b94d1dd3b19..cfb3884e070e873fea6b95ce658ff26260f2fb75 100644 (file)
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/tellico
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.72 2008/02/18 22:55:12 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.73 2008/02/18 23:05:53 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> tellico-1.2.10.ebuild,
+  tellico-1.2.11.ebuild, tellico-1.2.14.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -tellico-1.2.13.ebuild:
   Old.
diff --git a/kde-misc/tellico/tellico-1.2.10.ebuild b/kde-misc/tellico/tellico-1.2.10.ebuild
index 94c1a9a325b38fc6b266a6c32655e35d6fccf97e..b210b6bc241938e6ac3a23f406dd758522552add 100644 (file)
--- a/kde-misc/tellico/tellico-1.2.10.ebuild
+++ b/kde-misc/tellico/tellico-1.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.10.ebuild,v 1.5 2007/04/30 19:05:17 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.10.ebuild,v 1.6 2008/02/18 23:05:53 ingmar Exp $
 
 inherit kde sgml-catalog
 
@@ -18,8 +18,8 @@ IUSE="calendar cddb yaz"
 
 RDEPEND=">=dev-libs/libxml2-2.6
        >=dev-libs/libxslt-1.0.19
-       cddb?  ( || ( kde-base/libkcddb kde-base/kdemultimedia ) )
-       calendar? ( || ( ( kde-base/ktnef kde-base/libkcal ) kde-base/kdepim ) )
+       cddb?  ( || ( =kde-base/libkcddb-3.5* =kde-base/kdemultimedia-3.5* ) )
+       calendar? ( || ( ( =kde-base/ktnef-3.5* =kde-base/libkcal-3.5* ) =kde-base/kdepim-3.5* ) )
        media-libs/taglib
        yaz? ( dev-libs/yaz )"
 
@@ -32,22 +32,22 @@ src_compile() {
 
 pkg_postinst() {
        einfo "Installing catalog..."
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegatePublic" \
                "-//Robby Stephenson/DTD Tellico V9.0//EN" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegateSystem" \
+               "file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+               "${ROOT}"/etc/xml/catalog
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateSystem" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegateURI" \
+               "file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
+               "${ROOT}"/etc/xml/catalog
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateURI" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
+               "file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+               "${ROOT}"/etc/xml/catalog
 }
 
 pkg_postrm() {
-       ${ROOT}/usr/bin/xmlcatalog --noout --del \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
+       "${ROOT}"/usr/bin/xmlcatalog --noout --del \
+               "file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+               "${ROOT}"/etc/xml/catalog
 }
diff --git a/kde-misc/tellico/tellico-1.2.11.ebuild b/kde-misc/tellico/tellico-1.2.11.ebuild
index 2008b3755266b3055d3686be5a2a6773f9cbe7f5..ce980c7d62f68b36c7d486c7d73ccbbdb717e399 100644 (file)
--- a/kde-misc/tellico/tellico-1.2.11.ebuild
+++ b/kde-misc/tellico/tellico-1.2.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.11.ebuild,v 1.3 2007/07/26 21:58:37 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.11.ebuild,v 1.4 2008/02/18 23:05:53 ingmar Exp $
 
 inherit kde sgml-catalog
 
@@ -18,8 +18,8 @@ IUSE="calendar cddb yaz"
 
 RDEPEND=">=dev-libs/libxml2-2.6
        >=dev-libs/libxslt-1.0.19
-       cddb?  ( || ( kde-base/libkcddb kde-base/kdemultimedia ) )
-       calendar? ( || ( ( kde-base/ktnef kde-base/libkcal ) kde-base/kdepim ) )
+       cddb?  ( || ( =kde-base/libkcddb-3.5* =kde-base/kdemultimedia-3.5* ) )
+       calendar? ( || ( ( =kde-base/ktnef-3.5* =kde-base/libkcal-3.5* ) =kde-base/kdepim-3.5* ) )
        media-libs/taglib
        yaz? ( dev-libs/yaz )"
 
@@ -32,22 +32,22 @@ src_compile() {
 
 pkg_postinst() {
        einfo "Installing catalog..."
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegatePublic" \
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegatePublic" \
                "-//Robby Stephenson/DTD Tellico V9.0//EN" \
                "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegateSystem" \
+               "${ROOT}"/etc/xml/catalog
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateSystem" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
                "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
-       ${ROOT}/usr/bin/xmlcatalog --noout --add "delegateURI" \
+               "${ROOT}"/etc/xml/catalog
+       "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateURI" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
                "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
+               "${ROOT}"/etc/xml/catalog
 }
 
 pkg_postrm() {
-       ${ROOT}/usr/bin/xmlcatalog --noout --del \
+       "${ROOT}"/usr/bin/xmlcatalog --noout --del \
                "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-               ${ROOT}/etc/xml/catalog
+               "${ROOT}"/etc/xml/catalog
 }
diff --git a/kde-misc/tellico/tellico-1.2.14.ebuild b/kde-misc/tellico/tellico-1.2.14.ebuild
index a769f579ebec52cc1e46f45aff8d4642960b6d6e..5baeb2bc9ad3c150bf3c63b1bd8e43291d3e4757 100644 (file)
--- a/kde-misc/tellico/tellico-1.2.14.ebuild
+++ b/kde-misc/tellico/tellico-1.2.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.14.ebuild,v 1.1 2007/09/25 04:57:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.14.ebuild,v 1.2 2008/02/18 23:05:53 ingmar Exp $
 
 inherit kde sgml-catalog eutils
 
@@ -19,8 +19,8 @@ IUSE="calendar cddb yaz"
 
 RDEPEND=">=dev-libs/libxml2-2.6
        >=dev-libs/libxslt-1.0.19
-       cddb?  ( || ( kde-base/libkcddb kde-base/kdemultimedia ) )
-       calendar? ( || ( ( kde-base/ktnef kde-base/libkcal ) kde-base/kdepim ) )
+       cddb?  ( || ( =kde-base/libkcddb-3.5* =kde-base/kdemultimedia-3.5* ) )
+       calendar? ( || ( ( =kde-base/ktnef-3.5* =kde-base/libkcal-3.5* ) =kde-base/kdepim-3.5* ) )
        media-libs/taglib
        yaz? ( dev-libs/yaz )"
 
@@ -48,20 +48,20 @@ pkg_postinst() {
        einfo "Installing catalog..."
        "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegatePublic" \
                "-//Robby Stephenson/DTD Tellico V9.0//EN" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
+               "file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
                "${ROOT}"/etc/xml/catalog
        "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateSystem" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
+               "file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
                "${ROOT}"/etc/xml/catalog
        "${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateURI" \
                "http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
+               "file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
                "${ROOT}"/etc/xml/catalog
 }
 
 pkg_postrm() {
        "${ROOT}"/usr/bin/xmlcatalog --noout --del \
-               "file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
+               "file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
                "${ROOT}"/etc/xml/catalog
 }
diff --git a/kde-misc/youtube-servicemenu/ChangeLog b/kde-misc/youtube-servicemenu/ChangeLog
index b1c11bf0635c8037b707f1f2c7bf750d6c866c04..f6883c5ea847df3531731daf329d35c9e48b8560 100644 (file)
--- a/kde-misc/youtube-servicemenu/ChangeLog
+++ b/kde-misc/youtube-servicemenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/youtube-servicemenu
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/youtube-servicemenu/ChangeLog,v 1.1 2007/11/20 14:11:07 hanno Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/youtube-servicemenu/ChangeLog,v 1.2 2008/02/18 23:10:38 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  youtube-servicemenu-1.3f.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
 
 *youtube-servicemenu-1.3f (20 Nov 2007)
 
diff --git a/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild b/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild
index e92ddc1170361cfb05ad2bd78177eee19ee7acf7..6cdc60ac61cd11d7f65ef2849b3833bb55996681 100644 (file)
--- a/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild
+++ b/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild,v 1.1 2007/11/20 14:11:07 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/youtube-servicemenu/youtube-servicemenu-1.3f.ebuild,v 1.2 2008/02/18 23:10:38 ingmar Exp $
 
 DESCRIPTION="Download YouTube (tm) Videos"
 HOMEPAGE="http://www.kde-apps.org/content/show.php/Get+YouTube+Video+(improved)?content=41456"
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/python
-       || ( kde-base/konqueror kde-base/kdenetwork )"
+       || ( =kde-base/konqueror-3.5* =kde-base/kdenetwork-3.5* )"
 
 LANGS="de ru sk uk"
 
@@ -21,18 +21,20 @@ for X in ${LANGS} ; do
 done
 
 src_compile() {
-       einfo "Nothing to compile"
+       :
 }
 
 src_install() {
-       dobin get_yt_video.py
+       dobin get_yt_video.py || die "dobin failed."
 
        insinto /usr/share/apps/konqueror/servicemenus
-       doins get_yt_video.desktop
+       doins get_yt_video.desktop || die "doins failed."
 
        cd "${WORKDIR}/${P}/l10n"
        for X in ${LANGS} ; do
-               use linguas_${X} && insinto /usr/share/locale/${X}/LC_MESSAGES
-               use linguas_${X} && doins ${X}/LC_MESSAGES/get_yt_video.mo
+               if use linguas_${X}; then
+                       insinto /usr/share/locale/${X}/LC_MESSAGES
+                       doins ${X}/LC_MESSAGES/get_yt_video.mo || die "doins failed."
+               fi
        done
 }
Unnamed repository; edit this file 'description' to name the repository.