diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2006-06-23 01:13:23 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2006-06-23 01:13:23 +0000 |
| commit | 5fc0fbf681109f1542ceba25c50b757c05f3a90f (patch) | |
| tree | cd6f86b24f76fef0365798cd079ca98061d745a7 | |
| parent | Marked amd64 as per bug #137198 (diff) | |
| download | historical-5fc0fbf681109f1542ceba25c50b757c05f3a90f.tar.gz historical-5fc0fbf681109f1542ceba25c50b757c05f3a90f.tar.bz2 historical-5fc0fbf681109f1542ceba25c50b757c05f3a90f.zip | |
Added a warning to the ebuild that qt4 is the default in case both qt3 and qt4 are selected as use flags (see bug #137658).
Package-Manager: portage-2.1.1_pre1-r1
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/vtk/Manifest | 16 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-5.0.0.ebuild | 12 |
3 files changed, 24 insertions, 10 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 0ce123239228..f48d76217b2f 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.18 2006/06/12 12:38:38 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.19 2006/06/23 01:13:23 markusle Exp $ + + 23 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: + Added a warning to the ebuild that qt4 is the default in case both + qt3 and qt4 are selected as use flags (see bug #137658). 11 Jun 2006; Markus Dittrich <markusle@gentoo.org> vtk-5.0.0.ebuild: Fix RDEPEND and cmake configuration such that tcl/tk is only diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index b4296d7f8cd0..614eaab6bfec 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -15,14 +15,14 @@ EBUILD vtk-4.2.6.ebuild 5768 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 SHA MD5 748f5f3854a501ae6f6e0169dbd5dbde vtk-4.2.6.ebuild 5768 RMD160 96a37816b7b28dd87abc6389608b47e9a6a6c477 vtk-4.2.6.ebuild 5768 SHA256 c0b6175c198c86d93fd34a4b01bfe0ab0af8efbe8884e740c389f861f836447f vtk-4.2.6.ebuild 5768 -EBUILD vtk-5.0.0.ebuild 8106 RMD160 4fccca6b79b17bbe8e506690154df0dde2bc6a39 SHA1 10f388defb22ef9facc817b96eb3953a1676f8bd SHA256 df4704955f4eb88d6cfdd9e7d0a80236e8f08e147e8693c08b4aa50b6d518dc5 -MD5 61aed57e4f30a1525963ae24a1516367 vtk-5.0.0.ebuild 8106 -RMD160 4fccca6b79b17bbe8e506690154df0dde2bc6a39 vtk-5.0.0.ebuild 8106 -SHA256 df4704955f4eb88d6cfdd9e7d0a80236e8f08e147e8693c08b4aa50b6d518dc5 vtk-5.0.0.ebuild 8106 -MISC ChangeLog 3223 RMD160 aa77fbb4439eaee52ee6a1e8aec4533b896a2052 SHA1 df9706c03fa838467eefdabe01ddf55522124cb6 SHA256 9016f74ceed4c8d55a3eebb4ec88af70867dcc80b759b958a51f61d24f346d7f -MD5 10f05fb9af05e7cac679189f71ee864e ChangeLog 3223 -RMD160 aa77fbb4439eaee52ee6a1e8aec4533b896a2052 ChangeLog 3223 -SHA256 9016f74ceed4c8d55a3eebb4ec88af70867dcc80b759b958a51f61d24f346d7f ChangeLog 3223 +EBUILD vtk-5.0.0.ebuild 8297 RMD160 2368fb9278e32611b7764218a294f21ebb2c77bc SHA1 085a9d1e05b37e78a9ef631219448dde433b06c5 SHA256 1ed5dda64378e20330bcbbd43e73bfbab632a7ae3ab2eb01bc494ec7c7b6a091 +MD5 04bc328810242d346595fa7d5c13a19c vtk-5.0.0.ebuild 8297 +RMD160 2368fb9278e32611b7764218a294f21ebb2c77bc vtk-5.0.0.ebuild 8297 +SHA256 1ed5dda64378e20330bcbbd43e73bfbab632a7ae3ab2eb01bc494ec7c7b6a091 vtk-5.0.0.ebuild 8297 +MISC ChangeLog 3424 RMD160 9d56e6741cd47f3f42b9a453f659a664b0da0cc5 SHA1 4c783a5eb8dcc1d039c11c2e89701c7249e1a502 SHA256 a633e5eb400dc644a78396da807e3c3dbe2e270aea2ffc5df1dbb5b152651091 +MD5 bae940809ae71a9647a30da55f83ed26 ChangeLog 3424 +RMD160 9d56e6741cd47f3f42b9a453f659a664b0da0cc5 ChangeLog 3424 +SHA256 a633e5eb400dc644a78396da807e3c3dbe2e270aea2ffc5df1dbb5b152651091 ChangeLog 3424 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701 MD5 faca3b9ef12d38400a0b53e1818ce89d metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 metadata.xml 254 diff --git a/sci-libs/vtk/vtk-5.0.0.ebuild b/sci-libs/vtk/vtk-5.0.0.ebuild index 4c913bbf1e84..485afe8f849c 100644 --- a/sci-libs/vtk/vtk-5.0.0.ebuild +++ b/sci-libs/vtk/vtk-5.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.6 2006/06/12 12:38:38 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.0.ebuild,v 1.7 2006/06/23 01:13:23 markusle Exp $ # TODO: need to fix Examples/CMakeLists.txt to build other examples @@ -37,6 +37,16 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/VTK + +pkg_setup() { + if use qt3 && use qt4; then + echo + ewarn "qt3 and qt4 support for vtk are mutually exclusive and" + ewarn "qt4 support has therefore been enabled by default." + echo + fi +} + src_unpack() { unpack ${A} cd "${S}" |