Fix broken doc install, make LINGUAS aware.

Package-Manager: portage-2.0.54

5 files changed, 83 insertions, 8 deletions

diff --git a/kde-misc/kio-locate/ChangeLog b/kde-misc/kio-locate/ChangeLog
index b6231ffe812f..57c478705a3f 100644
--- a/kde-misc/kio-locate/ChangeLog
+++ b/kde-misc/kio-locate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kio-locate
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.18 2005/10/24 15:36:07 carlo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.19 2006/02/25 15:50:14 carlo Exp $
+
+*kio-locate-0.4.4-r1 (25 Feb 2006)
+
+  25 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kio-locate-0.4.4-bksys.diff, +kio-locate-0.4.4-r1.ebuild:
+  Fix broken doc install, make LINGUAS aware.
 
 *kio-locate-0.4.4 (24 Oct 2005)
 
diff --git a/kde-misc/kio-locate/Manifest b/kde-misc/kio-locate/Manifest
index 0227d3011b10..ffae320ec282 100644
--- a/kde-misc/kio-locate/Manifest
+++ b/kde-misc/kio-locate/Manifest
@@ -1,9 +1,12 @@
-MD5 9236f23e7ccb7fe8cec20c2c5ca5e9ec kio-locate-0.3.4.ebuild 538
-MD5 855dac34e9133c80debdd59366f30c03 kio-locate-0.4.4.ebuild 1053
-MD5 2efa12b98b3032c685f76b471f206bc1 kio-locate-0.4.3.ebuild 1053
-MD5 d51758e375bddec5ef9e1de2b8690086 ChangeLog 2230
-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 b4f99851d93b23a06933e2cc883efcdb files/kde.py-bksys-1.5.1.diff 504
+MD5 9278b68c655d33844605373b8ad57133 ChangeLog 2429
 MD5 149ef0ef857ecaa5596a4efc341027a9 files/digest-kio-locate-0.3.4 68
 MD5 5bd3f548f1edfa37dd7bb8ec16792269 files/digest-kio-locate-0.4.3 68
 MD5 303a3e274ff1ef17146ee7e057475c89 files/digest-kio-locate-0.4.4 68
+MD5 303a3e274ff1ef17146ee7e057475c89 files/digest-kio-locate-0.4.4-r1 68
+MD5 b4f99851d93b23a06933e2cc883efcdb files/kde.py-bksys-1.5.1.diff 504
+MD5 1effaa330a4a573ce04fc69859d3590e files/kio-locate-0.4.4-bksys.diff 1229
+MD5 9236f23e7ccb7fe8cec20c2c5ca5e9ec kio-locate-0.3.4.ebuild 538
+MD5 2efa12b98b3032c685f76b471f206bc1 kio-locate-0.4.3.ebuild 1053
+MD5 bcb825e9a029f17ce950c6bb6622aacd kio-locate-0.4.4-r1.ebuild 1161
+MD5 855dac34e9133c80debdd59366f30c03 kio-locate-0.4.4.ebuild 1053
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
diff --git a/kde-misc/kio-locate/files/digest-kio-locate-0.4.4-r1 b/kde-misc/kio-locate/files/digest-kio-locate-0.4.4-r1
new file mode 100644
index 000000000000..a444319fc7f5
--- /dev/null
+++ b/kde-misc/kio-locate/files/digest-kio-locate-0.4.4-r1
@@ -0,0 +1 @@
+MD5 180b7ae9e2023a52311aa4f6730d8c7e kio-locate_0.4.4.tar.gz 155628
diff --git a/kde-misc/kio-locate/files/kio-locate-0.4.4-bksys.diff b/kde-misc/kio-locate/files/kio-locate-0.4.4-bksys.diff
new file mode 100644
index 000000000000..e4c2b8240c3a
--- /dev/null
+++ b/kde-misc/kio-locate/files/kio-locate-0.4.4-bksys.diff
@@ -0,0 +1,26 @@
+--- admin/kde.py.orig	2006-02-24 18:32:04.000000000 +0100
++++ admin/kde.py	2006-02-24 18:41:18.000000000 +0100
+@@ -830,8 +830,10 @@
+ 		lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), cache )
+ 
+ 		if env['_INSTALL']:
+-			dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
+-			comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
++			dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
++			kde_config=os.popen('which kde-config 2>/dev/null').read().strip()
++			kde_html=os.popen(kde_config+' --expandvars --install html').read().strip()
++			comp='mkdir -p %s && cd %s && rm -f common && ln -s ' % (dir, dir) + kde_html+'/'+lang+'/common common'
+ 			lenv.Execute(comp)
+ 
+ 			#self.env.AddPostAction(lenv.join(dir, 'common'), self.env.Chmod(ins, self.perms))
+--- admin/generic.py.orig	2006-02-24 18:32:16.000000000 +0100
++++ admin/generic.py	2006-02-24 18:32:44.000000000 +0100
+@@ -606,7 +606,7 @@
+ 			lenv.Append(LINKFLAGS=[f.path])
+ 
+ 	def set_build_dir(lenv, dirs, buildto):
+-		lenv.SetOption('duplicate', 'soft-copy')
++		lenv.SetOption('duplicate', 'copy')
+ 		lenv['_BUILDDIR_']=buildto
+ 		ldirs=lenv.make_list(dirs)
+ 		for dir in ldirs:
diff --git a/kde-misc/kio-locate/kio-locate-0.4.4-r1.ebuild b/kde-misc/kio-locate/kio-locate-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..b83646c7ff4b
--- /dev/null
+++ b/kde-misc/kio-locate/kio-locate-0.4.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.4.4-r1.ebuild,v 1.1 2006/02/25 15:50:14 carlo Exp $
+
+inherit kde
+
+DESCRIPTION="kio slave to search files with locate"
+HOMEPAGE="http://arminstraub.de/browse.php?page=programs_kiolocate"
+SRC_URI="http://www.arminstraub.de/downloads/kio-locate/${PN}_${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+
+DEPEND=">=dev-util/scons-0.96.1"
+RDEPEND="|| ( sys-apps/slocate sys-apps/rlocate )"
+need-kde 3.4
+
+PATCHES="${FILESDIR}/kio-locate-0.4.4-bksys.diff"
+
+LANGS="de fr"
+
+src_compile() {
+	[ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
+	addpredict "$QTDIR/etc/settings"
+
+	local myconf="kdeincludes=$(kde-config --prefix)/include prefix=${ROOT}/usr "
+	use amd64 && myconf="${myconf} libsuffix=64"
+
+	scons configure ${myconf} || die "configure failed"
+	scons ${MAKEOPTS} || die "scons failed"
+}
+
+src_install() {
+	scons install DESTDIR="${D}" languages="$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))"
+	dodoc AUTHORS ChangeLog
+}