Help->Manual should work now. Cleanup.

8 files changed, 115 insertions, 118 deletions

diff --git a/app-sci/qcad/ChangeLog b/app-sci/qcad/ChangeLog
index 4c8ab50d6762..476316ddf30e 100644
--- a/app-sci/qcad/ChangeLog
+++ b/app-sci/qcad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/qcad
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.21 2004/05/11 08:19:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.22 2004/05/11 11:00:34 phosphan Exp $
+
+*qcad-2.0.3.1-r1 (11 May 2004)
+
+  11 May 2004; Patrick Kursawe <phosphan@gentoo.org> qcad-2.0.1.0.ebuild,
+  qcad-2.0.3.1-r1.ebuild, files/manual.patch,
+  files/qcad-2.0.1.0-1.src-gentoo.patch:
+  Help->Manual should work now. Cleanup.
 
   11 May 2004; Patrick Kursawe <phosphan@gentoo.org> qcad-2.0.3.1.ebuild:
   Declaring stable for x86
diff --git a/app-sci/qcad/Manifest b/app-sci/qcad/Manifest
index 185de1762817..586aa1a6ad9d 100644
--- a/app-sci/qcad/Manifest
+++ b/app-sci/qcad/Manifest
@@ -1,11 +1,11 @@
+MD5 c3c85aef749c32c9f5d6310bb9d9967b qcad-2.0.3.1-r1.ebuild 2479
 MD5 6510e0b2d6a5c6f31b3a59b4c931cf92 qcad-2.0.2.0.ebuild 1572
-MD5 586acdf51180d3b6a01ae4f4ea83ee84 qcad-2.0.1.0.ebuild 1201
 MD5 dfbb2d933e63902f6fb2c87fec8da24e qcad-2.0.3.1.ebuild 2126
-MD5 8072d1aa4a00557f1c4568de8995365c ChangeLog 3143
+MD5 885ad7476b59f9ea200b642ed2933d08 ChangeLog 3378
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 03a389a58ed129eda4567585a4094a33 files/qcad-2.0.3.1-1.src-gentoo.patch 2177
-MD5 ec141f17f0419be4c51b80ed330f4d35 files/qcad-2.0.1.0-1.src-gentoo.patch 2409
-MD5 d5c21b497bf2f1e9ce5f134eb5f96a2e files/digest-qcad-2.0.1.0 71
 MD5 5aab9950cd320093d39df3b09256dddf files/digest-qcad-2.0.2.0 71
 MD5 48b9ef97369159a131b93e1392af5add files/digest-qcad-2.0.3.1 71
+MD5 f6b59499dd0213d34c3d983a7fd7481c files/manual.patch 754
 MD5 ec141f17f0419be4c51b80ed330f4d35 files/qcad-2.0.2.0-1.src-gentoo.patch 2409
