Fixed ROOT issue from bug 168044. Also removed old revision.

(Portage version: 2.1.2-r10)

4 files changed, 8 insertions, 62 deletions

diff --git a/x11-libs/qwtplot3d/ChangeLog b/x11-libs/qwtplot3d/ChangeLog
index 75aa5e168ff9..05015aea1bd4 100644
--- a/x11-libs/qwtplot3d/ChangeLog
+++ b/x11-libs/qwtplot3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwtplot3d
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.9 2007/02/22 00:01:49 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.10 2007/02/23 12:06:47 cryos Exp $
+
+  23 Feb 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  -qwtplot3d-0.2.6-r1.ebuild, qwtplot3d-0.2.6-r2.ebuild:
+  Fixed ROOT issue from bug 168044. Also removed old revision.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.6-r1 b/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.6-r1
deleted file mode 100644
index 58c09d21d5e7..000000000000
--- a/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7ef960d7874f78162d6c9d241de2843e qwtplot3d-0.2.6.tgz 148834
-RMD160 ce2120f603ba87c4bfb3679457c0c041f4891bcc qwtplot3d-0.2.6.tgz 148834
-SHA256 ea7c2ea3d55960ee60019e0a5a5a63385bdcf7026a6385099fd8b31350803125 qwtplot3d-0.2.6.tgz 148834
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r1.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r1.ebuild
deleted file mode 100644
index 1092d8a4904c..000000000000
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r1.ebuild,v 1.2 2005/12/09 14:42:56 cryos Exp $
-
-inherit multilib qt3
-
-MY_P=${P/_/-}
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="opengl and qt-based 3D widget library for C++"
-HOMEPAGE="http://qwtplot3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qwtplot3d/${MY_P}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="$(qt_min_version 3.3)
-	>=sys-apps/sed-4"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	find . -type f -name "*.pro" | while read file; do
-		sed -e 's/.*no-exceptions.*//g' -i ${file}
-		echo >> ${file} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
-		echo >> ${file} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
-	done
-	find examples -type f -name "*.pro" | while read file; do
-		echo >> ${file} "INCLUDEPATH += /usr/include/qwtplot3d"
-	done
-}
-
-src_compile () {
-	addwrite ${QTDIR}/etc/settings
-	${QTDIR}/bin/qmake qwtplot3d.pro || die "qmake failed."
-	emake || die "emake failed."
-}
-
-src_install () {
-	dolib lib/libqwtplot3d.so.${PV} || die "dolib failed."
-#	dosym libqwtplot3d.so.${PV} /usr/$(get_libdir)/libqwtplot3d.so
-#	dosym libqwtplot3d.so.${PV} /usr/$(get_libdir)/libqwtplot3d.so.${PV/.*/}
-	chmod -R 644 examples
-	chmod 755 examples examples/simpleplot/ examples/mesh2/ \
-		examples/enrichments/ examples/axes/ examples/autoswitch/ \
-		examples/axes/src/
-	mkdir -p ${D}/usr/include/qwtplot3d/
-	install include/* ${D}/usr/include/qwtplot3d/
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR examples ${D}/usr/share/doc/${PF}/
-	fi
-}
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild
index f989cdd01b96..f983ddf1cc87 100644
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild,v 1.5 2006/06/16 20:50:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.6-r2.ebuild,v 1.6 2007/02/23 12:06:47 cryos Exp $
 
 inherit multilib qt3
 
@@ -31,7 +31,7 @@ src_unpack () {
 		echo >> ${file} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}"
 	done
 	find examples -type f -name "*.pro" | while read file; do
-		echo >> ${file} "INCLUDEPATH += ${ROOT}usr/include/qwtplot3d"
+		echo >> ${file} "INCLUDEPATH += /usr/include/qwtplot3d"
 	done
 }