Update kde admin directory, closes bug #142642.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 41 insertions, 15 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 77aec648e0b0..c475409136e8 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-qtimm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.32 2006/07/07 06:20:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.33 2006/10/18 10:02:01 flameeyes Exp $
+
+  18 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  scim-qtimm-0.9.4.ebuild:
+  Update kde admin directory, closes bug #142642.
 
   07 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
   scim-qtimm-0.9.4.ebuild:
diff --git a/app-i18n/scim-qtimm/Manifest b/app-i18n/scim-qtimm/Manifest
index 4460d2c1f4c6..da0d67227089 100644
--- a/app-i18n/scim-qtimm/Manifest
+++ b/app-i18n/scim-qtimm/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scim-qtimm-0.9.4-qtimm-check.patch 718 RMD160 b9a5068dd9e7057831778d7db27627b74bb7c874 SHA1 b2ff61ba1de15241f08ae9cbe276d5b27312f807 SHA256 1bcbb489de6721d9c62356cc583309130254d3210f2a823f51ee2828b5b4ec64
 MD5 3569dd7804d5fd79ee69cdf330906677 files/scim-qtimm-0.9.4-qtimm-check.patch 718
 RMD160 b9a5068dd9e7057831778d7db27627b74bb7c874 files/scim-qtimm-0.9.4-qtimm-check.patch 718
 SHA256 1bcbb489de6721d9c62356cc583309130254d3210f2a823f51ee2828b5b4ec64 files/scim-qtimm-0.9.4-qtimm-check.patch 718
+DIST kde-admindir-3.5.3.tar.bz2 187248 RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 SHA1 6847a0c05ce3c11fcbef0de49b0c0d599e864982 SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b
 DIST scim-qtimm-0.8.95.tar.bz2 542924
 DIST scim-qtimm-0.9.3.tar.bz2 543448
 DIST scim-qtimm-0.9.4.tar.bz2 536983 RMD160 68656066013975f4cca8816f016443ccd22cf7ee SHA1 c09807a8b85bf80a9f851b8e834676735d328de5 SHA256 11bafccea5dcb7160d5bb407275eac4eb2b1a8edf2cbc87053df8502c69d8daa
@@ -13,14 +17,14 @@ EBUILD scim-qtimm-0.9.3.ebuild 1502 RMD160 87d8f515822e88938e9a36d4535c036b9d869
 MD5 1857723054b38305c1db3832865d0d1c scim-qtimm-0.9.3.ebuild 1502
 RMD160 87d8f515822e88938e9a36d4535c036b9d8696ee scim-qtimm-0.9.3.ebuild 1502
 SHA256 60ccc8caa8f98f40621bdd4d132de1da57888180fe1b41b35bcffd1b3dac15df scim-qtimm-0.9.3.ebuild 1502
