Fixed internationalization. See bug #149630.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 114 insertions, 15 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index 95342bb1ce87..ff7530d33af2 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-misc/qcad
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.19 2006/11/06 02:23:22 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.20 2006/11/06 14:58:24 markusle Exp $
+
+*qcad-2.0.4.0-r4 (06 Nov 2006)
+
+  06 Nov 2006; Markus Dittrich <markusle@gentoo.org>
+  +qcad-2.0.4.0-r4.ebuild:
+  Fixed internationalization. See bug #149630.
 
   06 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   qcad-2.0.4.0-r3.ebuild:
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 39988d171202..f7084dd7e581 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX manual.patch-r1 841 RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 SHA1 f4ed3f70bd0cea6b32a82f9802c0884973940216 SHA256 f456451c59dea998a3b261874ca8c530c9f9e76629ba2fc4b88c0ee05c4b721a
 MD5 c79cda60b6383bbd7cd5c59e5975444e files/manual.patch-r1 841
 RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 files/manual.patch-r1 841
@@ -27,10 +24,14 @@ EBUILD qcad-2.0.4.0-r3.ebuild 2629 RMD160 e5d8c29f2867cb89929dbbde3f48b34501d4ab
 MD5 961cb8efdbe8c2b2a51ab7b5f7ee9187 qcad-2.0.4.0-r3.ebuild 2629
 RMD160 e5d8c29f2867cb89929dbbde3f48b34501d4abe8 qcad-2.0.4.0-r3.ebuild 2629
 SHA256 30026edb2a47825e724f016ba5a81b17c2e8647e3b9fec9c6cf62ce385a8655a qcad-2.0.4.0-r3.ebuild 2629
-MISC ChangeLog 7326 RMD160 1a5d2097c9413254390ff0902ca3a32ef39c953c SHA1 6729d2dea546d1a808f7dcc5c3b17cac6e8c0d1c SHA256 05edcd2c0fc3ba88bb7f3e6dc500197d39acace013a70016fdbd52a04de441de
-MD5 e5f10a9b24256d584c4f60320fa8b956 ChangeLog 7326
-RMD160 1a5d2097c9413254390ff0902ca3a32ef39c953c ChangeLog 7326
-SHA256 05edcd2c0fc3ba88bb7f3e6dc500197d39acace013a70016fdbd52a04de441de ChangeLog 7326
+EBUILD qcad-2.0.4.0-r4.ebuild 2746 RMD160 0bbad50e9e781c036138f1299f898bf67434bf4e SHA1 2d74faa403ae83f9a61f57583b75f8fe628705cf SHA256 d8203b4ec1f87600b18d7aabcc1abeb34e6ebcd6bd58cc8b99a42de9c98bdd5e
+MD5 ccbe95be8823b9cd8618adaf92ead800 qcad-2.0.4.0-r4.ebuild 2746
+RMD160 0bbad50e9e781c036138f1299f898bf67434bf4e qcad-2.0.4.0-r4.ebuild 2746
+SHA256 d8203b4ec1f87600b18d7aabcc1abeb34e6ebcd6bd58cc8b99a42de9c98bdd5e qcad-2.0.4.0-r4.ebuild 2746
+MISC ChangeLog 7489 RMD160 3cc768c0acad42e07c8c0945fb2e3485e30fe4ce SHA1 f8723ff8ca2c3a5b4c8bfd6632cb66c558e58386 SHA256 ba76d69bdf7eb0fc029cde7e3f0ed404b9456539f83123be6fa0f0fd92944e44
+MD5 551890a72e43a124f67e4ff9e405c90a ChangeLog 7489
+RMD160 3cc768c0acad42e07c8c0945fb2e3485e30fe4ce ChangeLog 7489
+SHA256 ba76d69bdf7eb0fc029cde7e3f0ed404b9456539f83123be6fa0f0fd92944e44 ChangeLog 7489
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -44,10 +45,6 @@ SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/di
 MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r3 521
 RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r3 521
 SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r3 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFFTp3A/NoSW7FuNV8RAt4kAKDP/3rRKUgghClPGdGgqIbndKxBtgCgnoC9
