Version bump, see bug #39804

5 files changed, 130 insertions, 3 deletions

diff --git a/app-sci/qcad/ChangeLog b/app-sci/qcad/ChangeLog
index 3e7dbf89f5f4..7a8032d44347 100644
--- a/app-sci/qcad/ChangeLog
+++ b/app-sci/qcad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-sci/qcad
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.15 2004/02/10 07:36:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/qcad/ChangeLog,v 1.16 2004/02/11 13:04:22 phosphan Exp $
+
+*qcad-2.0.2.0 (11 Feb 2004)
+
+  11 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> qcad-2.0.2.0.ebuild:
+  Version bump with a few changes, see bug #39804 for details.
 
   10 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> qcad-2.0.1.0.ebuild:
   Reverting changes - uses need-qt again, this should fix bugs #39804 and
diff --git a/app-sci/qcad/Manifest b/app-sci/qcad/Manifest
index 8dcdca080eb4..f2ccdfcd4041 100644
--- a/app-sci/qcad/Manifest
+++ b/app-sci/qcad/Manifest
@@ -1,7 +1,7 @@
-MD5 7aeaa8bc636323f44383e47a25930fa5 qcad-2.0.2.0.ebuild 1097
+MD5 2d821d581ceb2f7eac65e1c23999f48a qcad-2.0.2.0.ebuild 1553
 MD5 bf3847f2e7959afa3128e1695453c6b0 qcad-1.5.4.ebuild 1043
 MD5 e760c08781af35a843cf3b96b1f2a72f qcad-2.0.1.0.ebuild 1187
-MD5 27d56b1d690a1618d7941623d84ca31e ChangeLog 2242
+MD5 3e4f8a1fa4c0bce6e4c569cf409a76b0 ChangeLog 2409
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 1a2663c1af2274b28422a9a3c04a7bac files/digest-qcad-1.5.4 67
 MD5 ec141f17f0419be4c51b80ed330f4d35 files/qcad-2.0.1.0-1.src-gentoo.patch 2409
diff --git a/app-sci/qcad/files/digest-qcad-2.0.2.0 b/app-sci/qcad/files/digest-qcad-2.0.2.0
new file mode 100644
index 000000000000..1aea72950181
--- /dev/null
+++ b/app-sci/qcad/files/digest-qcad-2.0.2.0
@@ -0,0 +1 @@
+MD5 2ab7cd5d2fd1ae1c9c93f9b6327ac8e4 qcad-2.0.2.0-1.src.tar.gz 5028132
diff --git a/app-sci/qcad/files/qcad-2.0.2.0-1.src-gentoo.patch b/app-sci/qcad/files/qcad-2.0.2.0-1.src-gentoo.patch
new file mode 100644
index 000000000000..215994fecbe0
--- /dev/null
+++ b/app-sci/qcad/files/qcad-2.0.2.0-1.src-gentoo.patch
@@ -0,0 +1,60 @@
+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.2.0.ebuild b/app-sci/qcad/qcad-2.0.2.0.ebuild
new file mode 100644
index 000000000000..6a1e974e00f4
--- /dev/null
+++ b/app-sci/qcad/qcad-2.0.2.0.ebuild
@@ -0,0 +1,61 @@
+# 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.2.0.ebuild,v 1.1 2004/02/11 13:04:22 phosphan Exp $
+
+inherit kde-functions
+
+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"
+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
+}
+
+
+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"
+}
+
+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
+}
+