Fixed qt4->qt3 need for opengl use flag

Package-Manager: portage-2.1.4_rc14

3 files changed, 33 insertions, 23 deletions

diff --git a/x11-libs/qwtplot3d-qt3/ChangeLog b/x11-libs/qwtplot3d-qt3/ChangeLog
index 84e475271dc5..b5acaf630b8c 100644
--- a/x11-libs/qwtplot3d-qt3/ChangeLog
+++ b/x11-libs/qwtplot3d-qt3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qwtplot3d-qt3
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d-qt3/ChangeLog,v 1.2 2007/12/03 10:17:10 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d-qt3/ChangeLog,v 1.3 2008/01/14 11:24:25 bicatali Exp $
+
+  14 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  qwtplot3d-qt3-0.2.7.ebuild:
+  Fixed qt4->qt3 need for opengl use flag
 
   03 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
   qwtplot3d-qt3-0.2.7.ebuild:
diff --git a/x11-libs/qwtplot3d-qt3/Manifest b/x11-libs/qwtplot3d-qt3/Manifest
index f91a98edea66..fcc70a5fbc59 100644
--- a/x11-libs/qwtplot3d-qt3/Manifest
+++ b/x11-libs/qwtplot3d-qt3/Manifest
@@ -14,14 +14,14 @@ MD5 9e4814d553fb1c459c3580104ee167ce files/qwtplot3d-profile.patch 717
 RMD160 328c212e334d53f79234069b84c1b8a43675f790 files/qwtplot3d-profile.patch 717
 SHA256 4fcbc15ae0e33317b03270b8d4534ea7f2d68d02ccc588813acc20af5b2ca1ac files/qwtplot3d-profile.patch 717
 DIST qwtplot3d-0.2.7.tgz 183836 RMD160 0f28462cb95ef6091d73642c8b26ece60d50bfb8 SHA1 4463fafb8420a91825e165da7a296aaabd70abea SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42
-EBUILD qwtplot3d-qt3-0.2.7.ebuild 1512 RMD160 735e111234d85281058fb0aea695615c47218f6c SHA1 b8dd4003ce24c3bb1979799f9327f5afe2059f17 SHA256 7cbe25ff56ddb7df966585cfbb501ae4ec1d6e0eeca6d632f3d056cd560ca481
-MD5 45f158045b165e6ccb1d1cc316b6e548 qwtplot3d-qt3-0.2.7.ebuild 1512
-RMD160 735e111234d85281058fb0aea695615c47218f6c qwtplot3d-qt3-0.2.7.ebuild 1512
-SHA256 7cbe25ff56ddb7df966585cfbb501ae4ec1d6e0eeca6d632f3d056cd560ca481 qwtplot3d-qt3-0.2.7.ebuild 1512
-MISC ChangeLog 687 RMD160 fc2e36103cb552a865e4207e0757a6f3ce4f4537 SHA1 d6f148ba51d011b812dcaea4034fb50dbd472f04 SHA256 39d1acc21894075a3a6bcf01225b1428a571d4dc3a5c73807036b4102bc27e96
-MD5 232d1823cd76126ff1ee37eea2715567 ChangeLog 687
-RMD160 fc2e36103cb552a865e4207e0757a6f3ce4f4537 ChangeLog 687
-SHA256 39d1acc21894075a3a6bcf01225b1428a571d4dc3a5c73807036b4102bc27e96 ChangeLog 687
+EBUILD qwtplot3d-qt3-0.2.7.ebuild 1569 RMD160 077c589ec25537b79ac0332e42ab715baabe873e SHA1 ec9ce9ef8298a944f58cfe27a77fe07a98c37f39 SHA256 c5bd9f413d1e7660eaef4a2309a790138ed45d30553f71d913ea46633acc8250
+MD5 8aa3378c6a0a3c82a7aa6197b443cc9c qwtplot3d-qt3-0.2.7.ebuild 1569
+RMD160 077c589ec25537b79ac0332e42ab715baabe873e qwtplot3d-qt3-0.2.7.ebuild 1569
+SHA256 c5bd9f413d1e7660eaef4a2309a790138ed45d30553f71d913ea46633acc8250 qwtplot3d-qt3-0.2.7.ebuild 1569
+MISC ChangeLog 815 RMD160 1bba2acff478b93217b3056e9beeb9f9012a0e27 SHA1 3015d12c873e4ecf24f69185c866989f53d19584 SHA256 9b1a392b2a409cb76804a2a8821a41cf88706277ef8610f9d2eeb1b5591c6f1e
+MD5 cf84bca48171b26993ffa473f3e4d4d4 ChangeLog 815
+RMD160 1bba2acff478b93217b3056e9beeb9f9012a0e27 ChangeLog 815
+SHA256 9b1a392b2a409cb76804a2a8821a41cf88706277ef8610f9d2eeb1b5591c6f1e ChangeLog 815
 MISC metadata.xml 344 RMD160 194be3ec95d0dc1c16808e6051b535b93458490c SHA1 50b44cf035817c20a5444b96e6f12a4bdab86eae SHA256 ed42d0e99d750ff1d971d4da8d9672279ef7271165a90cb548277ec3c3053da0
 MD5 4dbef43226b20584a8604f5771e7a8a9 metadata.xml 344
 RMD160 194be3ec95d0dc1c16808e6051b535b93458490c metadata.xml 344
