summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2005-05-27 14:47:50 +0000
committerCarsten Lohrke <carlo@gentoo.org>2005-05-27 14:47:50 +0000
commitbc697641878c6b4f29067955c44c5be8a89309c2 (patch)
treeabec97eaa29865eadb2e89a5f01d186f29c36873 /kde-base
parentremove kdesktop from dependencies, #89867 (diff)
downloadgentoo-2-bc697641878c6b4f29067955c44c5be8a89309c2.tar.gz
gentoo-2-bc697641878c6b4f29067955c44c5be8a89309c2.tar.bz2
gentoo-2-bc697641878c6b4f29067955c44c5be8a89309c2.zip
install kdeeject with kdialog instead kdesktop, #89867
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdesktop/ChangeLog6
-rw-r--r--kde-base/kdesktop/kdesktop-3.4.0.ebuild7
-rw-r--r--kde-base/kdesktop/kdesktop-3.4.1.ebuild7
3 files changed, 15 insertions, 5 deletions
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 5d6b04176491..482c99d0cc3c 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdesktop
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.10 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.11 2005/05/27 14:47:50 carlo Exp $
+
+ 27 May 2005; Carsten Lohrke <carlo@gentoo.org> kdesktop-3.4.0.ebuild,
+ kdesktop-3.4.1.ebuild:
+ install kdeeject with kdialog instead kdesktop, #89867
*kdesktop-3.4.1 (25 May 2005)
diff --git a/kde-base/kdesktop/kdesktop-3.4.0.ebuild b/kde-base/kdesktop/kdesktop-3.4.0.ebuild
index d31471f318bb..304f4329e184 100644
--- a/kde-base/kdesktop/kdesktop-3.4.0.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.0.ebuild,v 1.4 2005/04/27 19:16:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.0.ebuild,v 1.5 2005/05/27 14:47:50 carlo Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -20,7 +20,7 @@ $(deprange $PV $MAXKDEVER kde-base/kcontrol)"
# there's a dep here
RDEPEND="${DEPEND}
$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
- sys-apps/eject"
+$(deprange $PV $MAXKDEVER kde-base/kdialog)"
KMCOPYLIB="libkonq libkonq/"
KMEXTRACTONLY="kcheckpass/kcheckpass.h
@@ -36,6 +36,9 @@ src_install() {
kde-meta_src_install
rmdir ${D}/${PREFIX}/share/templates/.source/emptydir
+
+ # we install this script with kdialog, will not be needed in >=kde-3.4.2 (bug 89867)
+ rm ${D}/${PREFIX}/bin/kdeeject
}
pkg_postinst() {
diff --git a/kde-base/kdesktop/kdesktop-3.4.1.ebuild b/kde-base/kdesktop/kdesktop-3.4.1.ebuild
index 91b42594d14e..c6fc7810f02e 100644
--- a/kde-base/kdesktop/kdesktop-3.4.1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.1.ebuild,v 1.2 2005/05/26 17:14:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.1.ebuild,v 1.3 2005/05/27 14:47:50 carlo Exp $
KMNAME=kdebase
MAXKDEVER=$PV
@@ -20,7 +20,7 @@ $(deprange $PV $MAXKDEVER kde-base/kcontrol)"
# there's a dep here
RDEPEND="${DEPEND}
$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
- sys-apps/eject"
+$(deprange $PV $MAXKDEVER kde-base/kdialog)"
KMCOPYLIB="libkonq libkonq/"
KMEXTRACTONLY="kcheckpass/kcheckpass.h
@@ -36,6 +36,9 @@ src_install() {
kde-meta_src_install
rmdir ${D}/${PREFIX}/share/templates/.source/emptydir
+
+ # we install this script with kdialog, will not be needed in >=kde-3.4.2 (bug 89867)
+ rm ${D}/${PREFIX}/bin/kdeeject
}
pkg_postinst() {