new revision that makes sre lilo-config is not built on arch!=x86, where lilo does not exist

4 files changed, 52 insertions, 3 deletions

diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index b06256985bd3..94ee509f7fec 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.31 2003/04/23 17:02:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.32 2003/04/24 21:35:52 danarmak Exp $
+
+*kdeadmin-3.1.1-r2 (25 Apr 2003)
+
+  25 Apr 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.1.1-r2.ebuild:
+  Never build lilo-config on non-x86 platforms, since lilo itself doesn't exist
+  there. This problem was introduced in the previous revision.
 
 *kdeadmin-3.1.1-r1 (08 Apr 2003)
 
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index a82ec911c7c0..98ef7f45abfc 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -3,9 +3,9 @@ MD5 0436d812e08501ed14a6e1f5158c70ae kdeadmin-2.2.2.ebuild 557
 MD5 67e6b58d8e4db581011f4a612481f4ed kdeadmin-3.0.5b.ebuild 792
 MD5 54c8e245d2f315394301b3e40407c2b2 kdeadmin-3.1.1.ebuild 579
 MD5 582c968d7cbe1dac2694607364a9b295 kdeadmin-3.1.ebuild 577
-MD5 97abb5de87f31e9bdb7c58b8aefcdbc6 kdeadmin-3.1.1-r2.ebuild 1394
+MD5 f895e6c90dce91e29919e0ace78982e6 kdeadmin-3.1.1-r2.ebuild 1394
 MD5 f23fbccd6b84393de9f07879e2facf58 kdeadmin-3.0.5a.ebuild 792
-MD5 8502ef23eaf2b76ff831bb207a3279ea ChangeLog 4415
+MD5 59c49f4721eb4e773e766286c19d0db3 ChangeLog 4666
 MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
 MD5 1316a500de36f700a22fa89a3bd18f67 files/digest-kdeadmin-3.1 66
 MD5 4e2463a3c245a4beec7d1b920d457216 files/digest-kdeadmin-2.2.2 67
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2
new file mode 100644
index 000000000000..c994a88073ed
--- /dev/null
+++ b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2
@@ -0,0 +1 @@
+MD5 755deaf26d0841ed16eddd7596701004 kdeadmin-3.1.1.tar.bz2 1563569
diff --git a/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..9a5f9540a662
--- /dev/null
+++ b/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild
@@ -0,0 +1,42 @@
+# 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.1.1-r2.ebuild,v 1.1 2003/04/24 21:35:52 danarmak Exp $
+inherit kde-dist 
+
+IUSE="pam foreign-package foreign-sysvinit"
+DESCRIPTION="KDE administration tools (user manager, etc.)"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+newdepend ">=app-arch/rpm-4.0.4-r1
+	dev-libs/popt
+	pam? ( >=sys-libs/pam-0.72 )
+	foreign-package? ( app-arch/rpm )"
+
+use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
+
+if [ -n "`use foreign-package`" ]; then
+    myconf="$myconf --with-rpmlib"
+else
+    myconf="$myconf --without-rpm"
+    KDE_REMOVE_DIR="$KDE_REMOVE_DIR kpackage"
+fi
+
+if [ -z "`use foreign-sysvinit`" ]; then
+    KDE_REMOVE_DIR="$KDE_REMOVE_DIR ksysv"
+fi
+
+
+# we only want to compile the lilo config module on x86, but there we want to make sure it's
+# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
+# because configure when left to its own devices will build lilo-config or not basd on whether
+# lilo is present in the path.
+# so, we make configure build it by removing the configure.in.in file that checks for
+# lilo's presense
+src_unpack() {
+
+    kde_src_unpack
+    use x86 && echo > ${S}/lilo-config/configure.in.in
+
+}
+
+# TODO: add nis support