From: Diego Elio Pettenò Date: Thu, 7 Sep 2006 16:54:24 +0000 (+0000) Subject: Add support again for different mkspecs and add ~x86-fbsd keyword to version 4.1.4. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4eae85814fdb82570dc22635ee0298b55f3bf503;p=gentoo.git Add support again for different mkspecs and add ~x86-fbsd keyword to version 4.1.4. Package-Manager: portage-2.1.1_rc1-r6 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index ae48b0ec86ba..5354e6598c58 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.344 2006/09/06 12:15:50 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.345 2006/09/07 16:54:24 flameeyes Exp $ + + 07 Sep 2006; Diego Pettenò qt-4.1.4.ebuild: + Add support again for different mkspecs and add ~x86-fbsd keyword to version + 4.1.4. *qt-4.2.0_rc1 (06 Sep 2006) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 6b1934c2023c..631f6e8be7e5 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623 @@ -110,18 +113,18 @@ EBUILD qt-4.1.3.ebuild 6367 RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 SHA1 MD5 6c5dd8d31125c5e8302c7dd3204aab22 qt-4.1.3.ebuild 6367 RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 qt-4.1.3.ebuild 6367 SHA256 a00d5b65b171fd3ebb2ba8a79d30bcf692dacce456868c113b0e8956308a1cbd qt-4.1.3.ebuild 6367 -EBUILD qt-4.1.4.ebuild 6439 RMD160 2aee2a0f0abc22fe0a082df9a3cd1a5445e6e9fa SHA1 f648466a99f9e4855500a106c8d629b68c45af42 SHA256 d8dc04c478ccda4acee1b002a5e5ed9433fc13c14cbb79e54c521980bc1b6c92 -MD5 5ac7cd4f220696002715d88623ca25de qt-4.1.4.ebuild 6439 -RMD160 2aee2a0f0abc22fe0a082df9a3cd1a5445e6e9fa qt-4.1.4.ebuild 6439 -SHA256 d8dc04c478ccda4acee1b002a5e5ed9433fc13c14cbb79e54c521980bc1b6c92 qt-4.1.4.ebuild 6439 +EBUILD qt-4.1.4.ebuild 6801 RMD160 b29e2755de96a8189577ce1bc17f7ae79d7ca522 SHA1 d46ceca1eaa2d58ca2f6879e11a76a121afa668a SHA256 0478c864bf0361ccc7d32dcbe5774d1df7a51cd5447ec793254a57335a95b349 +MD5 baf8b1717f967a7575d8a619335c788a qt-4.1.4.ebuild 6801 +RMD160 b29e2755de96a8189577ce1bc17f7ae79d7ca522 qt-4.1.4.ebuild 6801 +SHA256 0478c864bf0361ccc7d32dcbe5774d1df7a51cd5447ec793254a57335a95b349 qt-4.1.4.ebuild 6801 EBUILD qt-4.2.0_rc1.ebuild 6751 RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 SHA1 59ce5278972cef9dbee442e2d81a30a56d7c999d SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2 MD5 d565480cd2c41ccd20fb5db7dc59db90 qt-4.2.0_rc1.ebuild 6751 RMD160 06cfcc37a71f0518f3a2db29d31910e3a0f69ed4 qt-4.2.0_rc1.ebuild 6751 SHA256 cedc1b12b7ed0809a93cbd67c7ab0dfb11698c36736c12983fdda01f45a007b2 qt-4.2.0_rc1.ebuild 6751 -MISC ChangeLog 14095 RMD160 5052d93676e6ac796f1c897534acca45f0ac7451 SHA1 73b3cf194f54cfdf453a1b5ca50749c9c2b495f3 SHA256 3d3b15050e8a8c97c78fde9ddc7a2a3e1c69396d0d63ceb6d65018180ff8566a -MD5 98b8d057191944e9cc7c1d2f33af40a6 ChangeLog 14095 -RMD160 5052d93676e6ac796f1c897534acca45f0ac7451 ChangeLog 14095 -SHA256 3d3b15050e8a8c97c78fde9ddc7a2a3e1c69396d0d63ceb6d65018180ff8566a ChangeLog 14095 +MISC ChangeLog 14258 RMD160 82de584162f86cc806a9d7113c44f9e65d53ae67 SHA1 546c69bc4f9556ab712493b4b5944f7a3c3def19 SHA256 40162ec13d855a2ac640cf5fbc16fe6d4edc06b56bc0a21a0392780121ef9df6 +MD5 7173af59f01d9927c06bc37bb7d1e235 ChangeLog 14258 +RMD160 82de584162f86cc806a9d7113c44f9e65d53ae67 ChangeLog 14258 +SHA256 40162ec13d855a2ac640cf5fbc16fe6d4edc06b56bc0a21a0392780121ef9df6 ChangeLog 14258 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -144,3 +147,10 @@ SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/di MD5 ea1cb36339ecc7954be532597c153c79 files/digest-qt-4.2.0_rc1 301 RMD160 b055b1a3cfaee416de3d615c8b6fff1c9f150b61 files/digest-qt-4.2.0_rc1 301 SHA256 2ec5ae0152c97cf52bf9a42854f2c202f97b1bf4b3f72c14e30bbd98f2f7352b files/digest-qt-4.2.0_rc1 301 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFAE7fAiZjviIA2XgRArSRAJ9+TrFKQ+V1AQVD71feHuFZG+37VQCfY6ZN +fGCqDDxkV9JHJJjHv1qe7yM= +=+fsV +-----END PGP SIGNATURE----- diff --git a/x11-libs/qt/qt-4.1.4.ebuild b/x11-libs/qt/qt-4.1.4.ebuild index 1685f04399f4..999bc3deb237 100644 --- a/x11-libs/qt/qt-4.1.4.ebuild +++ b/x11-libs/qt/qt-4.1.4.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/x11-libs/qt/qt-4.1.4.ebuild,v 1.10 2006/09/02 18:02:05 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4.ebuild,v 1.11 2006/09/07 16:54:24 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -13,7 +13,7 @@ S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="4" -KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86" +KEYWORDS="amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib" DEPEND="|| ( ( x11-libs/libXrandr @@ -65,14 +65,38 @@ qt_use() { } qt_mkspecs_dir() { - # Allows us to define which mkspecs dir we want to use. Currently we only use - # linux-g++ or linux-g++-64, but others could be used for various platforms. - - if [[ $(get_libdir) == "lib" ]]; then - echo "linux-g++" + # Allows us to define which mkspecs dir we want to use. + local spec + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + spec="freebsd" ;; + *-openbsd*) + spec="openbsd" ;; + *-netbsd*) + spec="netbsd" ;; + *-darwin*) + spec="darwin" ;; + *-linux-*|*-linux) + spec="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + spec="${spec}-g++" + elif [[ ${CXX/icc/} != ${CXX} ]]; then + spec="${spec}-icc" else - echo "linux-g++-64" + die "Unknown compiler ${CXX}." + fi + + if [[ $(get_libdir) == "lib64" ]]; then + spec="${spec}-64" fi + + echo "${spec}" } src_unpack() { @@ -168,7 +192,7 @@ src_install() { make INSTALL_ROOT=${D} install_htmldocs || die fi - # Install the translations. This may get use flagged later somehow + # Install the translations. This may get use flagged later somehow make INSTALL_ROOT=${D} install_translations || die # The private header files of QTestLib aren't installed, but are needed by the test library.