Version bump and cleanup (fixes bug #117288).

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686

6 files changed, 68 insertions, 208 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index 9f53502783c7..366b1907439e 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/qcad
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.26 2008/04/27 12:54:27 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.27 2008/09/26 13:18:25 markusle Exp $
+
+*qcad-2.0.5.0 (26 Sep 2008)
+
+  26 Sep 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qcad-2.0.5.0-doc.patch, -qcad-2.0.4.0-r1.ebuild,
+  -qcad-2.0.4.0-r2.ebuild, -qcad-2.0.4.0-r4.ebuild, +qcad-2.0.5.0.ebuild:
+  Version bump and cleanup (fixes bug #117288).
 
   27 Apr 2008; Markus Dittrich <markusle@gentoo.org>
   +files/qcad-2.0.4.0-gcc43.patch, qcad-2.0.4.0-r5.ebuild:
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 07611ad19229..33674ab0be16 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -2,12 +2,12 @@ AUX manual.patch-r1 841 RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 SHA1 f4e
 AUX qcad-2.0.4.0-1.src-gentoo.patch 2177 RMD160 b695c75f1c5269c320244185e3dd4d9b37867aac SHA1 2a495e2213e35e65dad7994329d3038df24d76f4 SHA256 de8383b1492659e924231005fde4db5e4bfb605c7fd25dcf73a89554945e4cdc
 AUX qcad-2.0.4.0-1.src-intptr.patch 1174 RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 SHA1 596dd7b7cd37646dbcf248c9726d0260dedcff86 SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1
 AUX qcad-2.0.4.0-gcc43.patch 1847 RMD160 a15ef3fd2d8df6ee1c598b73aa581b736b32e3ee SHA1 2c94b9f743d945582da725d1344c66dadc317eaa SHA256 f0add6f710264383e09788ac299f9fb967cd0ff110b96d4829ee51e7a6e277cf
+AUX qcad-2.0.5.0-doc.patch 1138 RMD160 c0c28c75b704e7e6f4cc6395447e66e7fd513d7e SHA1 c0b370c9a5c148ef91950709cfdccfe3425fb141 SHA256 ec267df4458a0c4dc8d1859ece37f12d25a9e0dfd05e9b483fd9215eca2c380c
 DIST qcad-2.0.4.0-1.src.tar.gz 3169984 RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 SHA1 50c2d022b1f48649e90df11fc71f5b2d4d63f4a0 SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe
+DIST qcad-2.0.5.0-1-community.src.tar.gz 4470033 RMD160 85f0b6d3c1edaa0c19494436413521316e803429 SHA1 aff563389d1285740f6bf7e28f93b8df0f902e0c SHA256 83327a9598c0ff042025601f5b4cd0582cde541297f3071b01cc0527ffe1511d
 DIST qcad-manual-200404.tar.bz2 1648761 RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f SHA1 e907beb23b3bac2b3cb6ff7f23616454806251c0 SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6
-EBUILD qcad-2.0.4.0-r1.ebuild 2676 RMD160 9e8dca79e5ccd9c8af5cb0073d4cba46810ab6c5 SHA1 c53006c2a46103a4a176b427465557c043a49cf9 SHA256 e0105d05dd7896f00b01625ea93cc3305d26a19af015b34ac7fb9de6a999365a
-EBUILD qcad-2.0.4.0-r2.ebuild 2726 RMD160 994220ed3e842bb217b1fddc8a48878307852084 SHA1 9f4abd6850b8ff6e412cecac47514a0fffcc267a SHA256 fc31214766bfeeba5ecb955844dedc4ef30791b953f7786e041880effc3a20d6
 EBUILD qcad-2.0.4.0-r3.ebuild 2658 RMD160 5301a3855099e5de36f2835faf70ae458737bc37 SHA1 6c0bc0369f48a09b775011b6ddc6085ad692ac97 SHA256 32333c158c7ec82638c2b973da2452685612d880ce10301061ab42eaccd731b4
-EBUILD qcad-2.0.4.0-r4.ebuild 2773 RMD160 399fe081650a1791110b9f8df5707e7f1c4da6ae SHA1 1a87323d2d611802aa294eeaf3d0642bfd80a25b SHA256 5e627325970f4711968c59dc3dd934ae03a6fee58b5fba4c45036492acc38722
 EBUILD qcad-2.0.4.0-r5.ebuild 2839 RMD160 f928de90806b8c243168f1b217915555831f49dd SHA1 f44f62c4afce87cc85bbdd7c02af4885db044507 SHA256 533279d08296b8b46c4a7598ee251f54db3813cfc2a7270dbfe93245e0eca4c9
-MISC ChangeLog 8485 RMD160 f5345e7271742da50074d98803f0bd2eaef7809d SHA1 c26255e7916ce0383bcbd2c758364501c21095f9 SHA256 d65c387ac609c405ea7babf8f14f3ef3178b23def1fc821c7915b577b2e205f0
+EBUILD qcad-2.0.5.0.ebuild 3120 RMD160 b48b450eaed8c37b503d839cd19ba69b586ef40a SHA1 95fdc6ce22b5c3b8804247f24067367a145f617d SHA256 d15f1557078e3c0bc940f78c42accc90f5138fc203eea9f752a41e2115400354
+MISC ChangeLog 8748 RMD160 392f7daf65ffe29494da2ce5e2a4e6bd1ee17b60 SHA1 b53364234bb213298b849be841db2f6bb117824e SHA256 16037fe662d7bc10da6176354ad38afa885e340b2264750a62a38c811f1442cb
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/qcad/files/qcad-2.0.5.0-doc.patch b/sci-misc/qcad/files/qcad-2.0.5.0-doc.patch
new file mode 100644
index 000000000000..8feb6a6a0e85
--- /dev/null
+++ b/sci-misc/qcad/files/qcad-2.0.5.0-doc.patch
@@ -0,0 +1,18 @@
+diff -Naur qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp qcad-2.0.5.0-1-community.src.new/qcad/src/qc_applicationwindow.cpp
+--- qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp	2005-11-22 06:49:33.000000000 -0500
++++ qcad-2.0.5.0-1-community.src.new/qcad/src/qc_applicationwindow.cpp	2008-09-25 18:43:17.000000000 -0400
+@@ -2943,12 +2943,12 @@
+                         RS_SYSTEM->getAppDir().latin1());
+         RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
+                         RS_SYSTEM->getAppDir().latin1());
+-        assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
++        assistant = new QAssistantClient("FULLASSISTANTPATH", this);
+ 		connect(assistant, SIGNAL(error(const QString&)), 
+ 			this, SLOT(slotError(const QString&)));
+         QStringList args;
+         args << "-profile";
+-        args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
++        args << QDir::convertSeparators("QCADDOCPATH/qcaddoc.adp");
+ //        args << QString("doc") + QDir::separator() + QString("qcaddoc.adp");
+ 
+ #if QT_VERSION>=0x030200 
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
deleted file mode 100644
index 2299708a9c5f..000000000000
--- a/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.11 2007/12/31 19:24:55 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="x86 ppc amd64"
-
-DEPEND=">=sys-apps/sed-4"
-need-qt 3.3
-
-src_unpack() {
-	unpack ${A}
-#	mv doc ${S}/qcad/
-	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
-	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}
-	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
-}
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
deleted file mode 100644
index 9f8dfaff062b..000000000000
--- a/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.6 2007/12/31 19:24:55 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="~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
-	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}
-	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
-}
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild b/sci-misc/qcad/qcad-2.0.5.0.ebuild
index c94ebf99b089..17aa78df5f4c 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
+++ b/sci-misc/qcad/qcad-2.0.5.0.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/12/31 19:24:55 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.5.0.ebuild,v 1.1 2008/09/26 13:18:25 markusle Exp $
 
 inherit kde-functions eutils
 
