summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2003-03-18 11:51:08 +0000
committerDan Armak <danarmak@gentoo.org>2003-03-18 11:51:08 +0000
commit458a7ca3b6335eca1db2d49f84f22cfc6bcc7641 (patch)
treeee74f4cdd5853bff94253affc30417c5e109607a /kde-base
parentversion bump (diff)
downloadgentoo-2-458a7ca3b6335eca1db2d49f84f22cfc6bcc7641.tar.gz
gentoo-2-458a7ca3b6335eca1db2d49f84f22cfc6bcc7641.tar.bz2
gentoo-2-458a7ca3b6335eca1db2d49f84f22cfc6bcc7641.zip
disable rpm support in kpackage in kde 3.0.x tree. it doesn't compile with the latest rpm versions, it works in kde 3.1.x and it's not all that necessary on gentoo anyway.
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeadmin/ChangeLog8
-rw-r--r--kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild13
2 files changed, 16 insertions, 5 deletions
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index a2ce573f3dc1..f07360f382ea 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kdeadmin
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.26 2003/03/14 19:14:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.27 2003/03/18 11:51:08 danarmak Exp $
+
+ 15 Mar 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.0.5a.ebuild:
+
+ Disable rpm support in kpackage. It doesn't compile with the newest rpm
+ package, and won't be fixed in the kde-3.0.x tree, especially not
+ on Gentoo first :-)
*kdeadmin-3.1.1 (14 Mar 2003)
diff --git a/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild b/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild
index 4525399d6f56..d5784806adf2 100644
--- a/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild,v 1.6 2003/02/13 12:25:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.0.5a.ebuild,v 1.7 2003/03/18 11:51:08 danarmak Exp $
inherit kde-dist
IUSE="pam"
@@ -8,10 +8,15 @@ DESCRIPTION="KDE $PV - administration tools"
KEYWORDS="x86 ~ppc ~alpha sparc"
PATCHES="${FILESDIR}/${PN}-qt311-gentoo.diff"
-newdepend ">=app-arch/rpm-4.0.4-r1
- dev-libs/popt
+newdepend "dev-libs/popt
pam? ( >=sys-libs/pam-0.72 )"
+ # >=app-arch/rpm-4.0.4-r1"
use pam && myconf="$myconf --with-pam" || myconf="$myconf --without-pam --with-shadow"
-myconf="$myconf --with-rpm"
+
+# Doesn't compile with the new rpm 4.2. I don't suppose this'll ever be fixed in the 3.0.x tree,
+# and it's not for gentoo ppl to fix rpm problems really :-) so disabling this. --danarmak 20030315
+myconf="$myconf --without-rpm"
+
+