+MD5 48b9ef97369159a131b93e1392af5add files/digest-qcad-2.0.3.1-r1 71
diff --git a/app-sci/qcad/files/digest-qcad-2.0.1.0 b/app-sci/qcad/files/digest-qcad-2.0.1.0
deleted file mode 100644
index ee29abb68cdd..000000000000
--- a/app-sci/qcad/files/digest-qcad-2.0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fababf7415b692479e0d2958c31e18e qcad-2.0.1.0-1.src.tar.gz 2390817
diff --git a/app-sci/qcad/files/digest-qcad-2.0.3.1-r1 b/app-sci/qcad/files/digest-qcad-2.0.3.1-r1
new file mode 100644
index 000000000000..3edaf935d50c
--- /dev/null
+++ b/app-sci/qcad/files/digest-qcad-2.0.3.1-r1
@@ -0,0 +1 @@
+MD5 d5c87f9a416657e20da94e21dc6d4245 qcad-2.0.3.1-1.src.tar.gz 4680992
diff --git a/app-sci/qcad/files/manual.patch b/app-sci/qcad/files/manual.patch
new file mode 100644
index 000000000000..dc76c4900db9
--- /dev/null
+++ b/app-sci/qcad/files/manual.patch
@@ -0,0 +1,15 @@
+--- qcad/src/qc_applicationwindow.cpp	2004-03-27 13:37:23.000000000 +0100
++++ qcad/src/qc_applicationwindow.cpp.new	2004-05-11 11:48:36.023896194 +0200
+@@ -2798,10 +2798,10 @@
+                         RS_SYSTEM->getAppDir().latin1());
+         RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
+                         RS_SYSTEM->getAppDir().latin1());
+-        assistant = new QAssistantClient(RS_SYSTEM->getAppDir(), this);
++        assistant = new QAssistantClient("FULLASSISTANTPATH", this);
+         QStringList args;
+         args << "-profile";
+-        args << (RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
++        args << ("QCADDOCPATH/qcaddoc.adp");
+ #if QT_VERSION>=0x030200 
+         assistant->setArguments(args);
+ #endif
diff --git a/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch b/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch
deleted file mode 100644
index 215994fecbe0..000000000000
--- a/app-sci/qcad/files/qcad-2.0.1.0-1.src-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur qcad-2.0.1.0-1.src/qcad/Makefile qcad-2.0.1.0-1.src-gentoo/qcad/Makefile
---- qcad-2.0.1.0-1.src/qcad/Makefile	2003-10-08 10:09:05.000000000 +1300
-+++ qcad-2.0.1.0-1.src-gentoo/qcad/Makefile	2003-10-21 15:28:49.000000000 +1300
-@@ -20,7 +20,7 @@
- 
- qcad: src/Makefile src/*.h src/*.cpp ../dxflib/lib/libdxf.a ../qcadguiqt/lib/libqcadguiqt.a ../qcadlib/lib/libqcad.a
- 	- rm qcad
--	cd src && $(MAKE)
-+	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
- 
- src/Makefile: src/qcad.pro
- 	cd src && qmake qcad.pro
-diff -ur qcad-2.0.1.0-1.src/qcadactions/Makefile qcad-2.0.1.0-1.src-gentoo/qcadactions/Makefile
---- qcad-2.0.1.0-1.src/qcadactions/Makefile	2003-10-08 10:09:03.000000000 +1300
-+++ qcad-2.0.1.0-1.src-gentoo/qcadactions/Makefile	2003-10-21 14:27:13.000000000 +1300
-@@ -29,7 +29,7 @@
- 
- ./lib/libqcadactions.a: src/Makefile
- 	$(MAKE) src/Makefile
--	cd src && $(MAKE)
-+	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DRS_OPT_PYTHON -DQT_NO_DEBUG"
- 
- src/Makefile:
- 	cd src && qmake qcadactions.pro
-diff -ur qcad-2.0.1.0-1.src/qcadcmd/Makefile qcad-2.0.1.0-1.src-gentoo/qcadcmd/Makefile
---- qcad-2.0.1.0-1.src/qcadcmd/Makefile	2003-10-08 10:09:03.000000000 +1300
-+++ qcad-2.0.1.0-1.src-gentoo/qcadcmd/Makefile	2003-10-21 14:24:06.000000000 +1300
-@@ -29,7 +29,7 @@
- 
- ./lib/libqcadcmd.a: src/Makefile
- 	$(MAKE) src/Makefile
--	cd src && $(MAKE)
-+	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
- 
- src/Makefile:
- 	cd src && qmake qcadcmd.pro
-diff -ur qcad-2.0.1.0-1.src/qcadguiqt/Makefile qcad-2.0.1.0-1.src-gentoo/qcadguiqt/Makefile
---- qcad-2.0.1.0-1.src/qcadguiqt/Makefile	2003-10-08 10:09:04.000000000 +1300
-+++ qcad-2.0.1.0-1.src-gentoo/qcadguiqt/Makefile	2003-10-21 14:53:40.000000000 +1300
-@@ -89,7 +89,7 @@
- 	done )
- 
- ./lib/libqcadguiqt.a: src/Makefile
--	cd src && $(MAKE)
-+	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
- 
- src/Makefile:
- 	cd src && qmake qcadguiqt.pro
-diff -ur qcad-2.0.1.0-1.src/qcadlib/Makefile qcad-2.0.1.0-1.src-gentoo/qcadlib/Makefile
---- qcad-2.0.1.0-1.src/qcadlib/Makefile	2003-10-08 10:09:02.000000000 +1300
-+++ qcad-2.0.1.0-1.src-gentoo/qcadlib/Makefile	2003-10-21 14:23:55.000000000 +1300
-@@ -29,7 +29,7 @@
- 
- ./lib/libqcad.a: src/Makefile
- 	$(MAKE) src/Makefile
--	cd src && $(MAKE)
-+	cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS) -Wall -DQT_NO_DEBUG"
- 
- src/Makefile:
- 	cd src && qmake qcadlib.pro
diff --git a/app-sci/qcad/qcad-2.0.1.0.ebuild b/app-sci/qcad/qcad-2.0.1.0.ebuild
deleted file mode 100644
index 732533fdf531..000000000000
--- a/app-sci/qcad/qcad-2.0.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/qcad-2.0.1.0.ebuild,v 1.6 2004/03/26 12:24:59 phosphan Exp $
-
-inherit kde-functions eutils
-
-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"
-HOMEPAGE="http://www.ribbonsoft.com/qcad.html"
-
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-need-qt 3
-
-DEPEND="${DEPEND}
-		>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-gentoo.patch
-	cd ${S}/scripts
-	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh
-	sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh
-	# 2.0.1.0 sets QTDIR, I guess by accident
-	sed -i -e 's:^export QTDIR=.*::' build_qcad.sh
-}
-
-
-src_compile() {
-	cd scripts
-	sh build_qcad.sh || die "build failed"
-}
-
-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 -a patterns examples fonts scripts qm ${D}/usr/share/${P}
-	cd ..
-	dodoc README
-}
-
diff --git a/app-sci/qcad/qcad-2.0.3.1-r1.ebuild b/app-sci/qcad/qcad-2.0.3.1-r1.ebuild
new file mode 100644
index 000000000000..7109f9d11841
--- /dev/null
+++ b/app-sci/qcad/qcad-2.0.3.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/qcad-2.0.3.1-r1.ebuild,v 1.1 2004/05/11 11:00:34 phosphan Exp $
+
+inherit kde-functions eutils
+
+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"
+HOMEPAGE="http://www.ribbonsoft.com/qcad.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86"
+
+need-qt 3.3
+
+DEPEND="${DEPEND}
+		>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	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}"
+	epatch ${FILESDIR}/${MY_P}-gentoo.patch
+	epatch ${FILESDIR}/manual.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}/html:" \
+		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 -a patterns examples fonts scripts qm ${D}/usr/share/${P}
+	cd ..
+	dodoc README
+	dohtml -r qcad/doc/.
+	insinto /usr/share/doc/${PF}/html
+	doins qcad/doc/qcaddoc.adp
+}
+
+pkg_postinst () {
+	if ! has_version "app-sci/qcad-parts"; then
+	einfo
+	einfo "The QCad parts library is available as a seperate package."
+	einfo "emerge app-sci/qcad-parts to get it."
+	einfo
+	fi
+}