more fixes

14 files changed, 127 insertions, 22 deletions

diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-2.2 b/kde-base/kdeaddons/files/digest-kdeaddons-2.2
index 82b094a4e81a..d44edeafd86a 100644
--- a/kde-base/kdeaddons/files/digest-kdeaddons-2.2
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-2.2
@@ -1 +1,2 @@
+MD5 67a29b76d24cb394aff9fd8a7f68f34e kde-admin-acinclude.patch
 MD5 3c3d40e8d3e8de02ced840ccf7944790 kdeaddons-2.2.tar.bz2
diff --git a/kde-base/kdeaddons/kdeaddons-2.2.ebuild b/kde-base/kdeaddons/kdeaddons-2.2.ebuild
index 2da8b1913fac..02237a27f691 100644
--- a/kde-base/kdeaddons/kdeaddons-2.2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.ebuild,v 1.3 2001/08/22 11:47:43 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.ebuild,v 1.4 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Addons"
@@ -17,6 +17,15 @@ DEPEND=">=kde-base/kdemultimedia-${PV}
 	>=media-libs/libsdl-1.2
   	objprelink? ( dev-util/objprelink )"
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
 
     local myconf
diff --git a/kde-base/kdeadmin/kdeadmin-2.2.ebuild b/kde-base/kdeadmin/kdeadmin-2.2.ebuild
index d02b3ed995fd..d6763aa9a734 100644
--- a/kde-base/kdeadmin/kdeadmin-2.2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Administration"
@@ -20,6 +20,15 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND=$DEPEND
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
 
     local myconf
diff --git a/kde-base/kdeartwork/kdeartwork-2.2.ebuild b/kde-base/kdeartwork/kdeartwork-2.2.ebuild
index 2fb295581d78..6f07c906ce13 100644
--- a/kde-base/kdeartwork/kdeartwork-2.2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Artwork"
@@ -18,6 +18,15 @@ DEPEND=">=kde-base/kdebase-${PV}
 
 RDEPEND=$DEPEND
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
      local myconf
diff --git a/kde-base/kdebindings/kdebindings-2.2.ebuild b/kde-base/kdebindings/kdebindings-2.2.ebuild
index d2252040d60c..6bc5bcd98137 100644
--- a/kde-base/kdebindings/kdebindings-2.2.ebuild
+++ b/kde-base/kdebindings/kdebindings-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Bindings"
@@ -22,6 +22,15 @@ DEPEND=">=kde-base/kdebase-${PV}
 
 RDEPEND=$DEPEND
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
      local myconf
