summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2003-01-31 20:00:21 +0000
committerDan Armak <danarmak@gentoo.org>2003-01-31 20:00:21 +0000
commit5d2d2a2ad07c3ed640742f28065fa5b2196e696e (patch)
tree3839c6a40ebd069eb607dc01a4c3aace9ff53e81 /kde-base/kdebase
parentchange to ~ keywords (diff)
downloadgentoo-2-5d2d2a2ad07c3ed640742f28065fa5b2196e696e.tar.gz
gentoo-2-5d2d2a2ad07c3ed640742f28065fa5b2196e696e.tar.bz2
gentoo-2-5d2d2a2ad07c3ed640742f28065fa5b2196e696e.zip
change to ~ keywords; add fix for bug #12705 to kdebase 3.0.5a-r2
Diffstat (limited to 'kde-base/kdebase')
-rw-r--r--kde-base/kdebase/ChangeLog7
-rw-r--r--kde-base/kdebase/kdebase-3.0.5a-r2.ebuild15
-rw-r--r--kde-base/kdebase/kdebase-3.1-r1.ebuild4
3 files changed, 20 insertions, 6 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 1aa5fd158d6d..7f26f32ce50a 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdebase
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.53 2003/01/30 19:40:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.54 2003/01/31 20:00:21 danarmak Exp $
+
+ 31 Jan 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.0.5a-r2.ebuild :
+
+ Fix bug #12705: add missing Xreset, Xstartup, Xsetup files to the kdm
+ config dir.
30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog :
diff --git a/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild b/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild
index 8b1d68bcf784..b3c3f3bcbb55 100644
--- a/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild,v 1.2 2003/01/30 19:40:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.5a-r2.ebuild,v 1.3 2003/01/31 20:00:21 danarmak Exp $
NEED_KDE_DONT_ADD_KDELIBS_DEP=1 # we're a special case, see below
inherit eutils flag-o-matic kde-dist
@@ -8,7 +8,7 @@ IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba"
DESCRIPTION="KDE ${PV} - base packages: the desktop, panel, window manager, konqueror..."
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
newdepend ">=media-sound/cdparanoia-3.9.8
ldap? ( >=net-nds/openldap-1.2 )
@@ -224,8 +224,17 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
cd ${D}/${KDEDIR}/share/apps/kdesktop/
ln -sf /usr/share/pixmaps/ pics
-
+
+ # fix bug #12705: make sure default Xreset, Xsetup, Xwilling files are installed
+ # into the kdm config dir
+ cd ${S}/kdm/frontend
+ ./genkdmconf --in . --no-old
+ insinto ${PREFIX}/share/config/kdm
+ doins Xreset Xsetup Xstartup
+
+ # portage has a problem working with empty directories
rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+
}
pkg_postinst() {
diff --git a/kde-base/kdebase/kdebase-3.1-r1.ebuild b/kde-base/kdebase/kdebase-3.1-r1.ebuild
index e39a319c0216..ae911ffe3525 100644
--- a/kde-base/kdebase/kdebase-3.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.1-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1-r1.ebuild,v 1.1 2003/01/28 12:16:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1-r1.ebuild,v 1.2 2003/01/31 20:00:21 danarmak Exp $
NEED_KDE_DONT_ADD_KDELIBS_DEP=1 # we're a special case, see below
inherit kde-dist
IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
newdepend ">=media-sound/cdparanoia-3.9.8
ldap? ( >=net-nds/openldap-1.2 )