-EBUILD scim-qtimm-0.9.4.ebuild 1660 RMD160 92745ec6de4f4131658be57eee2bee11019ad1d8 SHA1 20e05aaf654151977a3c12267496b76a6f30527e SHA256 aa7c8154ca3da27332be32246ecb4c7b6e729c439e3fac12fee872519fac33d7
-MD5 34b7bfbe1d8c61b544dada1b90df40bb scim-qtimm-0.9.4.ebuild 1660
-RMD160 92745ec6de4f4131658be57eee2bee11019ad1d8 scim-qtimm-0.9.4.ebuild 1660
-SHA256 aa7c8154ca3da27332be32246ecb4c7b6e729c439e3fac12fee872519fac33d7 scim-qtimm-0.9.4.ebuild 1660
-MISC ChangeLog 5186 RMD160 d90c5ebdc0569ef7b1000ab035b0a0d67be4eec0 SHA1 2c81637da7927904be8f70b1271aab60cf0b5a3c SHA256 b69815d2aae71ddaa3487a50f21f7727d8aafdb317f69482ff857edcf4bbef6a
-MD5 a6e2362ed8db776bb3970e1d7f474449 ChangeLog 5186
-RMD160 d90c5ebdc0569ef7b1000ab035b0a0d67be4eec0 ChangeLog 5186
-SHA256 b69815d2aae71ddaa3487a50f21f7727d8aafdb317f69482ff857edcf4bbef6a ChangeLog 5186
+EBUILD scim-qtimm-0.9.4.ebuild 1856 RMD160 1b900b4308bf3d3185d7e5d3e207d8bd0acb86fc SHA1 428bd1c3bc9929ba76515ab8c077bc989e6b279e SHA256 9c72f5d0ba91dd599bafec1831d4e72451bc027c5de3f4ed7ebca24df1b3020e
+MD5 4691ec55333ea462e9533afa2188d6dc scim-qtimm-0.9.4.ebuild 1856
+RMD160 1b900b4308bf3d3185d7e5d3e207d8bd0acb86fc scim-qtimm-0.9.4.ebuild 1856
+SHA256 9c72f5d0ba91dd599bafec1831d4e72451bc027c5de3f4ed7ebca24df1b3020e scim-qtimm-0.9.4.ebuild 1856
+MISC ChangeLog 5317 RMD160 da3e420a79a78b923e832e73d4f8efacec2d10a7 SHA1 19c5fe4c010c6fcf4557963ac1109fc26d8eae09 SHA256 b9a16ba811139181b4159a73f7706f3303951564ed83c798bcda7214e2f6800d
+MD5 7f7e884a8ef05f92c20f26e1c102d084 ChangeLog 5317
+RMD160 da3e420a79a78b923e832e73d4f8efacec2d10a7 ChangeLog 5317
+SHA256 b9a16ba811139181b4159a73f7706f3303951564ed83c798bcda7214e2f6800d ChangeLog 5317
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -31,6 +35,13 @@ SHA256 221bf2698bee3cd06a232a06bf35852a0ad967f4bb49b71cd397c5df57a43f65 files/di
 MD5 49e66ba94592a548a5812cf2eb90e05e files/digest-scim-qtimm-0.9.3 69
 RMD160 a2064d040d32a3a71d3ae13c44f9e01f8745e73e files/digest-scim-qtimm-0.9.3 69
 SHA256 3c1475a58a5a39533dfd2787895e1c5b43790bbeb1990e42e1de52c28d4a775f files/digest-scim-qtimm-0.9.3 69
-MD5 e4ef1b6d9063940b5aa2a2a3a56bbf68 files/digest-scim-qtimm-0.9.4 253
-RMD160 e57f7c7624ad9c8e16215a3a1f074a398dd05aa6 files/digest-scim-qtimm-0.9.4 253
-SHA256 42b47dbb20aab2adc5a880ca26d105d399417853ae097265ced7880534b7d05c files/digest-scim-qtimm-0.9.4 253
+MD5 872d4863b77a9291935b7d0973b46588 files/digest-scim-qtimm-0.9.4 512
+RMD160 804fb4a3eee7508a03eb64e4630fb6ca60e25b49 files/digest-scim-qtimm-0.9.4 512
+SHA256 b70990f3afad8639dd0d9261cccf9ea51d006868953e336855f8cf24509210e4 files/digest-scim-qtimm-0.9.4 512
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFNfuvAiZjviIA2XgRAn4rAJoCBu7Pq6aVfyDIpCoDM8b9P+JMHACgkMsO
+OdrVcdega0wd2fNAotpXVUg=
+=Lk6I
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
index 58bde82086dd..256e092656b7 100644
--- a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
@@ -1,3 +1,6 @@
+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
 MD5 a58e8e7c18c27a20b3e9d953b1c75d94 scim-qtimm-0.9.4.tar.bz2 536983
 RMD160 68656066013975f4cca8816f016443ccd22cf7ee scim-qtimm-0.9.4.tar.bz2 536983
 SHA256 11bafccea5dcb7160d5bb407275eac4eb2b1a8edf2cbc87053df8502c69d8daa scim-qtimm-0.9.4.tar.bz2 536983
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
index e591d78c6b1b..e366f112cbf0 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild,v 1.4 2006/07/07 06:20:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild,v 1.5 2006/10/18 10:02:01 flameeyes Exp $
 
-inherit kde-functions eutils
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+inherit kde-functions eutils autotools
 
 DESCRIPTION="Qt immodules input method framework plugin for SCIM"
 HOMEPAGE="http://scim.freedesktop.org/"
 SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
-	http://freedesktop.org/~scim/${PN}/${P}.tar.bz2"
+	http://freedesktop.org/~scim/${PN}/${P}.tar.bz2
+	mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,12 +36,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	rm -rf "${S}/admin"
+	ln -sf "${WORKDIR}/admin" "${S}/admin"
+
 	epatch "${FILESDIR}/${P}-qtimm-check.patch"
 
 	# Fix for autoconf 2.60
 	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
 		admin/cvs.sh
 
+	export WANT_AUTOCONF WANT_AUTOMAKE
 	emake -j1 -f admin/Makefile.common || die "reautotooling failed"
 }