Fix make_desktop_entry.

Package-Manager: portage-2.1.3.3

8 files changed, 138 insertions, 30 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index 37626a9876b6..df85de68bfe7 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2006/11/15 12:38:01 corsair Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.23 2007/08/10 19:43:38 je_fro Exp $
+
+*qcad-2.0.4.0-r5 (10 Aug 2007)
+
+  10 Aug 2007; <jeff@gentoo.org> +qcad-2.0.4.0-r5.ebuild:
+  Fix make_desktop_entry.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> qcad-2.0.4.0-r3.ebuild:
   Stable on ppc64; bug #145841
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 85b90307cfe7..143c798183f8 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -12,26 +12,30 @@ RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 files/qcad-2.0.4.0-1.src-intptr.
 SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1 files/qcad-2.0.4.0-1.src-intptr.patch 1174
 DIST qcad-2.0.4.0-1.src.tar.gz 3169984 RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 SHA1 50c2d022b1f48649e90df11fc71f5b2d4d63f4a0 SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe
 DIST qcad-manual-200404.tar.bz2 1648761 RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f SHA1 e907beb23b3bac2b3cb6ff7f23616454806251c0 SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6
-EBUILD qcad-2.0.4.0-r1.ebuild 2656 RMD160 ab50953bfe78c80c57a837c225bb02d0b1f1c5c4 SHA1 85d489453899a768604eb1de0f109a0864a0dab8 SHA256 eec611bf49b07906d90f63155ef6ed6ec83eb460873cc47df688b015ce35bcb5
-MD5 bfd060d7bc21f90405d64d6a3bba3420 qcad-2.0.4.0-r1.ebuild 2656
-RMD160 ab50953bfe78c80c57a837c225bb02d0b1f1c5c4 qcad-2.0.4.0-r1.ebuild 2656
-SHA256 eec611bf49b07906d90f63155ef6ed6ec83eb460873cc47df688b015ce35bcb5 qcad-2.0.4.0-r1.ebuild 2656
-EBUILD qcad-2.0.4.0-r2.ebuild 2700 RMD160 0ca0f5a1bc695e1895a920b895e39250397158f8 SHA1 b05c6058e7eb471996c2f01206ad43ae36db8de9 SHA256 a54d86ef12e5c23f5d5beb4201a88dfb0bdd2f27fd5d8c475ae81e65b3ece782
-MD5 df004bdb0391b010068ee738f917d598 qcad-2.0.4.0-r2.ebuild 2700
-RMD160 0ca0f5a1bc695e1895a920b895e39250397158f8 qcad-2.0.4.0-r2.ebuild 2700
-SHA256 a54d86ef12e5c23f5d5beb4201a88dfb0bdd2f27fd5d8c475ae81e65b3ece782 qcad-2.0.4.0-r2.ebuild 2700
-EBUILD qcad-2.0.4.0-r3.ebuild 2631 RMD160 d440a9ddb39dda990bfca1abb63fcce07651fbac SHA1 b9d313e4c8d2bd13598322096812b88c08f57d4a SHA256 0b4698974fa54e988397140e76f71fac1470512203f8b6409548dc7faff35ba1
-MD5 238f3d2d1f307ae288c2fb04440376fe qcad-2.0.4.0-r3.ebuild 2631
-RMD160 d440a9ddb39dda990bfca1abb63fcce07651fbac qcad-2.0.4.0-r3.ebuild 2631
-SHA256 0b4698974fa54e988397140e76f71fac1470512203f8b6409548dc7faff35ba1 qcad-2.0.4.0-r3.ebuild 2631
-EBUILD qcad-2.0.4.0-r4.ebuild 2746 RMD160 774a8f95d205ce933f33b121aa21a89c9f1958e8 SHA1 4aa0d3a806173e2274518ce7ee5fcdc24d1fe0d4 SHA256 65010666d3b38e914544edbd822903250ae1b9c4c272f28fe1a00dbed11beae8
-MD5 ccbedf8db7298ffb2b24dd868eafc525 qcad-2.0.4.0-r4.ebuild 2746
-RMD160 774a8f95d205ce933f33b121aa21a89c9f1958e8 qcad-2.0.4.0-r4.ebuild 2746
-SHA256 65010666d3b38e914544edbd822903250ae1b9c4c272f28fe1a00dbed11beae8 qcad-2.0.4.0-r4.ebuild 2746
-MISC ChangeLog 7710 RMD160 14d7c692c6b92a3598a0c80c6a918f04e4298ef7 SHA1 9fcf2c5a40baa5cd1ba00c07a8ffed382ca577c4 SHA256 3626d6924c85f2cbcea5597ea078032b7ed79f6a6a36ce6d46dfc975593b3f2d
-MD5 2486ff860ec87b8322a012d1451a0acb ChangeLog 7710
-RMD160 14d7c692c6b92a3598a0c80c6a918f04e4298ef7 ChangeLog 7710
-SHA256 3626d6924c85f2cbcea5597ea078032b7ed79f6a6a36ce6d46dfc975593b3f2d ChangeLog 7710
+EBUILD qcad-2.0.4.0-r1.ebuild 2654 RMD160 b36a956fcbd4ef66ec20d54d9bf77501559b1dd2 SHA1 6e291d8e6a41a4b39dae90e960345671aa3bab98 SHA256 4d1007f818dd5f5e2ae1eca2a26f57c7eec5e8505a6921b3db82f772a5e79ad6
+MD5 c93704f498e05599088e68cbd5d6aa85 qcad-2.0.4.0-r1.ebuild 2654
+RMD160 b36a956fcbd4ef66ec20d54d9bf77501559b1dd2 qcad-2.0.4.0-r1.ebuild 2654
+SHA256 4d1007f818dd5f5e2ae1eca2a26f57c7eec5e8505a6921b3db82f772a5e79ad6 qcad-2.0.4.0-r1.ebuild 2654
+EBUILD qcad-2.0.4.0-r2.ebuild 2697 RMD160 2222260bb254f7924606b98f5a557c068e6b8246 SHA1 9695f7c603cf31f5ddd5d69a53dee0152013637b SHA256 dc9924331fbaeadafaf3ef14a024f2b18790d8ec48cacfd5352169cc93dcc7ba
+MD5 fe7dc4a73866ef30d0f402fdcc50ce49 qcad-2.0.4.0-r2.ebuild 2697
+RMD160 2222260bb254f7924606b98f5a557c068e6b8246 qcad-2.0.4.0-r2.ebuild 2697
+SHA256 dc9924331fbaeadafaf3ef14a024f2b18790d8ec48cacfd5352169cc93dcc7ba qcad-2.0.4.0-r2.ebuild 2697
+EBUILD qcad-2.0.4.0-r3.ebuild 2628 RMD160 c667ac73887a1b979e0bbc4a70315f7d2d9f6bad SHA1 8e5589c117fa019c7a45d1d8e480ed76f9bd600b SHA256 1565e4a0bc8001bfa1845b161dab5253e474944f34bbc9da7e27e64beed24637
+MD5 b186343c350d3766d937d9dbe48cdd36 qcad-2.0.4.0-r3.ebuild 2628
+RMD160 c667ac73887a1b979e0bbc4a70315f7d2d9f6bad qcad-2.0.4.0-r3.ebuild 2628
+SHA256 1565e4a0bc8001bfa1845b161dab5253e474944f34bbc9da7e27e64beed24637 qcad-2.0.4.0-r3.ebuild 2628
+EBUILD qcad-2.0.4.0-r4.ebuild 2743 RMD160 2ea9d8d60181c93ad75b37a860d25b4750367b6c SHA1 7e7568d7ee9bdf042f1aa9622f6eb4ab5f0e3430 SHA256 bacdd7b6b30c4ec4ccdb5900e53fccb4ea53951853ec51f0a0c8bd5bab8c248d
+MD5 9eb374af4efa735296806fa4a764dfc1 qcad-2.0.4.0-r4.ebuild 2743
+RMD160 2ea9d8d60181c93ad75b37a860d25b4750367b6c qcad-2.0.4.0-r4.ebuild 2743
+SHA256 bacdd7b6b30c4ec4ccdb5900e53fccb4ea53951853ec51f0a0c8bd5bab8c248d qcad-2.0.4.0-r4.ebuild 2743
+EBUILD qcad-2.0.4.0-r5.ebuild 2772 RMD160 c5947685cabb715a5f69dc8978926928e602ffb1 SHA1 16d15ff45b3a6c390621841da104e60afbcf0782 SHA256 da2a398c03f5fa35f7a4e73731e96eb0706b3caf46694737da674a2d3e64e752
+MD5 3849a4f2f45a97b7b30ea73214e2a137 qcad-2.0.4.0-r5.ebuild 2772
+RMD160 c5947685cabb715a5f69dc8978926928e602ffb1 qcad-2.0.4.0-r5.ebuild 2772
+SHA256 da2a398c03f5fa35f7a4e73731e96eb0706b3caf46694737da674a2d3e64e752 qcad-2.0.4.0-r5.ebuild 2772
+MISC ChangeLog 7826 RMD160 453d5f9e14107a14d5195cffa9e2deff8826e696 SHA1 3e217186da3d9ffa521488b154ed7717ae77045f SHA256 16cb9e5d7026b8c2915e72aa52712dfcfc58ec8cd93562246552fe8f106f75da
+MD5 d7a56e6c4bdf6085fc762c3c161089f3 ChangeLog 7826
+RMD160 453d5f9e14107a14d5195cffa9e2deff8826e696 ChangeLog 7826
+SHA256 16cb9e5d7026b8c2915e72aa52712dfcfc58ec8cd93562246552fe8f106f75da ChangeLog 7826
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -48,3 +52,6 @@ SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/di
 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
+MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r5 521
+RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r5 521
+SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r5 521
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r5 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r5
new file mode 100644
index 000000000000..53c49b93e844
--- /dev/null
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r5
@@ -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-r1.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
index 6240eb64e98e..2a45069e2d19 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.9 2007/07/15 07:14:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.10 2007/08/10 19:43:38 je_fro Exp $
 
 inherit kde-functions eutils
 
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
index 90c51902e005..25877240b722 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r2.ebuild,v 1.4 2007/07/15 07:14:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.5 2007/08/10 19:43:38 je_fro Exp $
 
 inherit kde-functions eutils
 
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
index 4b71c3ab8b65..902f637996e1 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r3.ebuild,v 1.10 2007/07/15 07:14:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.11 2007/08/10 19:43:38 je_fro Exp $
 
 inherit kde-functions eutils
 
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
index aa447f011b18..d2252449cb6a 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2007/07/15 07:14:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.3 2007/08/10 19:43:38 je_fro Exp $
 
 inherit kde-functions eutils
 
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
new file mode 100644
index 000000000000..e625cb868902
--- /dev/null
+++ b/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/08/10 19:43:38 je_fro 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}
+	doicon src/xpm/${PN}.xpm
+	make_desktop_entry ${PN} QCad ${PN}.xpm Office
+	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
+}