diff --git a/kde-base/kdegames/kdegames-2.2.ebuild b/kde-base/kdegames/kdegames-2.2.ebuild
index 72c58ffe8893..0d70417374b6 100644
--- a/kde-base/kdegames/kdegames-2.2.ebuild
+++ b/kde-base/kdegames/kdegames-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-2.2.ebuild,v 1.1 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-2.2.ebuild,v 1.2 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Games"
@@ -17,6 +17,15 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND="$DEPEND"
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
     try ./configure --prefix=${KDEDIR} --host=${CHOST} \
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.ebuild
index 63ce288e4953..27a2f1cfa347 100644
--- a/kde-base/kdegraphics/kdegraphics-2.2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.ebuild,v 1.4 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.ebuild,v 1.5 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Graphics"
@@ -21,9 +21,13 @@ DEPEND=">=kde-base/kdelibs-${PV} sys-devel/perl
 RDEPEND=">=kde-base/kdelibs-${PV} gphoto2? ( >=gnome-apps/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	 patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
 }
 
 src_compile() {
diff --git a/kde-base/kdelibs/kdelibs-2.2.ebuild b/kde-base/kdelibs/kdelibs-2.2.ebuild
index 9291a9a2be19..743002bc2d9e 100644
--- a/kde-base/kdelibs/kdelibs-2.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.ebuild,v 1.7 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.ebuild,v 1.8 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Libraries"
@@ -39,12 +39,12 @@ RDEPEND=">=sys-devel/gcc-2.95.2
 	sys-devel/perl dev-lang/python"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
 	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
-#    patch -p0 < ${FILESDIR}/${PN}-2.1.1-ksgmltools-gentoo.diff
-#    rm configure
-#    autoconf
+
 }
 
 src_compile() {
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild
index fd76d331c9a4..aa5cda69b31c 100644
--- a/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild,v 1.3 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.ebuild,v 1.4 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Multimedia"
@@ -27,10 +27,15 @@ DEPEND=">=kde-base/kdelibs-${PV}
 #	tcltk? ( =dev-lang/tcl-tk.8.0.5-r2 )
 
 RDEPEND=$DEPEND
+
 src_unpack() {
-	unpack ${A}
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
 	cd ${S}
 	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
 }
 
 src_compile() {
diff --git a/kde-base/kdenetwork/kdenetwork-2.2.ebuild b/kde-base/kdenetwork/kdenetwork-2.2.ebuild
index b20cbf0d9d86..0077a6a695fb 100644
--- a/kde-base/kdenetwork/kdenetwork-2.2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Network"
@@ -18,6 +18,16 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND=$DEPEND
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
     local myconf
diff --git a/kde-base/kdepim/kdepim-2.2.ebuild b/kde-base/kdepim/kdepim-2.2.ebuild
index 7d1c12593a8b..9c0e6b36b64a 100644
--- a/kde-base/kdepim/kdepim-2.2.ebuild
+++ b/kde-base/kdepim/kdepim-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias  <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - PIM"
@@ -18,6 +18,16 @@ DEPEND=">=kde-base/kdelibs-${PV} >=dev-libs/pilot-link-0.9.0 sys-devel/perl
 
 RDEPEND=">=kde-base/kdelibs-${PV} >=dev-libs/pilot-link-0.9.0"
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
      local myconf
diff --git a/kde-base/kdesdk/kdesdk-2.2.ebuild b/kde-base/kdesdk/kdesdk-2.2.ebuild
index 341817d46fa6..3df14b4b75b3 100644
--- a/kde-base/kdesdk/kdesdk-2.2.ebuild
+++ b/kde-base/kdesdk/kdesdk-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - SDK"
@@ -18,6 +18,16 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND=$DEPEND
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
      local myconf
diff --git a/kde-base/kdetoys/kdetoys-2.2.ebuild b/kde-base/kdetoys/kdetoys-2.2.ebuild
index 1c6d42b2cae1..a9071f42e13e 100644
--- a/kde-base/kdetoys/kdetoys-2.2.ebuild
+++ b/kde-base/kdetoys/kdetoys-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-2.2.ebuild,v 1.1 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-2.2.ebuild,v 1.2 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Toys"
@@ -17,6 +17,16 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND="$DEPEND"
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
  	if [ "`use objprelink`" ] ; then
 	  myconf="--enable-objprelink"
diff --git a/kde-base/kdeutils/kdeutils-2.2.ebuild b/kde-base/kdeutils/kdeutils-2.2.ebuild
index edc5a2bcd74b..7d8da538623f 100644
--- a/kde-base/kdeutils/kdeutils-2.2.ebuild
+++ b/kde-base/kdeutils/kdeutils-2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-2.2.ebuild,v 1.2 2001/08/22 11:29:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-2.2.ebuild,v 1.3 2001/08/22 11:57:19 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Utilities"
@@ -18,6 +18,16 @@ DEPEND=">=kde-base/kdelibs-${PV}
 
 RDEPEND="$DEPEND"
 
+src_unpack() {
+
+	cd ${WORKDIR}
+	unpack ${P}.tar.bz2
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	use objprelink && patch -p0 < ${DISTDIR}/kde-admin-acinclude.patch
+
+}
+
 src_compile() {
 	if [ "`use objprelink`" ] ; then
 	  myconf="--enable-objprelink"