Attempt some new magic with replacing the head command in the scripts

3 files changed, 36 insertions, 29 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index a8dc184f883e..825a32c1a41c 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.81 2003/07/20 21:26:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.82 2003/08/07 03:49:15 caleb Exp $
+
+  08 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.3.ebuild:
+  Add a function that scans and replaces instances of "head -1" with "head -n 1" 
+  (in kde-functions.eclass), but this ebuild uses it.
 
 *kdebase-3.1.3 (20 Jul 2003)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 938a9c413825..f9e7fa49c74c 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,37 +1,37 @@
-MD5 3c02c49be312168eec3fd325e0dc3905 files/digest-kdebase-3.1.3 68
+MD5 5e7b1ca75b00a29285cc5420eb1cadbb kdebase-3.1.1a.ebuild 3609
+MD5 75dee05358479ef907a183be65031a65 kdebase-3.1.2.ebuild 3793
+MD5 ddf44c551d7c629a88834166712ce28d kdebase-3.0.5b.ebuild 7930
+MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
+MD5 3a402daa3c966cb11070be489af72824 kdebase-2.2.2-r5.ebuild 2949
+MD5 6d6bc4a3e47c46287ba435b91e0d39cc kdebase-3.1.3.ebuild 3882
+MD5 03600cbc48114a8cec11e9f56ab95cb3 ChangeLog 14722
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
 MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
 MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
 MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.3/backgroundrc 342
+MD5 3c02c49be312168eec3fd325e0dc3905 files/digest-kdebase-3.1.3 68
+MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
+MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
+MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.3/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.3/backgroundrc 342
 MD5 8eb921e8d8edd7bb769af64521ec3404 files/3.1.3/startkde-3.1.3-gentoo.diff 1878
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
-MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
 MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
+MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
 MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
-MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
-MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
-MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
-MD5 243670f3f2a4da224d536bd829282db2 kdebase-3.1.3.ebuild 3723
-MD5 ddf44c551d7c629a88834166712ce28d kdebase-3.0.5b.ebuild 7930
-MD5 5e7b1ca75b00a29285cc5420eb1cadbb kdebase-3.1.1a.ebuild 3609
-MD5 3a402daa3c966cb11070be489af72824 kdebase-2.2.2-r5.ebuild 2949
-MD5 75dee05358479ef907a183be65031a65 kdebase-3.1.2.ebuild 3793
-MD5 a14fd4377e0660d84376b2cd82045e54 ChangeLog 14516
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
+MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
diff --git a/kde-base/kdebase/kdebase-3.1.3.ebuild b/kde-base/kdebase/kdebase-3.1.3.ebuild
index 99f14509d674..4a8a03d6a33b 100644
--- a/kde-base/kdebase/kdebase-3.1.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.1.3.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/kdebase/kdebase-3.1.3.ebuild,v 1.1 2003/07/20 21:26:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.3.ebuild,v 1.2 2003/08/07 03:49:15 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -42,8 +42,11 @@ PATCHES=""
 
 src_compile() {
 	#rm -f configure configure.in # to make sure the fontconfig patch takes effect
-	kde_src_compile myconf configure
+	kde_src_compile myconf
+	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure 
+	kde_src_compile configure
 	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
+	kde_fix_head_instances klipper/klipperrc.desktop
 	kde_src_compile make
 }