-QjnFeWE1m5X+E+vik3GgVP8=
-=vGd9
------END PGP SIGNATURE-----
+MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r4 521
+RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r4 521
+SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r4 521
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r4 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r4
new file mode 100644
index 000000000000..53c49b93e844
--- /dev/null
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r4
@@ -0,0 +1,6 @@
+MD5 d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz 3169984
+RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 qcad-2.0.4.0-1.src.tar.gz 3169984
+SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe qcad-2.0.4.0-1.src.tar.gz 3169984
+MD5 a8cd3682b9405c0de6d5bd77d50da0f2 qcad-manual-200404.tar.bz2 1648761
+RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f qcad-manual-200404.tar.bz2 1648761
+SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6 qcad-manual-200404.tar.bz2 1648761
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
new file mode 100644
index 000000000000..795e99278c68
--- /dev/null
+++ b/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.1 2006/11/06 14:58:24 markusle Exp $
+
+inherit kde-functions eutils
+
+MY_PV=${PV}-1
+MY_P=${P}-1.src
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A 2D CAD package based upon Qt."
+SRC_URI="http://www.ribbonsoft.com/archives/qcad/${MY_P}.tar.gz
+		doc? ( mirror://gentoo/qcad-manual-200404.tar.bz2
+				http://dev.gentoo.org/~phosphan/qcad-manual-200404.tar.bz2 )"
+HOMEPAGE="http://www.ribbonsoft.com/qcad.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND=">=sys-apps/sed-4"
+need-qt 3.3
+
+src_unpack() {
+	unpack ${A}
+	# Bug 112864 - fix dir unpack bug
+	touch ${WORKDIR}
+	cd ${S}
+	echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
+	echo >> defs.pro "CONFIG += thread release"
+	echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
+	echo >> defs.pro "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
+	for file in */Makefile scripts/build_qcad.sh; do
+		sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
+			die "unable to correct path to qmake in $file"
+	done
+	epatch ${FILESDIR}/${MY_P}-gentoo.patch
+	epatch ${FILESDIR}/manual.patch-r1
+	epatch ${FILESDIR}/${MY_P}-intptr.patch
+	cd ${S}/scripts
+	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
+		die "unable to add MAKEOPTS"
+	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
+		|| die "unable to set CHOST"
+	cd ${S}/qcad/src
+	sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
+		|| die "sed failed on assistant path"
+	sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
+		qc_applicationwindow.cpp  || die "sed failed on manual path"
+
+}
+
+
+src_compile() {
+	### borrowed from kde.eclass #
+	#
+	# fix the sandbox errors "can't writ to .kde or .qt" problems.
+	# this is a fake homedir that is writeable under the sandbox, so that the build process
+	# can do anything it wants with it.
+	REALHOME="$HOME"
+	mkdir -p $T/fakehome/.kde
+	mkdir -p $T/fakehome/.qt
+	export HOME="$T/fakehome"
+	# things that should access the real homedir
+	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
+	cd scripts
+	sh build_qcad.sh || die "build failed"
+	if ! test -f ${S}/qcad/qcad; then
+		die "no binary created, build failed"
+	fi
+}
+
+src_install () {
+	cd qcad
+	mv qcad qcad.bin
+	dobin qcad.bin
+	echo -e "#!/bin/sh\ncd /usr/share/${P}\nqcad.bin" > qcad
+	chmod ugo+rx qcad
+	dobin qcad
+	dodir /usr/share/${P}
+	cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
+	cd ..
+	dodoc README
+	if use doc; then
+		insinto /usr/share/doc/${PF}/
+		cd ${WORKDIR}
+		cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
+	fi
+	make_desktop_entry ${PN} ${PN} ${PN} Office
+}