Fixes bug #149899.

Package-Manager: portage-2.1.1

4 files changed, 35 insertions, 19 deletions

diff --git a/kde-misc/kbfx/ChangeLog b/kde-misc/kbfx/ChangeLog
index ade72179a451..1498f2f15cc5 100644
--- a/kde-misc/kbfx/ChangeLog
+++ b/kde-misc/kbfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kbfx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbfx/ChangeLog,v 1.5 2006/07/14 20:50:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbfx/ChangeLog,v 1.6 2006/10/06 18:48:19 deathwing00 Exp $
+
+  06 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  kbfx-0.4.9.1.ebuild:
+  Forcing automake 1.6 and autoconf 2.1. Fixes bug #149899. Thanks to Ghislain
+  Bourgeois. Thanks to Flameeyes for the admin trick.
 
   14 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kbfx-0.4.9.1.ebuild:
   Leave to the eclass handling of admin dir (bug #140406). Fix quoting.
diff --git a/kde-misc/kbfx/Manifest b/kde-misc/kbfx/Manifest
index d7d103f2ed4e..76030926a14b 100644
--- a/kde-misc/kbfx/Manifest
+++ b/kde-misc/kbfx/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA1
 
 DIST kbfx-0.4.9.1.tar.bz2 1010634 RMD160 681f49655ea0d170c58e2ec96e7d317e4cc5b338 SHA1 359e46767a236f46f11b0eb782768f2441e4229d SHA256 3caeefb354372ff753ce5976ea299253c46f6ba4c90ad13bfdb91734fbda0ada
-EBUILD kbfx-0.4.9.1.ebuild 626 RMD160 cca214419183c85e9b53e8bdc1cfcf94069f6589 SHA1 195dbb5f04cf61cd13afa194756e4eab21cc224d SHA256 fc2ea784dd56d89405d6f8cd374fe1b9cb43fb85fe3daf95c7389406660f9431
-MD5 a5e6b368f9d099f39794dffbc27e903f kbfx-0.4.9.1.ebuild 626
-RMD160 cca214419183c85e9b53e8bdc1cfcf94069f6589 kbfx-0.4.9.1.ebuild 626
-SHA256 fc2ea784dd56d89405d6f8cd374fe1b9cb43fb85fe3daf95c7389406660f9431 kbfx-0.4.9.1.ebuild 626
-MISC ChangeLog 1055 RMD160 7c7da55dcea4329962e6ce9de5dac12e85ae9948 SHA1 58d76120e8467921b5e289251954481ed96c574e SHA256 05956afedcd6a436394cb1b59607990467524d66c4d5bbe64f677c9bf71c7bdc
-MD5 736b2bc0c60bf3718cb2cdc168890769 ChangeLog 1055
-RMD160 7c7da55dcea4329962e6ce9de5dac12e85ae9948 ChangeLog 1055
-SHA256 05956afedcd6a436394cb1b59607990467524d66c4d5bbe64f677c9bf71c7bdc ChangeLog 1055
+DIST kde-admindir-3.5.3.tar.bz2 187248 RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 SHA1 6847a0c05ce3c11fcbef0de49b0c0d599e864982 SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b
+EBUILD kbfx-0.4.9.1.ebuild 794 RMD160 b018e16dc034b6229f65c60321c7a4ea3b58face SHA1 a04734a311c2ece64939d05ff2ec1078356d8bd8 SHA256 cac2f98a7e48451ec793c38ba3a66b643b6f4f696719843f0b5dde5ecfc38dbf
+MD5 da88448772ec0beda815f618968de262 kbfx-0.4.9.1.ebuild 794
+RMD160 b018e16dc034b6229f65c60321c7a4ea3b58face kbfx-0.4.9.1.ebuild 794
+SHA256 cac2f98a7e48451ec793c38ba3a66b643b6f4f696719843f0b5dde5ecfc38dbf kbfx-0.4.9.1.ebuild 794
+MISC ChangeLog 1272 RMD160 7ebc910da0ed4967c4d28334876335e418e29f47 SHA1 962bb4e8b499f29ed24b8713617dc37743d55bc4 SHA256 6794500115c189d3a2c9b826201ec241c66c1f48bfc782c6a26dad5f2a1cd38e
+MD5 4610afde5b6b0408250694bd0b6789ae ChangeLog 1272
+RMD160 7ebc910da0ed4967c4d28334876335e418e29f47 ChangeLog 1272
+SHA256 6794500115c189d3a2c9b826201ec241c66c1f48bfc782c6a26dad5f2a1cd38e ChangeLog 1272
 MISC metadata.xml 227 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed SHA1 dc84bfe01b6e845c77d5f26b9bc588904315b161 SHA256 e082e24d9d4d2f8a5a431ae131f9521749796f3888329160e106c456f257bc36
 MD5 ab02bedef313ee7002139bda0286947e metadata.xml 227
 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed metadata.xml 227
 SHA256 e082e24d9d4d2f8a5a431ae131f9521749796f3888329160e106c456f257bc36 metadata.xml 227
-MD5 d7e7fe92a3b493a746eb5d13b3094434 files/digest-kbfx-0.4.9.1 244
-RMD160 b6273950d5bea9b5dd99a9c0bc80643f5e7f5160 files/digest-kbfx-0.4.9.1 244
-SHA256 74b194e387c743b50cccdf8bbc1459bad35c25c3b9a6392a61c4c8a041bf2bef files/digest-kbfx-0.4.9.1 244
+MD5 7068c2830df8ece5a412bbd0a8a183b4 files/digest-kbfx-0.4.9.1 503
+RMD160 41f5dcc55a15c3b480717a4656f3dc95471cf897 files/digest-kbfx-0.4.9.1 503
+SHA256 2d3db457c6599ca6c977e59fd8dcac05fbdc29b6ec00c216c21272f63c628162 files/digest-kbfx-0.4.9.1 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEuAOkAiZjviIA2XgRAqVUAJ9U7+UfFrrsRaVvn7VjZG5UBZF2TwCg8FTh
-gX1Rxzr7i6Q/16qOh+BwJmo=
-=1uxW
+iD8DBQFFJqT8QVeVlgLp4x8RAgKAAJ9Mbk0cyTrouEOK5YeeSViLOlKWcgCeIFCW
+xkbhHpSxtkDQF4yV7ektMt4=
+=ipMV
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kbfx/files/digest-kbfx-0.4.9.1 b/kde-misc/kbfx/files/digest-kbfx-0.4.9.1
index 98d7503380d3..9ef83817ed13 100644
--- a/kde-misc/kbfx/files/digest-kbfx-0.4.9.1
+++ b/kde-misc/kbfx/files/digest-kbfx-0.4.9.1
@@ -1,3 +1,6 @@
 MD5 3d0bad1a2fc8fb870e3ec83629526806 kbfx-0.4.9.1.tar.bz2 1010634
 RMD160 681f49655ea0d170c58e2ec96e7d317e4cc5b338 kbfx-0.4.9.1.tar.bz2 1010634
 SHA256 3caeefb354372ff753ce5976ea299253c46f6ba4c90ad13bfdb91734fbda0ada kbfx-0.4.9.1.tar.bz2 1010634
+MD5 122f8bcc6b7eb5805df46461ed48bf2c kde-admindir-3.5.3.tar.bz2 187248
+RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 kde-admindir-3.5.3.tar.bz2 187248
+SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b kde-admindir-3.5.3.tar.bz2 187248
diff --git a/kde-misc/kbfx/kbfx-0.4.9.1.ebuild b/kde-misc/kbfx/kbfx-0.4.9.1.ebuild
index db2dfe859c94..7ea9b1e5b0d8 100644
--- a/kde-misc/kbfx/kbfx-0.4.9.1.ebuild
+++ b/kde-misc/kbfx/kbfx-0.4.9.1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbfx/kbfx-0.4.9.1.ebuild,v 1.5 2006/07/14 20:50:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbfx/kbfx-0.4.9.1.ebuild,v 1.6 2006/10/06 18:48:19 deathwing00 Exp $
 
 inherit kde
 
+WANT_AUTOMAKE="1.6"
+WANT_AUTOCONF="2.1"
+
 DESCRIPTION="KDE alternative K-Menu"
 HOMEPAGE="http://www.kbfx.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,11 +18,14 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 need-kde 3.3
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i "s:\$(LIB_KIO):-L${KDEDIR}/lib -lkio:" kbfxconfigapp/Makefile.am
-	rm -f "${S}/configure"
+	#rm -rf "${S}/configure"
+	rm -rf "${S}/admin" "${S}/configure"
+	ln -s "${WORKDIR}/admin" "${S}/admin"
 }
 
 src_install() {