@@ -30,9 +30,9 @@ MD5 1c2c3bff2bac6103bd29dd026d144983 files/digest-qwtplot3d-qt3-0.2.7 238
 RMD160 7e5f94b756ac1a531210c5ac0abfeb3f89ae776e files/digest-qwtplot3d-qt3-0.2.7 238
 SHA256 fc5b50ca9e2ca444a408b3ea92b9aac2f88a6221bd9a76ff60810f621bd33111 files/digest-qwtplot3d-qt3-0.2.7 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHU9es1ycZbhPLE2ARAv3gAJ42cYoreiIONS5SZ73zFYmDyNm7tgCfdWNi
-UbVDOsxNII8Kkt0FQm4pXfU=
-=NQfH
+iD8DBQFHi0Zy1ycZbhPLE2ARAs4cAJ9cHNVYmgRMGLD7Sj68l7Xbksxe2gCbBilg
+Mh82JYdYmCD5DaISFK1YZsI=
+=03zM
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild b/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild
index 51050a4b03e3..495a5f56c0b3 100644
--- a/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild
+++ b/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild
@@ -1,6 +1,6 @@
-# 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/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild,v 1.2 2007/12/03 10:17:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d-qt3/qwtplot3d-qt3-0.2.7.ebuild,v 1.3 2008/01/14 11:24:25 bicatali Exp $
 
 inherit eutils multilib qt3
 
@@ -19,10 +19,15 @@ RDEPEND="$(qt_min_version 3.3)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-QT4_BUILT_WITH_USE_CHECK="opengl"
-
 S="${WORKDIR}/${MY_PN}"
 
+pkg_setup() {
+	if ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "You need to build x11-libs/qt with opengl use flag enabled."
+		die
+	fi
+}
+
 src_unpack () {
 	unpack ${A}
 	epatch "${FILESDIR}"/${MY_PN}-profile.patch
@@ -32,11 +37,12 @@ src_unpack () {
 }
 
 src_compile () {
-	echo >> ${MY_PN}.pro "target.path = /usr/$(get_libdir)"
-	echo >> ${MY_PN}.pro "headers.path = /usr/include/${PN}"
-	echo >> ${MY_PN}.pro "headers.files = \$\$HEADERS"
-	echo >> ${MY_PN}.pro "INSTALLS = target headers"
-
+	cat >> ${MY_PN}.pro <<-EOF
+		target.path = /usr/$(get_libdir)
+		headers.path = /usr/include/${PN}
+		headers.files = \$\$HEADERS
+		INSTALLS = target headers
+	EOF
 	eqmake3 ${MY_PN}.pro || die "eqmake3 failed"
 	emake || die "emake failed"
 	if use doc; then