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

Package-Manager: portage-2.1.2-r10

5 files changed, 20 insertions, 81 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/Manifest b/x11-libs/qwtplot3d/Manifest
index 7ab9d7960180..d63093b6d132 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -3,32 +3,25 @@ Hash: SHA1
 
 DIST qwtplot3d-0.2.6.tgz 148834 RMD160 ce2120f603ba87c4bfb3679457c0c041f4891bcc SHA1 23330688ed2ca6e738e9ef5259e01fcca6aba2e7 SHA256 ea7c2ea3d55960ee60019e0a5a5a63385bdcf7026a6385099fd8b31350803125
 DIST qwtplot3d-doc.zip 776909 RMD160 bcf5494287447e66c1b277d2edfdd68c07402594 SHA1 a41072a28a04b96c4575d2bdd42b4c48308959e7 SHA256 093e1d6b387551635f42bc5cf977951627c3a9c690c7f28f401e5082dfa72483
-EBUILD qwtplot3d-0.2.6-r1.ebuild 1639 RMD160 d4a7d13e7dd65caceb414cc76c81c35dd5756a95 SHA1 e0971660a7f05156efad671dc9556c3f604b1a1f SHA256 cf0dee13a86ccd8832ebde75e6194f2e770be6b95e44df73628f19aeb0f048d7
-MD5 78ef49702234e7449e57b6295acf4976 qwtplot3d-0.2.6-r1.ebuild 1639
-RMD160 d4a7d13e7dd65caceb414cc76c81c35dd5756a95 qwtplot3d-0.2.6-r1.ebuild 1639
-SHA256 cf0dee13a86ccd8832ebde75e6194f2e770be6b95e44df73628f19aeb0f048d7 qwtplot3d-0.2.6-r1.ebuild 1639
-EBUILD qwtplot3d-0.2.6-r2.ebuild 1878 RMD160 71e537a8c41df0abfe81a2ae532729fa05eb12a4 SHA1 82a760080454d2c48aae18760c494eef939e2389 SHA256 b7dc67fac780f5f2a508f7c9569b7d77844ea8625f858f1d2914d88f5bf72099
-MD5 990f68341a8796ba58fe90c8c56cc097 qwtplot3d-0.2.6-r2.ebuild 1878
-RMD160 71e537a8c41df0abfe81a2ae532729fa05eb12a4 qwtplot3d-0.2.6-r2.ebuild 1878
-SHA256 b7dc67fac780f5f2a508f7c9569b7d77844ea8625f858f1d2914d88f5bf72099 qwtplot3d-0.2.6-r2.ebuild 1878
-MISC ChangeLog 1349 RMD160 c33825777b773986f08ab51419d4805cd03c23d4 SHA1 d2d67b3bee085ef772e770f8772823fa611c5d3f SHA256 75662b2b8e497b95e62684ba3e10a7a3aaddf592d82186736e85021df55f7d51
-MD5 8e7e05baadf34e1c343dace9a83d66be ChangeLog 1349
-RMD160 c33825777b773986f08ab51419d4805cd03c23d4 ChangeLog 1349
-SHA256 75662b2b8e497b95e62684ba3e10a7a3aaddf592d82186736e85021df55f7d51 ChangeLog 1349
+EBUILD qwtplot3d-0.2.6-r2.ebuild 1870 RMD160 d3b15a25f84f68842e20989849797bc249b5d7fd SHA1 036602bb558fd2e9256208e2b27d05cb25793bf2 SHA256 e2f6ec10c0602de7c59a60ecd58770533ef810828ea1bd5ee2051eea02002e58
+MD5 711bc07e7604f813d1eb373689c999e4 qwtplot3d-0.2.6-r2.ebuild 1870
+RMD160 d3b15a25f84f68842e20989849797bc249b5d7fd qwtplot3d-0.2.6-r2.ebuild 1870
+SHA256 e2f6ec10c0602de7c59a60ecd58770533ef810828ea1bd5ee2051eea02002e58 qwtplot3d-0.2.6-r2.ebuild 1870
+MISC ChangeLog 1523 RMD160 68266b7fb0939ae2f71da1f1e5cf26e839d741da SHA1 8978d2676b44398e45ef31ae2b82a22f6520912e SHA256 e986834d92474fd79e19ac6ece99f67ad5c5172273454492f566cbd177ba39e4
+MD5 829ad320658f7d8d8c77f2f6aebc05cc ChangeLog 1523
+RMD160 68266b7fb0939ae2f71da1f1e5cf26e839d741da ChangeLog 1523
+SHA256 e986834d92474fd79e19ac6ece99f67ad5c5172273454492f566cbd177ba39e4 ChangeLog 1523
 MISC metadata.xml 401 RMD160 8d2f7fd100b718f7deccf20a0fd5c7858393c0b3 SHA1 0eb3974e1cdf16c1df5d3a4c13214c36302f6fcf SHA256 b9ba2aa2e27cc4605fc4fb411015019b67ca9bd120814e3ac840cba6b917d52c
 MD5 215d34fcda8923ada4f99f2fbcd3a983 metadata.xml 401
 RMD160 8d2f7fd100b718f7deccf20a0fd5c7858393c0b3 metadata.xml 401
 SHA256 b9ba2aa2e27cc4605fc4fb411015019b67ca9bd120814e3ac840cba6b917d52c metadata.xml 401
-MD5 aa350ad68afc44526dd20bc697d2bad3 files/digest-qwtplot3d-0.2.6-r1 238
-RMD160 3dc372f881ba8c244004a6e76860cded7f242d13 files/digest-qwtplot3d-0.2.6-r1 238
-SHA256 540dc3223afa8dae555a3dcf1b97dfca267e380bd37fbd0158288dedb1842432 files/digest-qwtplot3d-0.2.6-r1 238
 MD5 1301658a35e8c111e268e51cbccfdc0c files/digest-qwtplot3d-0.2.6-r2 470
 RMD160 5cc83150ef98d2b2ec40fe66a68882b813c0f41f files/digest-qwtplot3d-0.2.6-r2 470
 SHA256 49751abaaf765f48fbde72ec3c3e545ec3051b3a2a908a8c8e86a850e909c650 files/digest-qwtplot3d-0.2.6-r2 470
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF3N0Fz974XjDVpbkRAoH0AJ9jbUsD2zKGA8qRGUuRdZL108NXvwCg3oUZ
-veLiWuExrrMm+UE6yka0aLQ=
-=YFlZ
+iD8DBQFF3tjhntT9W3vfTuoRAipbAKCstXzrMKy+nfSwfrXv9qsztszlpgCfYo+A
+Z7c8sLvgS4v8nhc3rzotmrE=
+=Aicl
 -----END PGP SIGNATURE-----
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
 }