-MY_PV=${PV}-1
-MY_P=${P}-1.src
+MY_P=${P}-1-community.src
+PATCH_V="2.0.4.0-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 )"
+		doc? ( mirror://gentoo/qcad-manual-200404.tar.bz2 )"
 HOMEPAGE="http://www.ribbonsoft.com/qcad.html"
 
 LICENSE="GPL-2"
@@ -23,20 +22,28 @@ 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}"
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_V}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-doc.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_V}-intptr.patch
+	epatch "${FILESDIR}"/${PN}-2.0.4.0-gcc43.patch
+
 	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}"/mkspecs
+	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}"
+
+	# code does not compile with -pedantic
+	sed -i -e "s:-pedantic::" defs.pro \
+		|| die "failed to remove -pedantic flag"
+
 	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"
@@ -47,7 +54,6 @@ src_unpack() {
 		|| 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() {
@@ -71,19 +77,23 @@ src_compile() {
 
 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}
-	cd ..
-	dodoc README
+	dodoc README || die "Failed to install docs"
+	mv qcad qcad.bin || die "Failed to rename qcad binary"
+	dobin qcad.bin || die "Failed to install qcad binary"
+	echo -e "#!/bin/sh\ncd /usr/share/${P}\nqcad.bin" > qcad \
+		|| die "Failed to create qcad wrapper script"
+	dobin qcad || die "Failed to install qcad wrapper"
+
+	insinto /usr/share/${P}
+	doins -r patterns examples fonts qm  \
+		|| die "Failed to install support files"
+
+	doicon src/xpm/${PN}.xpm
+	make_desktop_entry ${PN} QCad ${PN} Office
+
 	if use doc; then
-		insinto /usr/share/doc/${PF}/
 		cd "${WORKDIR}"
-		cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
+		insinto /usr/share/doc/${PF}/
+		doins -r qcaddoc.adp cad || die "Failed to install manual"
 	fi
-	make_desktop_entry ${PN} ${PN} ${PN} Office
 }