--- qcad-2.0.4.0-r3.ebuild	2006-07-22 00:04:24.000000000 +0200
+++ qcad-2.0.5.0.ebuild	2006-07-22 11:38:26.000000000 +0200
@@ -5,7 +5,7 @@
 inherit kde-functions eutils
 
 MY_PV=${PV}-1
-MY_P=${P}-1.src
+MY_P=${P}-1-community.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
@@ -25,6 +25,7 @@
 	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"
@@ -34,23 +35,30 @@
 		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
+
+	# JeR: Do not expect ISO C++:
+	for file in */Makefile mkspecs/defs.pro; do
+		echo "sed -e 's|-pedantic||g' - $file"
+		sed -e 's|-pedantic||g' -i $file || \
+			die "unable to remove -pedantic GCC flag from $file"
+	done
+
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${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 #
 	#