Fix broken doc install as Alan Mimms pointed out in bug #119504, make LINGUAS aware.

Package-Manager: portage-2.0.54

5 files changed, 94 insertions, 5 deletions

diff --git a/kde-misc/kdissert/ChangeLog b/kde-misc/kdissert/ChangeLog
index 949121c0a6e4..9389e030c149 100644
--- a/kde-misc/kdissert/ChangeLog
+++ b/kde-misc/kdissert/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/kdissert
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/ChangeLog,v 1.21 2005/11/24 02:03:45 chriswhite Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/ChangeLog,v 1.22 2006/02/21 18:06:39 carlo Exp $
+
+*kdissert-1.0.5-r1 (21 Feb 2006)
+
+  21 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdissert-1.0.5-bksys.diff, +kdissert-1.0.5-r1.ebuild:
+  Fix broken doc install as Alan Mimms pointed out in bug #119504, make
+  LINGUAS aware.
 
   24 Nov 2005; Chris White <chriswhite@gentoo.org> kdissert-1.0.5.ebuild:
   x86 stable for bug #112837.
diff --git a/kde-misc/kdissert/Manifest b/kde-misc/kdissert/Manifest
index 4a1de4ddd3db..a264bcfd47c1 100644
--- a/kde-misc/kdissert/Manifest
+++ b/kde-misc/kdissert/Manifest
@@ -1,5 +1,8 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 150668a8c2ee1e5ac42d4b32bd4b1d6b kdissert-1.0.5.ebuild 920
-MD5 29b6912e7082004d383241e7b6a03419 ChangeLog 2650
+MD5 5e9eb11e0ea65a2cbd2a171a8b5b3af2 ChangeLog 2881
 MD5 41a4e81509b92498f4cf56f577e8d50b files/digest-kdissert-1.0.5 67
+MD5 41a4e81509b92498f4cf56f577e8d50b files/digest-kdissert-1.0.5-r1 67
 MD5 fbfadc487e34ee447f1484ccd1b6d701 files/kde.py-bksys-1.5.1.diff 504
+MD5 437dcf6eb6a982038eef9e438f2bdfb4 files/kdissert-1.0.5-bksys.diff 887
+MD5 040ac5707827c4e5aff1d2562607c3dc kdissert-1.0.5-r1.ebuild 1649
+MD5 150668a8c2ee1e5ac42d4b32bd4b1d6b kdissert-1.0.5.ebuild 920
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-misc/kdissert/files/digest-kdissert-1.0.5-r1 b/kde-misc/kdissert/files/digest-kdissert-1.0.5-r1
new file mode 100644
index 000000000000..3ec13cf5dcc7
--- /dev/null
+++ b/kde-misc/kdissert/files/digest-kdissert-1.0.5-r1
@@ -0,0 +1 @@
+MD5 cd8262715c6e38e662b155c7e62e4e15 kdissert-1.0.5.tar.bz2 488894
diff --git a/kde-misc/kdissert/files/kdissert-1.0.5-bksys.diff b/kde-misc/kdissert/files/kdissert-1.0.5-bksys.diff
new file mode 100644
index 000000000000..c5984ee52821
--- /dev/null
+++ b/kde-misc/kdissert/files/kdissert-1.0.5-bksys.diff
@@ -0,0 +1,22 @@
+--- bksys/kde.py.orig	2005-10-15 17:13:39.000000000 +0200
++++ bksys/kde.py	2005-10-15 17:14:01.000000000 +0200
+@@ -816,7 +816,7 @@
+ 		lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), cache )
+ 		
+ 		if env['_INSTALL']:
+-			dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
++			dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
+ 			comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
+ 			lenv.Execute(comp)
+ 			
+--- bksys/generic.py.copy	2006-02-20 23:55:30.000000000 +0100
++++ bksys/generic.py	2006-02-20 23:55:52.000000000 +0100
+@@ -605,7 +605,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/kdissert/kdissert-1.0.5-r1.ebuild b/kde-misc/kdissert/kdissert-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..ba453b935fe8
--- /dev/null
+++ b/kde-misc/kdissert/kdissert-1.0.5-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/kdissert-1.0.5-r1.ebuild,v 1.1 2006/02/21 18:06:39 carlo Exp $
+
+inherit kde
+
+MY_P=${P/_/\.}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="KDissert - a mindmapping-like tool"
+HOMEPAGE="http://www.freehackers.org/~tnagy/kdissert/index.html"
+SRC_URI="http://www.freehackers.org/~tnagy/kdissert/${MY_P}.tar.bz2"
+#SRC_URI="http://www.kde-apps.org/content/files/12725-${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-util/scons-0.96.1
+	>=dev-lang/python-2.3"
+RDEPEND=""
+need-kde 3.4
+
+PATCHES="${FILESDIR}/kdissert-1.0.5-bksys.diff"
+
+LANGS="de es fr it nl pl"
+
+src_compile() {
+	[ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
+	addpredict "$QTDIR/etc/settings"
+
+	local myconf="kdeincludes=$(kde-config --prefix)/include prefix=/usr "
+	use amd64 && myconf="${myconf} libsuffix=64"
+
+	scons configure ${myconf} || die "configure failed"
+	scons ${MAKEOPTS} || die "scons failed"
+}
+
+src_install() {
+	local LANG_INSTALL="$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))"
+	scons install DESTDIR="${D}" languages="${LANG_INSTALL}"
+	dodoc AUTHORS COPYING INSTALL README ROADMAP
+
+	# fix broken doc installation
+	cd ${D}/usr/share/doc/HTML
+	local KDE_HTML_DIR="$(kde-config --expandvars --install html)"
+	for i in $(ls) ; do
+		if [ -z "$(echo "${i} en ${LANG_INSTALL}" | fmt -w 1 | sort | uniq -d)" ] ; then
+			rm -rf ./${i}
+		else
+			rm -f ${i}/kdissert/common
+			ln -s ${KDE_HTML_DIR}/${i}/common ./${i}/kdissert/common
+		fi
+	done
+}