Removed run script creation, now using the binary as supplied. Closes bug 110871.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 107 insertions, 2 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index 210da74760b3..ffb119337728 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.12 2006/01/07 18:45:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.13 2006/01/15 14:28:20 cryos Exp $
+
+*qcad-2.0.4.0-r3 (15 Jan 2006)
+
+  15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> +qcad-2.0.4.0-r3.ebuild:
+  Removed run script creation, now using the binary as supplied. Closes bug
+  110871.
 
   07 Jan 2006; Carsten Lohrke <carlo@gentoo.org> qcad-2.0.4.0-r1.ebuild,
   qcad-2.0.4.0-r2.ebuild:
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index b21595da09b6..05d62f45f3fa 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -1,8 +1,20 @@
-MD5 9bacea1da575354851ebcb20703e9827 ChangeLog 6344
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5e707390c1e66a0a477839be9fb4a0c6 ChangeLog 6540
 MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r1 143
 MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r2 143
+MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r3 143
 MD5 c79cda60b6383bbd7cd5c59e5975444e files/manual.patch-r1 841
 MD5 03a389a58ed129eda4567585a4094a33 files/qcad-2.0.4.0-1.src-gentoo.patch 2177
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 153726eb90066d26218441f810bd5c12 qcad-2.0.4.0-r1.ebuild 2653
 MD5 909354e6713c6ca98f4b94c97233eb4f qcad-2.0.4.0-r2.ebuild 2697
+MD5 393a08aeb4d32f26bde1eaefb08b4e22 qcad-2.0.4.0-r3.ebuild 2578
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDylwQntT9W3vfTuoRAjISAJ9nYIWI1IifaQeoitWaoMFbRyISTgCgqbgp
+vEtPqDX5y4oMZdu6Dtiajts=
+=WNWg
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3
new file mode 100644
index 000000000000..e83bcbbf94dc
--- /dev/null
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3
@@ -0,0 +1,2 @@
+MD5 d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz 3169984
+MD5 a8cd3682b9405c0de6d5bd77d50da0f2 qcad-manual-200404.tar.bz2 1648761
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
new file mode 100644
index 000000000000..8a3c1a559bc0
--- /dev/null
+++ b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
@@ -0,0 +1,85 @@
+# 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-r3.ebuild,v 1.1 2006/01/15 14:28:20 cryos 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="~x86 ~ppc ~amd64"
+
+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
+	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
+	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
+}