diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2007-12-21 20:55:35 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2007-12-21 20:55:35 +0000 |
| commit | 011c13746c54faf63af4fa5ec0c3f8d3cad2b89b (patch) | |
| tree | 7548c0ed16616cc879172514a03828c247b9e4f3 /x11-libs/qt-core | |
| parent | This should only be ~x86 (diff) | |
| download | historical-011c13746c54faf63af4fa5ec0c3f8d3cad2b89b.tar.gz historical-011c13746c54faf63af4fa5ec0c3f8d3cad2b89b.tar.bz2 historical-011c13746c54faf63af4fa5ec0c3f8d3cad2b89b.zip | |
A little cleaner on the packages
Package-Manager: portage-2.1.3.16
Diffstat (limited to 'x11-libs/qt-core')
| -rw-r--r-- | x11-libs/qt-core/Manifest | 8 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest index 2b0a5f30b69f..6849af2b1635 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -1,8 +1,8 @@ DIST qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137 RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 SHA1 e242dc542eb1424a51c47e7c80aaefd26668451c SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88 -EBUILD qt-core-4.4.0_rc1.ebuild 4276 RMD160 4518e2ce283a7789784a882125a3232578c20054 SHA1 c3c9caca627ffc2645fad998ffd05835cce08a5e SHA256 84c57e1808293de5ab4c03369954777ba603a59cf62ddced0e513b14d3c2adba -MD5 6e8f21891d09115192293f852fbe6da3 qt-core-4.4.0_rc1.ebuild 4276 -RMD160 4518e2ce283a7789784a882125a3232578c20054 qt-core-4.4.0_rc1.ebuild 4276 -SHA256 84c57e1808293de5ab4c03369954777ba603a59cf62ddced0e513b14d3c2adba qt-core-4.4.0_rc1.ebuild 4276 +EBUILD qt-core-4.4.0_rc1.ebuild 4272 RMD160 120bb8e23cf05d3add3926df6f91fc975e0743ac SHA1 bc669e1dde88f201449faf0c046ab6bb49538332 SHA256 9c2aff47856b99eea174d8d18e8c972b164a938a50d0842380625576515d585e +MD5 641a2c5e15613185677e1d7d22dd0d87 qt-core-4.4.0_rc1.ebuild 4272 +RMD160 120bb8e23cf05d3add3926df6f91fc975e0743ac qt-core-4.4.0_rc1.ebuild 4272 +SHA256 9c2aff47856b99eea174d8d18e8c972b164a938a50d0842380625576515d585e qt-core-4.4.0_rc1.ebuild 4272 MISC ChangeLog 347 RMD160 0ba45d8cf793fff418d88861a582e2aa6ec5f74c SHA1 8c251a48f738f2b541879b4795ce466d724e483e SHA256 68214470c89333b272a02751412480e807fc15f51ed29deab71cba378b059503 MD5 deadb8ca02e2a06484c85c7df33e94e2 ChangeLog 347 RMD160 0ba45d8cf793fff418d88861a582e2aa6ec5f74c ChangeLog 347 diff --git a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild index 9d7ad70f802e..56bda3121a56 100644 --- a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild +++ b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.1 2007/12/21 18:59:13 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.2 2007/12/21 20:55:35 caleb Exp $ inherit qt4-build @@ -82,6 +82,9 @@ pkg_setup() { qt4-build_pkg_setup if has_version x11-libs/qt-core; then + + # Check to see if they've changed the glib flag since the last time installing this package. + if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." @@ -90,35 +93,32 @@ pkg_setup() { ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." fi + # Check to see if they've changed the qt3support flag since the last time installing this package. + # If so, give a list of packages they need to un-emerge first. + if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then local need_to_remove=""; ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - if has_version x11-libs/qt-sql; then - need_to_remove="${need_to_remove} x11-libs/qt-sql" - fi - if has_version x11-libs/qt-opengl; then - need_to_remove="${need_to_remove} x11-libs/qt-opengl" - fi - if has_version x11-libs/qt-gui; then - need_to_remove="${need_to_remove} x11-libs/qt-gui" - fi + for x in sql opengl gui qt3support; do + local pkg="x11-libs/qt-${x}" + if has_version $pkg; then + need_to_remove="${need_to_remove} ${pkg}" + fi + done if [ -n "${need_to_remove}" ]; then - die "You must first unmerge these packages before continuing: ${need_to_remove}" + die "You must first un-emerge these packages before continuing: \n\t\t${need_to_remove}" fi elif ! use qt3support && built_with_use x11-libs/qt-core qt3support; then local need_to_remove=""; ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - if has_version x11-libs/qt-sql; then - need_to_remove="${need_to_remove} x11-libs/qt-sql" - fi - if has_version x11-libs/qt-opengl; then - need_to_remove="${need_to_remove} x11-libs/qt-opengl" - fi - if has_version x11-libs/qt-gui; then - need_to_remove="${need_to_remove} x11-libs/qt-gui" - fi + for x in sql opengl gui qt3support; do + local pkg="x11-libs/qt-${x}" + if has_version $pkg; then + need_to_remove="${need_to_remove} ${pkg}" + fi + done if [ -n "${need_to_remove}" ]; then - die "You must first unmerge these packages before continuing: ${need_to_remove}" + die "You must first un-emerge these packages before continuing: \n\t\t${need_to_remove}" fi fi fi |