diff options
84 files changed, 391 insertions, 2886 deletions
diff --git a/dev-qt/qt3support/ChangeLog b/dev-qt/qt3support/ChangeLog index 0011211498ca..fe454e240fcf 100644 --- a/dev-qt/qt3support/ChangeLog +++ b/dev-qt/qt3support/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qt3support # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.12 2014/01/26 11:55:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.13 2014/01/26 17:45:45 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qt3support-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qt3support-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest index 217f787ba2b3..d05350041f55 100644 --- a/dev-qt/qt3support/Manifest +++ b/dev-qt/qt3support/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qt3support-4.8.4.ebuild 1059 SHA256 8ef082b38a847bcc1b75b3ed394e983da130dffd7708fbb55601f1fa6fa2ce40 SHA512 154a112daba5f896e19be2595ef82eb6f7e92b0677e692dcc0511e247372543e030a5bd2d1698f2d83ee332395bcdd892789f129115f8e972641af667af736bc WHIRLPOOL 907900071ff3025794bf8d44d350a7747367f270efc6609418e64f87ad690a4ee75e25ace68d5cc5494f5ca03688f7e485e7da4b0200259b89a996c608028d82 EBUILD qt3support-4.8.5.ebuild 1022 SHA256 96eeb78bf2846064d1eb4eddd95f4a6e44a354afb4704cf6d10071392c0a24f8 SHA512 76cb57ce2852584495a0aefd19b18d3d84dde4a940568b79e9a007b431e43b0da317a448bba202d09c3575fdf90c7ff285e356a45b0468584662eb85eeb2bb0a WHIRLPOOL 96d9f05fada0140d5fb55d39fd5e00d6e0a5d27d9893af625b0268e8b02893d76f566498371868111a8d2f306a9b2b86ff356bdd1bfc6c243f5f65e9e40141cc -MISC ChangeLog 19315 SHA256 a0edf70fb46ce32c3dbff9dfb0ffe1002b4d3a7e67e25c2516683f5a01176aeb SHA512 897e257f8b2f0d9872d632478d7900544194861cd43c240dd12d77aa92aac289f9256c4c7de48cbe60d16120bc9de5e40f552f6d67c1459b44542cb6a5f1eb76 WHIRLPOOL 5a391391afd1382b8fade130d499803387961810e689e9c868f374bf1ea251226d4723026cf959f6bca4085c16fc5b5eb6fa79f4e1748ea78de02c691ad02f9b -MISC metadata.xml 483 SHA256 4cdc431ac69278742df18f422ec6b633b37fad1698b3e12a08f5255ae239ebd0 SHA512 595ab201600424b6e7de1a4940999cb2c738a5c66375c1e3e2e28df6b5bf0279e746d73dd140538ac38b2119c8503710626704f7243e1d42aaddba9efc10b3ca WHIRLPOOL 1dd68aa55a41d2b3b576a73b047a0cd3fc1fc2a300f39d845ca0feb354b99e8396dfb461926dd5a79f80ded3ada42b46b7de28ed9b1dd667c9f2b92235f2077a +MISC ChangeLog 19420 SHA256 d4090f42382092f6d67f5555748c80dd32f16917b6d92512bcb36ccfc0ca0029 SHA512 6366ada9c0240a12cc4bf39480886715797064d294353216dbd715fa096320ada6e49641213bdbdc8f2f46b438ec3ab771a8246050e74f50bad865607ed2f919 WHIRLPOOL 2659312dfe241dd80be3b4555cc39108516521dd35e8f6f952b95e8dcf105c6a2523705b1510f76acd033926ac0a97739573e4f1888f5c36de0686f4bc8df0c9 +MISC metadata.xml 424 SHA256 b62b25809f9c9553196d5c5d30ee0c0743a7d61ea187a30da41f7db4e9cf2757 SHA512 fd8672a63021d6871560fadaeb1cb7d7bb29e3833d6250e57e6ed02af0e60624d1da62cb458c0a9e63452ed4b179a967575c7f557584a987c975d7106064e4d5 WHIRLPOOL ba51ec14f8145452e6e6056a6350c5adb4fd1c713aa74bfc0aabc6e49cfa8785e0e2bbc59c52df1aa87fb164e1a09eb6ea75a38c404e731e13aff7c357cb9fbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5Pe8AAoJELp701BxlEWfWUUP/Rg2bifEtapbl13MoXwNjGzP -w1l+4iONCdxeKNkaAgIPFm1jcFV5hMQ88AVuOAh1ZFvhq9NPERtIAIWH6Px/84am -TGnRyOUYUbROH83AW7YvQiPxSiaq56yG3zt8SuWcbzibLk8o/Di7eDcII+YJda2Q -7baekJU4QtECJH0obC4c/VeyGI9yq7KeaBwwKrnrBAK6DcJ285PtuhTOTI2FdbMD -s2U6/v775lrUuOKc6291tD+9/Ke6flQug5eGel7rdXiZF0y5SShR4fk2oGsMFmLl -zmSGIky8MN10PxR3ds7seHXxMkFWMDAjKW5CeYgrY61ODDOy4GXIo3IbN1uWKBSw -igdWB5TCr/htSHTXe8uy0+tmX3M+VU99Ii9bM/Jd49qUwFK+N2KzicssR8jDaaK4 -wGa7Tw9OO32jTqkqR+Xec0tDBaDDKBwzVMlpHbLDjQISjTPSOFm2wB/7hsEQjUd9 -xsgjTM6vSQQw44hcV/GH1ofGaDehmRgXrG17CwaDB/KQqGUWeQbav2d4AGkNqCeS -WLpkHQSMSv47ZfuzrbOI5ctqN5WxGwf72xH4eipFPe9an7493VoR67QbAOFALk1u -geW097zR2B/q1H0m8WkMt17uvmgHbZ9NHT1xAfD5H/LuN6Q2yOSH2UsSI60/KVJq -4hmrjrrjEe9e0mja2MxF -=JZ8m +iQIcBAEBCAAGBQJS5UnXAAoJENXLsxwXqFxyacAP/RwIj6gZhze/V/UZNqepH1Yp +7m+Dx3N8fIoZo6A90uohX7FZRFoN4/rWZXDImWvJefmRO/BgjQenHaVh6MHlqN1M +L0h6T0LIouldpCoB7sgZHaSFtPoJubx3dmpE38tClj53igaVkwcDjqa6EX5xHdkr +mdctwgVB1H6DCSNkNQAVtRCNbwIY3kuzJyMIbuTEyOWB+cTrLoLil9HCCwmGOIm9 +nyobIS416gKasC9LlBG4YyNFvxA2nyg99XsW0LPTkvB4XyU+mLDviq4hIH/GDJv3 +CsdgBZA+yRczOni/EuZkRdUZ34pPd6s+ApsTE9tW3JM6q7UgVLl8tYktx98h43RJ +Tmv3dweoUE0kG6T38EknAqUBKFa9FdRpDbRuaHz3qOqer2BjzTSrXB07glPFCrFT +gpMieATyqZ7q8jQpLIC91XCJbU5CpnTXsEUlzaN/WbZM+EYcnqY6ZRjJCvqEf9FU +a/i8lDJG0i5hXNdht4v6NHs9bQj91/S+sw9XQLfrRkdfHcKZWgrnelmNZkveBAXG +7wlrbGOIvQermBTXB7MTLAP3xMzLJAtdlQK5Kp6t/d90/S6TtbIiEuUUxa1dyLXw +FRCfoSCGCV3tjdbKxMbzmzX0l3WfV8zFjvg3JLBjkVaou5j6am7Qp+ykg6cdS0zF +7/nRWhVQSGGkXDFx7Ihx +=dmaP -----END PGP SIGNATURE----- diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml index 782c1341ff99..14dca051b169 100644 --- a/dev-qt/qt3support/metadata.xml +++ b/dev-qt/qt3support/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qt3support/qt3support-4.8.4.ebuild b/dev-qt/qt3support/qt3support-4.8.4.ebuild deleted file mode 100644 index 89cdff2a9603..000000000000 --- a/dev-qt/qt3support/qt3support-4.8.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.4.ebuild,v 1.2 2013/04/08 15:17:16 pesa Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt3Support module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/qt3support - src/tools/uic3 - tools/designer/src/plugins/widgets - tools/porting" - - QT4_EXTRACT_DIRECTORIES=" - src - include - tools" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -qt3support - $(qt_use accessibility)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtbearer/ChangeLog b/dev-qt/qtbearer/ChangeLog index 338516865e29..3f8a5575d6f2 100644 --- a/dev-qt/qtbearer/ChangeLog +++ b/dev-qt/qtbearer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtbearer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.14 2014/01/26 11:55:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.15 2014/01/26 17:46:44 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtbearer-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtbearer-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest index 6786821cedd1..500f60dd75d6 100644 --- a/dev-qt/qtbearer/Manifest +++ b/dev-qt/qtbearer/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtbearer-4.8.4.ebuild 1670 SHA256 febcb630d265821fa7e21f818ed3877cb98bc87e755e874f83369ba9c642af10 SHA512 692c8a6fb523f09bf513000c3508b1e84805dffec80b3a0cc0edef02b94aa9aade0f08dc77f22e004d0add6d901a229b318c9379147387e37b2c77256e2f8eec WHIRLPOOL 6b7471aa28a1bbab41d7bf03d402c0adfcc5b119056808a514fe1c074f20768b584722fbad12b2999be7b8c235cfb68470803cb741b776eac9bc6241151efe77 EBUILD qtbearer-4.8.5.ebuild 1684 SHA256 e5cc6d865f80c64fb2046f86ce69d6c0a5815708c7288e1b776508e65699eb5c SHA512 f284f3fd478312fcf59c71f744aefcfb44e07f9bd130ce4ba536a86b5ca1363f764073ef14258471e9fd2c9391f13ea986a73f23253996f4075cd5771b793eab WHIRLPOOL e7bdda38b7c0ec3ff5a6d4e583d821f2c410dea7cad3f888aab32378d1820e53974d3b3b5bc43b901e5dffbe25b58c809e9a39d258ccb3fbcbc44501b14fdfca -MISC ChangeLog 4855 SHA256 42d3357cbe80a84381539348485e6588269a112222cd47c64e29e850f8c56bfe SHA512 a20eae483ce66a8643afc2579fffca307f30e8a521a135d5278257f9dea3690956548e7d87354f12a573a7337da3225ca71c849cfd8a510c5ede81344a0cf0e8 WHIRLPOOL 6b7fa23e6317df054c7b4e7465bc3c65f7dd41b41a9ab8b470709ea8dbb732bfd14eb32a0d8b6747f258b923f34a485a76d75b390ce2cb2a55c4351da70c121e -MISC metadata.xml 483 SHA256 4cdc431ac69278742df18f422ec6b633b37fad1698b3e12a08f5255ae239ebd0 SHA512 595ab201600424b6e7de1a4940999cb2c738a5c66375c1e3e2e28df6b5bf0279e746d73dd140538ac38b2119c8503710626704f7243e1d42aaddba9efc10b3ca WHIRLPOOL 1dd68aa55a41d2b3b576a73b047a0cd3fc1fc2a300f39d845ca0feb354b99e8396dfb461926dd5a79f80ded3ada42b46b7de28ed9b1dd667c9f2b92235f2077a +MISC ChangeLog 4958 SHA256 0940e5ea2866b4af2d86eb1fd651b688f6ffab8cf3ce8009c8b6406a9bb65c3d SHA512 c6e6f89db8b5ac78e8f35a4f9c2eda531061c56f6029db5fdc67666c5a0c7d575bb0291caef473d717800ee2de586b7f04b2f5857adfcba7f7dafa05c6886b75 WHIRLPOOL cbde732bf116aded2378e241073abe45913c5710139f1cd03a7253e6f25a5ec6310cf2431b1532bec390b0dc9d24e87b406b24c71b669921083e80e6895ab2a2 +MISC metadata.xml 424 SHA256 b62b25809f9c9553196d5c5d30ee0c0743a7d61ea187a30da41f7db4e9cf2757 SHA512 fd8672a63021d6871560fadaeb1cb7d7bb29e3833d6250e57e6ed02af0e60624d1da62cb458c0a9e63452ed4b179a967575c7f557584a987c975d7106064e4d5 WHIRLPOOL ba51ec14f8145452e6e6056a6350c5adb4fd1c713aa74bfc0aabc6e49cfa8785e0e2bbc59c52df1aa87fb164e1a09eb6ea75a38c404e731e13aff7c357cb9fbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5Pe/AAoJELp701BxlEWfrfsP/3P6T1k4YQazUMLTaoek4mrp -sIP9kDaJ8sSAWZPZPDDQODqbzb4+ra1br/lgl2Du48o0UiA8Q7ct96uB3RqORFcd -RGMzAItuoZU+ZkK21QARptFyTxfnrRDy5fj1LEzxOHYatdurgTK99EOZpX3euLeA -Mbx8xxzKlEtzpArDrmf4ZHjye8JTRmpaJmUXMe+gaOF04hdcA0KEj0Gyx1KHBXFN -TQTVKIOwaHd8SXWFzW/MdJx3KFu8l2o8nF+JPs7GKJahv3rnknz0BUcmKRUPHG4L -T8DLBmd1wMUALzfxToFOoxa+x1/MyU8Q/AFXe5O77cxhDPrtgzQnuPE02YIXVqCF -xSFj2bLqOIN0mu5hubdZPkQYq1A4rCCcYa+povrL0zZvStfMooA6oNstMKp6p/62 -CTVhB0vaNy7thnEEwCRA+Es6QIve+OapNz4QwJh/G6AkOBghQKRtyS0klKkdyp0M -ZC7sZHLzOuF3MX47PyHuEWTV6giT4E3z6ak/2gq4K+YguvnnVtE+PHQL3nQ1vEY/ -6gly45XLWm38nr1F4MCqQAsyJRU7atKOHIJwq1JTCdquW2uUdz6Muh+RToBBgTGA -zE58Haw4ZY545RqtN7civUgyNS0CRdZTwEPyrTwKLLqw9GwiglZUQi1EDTH16mLu -NWzj9Yl79fvL4rPVTif9 -=IV4u +iQIcBAEBCAAGBQJS5UoFAAoJENXLsxwXqFxyEO0QAKILjKwDQT4SEjhYrEFR8qzd ++WUfTpVu6cpYKUyCoX79uTi9rSc+FfACixpyoTjE8VAg+zcluRMyZyrz99K1fXWk +Kfb7WP+ANn7SFnn0Ua0I/C2r4WL3h7ncT443jbr6Ls0mMi4xemEfXKRyjQ3qQNrD +6wzwJV6Q9tVJQgyA8JkX/LrACuEmkKS2illhu2s4pDhHmnSj0JBuancWEcITknwS +Uy0p8mPfbmQS7AJRRBIRn8HUmV5XaOHi7zmZJDdStmUtsd4lpTBIzkmo4pd2vqto +UQUycJSTzbXIvXITb0MFfmsfem8SXf6M/+t591wyWjZH+oIF3X0cMNC8eXhd6b2M +5Uhn9lgU2k+klWw5GBGrNjiJPlChBc1oiuG4NBSTh+P/JAZbIA9vrRpdiecHnJ5b +t9wTxQe6F7Wo8qmoJDH5l/ROeHg7Do2Xj6pHgCOzqe46/FVYD2M97XXA5sSptOrV +kWbGZgTjaPtVhpT0dsrN1bkmr5QyUPb/20AkjsHxoi+5ujg5NIqpQGxT9/tTX5GW +DGPWrmpNPxXwaWeDOTcFvTP2cG6XxFTOYy49aqgiytguXK66XThle0SC8AMX3ZvF +GHyaYbzQGSS3oV6aLy072AjX6psFvDiDyIcyJVmtAlGAufHcCyjVhCVMiDIbkWK8 +pHRuDamSHUJ41JToCS1P +=VGkF -----END PGP SIGNATURE----- diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml index 782c1341ff99..14dca051b169 100644 --- a/dev-qt/qtbearer/metadata.xml +++ b/dev-qt/qtbearer/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qtbearer/qtbearer-4.8.4.ebuild b/dev-qt/qtbearer/qtbearer-4.8.4.ebuild deleted file mode 100644 index 3a8edbfd2a8a..000000000000 --- a/dev-qt/qtbearer/qtbearer-4.8.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.4.ebuild,v 1.1 2013/03/02 15:25:37 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The network bearer plugins for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" -fi -IUSE="connman networkmanager" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -pkg_setup() { - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtDBus - include/QtNetwork - src/corelib - src/dbus - src/network - src/plugins/bearer - src/plugins/qpluginbase.pri" - - QT4_TARGET_DIRECTORIES=" - src/plugins/bearer/generic - $(use connman && echo src/plugins/bearer/connman) - $(use networkmanager && echo src/plugins/bearer/networkmanager)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(use connman || use networkmanager || echo -no-dbus) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" - - qt4-build_src_configure -} diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog index 41cf4d2937ed..4e91ee29c362 100644 --- a/dev-qt/qtcore/ChangeLog +++ b/dev-qt/qtcore/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.41 2014/01/26 11:55:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.42 2014/01/26 17:47:41 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -files/CVE-2013-0254.patch, + -files/blacklist-mis-issued-Turktrust-certs.patch, + -files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch, + -files/moc-workaround-for-BOOST_JOIN.patch, + -files/rename-qAbs-function-for-timeval.patch, + -files/set-pkg-config-locations-directly-to-install-dir.patch, + -qtcore-4.8.4-r4.ebuild, -qtcore-4.8.4-r5.ebuild, -qtcore-4.8.5.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtcore-4.8.5-r1.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index c64327a0fab4..1fafe8d12295 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,38 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935 AUX CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch 4531 SHA256 fd6e59635ea7bc86fdc36333ecd77609ae5cdc52c3a388c3b0088887d9a21b72 SHA512 b81810d62e8652f91b787285e8208b42d723e89aef248aeca24f02cd84b4a098c82571ece7c8af9c25c0535bde61ee376b6c24992f55fbaef2dd77f54f14ef1a WHIRLPOOL f7e6d005c157314eba3501bb9fdcecdb1f0b317880d659ac42e9b17a79ba98892c6ad9b49651a81d2a8c5c77d9e6ab9b7953422435543b1e38f1eeef0865dbd3 AUX CVE-2013-4549-02-fully-expand-entities.patch 6117 SHA256 848dbcd78c2ae0a3f6acca07b48067c453f721adfbe4dcdc90ca8267eedbc065 SHA512 1564fc1e299704c7f51015fdf3213e3c85460d2950821f53f94bbf98c80275e845aa8804250081df9db8172ca26fde11070e21ce18b8ee17961689ceb96daac9 WHIRLPOOL ccf1494fd0b243aed5149d6f1ebaadb5bfefff4698a95fae6d006247a9daee493e8e4c567a2bc930efc7b22c27761207afd1c8fe8f104c5a3fed491a669d14e8 -AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5 -AUX fix-call-to-QMetaObject-metaCall-from-updateProperty.patch 1570 SHA256 bca22cbb85b852101ba90bb03a96922f35f8bc158e5781d62dcedea6481d832b SHA512 119c44be4cc2195dd593b5a4c3986b267a12a3e415c057f36ff953c980eaff9df68171440782d5e81803961df062fe25506bef8e564b220caf10ccfb462b6839 WHIRLPOOL 0a1931d941a8bfd62835864b4042019a5d96b44f4da04f911a9f721e30a0304d0aa24ce8205edbe222e0c6b37fb544fcb1c451ad8d6402d70554d1ee04e3fd1a AUX moc-boost-lexical-cast.patch 584 SHA256 dadd3eab516ee26f1c19f17dbcb7be46e7c9efba49924fa1d53cc0176491736a SHA512 ed2cc3d36ac8576cee42d1586b99913ce060a47e72c82890e7b5fe4fc500e857693f2348f4446ce7dfbd1bbdf6e51b99b57f2fc09d6c15f9075f10c4b5459fa6 WHIRLPOOL d4ee64605ad9dacd371519a9c08582c25ea891480c79795822cfe74e6bafb332d558dca5d024c6f369e3674fde5a89a15a7d79042093295ac9d0a0d516493583 -AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe874f6d408db447a3e078006c6f2d722e8c0b7 SHA512 9530a50fab3ef08c805b7a3b3e85ad2ea86c6c014a2e5702ca00a21e8445477699bc5280edcdce5defbc37fe43f50f7581677281ca9897fcc55ac68eefd3c81f WHIRLPOOL 302dc275378046661353cc69ac93a062d331f7932ca733b0dc1f1770604d54e698ff473477a8e082bac196134e7590573f5bb2ca895d17347dbcd471233b1d28 -AUX rename-qAbs-function-for-timeval.patch 1679 SHA256 0a8cc8677fffba64cca24a9810d3c7afe6137d4888de33ebf2ff5bea3a33d487 SHA512 14e818316c62a41851b8c3e80ef2b059eb830672e88cedb1b73c797ee137fc0fc056879db1262285c68c93e0e8c37d7fd16339530a8783f9697b4ce2e6c65054 WHIRLPOOL 106adacf22078e5032591a7c864e28d0ff081dbfb265d7087a37064ed3a0055804e935e31479ee22fddd722e17d234c8060e409409a41fc057f01efa0d9f8bb9 -AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -DIST qtcore-4.8.4-update-defaultNumberingSystem.patch.gz 7719 SHA256 69e4be2ad4d08067a6bc8708a164822128a8fa8226d90a0be02e89ba537d90fb SHA512 a8d1501223ffbeeb9898afd5ce7fc4839a6155ae2612d796eed674a01bf8d53241d627a60a179bf93cf3e0d338de5468b1495c97843166245f295df559c52b12 WHIRLPOOL f8027c78f1691d1a50b30bcfe53c8750727a1d49dc45233ebeab5a1d7388a4291fe74a9b35bff5417b48fcfbdeadab3dc130fade17012c95ca751d73b2814b4f -EBUILD qtcore-4.8.4-r4.ebuild 5218 SHA256 44f7a0a6c7bb22b838b7e5ff0ddd8da8bf70c891e914fa454d6f198751de9ded SHA512 af3015e641f8eeab5e48e949cffec9fa9b97691b3de20dd5bfc3c6a6d480d874da85168cb2f17a04a953cc275669aae0523fcc61f3c57a9b8bb1897e6dd277a3 WHIRLPOOL e3a8bea441ca667e0c6c100b1b3b37559d7fe47a628450586bdf102e0a0d507c09ed61210de86df378d55277731cd863406206af8306013abd5d5c54acd019ba -EBUILD qtcore-4.8.4-r5.ebuild 5513 SHA256 f35bf696783b5c3c998343ce75de7139b1c35eb921dfd27981c633d8f36e9bd9 SHA512 f42faa5b31eaafbb843fae66573a4d95ea574f589acc8733240dfa7c89d0a833e7aa0fb77d0987355e26497e0ffc5fc9b5ea82511e881a57bf5b3093ea660b3c WHIRLPOOL 1ebbc32a2491743b92bb1e5dd130cce0cd6efe832be7fa6642c68b0fdafc4329fecd35c8ac0c0349d129890ff644a0d6bfdd4ab6e0f183940de5268d0b66b751 EBUILD qtcore-4.8.5-r1.ebuild 4999 SHA256 dff2a669014633f428962001c8872b0685c7402fe04806f3cba4c2e7ec267d7a SHA512 d91eb2855bb543301ce4261b36a82104abd3a3e030a0f56d2b6efe6bf5b635c454f10a9c5916a55129f025ce5f2429785c1ccca748f44ae9e0e775cd64f26e9d WHIRLPOOL 6efecaff544000db98e67e8db7bb90837dbc621e61504ea781e4c0ceadef28798c8262c3516bdf2250d86e142f542f04be1ed63fadbfdd79b8b699ee4408e87e -EBUILD qtcore-4.8.5.ebuild 4857 SHA256 bd91a8cef1b938a207d7c05cef07d60f7e4d2cdac9d25e08477f40c14abf7679 SHA512 db2eedbed92461951201297caec5136e58da21bd70ea585a887ce76c1c00e59dad4ab7a269f0d397ca17088a7fa8d7a49a3f7c841926e867decc584d47355b6e WHIRLPOOL 80864fa6f8f96610eacfc33f410c6acb792a57845c28f3bfcd43071675994752116e17d3e4db654a11d2376baad49c5df59daccd8bac1a4dc43405ca65230422 -MISC ChangeLog 34056 SHA256 4b5c09a8e321930e4d3a5165168fb6ec4c88dbe20111ebba5d26c808244c899f SHA512 61a69c13a06996698b87f3335499f8d9fa4d32899b44658221ac286f6c0992252248d66236980e32a4569267c755b5cc8e8623fa7fea71447c9b4ebd35d9ae6f WHIRLPOOL 9dbcc3dbd746bc47a2ba600b0ef9b047fa98bfc41430e56c27a7a431561a7c768179d29075cd3a8cefcfac563a30bd0bd261150cbe3f38a1a8fb4e032128406c -MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824 +MISC ChangeLog 34519 SHA256 12fb03a6af89546f2946664c738e5ce08b90c77cc5a8749621d58915118d74f1 SHA512 85a20ff36a8a91b5c40c02dcf835970ef8d80777fc929b09ca39e1d2f617131e20103f5ab73d4754c22ef86b497af355163487072d3f3f4119d606c5f802e54f WHIRLPOOL b627a8db920a4598b7de099275b8558409e9c6cf02a54d3e6bf8ec73ef3a4304ab9f7aa5d70773dd757140e333a5fff33309b42525fb050597248bbfbaa4280d +MISC metadata.xml 652 SHA256 a88dbe9c440633e05448d8352cebb33dc4c0bdd5e2e2ed7f99c1a75ee1838ce2 SHA512 f5497c4916a7f99132eb394eb88b5d58771fee0d4c238c9a0af0a869947f2edfeeee3f48be56a879ac38a91a4ec09d1983825669afc786c65f8c53d718a035dc WHIRLPOOL f735442ba47063cc524afcd1c565694d4a3647c7d44a063039a1a9c046bb79014d805b92c2094b5ecf20799bd30253f23b66dd5ad9e21003e1a6ece2bf41a9cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfCAAoJELp701BxlEWfZdIQALCetwJrwMBeQiT+V3ucEFM4 -JeGM16zlJPdHu5JV7luyk/kjA/iTYJK7grQO17K0ntdg6tPO7xHUn2eocHwc5jfv -l5e0+bT3E0YuMPLjmK48RNVAi9Fq369/OrurVQMsH2RBuJrHyt1bMIhhkAuBv5ju -I4vhiCfyIgDamrOGVt48hUl62Tn1b5zkkwZjPTyf4ZQjbx5uw+K5N/RDYxnQvmaT -LsgWCSSzZNiArEIRc16TIYglGd4slrcwzi0Y/RrHexQVigUaXPKo48nLENRWf7kX -8Zyj82AK44Zcn7VBt5SCmX5zOIhxY+IEBLz7dUpRFOHwgdd4p+S2CSjZXAjmaIss -A+fj2QRGcr9TwjsZYSfNY+yF1vS+Ne7Bo+W/dBD9m0Kncg6Nv3oFm6bPaUDHZ9MX -OGGXi9OskA7dHyj6KlV04N0BvC/RVz1TXq8FCS4SlGTPc/qnTZgEd0Qvs0unK1K+ -CxXcefc/uu+gotd4b3VFORKLUyY94n/qJWtmyT3drClqsz2JUx4Dm6w7FqIDYree -IGX5VJNoDSuDq4JwcERtCUVBCk1b8592mjcw9+gHcW2wiJjrvkmGKpFkKV8hpVug -Xr7K6jde5LZSLfvpN8mqe5Fy04GxAolBnzmZeb2iU2osa/ySd0IMKs0MPFbIg/xk -CO8irNMW+9f7t8uJqDi3 -=V3n/ +iQIcBAEBCAAGBQJS5Uo+AAoJENXLsxwXqFxydMwP/Am6m7OFQ2wL9JindM8dR1ZQ +0JjPCV9rGJeA6Nbdy1XrfM3QLocnLsDHka4OHL4lr14KeouySDKdCCxS1NrHBdjF +Ifr7JzLi3IFfEkMp6Agbcv7la29VBaZMJ4qXb6KtHzjpsrsIw4rMQbbRgycjCE6Q +sUFGP2uWp+12wwwC5byRSuCP3+7hYTOh2cgWnRwD0wLjkMZSG6qERbDg2sZxXJMi +5fKo4apw+XSFSLdnHX8Ufb+5KyHhL23iOfNPYeWCGwjmp282H/WHr0ILSOZWUooS +CPEbrCVzJ3mSvADHM0HRHpEY7l8bB63gCCLz20Rd/opOr4BbbXqGkqY5LxrOuVhl +ughbjxgAGXX0xnrdkN2t8klHNrLe5oSCONW4XnSgTnuyF0Qsc9+kPb9PqSPO9zsL +BV9Pu+CzvW5Z90B/wCwLEOVaDAfVxKpp5Qm5bv5cvUjLEa4MuAGvH/qZtwKXLL5e +suiGxJXrsLO1KZgmvGB7nk6ejjXBlYBT0kX1oKJneVllVAnltZHcsIdXBTdv7eCo +0PUXKD4pmCoqZ8IX69AntttJUvExEsvsBQWwybhjbrmPaac5G+bXCp7TeCv2fL9X +NOLB2VyXh/EUvAIv5c2MB5RIgMExd4L1tW2ySBC3dGlaYOgToe97k4/X4xpDKni2 +Lyhij6hA0vKuRm3e8urE +=jNLI -----END PGP SIGNATURE----- diff --git a/dev-qt/qtcore/files/CVE-2013-0254.patch b/dev-qt/qtcore/files/CVE-2013-0254.patch deleted file mode 100644 index 48cc05f1800d..000000000000 --- a/dev-qt/qtcore/files/CVE-2013-0254.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); --- -1.7.1 - diff --git a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch b/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch deleted file mode 100644 index c2245ccce0a0..000000000000 --- a/dev-qt/qtcore/files/blacklist-mis-issued-Turktrust-certs.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001 -From: Peter Hartmann <phartmann@rim.com> -Date: Fri, 4 Jan 2013 11:06:14 +0100 -Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust - certificates - -Those certificates have erroneously set the CA attribute to true, -meaning everybody in possesion of their keys can issue certificates on -their own. - -backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase - -Task-number: QTBUG-28937 -Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/network/ssl/qsslcertificate.cpp | 3 +++ - ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++ - .../blacklisted-turktrust-ego.gov.tr.pem | 31 ++++++++++++++++++++++ - 3 files changed, 58 insertions(+) - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem - create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem - -diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp -index 038187f..37799d1 100644 ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = { - - "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust - "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust -+ -+ "2087", "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate -+ "2148", "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate - 0 - }; - -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -new file mode 100644 -index 0000000..33f2ef4 ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem -@@ -0,0 +1,24 @@ -+-----BEGIN CERTIFICATE----- -+MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow -+gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr -+b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz -+bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA -+a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -+CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5 -+GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R -+rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa -+tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r -+Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF -+9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw -+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K -+JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l -+zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA -+l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8 -+3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp -+Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC -+pWfGWA== -+-----END CERTIFICATE----- -diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -new file mode 100644 -index 0000000..e9d048f ---- /dev/null -+++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem -@@ -0,0 +1,31 @@ -+-----BEGIN CERTIFICATE----- -+MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD -+nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl -+cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0 -+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo -+YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow -+bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB -+MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE -+AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -+v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V -+50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF -+Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO -+wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q -+blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N -+Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS -+29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G -+A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF -+BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF -+MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t -+LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd -+MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy -+dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz -+aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy -+a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn -+vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV -+gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj -+7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU -+h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1 -+Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I -+hQ== -+-----END CERTIFICATE----- --- -1.8.1 - diff --git a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch deleted file mode 100644 index d59ac490785a..000000000000 --- a/dev-qt/qtcore/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> -Date: Sun, 3 Feb 2013 23:07:07 -0500 -Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty - -Create an array of arguments in the same way -QMetaObject::write does - -Task-number: QTBUG-29082 -Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305 ---- - src/corelib/animation/qpropertyanimation.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp -index dcf779a..9869d7e 100644 ---- a/src/corelib/animation/qpropertyanimation.cpp -+++ b/src/corelib/animation/qpropertyanimation.cpp -@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast<void*>(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } --- -1.8.1.2 - diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch deleted file mode 100644 index fa82334d7d4b..000000000000 --- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 -+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 -@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ -+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829 -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch b/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch deleted file mode 100644 index a862ae83504c..000000000000 --- a/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 522c899b777eb25adb7e235baf0027c0c0a9119a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> -Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH] Rename qAbs Function for timeval - -This decouples it from qAbs which is declared as a constexpr under -certain compilation flags and enables for qtbase to be compiled with -GCC 4.8 - -Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -(cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c) -Reviewed-by: Olivier Goffart <ogoffart@woboq.com> ---- - src/corelib/kernel/qeventdispatcher_unix.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp -index df3cda1..abf1c29 100644 ---- a/src/corelib/kernel/qeventdispatcher_unix.cpp -+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -356,8 +356,7 @@ timeval QTimerInfoList::updateCurrentTime() - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { -@@ -406,7 +405,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - void QTimerInfoList::repairTimersIfNeeded() --- -1.8.2.1 - diff --git a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch b/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch deleted file mode 100644 index 46b9c28cfde4..000000000000 --- a/dev-qt/qtcore/files/set-pkg-config-locations-directly-to-install-dir.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 87fa0250081cffb6e413fec7957f5ac4add6cdd1 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -Date: Tue, 8 Jan 2013 16:34:26 +0100 -Subject: [PATCH] set pkg-config *_location directly to install dir - -qmake tries to replace all occurrences of the install prefix with a -literal ${prefix}. of course this would mess up build paths which happen -to live under the prefix (this is untypical, but still), which would -break the sed magic in the subsequent install step. as qmake itself has -no use for the .pc files, it's ok to target them directly for the -install dir. we do the same with the include and lib dirs already. - -qt5 is already doing the right thing. - -Task-number: QTBUG-28807 -Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 -Reviewed-by: Davide Pesavento <davidepesa@gmail.com> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> - -diff --git a/src/qbase.pri b/src/qbase.pri -index 991c888..feec9d6 100644 ---- a/src/qbase.pri -+++ b/src/qbase.pri -@@ -166,23 +166,25 @@ DEFINES *= QT_USE_QSTRINGBUILDER - - TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end - --qtPrepareTool(QMAKE_LUPDATE, lupdate) --qtPrepareTool(QMAKE_LRELEASE, lrelease) -- -+QMAKE_MOC_PC = $$[QT_INSTALL_BINS]/moc - moc_dir.name = moc_location --moc_dir.variable = QMAKE_MOC -+moc_dir.variable = QMAKE_MOC_PC - -+QMAKE_UIC_PC = $$[QT_INSTALL_BINS]/uic - uic_dir.name = uic_location --uic_dir.variable = QMAKE_UIC -+uic_dir.variable = QMAKE_UIC_PC - -+QMAKE_RCC_PC = $$[QT_INSTALL_BINS]/rcc - rcc_dir.name = rcc_location --rcc_dir.variable = QMAKE_RCC -+rcc_dir.variable = QMAKE_RCC_PC - -+QMAKE_LUPDATE_PC = $$[QT_INSTALL_BINS]/lupdate - lupdate_dir.name = lupdate_location --lupdate_dir.variable = QMAKE_LUPDATE -+lupdate_dir.variable = QMAKE_LUPDATE_PC - -+QMAKE_LRELEASE_PC = $$[QT_INSTALL_BINS]/lrelease - lrelease_dir.name = lrelease_location --lrelease_dir.variable = QMAKE_LRELEASE -+lrelease_dir.variable = QMAKE_LRELEASE_PC - - QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir - --- -1.8.1.1 - diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 5e30afebf876..9d8d98a6b84e 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.</flag> diff --git a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild deleted file mode 100644 index 7f9db1e9e6db..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r4.ebuild,v 1.10 2013/04/08 15:04:10 pesa Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" - "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" - "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch" - "${FILESDIR}/CVE-2013-0254.patch" - "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - include/QtNetwork - include/QtScript - include/QtXml - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done - - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild deleted file mode 100644 index 0dd5bc4a9562..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r5.ebuild,v 1.10 2013/08/04 11:45:42 ago Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" - -SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${P}-update-defaultNumberingSystem.patch.gz" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" - "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch" - "${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch" - "${FILESDIR}/CVE-2013-0254.patch" - "${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch" - "${FILESDIR}/rename-qAbs-function-for-timeval.patch" - "${WORKDIR}/${P}-update-defaultNumberingSystem.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - include/QtNetwork - include/QtScript - include/QtXml - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_unpack() { - qt4-build_src_unpack - unpack ${P}-update-defaultNumberingSystem.patch.gz -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done - - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtcore/qtcore-4.8.5.ebuild b/dev-qt/qtcore/qtcore-4.8.5.ebuild deleted file mode 100644 index ddfa09074fd4..000000000000 --- a/dev-qt/qtcore/qtcore-4.8.5.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.9 2013/11/11 13:56:14 jer Exp $ - -EAPI=5 - -inherit qt4-build - -DESCRIPTION="Cross-platform application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-boost-lexical-cast.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src/plugins/plugins.pro - src/plugins/qpluginbase.pri - src/src.pro - src/3rdparty/des - src/3rdparty/harfbuzz - src/3rdparty/md4 - src/3rdparty/md5 - src/3rdparty/sha1 - src/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # Don't pre-strip, bug 235026 - for i in kr jp cn tw; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done - - qt4-build_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed for qconfig.h failed" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog index 52735922c4fc..093d7546dff7 100644 --- a/dev-qt/qtdbus/ChangeLog +++ b/dev-qt/qtdbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtdbus # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.11 2014/01/26 11:55:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.12 2014/01/26 17:52:34 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdbus-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtdbus-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index 4fc1e3a52164..b7e8b32060d3 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -3,26 +3,24 @@ Hash: SHA256 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cbe98c61543475cf75b0251722d0f562e9ff8a3b8a89d3838811 SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 WHIRLPOOL c28d79d56c284dc17489c31449b20d774021a0a9dac385c327e6b42997dabc0d92aeca4f5fae3020926f6c16053b30f82913800019e5419e3a82f58481fa30db -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtdbus-4.8.4.ebuild 1186 SHA256 5e192084b00d47949c98e159a9d7fd93eb355e78650c961eb4ce917b99476bfe SHA512 dbbf0d432e862bbc81ef3aaa6551eb56024446a7a9092b97063c06121c41ed05675a93a1d720ef8185fb77b68b470dbfc8d826e14ce54993bbd142b5b6d353ed WHIRLPOOL f241422975521969a8fd3c7cf07ece6091ed49c88f8eb1471d143eab311997179d9ab24e4a94004c1e34713b5fe19c63573f4558c6b92505ed69a2a7b29334bb EBUILD qtdbus-4.8.5.ebuild 1184 SHA256 2f9ac94d2d32deb1798a98425b288ea6ffb900bbe9dfbfd24b156cf869249476 SHA512 4defc49eb7de95e21e12a07ee919fe0a3aad462e3f75b46e763a0822d7c28df103b6fc4c2173a50e3e8df6eb30f3585f28417283b6b1d2023fe3e0f6a055ebed WHIRLPOOL 56ae1d167972bc7540d4195e3bb6660a0e58f0e50ece0d897fa679af196d404d9156e0cd48fa94fdd00fb404e2139aee5861482b1c33ed0e2fcb0ba7e4b81fee -MISC ChangeLog 18066 SHA256 c3529f4d56ecf587adfbe113bdaa16778f0e06ded39bd838c69eedbdafb574db SHA512 038d88a3693557dba89e65ebf9cc1a41c1ba924d29c1564249e551a6ee19409cbb179e1699b7aeb040fd85231c759d4bfc57201d6ca8b27b97052cc5c5d01796 WHIRLPOOL b4287dd93a35147f7bf99aa410533978f7a405b69a321a06b5386f13d0e48499432cedd75fffd0e4f492dfb586737a3e6aae1d774c251d1d8a9b68c715478045 -MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f +MISC ChangeLog 18167 SHA256 4db3b59434a57f8342f049d361b073917da94376ba6244bf93480497ac8c7096 SHA512 a4c735b8e4b3ee5aa3518afc873d8205fff6d249e879ce16ddbd4953cabcdca3719a0e7eee4169e35c5984ff94d4b6ee70b693bc9b94d978f86018a398262479 WHIRLPOOL b6d1b70b375e9823490ab26eaab3194bdd504871e628dabc51e6d3badaa80f05cd3b86a6ec07b187408a958a09d928357ee651b8878156319d255d38ffa243c4 +MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfFAAoJELp701BxlEWfCEkP/jgaO4aYT66dizD8FyybACSu -Od5BC6CAOTUfhefT/T+zEQewB/bcQCJ5YXOY5tjp21HC017M+EcpdOCKmciOP71B -cN6q404eldCNThWK0x1oQE4gwQgVew05y8ZjaCqqfQPjuksepeJb8GNgyoO9Coy8 -ENx683LlCinw7PENKdmDPNXF9DucCWriPb4BAtn96b5GDR89w22L86/EijtrC3pW -FJPC599UN8ruj2hGoNHn/K5pLMBAfuNkMOltLDMXN1cQEziOfHtwzpxOwCsaaP87 -KR6GUQEeAAebQIZ5sEkJfC63u4DKimOpcPy/BgCgfTOSfmKvxUS7gderZ/fzMUVk -uQaM5ZEy4zGzKtxZCOdEIlHr/0dB+MtllSEEKpU3eax6G2YCLbBm90YrHKSJC4MV -ITZ6ufK9weKQrFYmBZajCeKag7ZpGvsWfsDr1P68O0ET9OT7Bs2/hV5R6MXxAwzI -zs7FTg3wW6o2g8Qn+mdS8vxShi/GUjzFQS2xlEUJ7yjWm5u4wbcMpKAcEbZzGGuG -UGQDdOGfWOHCGW5mOSaOQJgSOy1PUZa29W1HDc7zT22Ja3Px7XNoqYVgdghkcRm5 -3dpMn0U73StDWyWckf7q3bURIIyxHVdhVJCJ78A+ovr1AJLSJuZKo4v0aG5ikFL7 -7nS0AY2FDQTOjqC1RV+W -=Bt37 +iQIcBAEBCAAGBQJS5UtjAAoJENXLsxwXqFxyxh8QAKm2882lIxC8UYSqaFZ41bgK +dLXrhgVZw/skIyLItNHuODWZ+aPMveMzRkAK6J92TdOsnp54Qxip2TB0Ub/ORHU7 +BKa/QVpWQonwqAl9MXamJy32+ixoO3c1bLO/8bnTUTlNEawN9QOk0amS2H6g8CDM +cxSQ53qrbG+UtR9psZkeHUNgBQarv6CkG+W7/tRW/NCD0719YPfzut0VjL46b4yd +9CIksEFQMa6U2mXS4tpvC1uVbgRF2EQQIMoZ1F/Tmso9VKQa/RJfbHl/QOY8QlEc +OWo/JjYZbftMWeUckIumnjp5g/8tx82CSHzP2Zk9moM1HsC27SZHfwf5IsaGoa62 +AuBQa9drheEn//ekwl4dgVlupGbB+h2hCenfVA9RxOHxCKIDxQ39uHkVEImQOpX1 +r+D+HygfckVwcuKRuTgvtB0YohoyDu0qWsn9idWlLYNEGXOu8GGrKgDGRMlSnLqR +znAyBC5uIL92P6Xw5NM0/bvVa9J8JN+Ut9/WaH48qE2Ze7C4zjE1IEqQygs6Ufhw +N7mhrjhGdxr4q/F4Baawrwmy/EFpMYp1y4ubqxeFHHRu+tIgLLjOpceifJgQE4eb +1hN98ukYjFJ6a50dNCnIMGEl6o+oQI6Lr4RIGLo0C9n0hFnmLkc1Ly/sPXX4gxQI +EKhuh8FpxGEJEvUywY/Z +=2Vue -----END PGP SIGNATURE----- diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml index 93e5fd3f1e69..e3ba68900f83 100644 --- a/dev-qt/qtdbus/metadata.xml +++ b/dev-qt/qtdbus/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qtdbus/qtdbus-4.8.4.ebuild b/dev-qt/qtdbus/qtdbus-4.8.4.ebuild deleted file mode 100644 index 67b77296eee9..000000000000 --- a/dev-qt/qtdbus/qtdbus-4.8.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.4.ebuild,v 1.1 2013/03/02 15:26:24 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The DBus module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - >=sys-apps/dbus-1.2 - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" - "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/dbus - tools/qdbus/qdbus - tools/qdbus/qdbusxml2cpp - tools/qdbus/qdbuscpp2xml" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtCore - include/QtDBus - include/QtXml - src/corelib - src/xml" - - QCONFIG_ADD="dbus dbus-linked" - QCONFIG_DEFINE="QT_DBUS" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" -dbus-linked" - - qt4-build_src_configure -} diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog index edda031cf60c..04f4e22c87dc 100644 --- a/dev-qt/qtdeclarative/ChangeLog +++ b/dev-qt/qtdeclarative/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtdeclarative # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.12 2014/01/26 11:55:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.13 2014/01/26 17:54:24 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdeclarative-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtdeclarative-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index deee9b328e74..cc4a7e1f5587 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtdeclarative-4.8.4.ebuild 2025 SHA256 d58ec93e76453f904b5f16d98e6e07c2395ae2f2b715924aa772a346433d352e SHA512 d5281b9da6f0d88365eb7ce9196f055078b81a066b51521c58836672501e532c6958656c01f3927e79606ec12d75f1108a554d43f2410abf35d6af17e3e29afa WHIRLPOOL 67d58d0cc0314c5df69953f70a8fe5b59ee3c8086831c273816905081519dd32da7c8e157ad1d867d13bfc2e5a8710b5ba0a3fc9ac34d99fb53c9a5eef061352 EBUILD qtdeclarative-4.8.5.ebuild 1982 SHA256 ef04c159545997c13d866af405727d598073d07dd51a0be315b1d47343f5cc42 SHA512 f3235d4cef1ffc732be9034e12da9ce3217ba8c4532336a0d116bba9902d645c4c5ef93fde1ea94724ea50ab3e5431cb5e7fc072400e7dbcf972935f4ebe6f3f WHIRLPOOL b4fc1afe86e01206ce909154d55d5cc50f90d48fae6c96b2d501c8b589994e88a5e3f8600c31cca541c21e689e8441208063a5188bb36d392e8f5e8888947ea2 -MISC ChangeLog 9833 SHA256 0c2cb53e8964403492707402b60b67f50b559f01a7bc50fac706cf44b87a2b15 SHA512 676b7b29937760e1f51d8a2d6723efb686c791dba4adfca6b0f2dd8a83d088027626271c07ba32df459f15176252b1db2224c55c6e36523a05996977ee41a7f8 WHIRLPOOL 2038916767111281ad5a2bb4be50612a2a8e5b93ddeb16f2e923c00ad0ef78b185f0e5549db12e9f1fec72b0c3b8b45e9b88729a4a5f36b30953ca6e0682ee22 -MISC metadata.xml 694 SHA256 3d234b538acdba36e5c2ac95cc44a7e58538d51bfc3ac1bdc04331ea4cf7bf4f SHA512 b9a8dc2d22bca30d1ad6207f51ba29c4d527a9de75e4671b4bbef04085ca5cbea47f72bd72298d3d24b9a0335fbfb2dd2828ac74ddfe8af9648ee781ffa0559d WHIRLPOOL e3a2c6e770a50e9b94ef8efa3fa2dfb4ba61d4417ac5854a5e3308d07a7cb9abc74be8bec10e456544170ead1739280bd5d9060d57b1a3bf4a7a7cfb7f870710 +MISC ChangeLog 9941 SHA256 44f3772c3da427955368eeccfc3cbdc27820ea2675258b308192a443743fd51e SHA512 2b545549547010cd7b85488a87e241c3a8906c7ebf63ea5749aee5201a7f6ddd0bc8cbfb1783c62e9a5f75a61e675e3e049e39a2b92e0184b01ce99e5246ac27 WHIRLPOOL 86ab7cbe19e56605137fc98e704eb620f977013bdb6cca6554803c89a5a324fab5a59498baaa126c3106d7ddcfb239f1d2ef54b70ef9b4bc0c3a921d06ab7949 +MISC metadata.xml 635 SHA256 b79885bca4903aad3f9f3b1bdc5abbf018d69a1b276676f80079b5c2b6e72232 SHA512 8a3629eb0683d8088fcc4e4f94eaba48ba664f4be326e16fabf2d37105fa89cabfea5cd1d1093df44ae52cdbceba0622a5c5f24acbce8dcf991afe42110c0223 WHIRLPOOL 6f71e91d4710da81d6d6e02515efde6291877e5e8fe20b4ae35d9f7673f5b7ae4fdf13b4150fabc7925f50b959457ba215503aa24ffdae013e0447e995f28913 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfIAAoJELp701BxlEWfNwAP/0/edyOnuox/QyMtQZI5MVds -aGy+73chAv9EA0VQamIQU9BEU7OrfSQ47oVERRioG41KAxx+3nKVz+nuZwvHCnK1 -REy0NR5JF1RIA8HLQJ2TpTRrLD4ketrfEYtIX/1T+nrbSV++zNxgUWoH4KA9RTDP -XU0UAhp5u2fezijx5zeopvvmU0/huZVYMGzBDXeO+KqTgxxAuumnrY3bKKjAUyFG -9agGwdJvRjMhw43ZMLvmwmP5kCfOco/cXThNa/PEXzAZTC9RjW2jfGUJzYhb3b9a -X8dg90EAarMkSdThovctRlP0kEm59sos+rznomUivEJXIw8Csr+lZgDw7puqXxGY -0/SsVJVqA8m3npE2/ABeQm+X869EC8jKl1sT4qh7d7RzZ93CrvNOkhtpni/qNIz5 -9qSJKD7Haa89uNBKVnSArhtCY5dtSsC/T7AXjsftYYGKYYZIMPFx+2Ud907yK/E9 -iMka0oFAJNAao82VlpjbbWGUvS2+9u4nJlYeKxbTX7gwiMoEpq9RByrGX7912Rht -bZwBV6UNxEJJd+G2kwSuW2gO4sMQFZ/2vNoHy+YIICrJg1Rx91ydpVEjkZ0wNgQw -CeArfU+Yk8K3Me4BBxHe1TMOHvlRJC27zywzZy9LdFo7vbj0XxTPLhlyHYbvkBrH -8qmeIUQ2s2hacrDNMyBJ -=IdXi +iQIcBAEBCAAGBQJS5UvRAAoJENXLsxwXqFxyUZcP/A7DYt7lYis6HAO2m5qihFRl +dNw6QO9zfsMOA4kKuHtvR1ERSYdqLuuFe8+MxhgvfvPCX3VdB2UckpY+/I+6DTUo +uCT1saCVVTkl7ax0+KaJIKi9pSBJDAIpllxSk9zyW6pWO2UgFOPS9Djdxel57pg2 +eJxdc338Xfrq6/MK4WWLQxCiJIKPjXjAOwNsu+xKR7geFdCgJ65Z0+QRt9MJEa+h +sRc09n3uOkFt9ePdAAIkPDU7x2gy86ScFkVg0CehuSQMfHj6Ny8VVODmdmn/WVUa +tqMhmsWXDCGR4i5qJE6gmhMw4Ex1FAU9CeiVcqjTZF2/r2QRa+Vpt2dJrWPW/uLy +1Nwg26021ys8Tju5xjJB3SSFY81GHiwJFUpcu2CZD1sWxfzsJMQyYzCUR0lJMJyX +yxY8IRcnlNiBdMx9rSWTlrXo1krKQ5tXQ9OIV9vled5Qu5ehQTQ1K8dzRUQVTLFy +Ual+klocw87JQSoKzhMqiwp96NVrJxao1O3vuUDw1pWICD7/sT4JCFfq4weWtj8Z +ElmoDtEnJIfyZY2uNm4dCV1fzhEX7YKeiwq2Iy3tTgHcReWBld8LLHev8cHBfwfF +eFLysgHHHUb3VjZIQBrVLpfyJJAV/HPBD7OZ1VyreSLCzJEr1Ph3+nyrNEcf1gTP +uUDcLlYb3DOu5xEN3XH8 +=SyBC -----END PGP SIGNATURE----- diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index da493d03e67c..082a7f8f093f 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.</flag> <flag name="webkit">Build the WebView QML component</flag> diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.4.ebuild deleted file mode 100644 index 1a63e3b2c0c8..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.4.ebuild,v 1.1 2013/03/02 15:26:48 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Declarative module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -fi -IUSE="+accessibility qt3support webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=] - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/declarative - src/imports - src/plugins/qmltooling - tools/designer/src/plugins/qdeclarativeview - tools/qml - tools/qmlplugindump" - - if use webkit; then - QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative" - fi - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools - translations" - - QCONFIG_ADD="declarative" - QCONFIG_DEFINE="QT_DECLARATIVE" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -declarative -no-gtkstyle - $(qt_use accessibility) - $(qt_use qt3support) - $(qt_use webkit)" - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private - # ran for the 2nd time, need it for the updated headers - fix_includes - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private - fi - find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} + -} diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog index 5e8957d17bd6..1b71a8420c20 100644 --- a/dev-qt/qtdemo/ChangeLog +++ b/dev-qt/qtdemo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtdemo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.10 2013/12/28 02:06:13 pesa Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.11 2014/01/26 17:55:58 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdemo-4.8.4.ebuild, + metadata.xml: + Cleanup. 28 Dec 2013; Davide Pesavento <pesa@gentoo.org> qtdemo-4.8.5-r1.ebuild: Don't fail if gstreamer is not installed, since other phonon backends may have diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest index 1cc7dfa864ad..832796d87e64 100644 --- a/dev-qt/qtdemo/Manifest +++ b/dev-qt/qtdemo/Manifest @@ -2,26 +2,24 @@ Hash: SHA256 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtdemo-4.8.4.ebuild 2820 SHA256 78b2416dcfa2440424c94083f7aab9cb5586553d6177fb99a68cb933250092ef SHA512 914c48eb9cea03bc74e4564bc8bdb3359b5eafb5a46d0544acd65ce044dd69bfb5381f6003b55483d0276d60d6c965c5f9fb6030812b7ef20b6b654fde005b9d WHIRLPOOL 1160c59e520fbb3c795e0dda59194535e961d4b865b4698fec21a9e98c1d38529d29d40cbf4b9b4cf6e431bb4c19286ac1cd19c9bb6c4e5f946ba35b55310f08 EBUILD qtdemo-4.8.5-r1.ebuild 2922 SHA256 2a8b0b050419c6b15dc62aa5e64ddc129c9107899c2ae96385425132b2ece2eb SHA512 7b35bf6737ea85c04653077a7d763dc833f44c858a177381fc45029651038f1d8814192d2e06f68b3a36f1d3042efc6a9bc6507cc25ea9bf783f789701e6214c WHIRLPOOL ce22d3812314352f3a7cd3648c92538ac79004ee09309da552b794004378420dbe52b4546110331d55ce8e09e305e7c72fe1b9b1ebc769e7f7521fba50c5202e -MISC ChangeLog 14166 SHA256 a8de5ba04fcd35d1d8d22e7da0ef170156785de378f8627c90a08b72c0653f0f SHA512 f431ad5cfd4dcbb5e3783d7dfb26c4c7168a58eedd59feefc47078523d2e6e4bef0b15e7f2fc48c39fe26e78252dda93cd7de677e2d986197d246a8ed753be14 WHIRLPOOL 3f35c3880709e0a7abc31420a38359d43a64de86d11fde4e4a4b1d8f5963bc1734e687ab34c3bb0765eaac293551b7080b56eb3fccfc15d32a0ca026eb26b009 -MISC metadata.xml 1079 SHA256 08bc762000c20f0f047c68fcc5f555645f33db71c819f453332bfc49613cfb6a SHA512 0703ae5856ba12a07bc8aa42b10992c32722b2eb86f2f8fc2a0696c866e530a0233fcfcc15507c7fa673c18496eccda89b970ef74394e25e9c4ce7fb23f409b9 WHIRLPOOL b939c74d638808140f7f67af8afb459958b4959956f4c02b31d630e9031febda2e79f52cbbd6f62188073e7b22f56feaacbc4db62ffdf1468856ebd50bcefad7 +MISC ChangeLog 14266 SHA256 8369143c58a6c82ed877a97a8f4c2bb3025821978abc506e2dac3190c0e6ce4b SHA512 c1cd472d2a47ac5e56190a571e738591bb9b1660434218b5590df904cca6b9beacce712d0fd9dd3387df17f9cbc53b5c4343f410aee06d4032b22d420986afcb WHIRLPOOL cf1c028449c5a099d60d67ec4c6d3ef9a003075764ce9a6f3a260d98bccfb9977c2e5758a9f578de23c0daeda0203cd447d7ff3bf62e9cebb01e51007817f71f +MISC metadata.xml 1020 SHA256 46f76f0975f7fe04b16af4d3bc7cdf7802fae2e4115a2cf6ace589c613a2de8c SHA512 f6b9b50d4918ca7382a099400650baa337acde441e173095ce718d398fccee9231aaaee45dc9f6158a0b8207abb4d26acf70cca57520bc281cc77643a266febc WHIRLPOOL 2a51b2184a889c8fe63d3879c328c24f69d4feb0de9b5856fb21d32c8f70586b1ca35c36fc4bb543874897ddec410c4476e0c6113c3546727adde7720e97485a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJSvjIWAAoJENXLsxwXqFxy8uEP/1+QuEeB1+eG4zztT7wTzTf4 -hPxhhf+xTZ17yzrx0eaTitlCNuVu9NIqBaDZ5SAMdRy/rw9VW5FuAxaLgoKK66uZ -0fg/TJHQWsDmgprQbDTvgR75Gf0H9rgZXwb2xZQuDw+zgF6wTEWTrz+CovrvstMT -kphLdhJe6k5DYlvZAEeu+IgwPA8HvZF5NVynTDgYixvwMshM/iPU/4mzYQ19tY2R -fkDrjT8JkM/XXRUfZdi5p89Q/+LoEBRio2EM7AMzDErLSL58GS9QnUxWz5+ysDz9 -ztyHXPRKbnYiFFk6VoFSwfndwrqM7bAnBrCinkLIuT/yhg1eeAhpSInA25BkoTV2 -YY5Envcy8BwexOlqScEqPfP1/jqzJE/qbYhuFEqxx5QtAhPUPXMuhiWQR/HpB4RU -bW0JbkX1+pyrIFZnPacd9H7gjDkTur/aYFXzsU+DPntwccPqZHQOSs77V2FWplEM -lPNhXVwfoPO2A2mTfcSxeEXQyYc1n72GE95+LDvSbVy1tcntb4XSBh+0nZEGXpGe -bnlQWIFDi1+hlnPQPsig+emI1HM3H+rLG62QiqWFetoLyfJtrL9t1npFbU20u19o -qqn7D3TgZYW9RDMiT8FZUMi4hi2iq0wRR7Gu3coGeEoFCReUDuKWsaca6HXbJPax -46NMyFd+BmyrToDRKY7E -=rwC7 +iQIcBAEBCAAGBQJS5UwvAAoJENXLsxwXqFxydNYP/0BbdRXw6WshngjxpVP+DXDX +IoXtPkanGHFmBYkZm9wmBdn2HNIGVm6dOXt60LANnkfbtbwPK73bxeJTo7HRHfnn +kjdTzEmtZ9qzyvkEtKH3sqkQ+o2DKDj8clVBbBm8C+bGDoT29thWoOZN+Kxibg0R +ao1AstvHraXGb2WK9wnQOkvXN0UzOcEJk1yyqdi9+NV7pgS/wgC2dc5VBaBcEBOc +SV+VHBHQ8REb8Mjo1XBOVsLIGL2wTXi9TjU+Go+IVdXzY0lwxEHexhCyH0Q0/C2U +Ml/wNFohqAwF6JAIuaxgTyjxEi6NoCh7UApZ7GrH0juNU9k5M23Q1Kpfzdez2t9Q +e8dhOtT0PLboOsCbithW5GwOBfbs1DwvESUXMczjhdR9UGzYg53LMSnF9tSpnR1F +xLu6coL6hl/s7Kujtb5LpWak+a6jvYY1nU8ty4dgooky5MLuQVt7FKmlbenmP0S0 +PKKs+va2rW1RIdYKmHMQKNq521u0GvQrYx0ZWGftXXjrXloty8ppzgSqo8UAlNaR +9eHJeF6SH3C+D8YvrPENp8DenxbQ1+G4kAGpJlYfhO+WqG3ova2pFxn3aLZhaZe5 +KxTCvG+Um5wWVv5YpymbXXuSXKTEXLlm3GJ3zANUcXQzwvVymt8g/C1/ASbtPrnb +Uulx3DFEJ5uQICvg0FfX +=xX/7 -----END PGP SIGNATURE----- diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml index 2d20d629c78f..4bb5221e23ca 100644 --- a/dev-qt/qtdemo/metadata.xml +++ b/dev-qt/qtdemo/metadata.xml @@ -3,11 +3,10 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="dbus">Build QtDBus examples and demos</flag> <flag name="declarative">Build QtDeclarative examples and demos</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="multimedia">Build QtMultimedia examples and demos</flag> <flag name="opengl">Build QtOpenGL examples and demos</flag> <flag name="openvg">Build QtOpenVG examples and demos</flag> diff --git a/dev-qt/qtdemo/qtdemo-4.8.4.ebuild b/dev-qt/qtdemo/qtdemo-4.8.4.ebuild deleted file mode 100644 index 2342fadb6c38..000000000000 --- a/dev-qt/qtdemo/qtdemo-4.8.4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.4.ebuild,v 1.2 2013/04/08 16:56:00 pinkbyte Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="Demonstration module and examples for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos" -fi -IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns" - -DEPEND=" - ~dev-qt/qthelp-${PV}:4[aqua=,debug=] - ~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qtscript-${PV}:4[aqua=,debug=] - ~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qtsvg-${PV}:4[aqua=,debug=] - ~dev-qt/qttest-${PV}:4[aqua=,debug=] - dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] ) - declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] ) - kde? ( media-libs/phonon[aqua=] ) - !kde? ( || ( - ~dev-qt/qtphonon-${PV}:4[aqua=,debug=] - media-libs/phonon[aqua=] - ) ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] ) - opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] ) - openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] ) - qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] ) - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.6-plugandpaint.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - demos - examples" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - doc/src/images - src - include - tools" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Array mapping USE flags to subdirs - local flags_subdirs_map=( - 'dbus' - 'declarative:declarative' - 'multimedia:spectrum' - 'opengl:boxes|glhypnotizer' - 'openvg' - 'webkit:browser' - 'xmlpatterns' - ) - - # Disable unwanted examples/demos - for flag in "${flags_subdirs_map[@]}"; do - if ! use ${flag%:*}; then - einfo "Disabling ${flag%:*} examples" - sed -i -e "/SUBDIRS += ${flag%:*}/d" \ - examples/examples.pro || die - - if [[ ${flag} == *:* ]]; then - einfo "Disabling ${flag%:*} demos" - sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ - demos/demos.pro || die - fi - fi - done - - if ! use qt3support; then - einfo "Disabling qt3support examples" - sed -i -e '/QT_CONFIG, qt3support/d' \ - examples/graphicsview/graphicsview.pro || die - fi -} - -src_configure() { - myconf+=" - $(qt_use dbus) - $(qt_use declarative) - $(qt_use multimedia) - $(qt_use opengl) - $(qt_use openvg) - $(qt_use qt3support) - $(qt_use webkit) - $(qt_use xmlpatterns)" - - qt4-build_src_configure -} - -src_install() { - insinto "${QTDOCDIR#${EPREFIX}}"/src - doins -r doc/src/images - - qt4-build_src_install -} diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog index 272b1d50affc..c760fb1f3021 100644 --- a/dev-qt/qtgui/ChangeLog +++ b/dev-qt/qtgui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.18 2014/01/26 11:55:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.19 2014/01/26 17:57:41 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -files/CVE-2013-0254.patch, + -qtgui-4.8.4-r1.ebuild, metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtgui-4.8.5-r1.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index d8b130023836..ccb06be71bc5 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,29 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9 AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtgui-4.8.4-r1.ebuild 7213 SHA256 acd016b867ab1a37a4ea62e156277e2cbb618e22bf658a7f82ce2f3f1d2b6684 SHA512 67125c1bc35aa87f7f2806b4d4c4ffb1ba5f9cb5c553f29597298c6dc68244da5b9a8bbb3fce687bdb811bfa8dfcd6e2154b291a9edfc62dac65745b4bb6e585 WHIRLPOOL 710dfdecb00d9fa23df82e8efc8170ccd65dad81e5f5f7c34230ced2ed9ffdff0df580a80629f616c10a3ecbc36d79afe868f9800a5c187780e66ee4faff7812 EBUILD qtgui-4.8.5-r1.ebuild 5661 SHA256 bc8ed1ba030dc609d567346b51bc8581e5aba7429834507a3309a3b397668b3a SHA512 676f6c4b1355ac97358316c6647ae98b4a3256531e605711d08a081e4b9f57948a5f334a1666bc890e423ab98a5d32c9b112bceeb71d0eb26c8e9275f6a26821 WHIRLPOOL f090a7f16a02e5f85d9346ef83d6cb6688f1881237e33792d491bd7ec034e1907637d54fa7c01bfa10d620fb5e85644581750af48c274e1d25df12650d2dc6c0 -MISC ChangeLog 35720 SHA256 11266dd5bf3b5d6216973ef6040f827753bf5fb6acb883611b60cd61ce1fd0a7 SHA512 814ab6b0c6cbec67880179160d461ca71aab5a79426615fb410eabc07bc39cd0ffb2ad38222a58db6f8404c2d81d8bd29cf28b2d18a48a9bb7bc327a43e85139 WHIRLPOOL 2e4df5fda51d1ba044112f5d015f27a64e4ac53642b6bdfb64dcc33ee5b5e3730d71e5dd126674b791ba7df04f625dadefd99689d112a8773a16c1d25f00dc84 -MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb +MISC ChangeLog 35851 SHA256 985fe4d31c864dbacd728b64a95da0d0bb4557f2ca6b0a938415f219203b1d42 SHA512 a086027fe84c52545651f35f9c644c371bbd5bc45eab63a57a3689351f13dc6d2c576a4d2f627fc85be5fbbb26fe90ec04c6adc79525842249d98420b9cf1c0c WHIRLPOOL af885ba3d6143708370177ef953ea7c6abef663edc7debdca4ca5a205e20efcc4d3a76a65a2a22f3541cc34c051c4b3540444dab0cb9eee5faec323104d1cbb8 +MISC metadata.xml 1058 SHA256 fea87cdb725fa8f278ed1310f49796cf553025a0e05d54fa813bd455ad4ab923 SHA512 360984939e4ff6607bfb207e826a54c8faf6c08f5f2b71d10cc7c08b374d2edb9cb91bff959a9626212d2548c09ed85a8c253e22c41aae28c885795e17cee0bb WHIRLPOOL 1d27158db4c3e2c735c5881972d9e10e12087789597a96042e8a9031d3eb847745101bd0fe7c68b42350ea581dcda8851c472e8c8db7982661a1ac89ceb117ca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfLAAoJELp701BxlEWfWy4P/3RqqDNAG99OHyZ2B0bXfsGR -3dMGlk+zc8m4UAkmEYoPBTMfICKQzFQd29FZqWbSi9CqB04J7F/zLRnWlIcI2qcv -iuw3jrq0Lo+noiSCV2QkENMaOvfatxj/8O8xjISr9rnjt6ypbT+7tJyIrLZKPj18 -7ooYKxzknhUApgz+h+dcm66DPdIrHj3Z3OyXbSyDpbQ2C8U0qjg7b6jyCMhsDynr -2No/oP8G0HDnekVE6JyxWliH74DXCLd/lUm6aNihBFqr0k9UQoTkYSfdegJKPKlx -FAbNzBG/gJoQGg9KIyHy75UovRFApb2oVVPEnNuJYo4vUcIA6Z7iPQu38LAIK3NP -IVjRPVJkgmR/DFs2sLhNjA75Yd+fNE+NLzAXrADZogw2OcOrZQ6tE3+rZKjr516X -7kXGJo9HV7ByvhBqGcrGnr+Qrq22gj8NMykKZHybu7egYb9nZK3tJ+n/5NtjQP8z -gc35srImirft28NfcMHavtoZ7vjqfmlTgZ03paDqyvCqMwsq3zo4UOyYC434pnO3 -vnVdAg5A2UZYU+7AvWJPGCxC4vQX8YVDUW46Q2JF7SC7eZhbBynKxZGeOEnu7zYu -Nqn1kGI9gKo87NVhOvmY3yoq9CERALDLFzQM3jDpkzzbQQZtbw+UvutylXB0vCd+ -QXqPmShFD5908v/1QYYv -=wkkR +iQIcBAEBCAAGBQJS5UyWAAoJENXLsxwXqFxyJCQP/itnZSPfKiWmelH1k6YVptrU +Gq9knx+B7OiObac3zo+Zdegm5RIBe7Xe0UzBmmmNLwcQNztYjpx9v7ABtvfr1q6v +auVqX0xndJ7LXRJC6HuLuhz8smCYjqWYNJ1tD7LshyXiGPNV5mFbJIJwBDCBZPc9 +i6cdit1Enm4T8LTYCznDlt5c3tzhUHX+OKgUlSeB0rI07I60wUdyBYBGEIBBmrIb +EYSkLrA6q2sUACOAvvGpUdMWJhbHrhB2WYDVDPuRpgIsWhzuArZVvK3wuxru3RSr +CkbLT+rnN6BEcPOnRf4k/laXNEF95E8kO2ZsR5RQ8lW1E1J1Ks1ETcYMYSjIwTm/ +PWaQFKv2IhLjRKZ4B6zohNfuF/pM0LEP8/DYUl8Xg9J+GpkhePPszXJQkBlfdohV +pt6GpqlToPoI/UORWn+J3emkq043hUdorQU/B5fcdZ/c1/Ps6RH8Wn0TGGj6+VUK +UNt7qLnMN9wPSbGBZjWeDm1JpnDfybNJTKx8C/FmSO3NySxFQe0ljfMkJM1FVSiO +tC3eEwxFepOTtjghth3vrdDuW4+n9c+FQlektHvhzPlzXAYIvV3dAJjzBWhhMOkn ++t5T41FDnGd1EFTono/dnpcoS7uNBk+j84EIbeu2SwTd3k+ABW+l7ljhu2iYG2VI +7QduCh+TaGNr84tZmpUV +=zvZw -----END PGP SIGNATURE----- diff --git a/dev-qt/qtgui/files/CVE-2013-0254.patch b/dev-qt/qtgui/files/CVE-2013-0254.patch deleted file mode 100644 index fa05da333257..000000000000 --- a/dev-qt/qtgui/files/CVE-2013-0254.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Sat, 22 Dec 2012 08:32:12 -0800 -Subject: [PATCH] Change all shmget calls to user-only memory - -Drop the read and write permissions for group and other users in the -system. - -Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 -(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) -Reviewed-by: Richard J. Moore <rich@kde.org> ---- - src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- - src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- - src/gui/image/qnativeimage.cpp | 2 +- - src/gui/image/qpixmap_x11.cpp | 2 +- - src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +- - src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +- - tools/qvfb/qvfbshmem.cpp | 4 ++-- - -diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp -index 20d76e3..4cf3acf 100644 ---- a/src/corelib/kernel/qsharedmemory_unix.cpp -+++ b/src/corelib/kernel/qsharedmemory_unix.cpp -@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) - } - - // create -- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { -+ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { - QString function = QLatin1String("QSharedMemory::create"); - switch (errno) { - case EINVAL: -@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) - { - #ifndef QT_POSIX_IPC - // grab the shared memory segment id -- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); -+ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); - if (-1 == id) { - setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); - return false; -@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() - size = 0; - - // Get the number of current attachments -- int id = shmget(unix_key, 0, 0444); -+ int id = shmget(unix_key, 0, 0400); - cleanHandle(); - - struct shmid_ds shmid_ds; -diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp -index fad9acc..e77456b 100644 ---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp -+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp -@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) - } - - // Get semaphore -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); - if (-1 == semaphore) { - if (errno == EEXIST) -- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); -+ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); - if (-1 == semaphore) { - setErrorString(QLatin1String("QSystemSemaphore::handle")); - cleanHandle(); -diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp -index 9654afe..fef38c5 100644 ---- a/src/gui/image/qnativeimage.cpp -+++ b/src/gui/image/qnativeimage.cpp -@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* - - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp -index 280d8bd..88c9b7b 100644 ---- a/src/gui/image/qpixmap_x11.cpp -+++ b/src/gui/image/qpixmap_x11.cpp -@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h) - bool ok; - xshminfo.shmid = shmget(IPC_PRIVATE, - xshmimg->bytes_per_line * xshmimg->height, -- IPC_CREAT | 0777); -+ IPC_CREAT | 0700); - ok = xshminfo.shmid != -1; - if (ok) { - xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); -diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -index b6a42d8..0d56821 100644 ---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp -@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI - 0); - - m_shm_info.shmid = shmget (IPC_PRIVATE, -- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777); -+ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600); - - m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0); - m_shm_info.shmseg = xcb_generate_id(xcb_connection()); -diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -index bf003eb..46a2f97 100644 ---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp -@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) - - - image_info->shminfo.shmid = shmget (IPC_PRIVATE, -- image->bytes_per_line * image->height, IPC_CREAT|0777); -+ image->bytes_per_line * image->height, IPC_CREAT|0700); - - image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0); - image_info->shminfo.readOnly = False; -diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp -index 7f9671f..84b6ebe 100644 ---- a/tools/qvfb/qvfbshmem.cpp -+++ b/tools/qvfb/qvfbshmem.cpp -@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, - uint data_offset_value = sizeof(QVFbHeader); - - int dataSize = bpl * h + data_offset_value; -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId != -1) - data = (unsigned char *)shmat(shmId, 0, 0); - else { - struct shmid_ds shm; - shmctl(shmId, IPC_RMID, &shm); -- shmId = shmget(key, dataSize, IPC_CREAT | 0666); -+ shmId = shmget(key, dataSize, IPC_CREAT | 0600); - if (shmId == -1) { - perror("QShMemViewProtocol::QShMemViewProtocol"); - qFatal("Cannot get shared memory 0x%08x", key); --- -1.7.1 - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 66d14b70e816..5359da53269e 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -3,11 +3,10 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="egl">Use EGL instead of default GLX to manage OpenGL contexts on the desktop</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active GTK+ theme</flag> diff --git a/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild deleted file mode 100644 index 1d19df6e8973..000000000000 --- a/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild,v 1.3 2013/08/27 15:52:30 kensington Exp $ - -EAPI=4 - -inherit eutils qt4-build - -DESCRIPTION="The GUI module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -# cairo[-qt4] is needed because of bug 454066 -RDEPEND=" - app-admin/eselect-qtgraphicssystem - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg:0 - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - cups? ( net-print/cups ) - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) - egl? ( media-libs/mesa[egl] ) - gtkstyle? ( - x11-libs/cairo[-qt4] - x11-libs/gtk+:2[aqua=] - ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - !aqua? ( - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) - ) -" -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.3-cups.patch" - "${FILESDIR}/CVE-2013-0254.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/gui - src/scripttools - tools/designer - tools/linguist/linguist - src/plugins/imageformats/gif - src/plugins/imageformats/ico - src/plugins/imageformats/jpeg - src/plugins/inputmethods" - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" - use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" - use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" - use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" - - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_prepare() { - qt4-build_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure - - # Don't build plugins this go around, because they depend on qt3support lib - sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro -} - -src_configure() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - myconf="$(qt_use accessibility) - $(qt_use cups) - $(use gif || echo -no-gif) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use dbus qdbus) - $(qt_use dbus) - $(qt_use egl) - $(qt_use qt3support) - $(qt_use gtkstyle) - $(qt_use xinerama) - $(qt_use xv xvideo)" - - myconf+=" - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - - [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 - - qt4-build_src_configure - - if use gtkstyle; then - einfo "patching the Makefile to fix qgtkstyle compilation" - sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile || - die "sed failed" - fi - sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed" -} - -src_install() { - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-gif no-jpeg no-png" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" - - qt4-build_src_install - - # qt-creator - # some qt-creator headers are located - # under /usr/include/qt4/QtDesigner/private. - # those headers are just includes of the headers - # which are located under tools/designer/src/lib/* - # So instead of installing both, we create the private folder - # and drop tools/designer/src/lib/* headers in it. - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ - fi - doins "${S}"/tools/designer/src/lib/shared/* - doins "${S}"/tools/designer/src/lib/sdk/* - - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private - fi - find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + - - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - # rerun to get links to headers right - fix_includes - fi - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - touch "${ED}"/usr/share/qt4/graphicssystems/native || die - - doicon tools/designer/src/designer/images/designer.png - newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png - newicon tools/qtconfig/images/appicon.png qtconfig.png - use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' - make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' -} - -pkg_postinst() { - qt4-build_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old - - if use gtkstyle; then - # see bug 388551 - elog "For Qt's GTK style to work, you need to either export" - elog "the following variable into your environment:" - elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"' - elog "or alternatively install gnome-base/libgnomeui" - fi -} diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 8e90a8f290ba..f5a5d7acbf51 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.19 2014/01/26 11:55:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.20 2014/01/26 17:59:13 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -files/disable-webkit.patch, + -files/qthelp-4.7-fix-compat.patch, -files/qthelp-4.8.2+gcc-4.7.patch, + -qthelp-4.8.4.ebuild, metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qthelp-4.8.5-r2.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index 222cbc94e53a..42d827b92d4b 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1,32 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b WHIRLPOOL 13848f7cc0f8df9b05da590cc61b7872f1eff7cc09d004d77c78b459ad5c0ae6623eb229484e256a3e582d43fd6573f06dbc01ccadd3cf6cb1f0d1d84e9bc92c -AUX qthelp-4.7-fix-compat.patch 2987 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc SHA512 db10e2ba5fa7c513b39faef25dd160bc9cef8f28b6b11e879b66dadbc7bb9fbc2bfb1b25363c0d0d9c09cd97fba8734898ad6edef4a311234be65571c74c63ce WHIRLPOOL c4faaf70e3c836164abcafb3c1e6ec830e6e1871952291c11e3b8573dc51c8c6cb268c8455425cc6982e709f8f7cdc9a71865cf96165c504b9555776d884023e -AUX qthelp-4.8.2+gcc-4.7.patch 500 SHA256 1e28d6035fec1ea45feef2137f9f8ff7d4ecea0d8236750f974802fb98200c83 SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18 WHIRLPOOL 6712b21ffa4d23786780768df470dd81e90de40b775417c9ce9f9ba3b30b398ce15c932a01678331d6c4819c71a99be22cf3442360bf440aea56dc943aa1dd1c AUX qthelp-4.8.5-fix-compat.patch 537 SHA256 625a9f9e1a0dd4c9e44ec40c119a88922f387028c988dce5ecca6dca848799ac SHA512 2de58b8830d82ee35d2d74c2809930c0a5e2df8be14eee73464c875100b9106249cbaefc7f4218f46a298908755312d6a1fd58013f089bbf105c931f93728b39 WHIRLPOOL d27b279fcfefcdf75b863f1ecab68d051c626eb2ff0d994545ec596133ffd528fe5aa5e94442f699f5fb1bb438e46d7b1d06daf295a97e475eab12a315421340 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qthelp-4.8.4.ebuild 3575 SHA256 db5ccfa61f95ce4bc49817da4d102dc38aade57dca0f51bc18fffa46833a62cd SHA512 7617222713ba7be74271469b483c98b7478673d2c89a3dbba1ad7e9bc4405733a6f02efa7f01243b5f54da8bf70ce4a76fb345ead413a088a76612fe9b4300e7 WHIRLPOOL 44c1a0c10dae94aca721ad280247f97db3a0b8b2bebbcc6841c11fe70e4391c6b6592fac138d2945548813efa59289ad1088d151405b72c3eab9e138930b3856 EBUILD qthelp-4.8.5-r2.ebuild 3221 SHA256 557c2fb440f163e93fe5088223840c76d9b267fb0c1715e0584ed2ee3f668043 SHA512 84b2f11866c095d31c7833653ac7f65da0f8a821a5af213f4759df6d34baf749fce440004b22eabea79863b6bf204b8e0dc454be0365fdced036c8e6c5a49d21 WHIRLPOOL 2954c1bd8dc09abd85a56402854ff99477b2b434e74a70ffaa8c47c0e4ebdd5e007cc98f15c2ef69c7e1284700dc95d4423a6e785588c1316681bf9314f655ac -MISC ChangeLog 24413 SHA256 28ce13f2423c00a204c519586d84cfc7de2c10e5192aca44d5dfac8ddae755bd SHA512 d2562f524fef028a5a1f9560ce3ac70379c51ee5e5a72b51c81508bc9864a24d2b8074beb0e98181f18284f86c5a8ebbda943a6809786e6be9e1c275b9a3eb2e WHIRLPOOL 2225ca54d2c578ae87b162594ebd1f17d936000d3ff4250632d5ebb9a1ffe5bca81988c14c9d0335b9c9b7c98dd08d451cec69c40cc0670141a16380c046ce6f -MISC metadata.xml 1049 SHA256 a9725618619fe6cfea87bfa9cc1ed9e2539d6f3eb36efb02c82575df0f7db42c SHA512 3b8f0eb7f20ab99aa9146eca7c4be9fd58128501dad2bb044d22954509d14ba3e21a0171eeefad31fb58bcc9d3f206542379f014105298c3326bf47be6d7a6a3 WHIRLPOOL 54633e1a14619a0192033d7411abca4dedf26d5ad07bfa37ab44990cafc74ccfe1b9803af2ab3626401d1353d70247316bbfe0d730c61c377099b0491531eb9a +MISC ChangeLog 24616 SHA256 5ebddd2f6c9198bd8b4be6eb27dcf2d1cb26093f4e3627f312dc1a974b9c5894 SHA512 b10942df65847a301ff7dbcc2b28cb9192b8f8ec98b0978042239f35f959e2d16bee1cb7d272a30343eb974b385107706de17d2074215d4f3004c45f6c89235d WHIRLPOOL 081942ffe1421c78553ed3d18a41731658487458e5737003f2037aa34a2000e0e0d1cf2bfad51eedb2c5cee9609274779e6095b0dcd2cb01d025ee872aa0591e +MISC metadata.xml 628 SHA256 cc82998d8784865ec0aa746a59af9d0231e131d0d9137d3677a5b46499c64202 SHA512 48d153886abfc84577c9ccc2a95ff1407d44f91eb9fb5433415406d02b16830189c94883d5eeeef1b2c47690dea0c7366bc0ce5e7bd3275a63fd2fc394b20efb WHIRLPOOL a50fe577e08574e81c09ddc4e68cdba2cbad81069f4e94dd5137395dbbacfefa70c95351ea745d792cceaaca1e051f80d209692ab59e1da22418be3f13ecc838 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfOAAoJELp701BxlEWfdtYP/RGJKUhlsj3zYFXvfCXQhurU -YJAKFejEvxRFK1YyY20BIAvaXWZmUhV71V69qt8HRus/E1v6xYOJlljOB1RSu6cx -g0AsdARNTdZR769DdSa4EMhcr+1dP52QrgaDxlqasJe+byb3Mg6f8oX6asQpHXHi -oCf7kjFVOOqacOIe6WGkxqDiyJCwFKfDjC+ma/Aoe5a9KdcWa0MxFc0F0TMmoQYi -ojoJLaXBpBhpAeMwb4x/uCQOlO6HLV5AiRa6ItBXUU4OkD8eRlDNcn6+W8oS5nXD -MKK7HhCfGnd1GhxHwJqSo1X4vcpa2eHqMWNp8IjJTyH3W1j8DlgiK3kWAAzQ6c0k -uRmW9rNk75dTjLjAOJWYgSwbOrNf4srmzosIYRHIdcv6vcAYDV+VuCLQoaG8H/9j -UUeoO8w/WpEr4XVi9nMEALSAAg1fSJy7t5s+TQfocYd8o/0eld9nKo+x0O0Enr/7 -BlTD63RoyHbcVpgA9xeqbFxx9oY09A95ZVK1LYf/FVFiHaN0F2A+AEhKgq4gtdZH -rPruX26CuzvPxdfb3nd7wadjoMQb/TGGNF7JgBeF6m4rJFFy2Pqjsblrlng42v24 -HdjvMw3bRAgdcFB5qSFRr6K+Wc0FDKngFKEEypIisp5LmnKcLq6EK4t7H83lYpYO -aNLWnxvg/b87rJFfHZyE -=ZcIG +iQIcBAEBCAAGBQJS5UzyAAoJENXLsxwXqFxyl7YP/3o6oNT2zjF/DQQgwtVnI3s9 +Ap2j202kQQvNFAV7YQQ2hqI5mrcC9y04hXmJDNG1Y57r2eZ6QwlYECg7o23EMJ/s +wfdX38srPidP3aZJ7jeZBIJzYXZPExp2i5mmQ7I71VulHLydn4g36VlimuZqD/uG +v4Tu4lTlObYKRBHUuzxvDWKuiDQr0XX48ytEKsfxJPJOz/hYEBzWizwl9cXJLhMo +xGO9oHmeeiMmoTJx8p8ufdH34cw+VuhOq5VmL2apFiHp5A2S/Ith5+XwqAk6l2cD +uD7xp9neT5x+RJ6zh3isYL32Bi6NWxi0VE8ELX0FvEnFybMrwmJ3zG6H7bSs/NWP +C/kbwfUz+NWHYj1d1fbsIQtxcQ42M2Qc68XHhct+SSo/uLvOtbedsqXHYfC60XPB +/3oGyhg75Tr0WQV+no8XlVtzUgHG4FohxrR/yQjOLUUNso82Rrqau+zdaOKjskWJ +Yj8BYq3L33oNoG0Dil47230eHIVZkmtd3GRyu085JSuZAj5RfD8jwndFNpEbe1lC +xjuOoRnmILWV1lG9wLh67ZP6/XjI8mWRXQsstMNzwRi1dzuxONXBlLrkhMo/ZDqH +sAlU45M4anP5qt3WzffkZ++W2C/7nWanvTH7h5TURNhunBZkWXlDBL46a5cT+gUU +C+Xc9W6fuXd5Qlep9F65 +=nUtv -----END PGP SIGNATURE----- diff --git a/dev-qt/qthelp/files/disable-webkit.patch b/dev-qt/qthelp/files/disable-webkit.patch deleted file mode 100644 index 61bca05148e5..000000000000 --- a/dev-qt/qthelp/files/disable-webkit.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -=================================================================== ---- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro -+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa - TEMPLATE = app - LANGUAGE = C++ - TARGET = assistant --contains(QT_CONFIG, webkit):QT += webkit - CONFIG += qt \ - warn_on \ - help -@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \ - openpageswidget.cpp \ - openpagesmanager.cpp \ - openpagesswitcher.cpp --contains(QT_CONFIG, webkit) { -- SOURCES += helpviewer_qwv.cpp --} else { -- SOURCES += helpviewer_qtb.cpp --} -+ -+SOURCES += helpviewer_qtb.cpp - - FORMS += bookmarkdialog.ui \ - bookmarkmanagerwidget.ui \
\ No newline at end of file diff --git a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch deleted file mode 100644 index 1c28c151cfbd..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.7-fix-compat.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 -+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 -@@ -14,6 +14,8 @@ - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ - TARGET = Assistant_adp - } - -+target.path=$$[QT_INSTALL_BINS] -+INSTALLS += target -+ - TRANSLATIONS = translations/assistant_adp_de.ts \ - translations/assistant_adp_ja.ts \ - translations/assistant_adp_pl.ts \ ---- tools/assistant/assistant.pro 2010-09-10 12:04:47.000000000 +0300 -+++ tools/assistant/assistant.pro 2010-06-02 05:03:09.000000000 +0300 -@@ -3,4 +3,6 @@ - - SUBDIRS += lib/fulltextsearch \ - lib \ -- tools -+ tools \ -+ compat \ -+ compat/lib \ -\ No newline at end of file ---- /dev/null -+++ tools/assistant/compat/lib/QtAssistant/qassistantclient_global.h -@@ -0,0 +1 @@ -+#include "../qassistantclient_global.h" ---- /dev/null 2010-09-28 21:07:22.854999850 +0300 -+++ tools/assistant/compat/assistant.pro 2010-06-02 05:03:09.000000000 +0300 -@@ -0,0 +1,84 @@ -+include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri) -+ -+TEMPLATE = app -+LANGUAGE = C++ -+TARGET = assistant_adp -+ -+CONFIG += qt warn_on -+ -+unix:contains(QT_CONFIG, dbus):QT += dbus -+ -+build_all:!build_pass { -+ CONFIG -= build_all -+ CONFIG += release -+} -+QT += xml network -+ -+PROJECTNAME = Assistant -+DESTDIR = ../../../bin -+ -+FORMS += helpdialog.ui \ -+ mainwindow.ui \ -+ tabbedbrowser.ui \ -+ topicchooser.ui -+ -+SOURCES += main.cpp \ -+ helpwindow.cpp \ -+ topicchooser.cpp \ -+ docuparser.cpp \ -+ index.cpp \ -+ profile.cpp \ -+ config.cpp \ -+ helpdialog.cpp \ -+ mainwindow.cpp \ -+ tabbedbrowser.cpp \ -+ fontsettingsdialog.cpp -+ -+HEADERS += helpwindow.h \ -+ topicchooser.h \ -+ docuparser.h \ -+ index.h \ -+ profile.h \ -+ helpdialog.h \ -+ mainwindow.h \ -+ tabbedbrowser.h \ -+ config.h \ -+ fontsettingsdialog.h -+ -+RESOURCES += assistant.qrc -+ -+contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -+DEFINES += QT_KEYWORDS -+#DEFINES += QT_PALMTOPCENTER_DOCS -+ -+win32 { -+ !wince*:LIBS += -lshell32 -+ RC_FILE = assistant.rc -+} -+ -+mac { -+ ICON = assistant.icns -+ TARGET = Assistant_adp -+ QMAKE_INFO_PLIST = Info_mac.plist -+} -+ -+target.path=$$[QT_INSTALL_BINS] -+INSTALLS += target -+ -+TRANSLATIONS = assistant_de.ts -+ -+unix:!contains(QT_CONFIG, zlib):LIBS += -lz -+ -+contains(CONFIG, static): { -+ win32 { -+ exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { -+ QTPLUGIN += qjpeg -+ DEFINES += USE_STATIC_JPEG_PLUGIN -+ } -+ } else { -+ exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.a) { -+ QTPLUGIN += qjpeg -+ DEFINES += USE_STATIC_JPEG_PLUGIN -+ } -+ } -+} diff --git a/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch b/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch deleted file mode 100644 index 1cf70275f634..000000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.2+gcc-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200 -+++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200 -@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont() - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } - diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml index 5269010b41c0..7e00496dedac 100644 --- a/dev-qt/qthelp/metadata.xml +++ b/dev-qt/qthelp/metadata.xml @@ -3,16 +3,10 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> - <flag name="compat">Build the extra compatibility layer required by a few packages, - see http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag> + <flag name="compat">Build the extra compatibility layer required by a few packages, see + http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> - <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - <flag name="trace">Build the 'qttracereplay' utility which is required to - play drawings recorded with the trace graphicssystem</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qthelp/qthelp-4.8.4.ebuild b/dev-qt/qthelp/qthelp-4.8.4.ebuild deleted file mode 100644 index 4cf919c8a91e..000000000000 --- a/dev-qt/qthelp/qthelp-4.8.4.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.4.ebuild,v 1.3 2013/06/17 16:09:59 bicatali Exp $ - -EAPI=4 - -inherit eutils qt4-build - -DESCRIPTION="The Help module and Assistant application for the Qt toolkit" -SRC_URI+=" - compat? ( - ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz - http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz - )" - -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux" -fi -IUSE="compat doc +glib qt3support trace webkit" - -DEPEND=" - ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support=,trace?] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,sqlite] - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" -) - -pkg_setup() { - # Pixeltool isn't really assistant related, but it relies on - # the assistant libraries. - QT4_TARGET_DIRECTORIES=" - tools/assistant - tools/pixeltool - tools/qdoc3" - QT4_EXTRACT_DIRECTORIES=" - tools - demos - examples - src - include - doc" - - use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_unpack() { - qt4-build_src_unpack - - # compat version - # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ - if use compat; then - unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \ - qt-assistant-compat-headers-4.7.tar.gz - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die - mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die - fi -} - -src_prepare() { - qt4-build_src_prepare - - use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch - - # bug 401173 - use webkit || epatch "${FILESDIR}"/disable-webkit.patch - - # bug 348034 - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -src_configure() { - myconf+=" - -no-xkb -no-fontconfig -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon - -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility - -no-fontconfig -no-multimedia -no-svg - $(qt_use qt3support) $(qt_use webkit)" - use glib || myconf+=" -no-glib" - - qt4-build_src_configure -} - -src_compile() { - # help libQtHelp find freshly built libQtCLucene (bug #289811) - export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" - export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" - - qt4-build_src_compile - - # ugly hack to build docs - qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die - - if use doc; then - emake docs - elif [[ ${QT4_BUILD_TYPE} == release ]]; then - # live ebuild cannot build qch_docs, it will build them through emake docs - emake qch_docs - fi -} - -src_install() { - qt4-build_src_install - - emake INSTALL_ROOT="${D}" install_qchdocs - - # do not compress .qch files - docompress -x "${QTDOCDIR}"/qch - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs - fi - - doicon tools/assistant/tools/assistant/images/assistant.png - make_desktop_entry assistant Assistant assistant 'Qt;Development' - - if use compat; then - insinto /usr/share/qt4/mkspecs/features - doins tools/assistant/compat/features/assistant.prf - fi -} diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog index b7b6b096796c..2014c209e20b 100644 --- a/dev-qt/qtmultimedia/ChangeLog +++ b/dev-qt/qtmultimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtmultimedia -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.8 2013/11/07 06:01:15 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.9 2014/01/26 18:01:34 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtmultimedia-4.8.4.ebuild, + metadata.xml: + Cleanup. 07 Nov 2013; Agostino Sarubbo <ago@gentoo.org> qtmultimedia-4.8.5.ebuild: Stable for arm, wrt bug #488536 diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 5e3ab6684c0f..a9fb054f271e 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,27 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX qtmultimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 WHIRLPOOL c5359f79a53b4d488c346e2d58924e21df3deabbb87e59762185afe43b05543578a1bc2d2bdafa31b1a345adf7a287851bde3a963c56ed1cc686beb14cedc321 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtmultimedia-4.8.4.ebuild 1518 SHA256 19fa410e7e7dc77d5666d3b2ac855746563d9f22513e8b0a176fcc06d4a51b04 SHA512 0effbb560524ccca50dc61ff16e93e5690fb3233c3cf1e432a42b5b0bf2674471b4e4fb1054dd69fa45c8afae59f8ff0ec5bd320f8d99911d4097384a421c73c WHIRLPOOL 4dfdb99842d7f70779c4f9860e8cf3d020817c6299b15979bbd6cf8cd72881448fd0e7a8d9394f5b9726cf8575a866f629a9ff73feda0ccef0dfeaf1921347df EBUILD qtmultimedia-4.8.5.ebuild 1515 SHA256 a1386a7472171b861981f04e7c484cce090a87efd5c08d73557135bb03e50067 SHA512 6f5d7ac5d7f90c1eac874b286d4fee243caf5456b8ca1b989c4e2ba77fb4816cc85d7dc28f6071eb2cebc651ef3f708dd8b918dc5346d24944cdd0a98230703e WHIRLPOOL 3be8a10021a17b8022e446409f6022e27d47b6edd0e765871f5b9e5c194fb2c9ae6ba3c26262beb82f553c37a908346ee255fc121db026b1eaaa7e59b319364f -MISC ChangeLog 10462 SHA256 29b916f821a2d705e5f876e7a83a34855814822cc7352632b7681e89e7cd084d SHA512 ced01ecb7a43eb8212febfca6db6334053c897ccf495081897ee29759379602dc9f74fa0dcc7423531dd0958b8c3b33659d612db5c203e252711b6ccc8cb410a WHIRLPOOL 52ecc1a767e18281fc4a341ca9cb4cb35dfdeb3d6f6c54c7d843de5818da47d388e4fa2060d6a322f5604ad52fd6a8a9855e3c226533507bb714b038914e0570 -MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f +MISC ChangeLog 10569 SHA256 fbabd5259b251580e673e5f69ba46cfd6386421b31f72afacda78d4cc2aad0f7 SHA512 9bdb2f1223ce5685d3fcdc0847bcfb5250c00497e67aaa1d30a0fd4809d393a91e6f14908898607e60a479875756695ea260ceba6288baadb750eb20ebb51dff WHIRLPOOL 62efabccf59e4128f4de3e9e49ee8a16c8f81ed5e0a7df3aa23e8d7bc6203e15e3fe43572906d0d55b5f7445ff2da8aec770a2ff8c51109e5a7681fc506e2f57 +MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJSeyyiAAoJELp701BxlEWf9ckP/jG8+HkkLNZ0H394gYgVcSOp -t7aDs/kUG4PQHaa9xOjKZ9PMeEXoEE+tBBuWtqxI7CdsrqqEyflFYGEPFlQS72ss -LqhrlLJflovaw076VLvPNe2hLHWD8c+GQHu5b3jnuwav1I/SXKSkPCqBuflWD2ec -iOQ+bT5r5RWnzYOa0JlOeS2lznn2X3K3cX/xxh04fzzx8OAtVx76qBEbKo8Y3QyF -qugCZ0lSyKw/7ImS8w49XDB27gbgfS5UW2tkL7U6xuYo6r/tftamofazTB5YHi2n -kid788PIYibKgmOuyhyWkknPAnN9KeLk/aYQDtzVViK1MpUnN8LX//knTAY6sziK -l3QtayhZi5jmHBGhha5Jyhj8q/+CRyYMa1goMcZjJYpusMxBmBQKmUcraR+DiyJF -53pdi5aBkPhJOym7evLEboABV0iLMHMP6sVEcAflabMblYPIrrg3ZCYc7fMNM/eP -85HWTIphIvRoEiHjo40OjSvOoQSRs3JN5XpcIORjNRioQJUH+owzsARmu5fQZSbf -bvuMQTOLY2nPF/N90VAH0d+7XYFNyeuhoCOBLac0kZWv6CEFEaB5sDpGjKF4PXot -HNEjRR+Pv+XzM87pHexWLSW1GDtVwVAkhSx+iHumrfxTalbAxeM7wOSPWlTX25qm -4m9I+rmAIvPpBL6Zv9SJ -=EavB +iQIcBAEBCAAGBQJS5U1/AAoJENXLsxwXqFxyJHcP/iiWqeXNDfQYsjMV4Jsp+N8J +M2N7tq3TnScaxh8qmE/uEUU/oBL1YrJ69+ohp+NoLsrOZDgrYp0U9tCu1+BNgpki +cH748qYG7hVnZz9xraWVtlpq+d2Uj/yNOpZHf2ZSCHp5C71SfOIxtPNYBtCAwnlb +aOEQ/gNzB/OATHuOEHSsSnmqL4OHw/LE852Ne0e1+r+hJEo4KNCfxEgKoTMEeSTY +8de+3kbtcZYL0PhNoyqJfEuF79aqh3Hv3aXkHAcqBXNqhW62WGHAaXffCiNYodpa +4L9YqGobZnhhHecTwgqfGanGsLU+dA2Ar/Q20Lqxja0MorBdre5+zibvZ4lslEBC +/lIl1kKHnrNt8T1uTy8nn/sSON8b9vYii5ByT9h2GaASRetTbTAhXEcJLz3JtbtT +otMx+5s6Ci6pyxUn0KiMplnCgID55PvRRyEVgWo/tA+yNDDGa8niflsxqNlyZY3Q ++OKJ+4IQiXWVB3anp8DG+z/ESrudtdSml8MH92/F7xVZaqT9VBrKFakyj/UTsGyE +CAJeNgdewEU7OTEIPavHDhkV2wh+g6a+V+RB6glKa3ZxeRb3yo4pMrZB8rxzxPG/ +pFDzPJuYVoUqgzC1HfnRWuBcfUW2oAUEOc+iWOk5uSJ76CgLLN01RFjPXU2jJHK1 +LrxIkdIvr3uJvmBW5D4w +=slzt -----END PGP SIGNATURE----- diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 93e5fd3f1e69..e3ba68900f83 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild deleted file mode 100644 index 501692432dfd..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-4.8.4.ebuild,v 1.1 2013/03/02 15:31:35 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Multimedia module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -fi -IUSE="alsa" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - alsa? ( media-libs/alsa-lib ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.0-alsa.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/multimedia" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtGui - include/QtMultimedia - src/src.pro - src/corelib - src/gui" - - QCONFIG_ADD="multimedia" - QCONFIG_DEFINE="QT_MULTIMEDIA" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" - - qt4-build_src_configure -} diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog index cc265419176d..eb3ae86ae090 100644 --- a/dev-qt/qtopengl/ChangeLog +++ b/dev-qt/qtopengl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtopengl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.11 2014/01/26 11:56:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.12 2014/01/26 18:02:25 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtopengl-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtopengl-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index b2c9d09e8105..82bba1c44422 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtopengl-4.8.4.ebuild 1435 SHA256 aecb13b6b598a93e3ddc42722b9ef470f23e37870b5244a52c9ae2c22e5d01a6 SHA512 95db1cc3f8b0cede3fda810a1f308b45b0a5836b78d6e310b8b485f5e0864997690aadf04928f3436e36504f739bfab5b8ee3cc2acc56fb24e94966279178583 WHIRLPOOL 3ca29cf71215519bc2c7c500d8f385fa6ce4675fdf3a12c5371a6d276e80c2cc741b70f4de0ef70f31e677447772e4e01bd1d9ee447acf8ec452c6a6f5c4cb43 EBUILD qtopengl-4.8.5.ebuild 1433 SHA256 75d5b483dfe2fe09532a61ffe907760f9e7bdeb56750a852bded1135f88f185c SHA512 7e99694d0c783e70e9bbc001a6ce9703a6cc838c1960f7ec9eea0966347778061770db091556e7100326653062d1846fb9b31b3e352ada1bedee6814b6aa5fa2 WHIRLPOOL 71211727da94a51a8ce3a3c06b70ed23a1b92ee21d52c6a13f4368083dd052479f07c420a620b4e5d5e9e58f037438f720c8a6f55631b781cc82104c5560808c -MISC ChangeLog 18449 SHA256 c27ab4d62e031a3641ba4c92714adde4734fdc2162db46345d994e6fb6835250 SHA512 61966a77f385869beaeb3db1e8b285f89a8a9f9fa6b7f28375466ae2ae40790be9f657c8610214fa415789b434f5538f1e0797b724131df41f37de08886a8a88 WHIRLPOOL 6085c2ed07b45694f4ed7fc7e6d75747f20466028c6a84427df6518c7a731eff4b8e5a60c1b7d8a9072cbcd115c24e82d79c5e5850c1f5290a7bc7dc7dce7370 -MISC metadata.xml 658 SHA256 7fdec67782aa5420b8fa978bceb6a109ef6e2f0cc0b466489536f8eb7ef329a7 SHA512 69d59057bb9873e6a7d99269346c2d3d4f1cccbe0f3b1dc08ff7abb1bb6196aebf9d2c763a4b0c07401cb0a8c8103784fa9c79254551c70a210a1df61b35069c WHIRLPOOL 81d2b4d2b324f87f25f1b4042efbe532900eccf5313f1fc5ab4649293a560e55660d2afbada1a5d066483b548b658edc2f8e86fbd1767c66e3aba7867173d62a +MISC ChangeLog 18552 SHA256 352215ce4dc0445ec7688ffd8db84617b16e1f0e087eba889f2e34343ad06734 SHA512 e1bfaf16a83a8a12036d79e7e76c90dfc2450171e5ebc190fce9bdf59ca3d5bdcacd686cbd64334c76db42e0d2b1d1ec73466ba2ccfcd0a976d3b9383eab0572 WHIRLPOOL 69fb94b2917a3ce9bea18e0b0dca3ab3e687a5ac1a587cf2fbc42204658b79c29ac1863a05aa905e3b2552e708ddaba24339fef7cf5446b31128949e7c1079a3 +MISC metadata.xml 599 SHA256 b8e9d5329156d33cce6e184e6871ab588be27371c58411fdb9587dc538e6b403 SHA512 67ca388452933e1b87a6857c11be92dd1c29d1daf44a0e000bda38d31ac3f931c037fbc1e1dc6f822dce768a387b4e23c777e164dc4b39cc07cb3d62014ae17d WHIRLPOOL 661eb46c28d066b3479e6b6ac21dfd87e76c1cd217dd968145f5c709f08cc4d2f9179f7748ed52a11a2cd8d8c5b108605affd49f5331b1d32edf91c40b237da1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfRAAoJELp701BxlEWf1ucQAIbPG8g9NFjd8nHpS7LMTnbt -Y8hD1YiTxjKx8LfUb41q1X1fbP3jFh+4X+xO+AQbSEIHx7PPNR/KshuWlXj0CXJi -/+YGjZ+SNLZA63P+c85kv1Quj4xYFBLAuXHNz985DHdXCyFct1guMTPle6GWoopq -bZxin4J7ml8GvI0m9RO90++CBiuS5sPVwol3j7ulTVTIScSu2DAf3cLs0g6k2tm7 -fTiIT9qRUD00I/rkf5n+T/is+V1olNQmejNBqwirP2/VzcfDqwDKow0EesofnlWy -Va5JdXcQmWg8Hep8KRTpnIPf0AvjuZ6bwIKwPVo7pZpWCzqQrf8f+paSRT1O9KGh -5653KFfD9yc8hH13icq+sNLix5DD3CWnqNddTTrvcdecQu3M17QgWXemaeCqZB91 -L1/1otRp3C9frVsEIlBinLLsMngFvfjXJNHaJpC75Oz5RNP6gANZC7ycqIA1a21u -rzgYY58+uD8JBOINiaUYU2WipZFijddFQCE4ph859Jme3iQRrGJug4yUwnOi65QQ -ftAAF5oI28iJmMsmD9vjukuJup8JkJHXYNyqZXPzJ36Rvfcq4ny9p92rX7Rh4IwP -ZLbHoS8e0xybSehL9ZKolmD2ImCyXQw+59BpbLi/Aq7kfqDvmYmEHrS/0gDbX4H6 -XAOagxC4/igrHdKOCxTF -=dZjt +iQIcBAEBCAAGBQJS5U2yAAoJENXLsxwXqFxyeE8P/iemceIWY9pHSlEIwWAV7DQD +TzncI94Sz/DQymng899LmRtCSI9s+fGHC0rbY56ACOkrTgTB19En0D6ofB07hue4 +ea3fDw06KIL3+dwe46J2X8opR/MTVk2j0eTpnZXeHSM/vSNSCb7xlcRjUzI1Ptjy +u0KLvkPqoEnX6UpyTAcK0zaN15++bPgTautQFG6aU4q/O8ZbnhPqyyCKUE+NBayp ++WWPvxX9MBf8RpAsipLRIeT+HEO6lXfh+KKBLrP6nPNTYt8/VarAXMIOEzseLU+Y +1pq1zpgdakABfzVrRWk42I77qgylP1Z8JFb0pAB/d5V4WzIokdM1YKBbdOFxE+eo +XiaCYpYrIw/exkt/BXUNBc0yBzaBRQ18P788+WoZtAr86h19GrpcYG2IB/wDuide +Uq20rQurfzgT/8+7fVHKckdBqHlE5EQz4t6bNO4gzoC8mzX4G47JPqkb60y121I1 ++bP5HTro8GYT79t7KbE5eAqUu2fC/dgYdItofyJMvxejAeko9TxKkrtU7XV2O1De +nMGZczt/a4CBfp401gRZFkLRvP9Qzcw81H726sxdqCtQCTRnowElItTGZornxYR8 +R7tWUiwAzI/6HdfOLSK+LYg8oM/Mh38fmoTeOw1eFbK4FRMSpHmifMo5BQM6xbTB +YcloDMXOZAOWazlvUpqM +=n1cL -----END PGP SIGNATURE----- diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml index 6fb8805f1644..d410c710cc60 100644 --- a/dev-qt/qtopengl/metadata.xml +++ b/dev-qt/qtopengl/metadata.xml @@ -3,11 +3,10 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="egl">Use EGL instead of default GLX to manage OpenGL contexts on the desktop</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> </use> <upstream> diff --git a/dev-qt/qtopengl/qtopengl-4.8.4.ebuild b/dev-qt/qtopengl/qtopengl-4.8.4.ebuild deleted file mode 100644 index 9f9515f7b54e..000000000000 --- a/dev-qt/qtopengl/qtopengl-4.8.4.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.4.ebuild,v 1.1 2013/03/02 15:31:52 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The OpenGL module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="egl qt3support" - -DEPEND=" - virtual/opengl - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/opengl - src/plugins/graphicssystems/opengl" - - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtGui - include/QtOpenGL - src/corelib - src/gui - src/opengl - src/plugins - src/3rdparty" - - QCONFIG_ADD="opengl" - QCONFIG_DEFINE="QT_OPENGL" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -opengl - $(qt_use qt3support) - $(qt_use egl)" - - qt4-build_src_configure - - # Not building tools/designer/src/plugins/tools/view3d as it's - # commented out of the build in the source -} - -src_install() { - qt4-build_src_install - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die -} diff --git a/dev-qt/qtopenvg/ChangeLog b/dev-qt/qtopenvg/ChangeLog index bc1d9fd52cd3..9db9f19bd478 100644 --- a/dev-qt/qtopenvg/ChangeLog +++ b/dev-qt/qtopenvg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtopenvg -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.6 2013/11/04 21:31:20 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.7 2014/01/26 18:03:18 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtopenvg-4.8.4.ebuild, + metadata.xml: + Cleanup. 04 Nov 2013; Agostino Sarubbo <ago@gentoo.org> qtopenvg-4.8.5.ebuild: Stable for ppc, wrt bug #488536 diff --git a/dev-qt/qtopenvg/Manifest b/dev-qt/qtopenvg/Manifest index 354b1010dd5b..4d7bbfd8fd99 100644 --- a/dev-qt/qtopenvg/Manifest +++ b/dev-qt/qtopenvg/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtopenvg-4.8.4.ebuild 1310 SHA256 667badc130abd36fb3e1170fa23d4f48af93b372df7860d956a889fd17e2ec00 SHA512 f2a96e04936c91bb4bef412d35488beffd61e3641d79ea9d6a794826839a5ddcc4bef88730cd3de2ea526b64fd67603fd88c0c6bab80c4c82c917b1a2d35bd38 WHIRLPOOL ef7e5355dda7311293eb8cb9fa07e6085d4e5e6fe14d06c2584b0355bdf58b6d605f4cbd0f9e02a4a388989e5a0a88999c780965c280d1ab489222bdc997bafa EBUILD qtopenvg-4.8.5.ebuild 1307 SHA256 e405d5cf56c124c9a07be7d4e0bd976ff60d3924b5507e362c4727ee4afdd9fb SHA512 4a2f70c4094067f0568a6fbc4007101b9f3d7f6b76b202eecbd04acbc6519c12486b3d78b8c6912676e483d86b8867cca0757dc46f64a40cafafc714f85dd1ab WHIRLPOOL 17fdcf06e7d7f4f88c80e3bd515b127c0cfefcff10437c5eb2bc16860ba68f1bce922d66707c218474bd06377cd8b48d38bf5268b783c9a7da73389a77a2d336 -MISC ChangeLog 3353 SHA256 20d38c9653a06984415f8c3452e1205ff690dcfab857496979ed3e0fe420cbc2 SHA512 188be1e5259987be6a673a260972f7692ba835b5a32f184ab42f55de71e1af864e6f37bbdf688d8d086e3de005d2bcac0d6795a2b1f886ce5a87a17068f4510f WHIRLPOOL 6482f15cbf420694faa3af0c9b66ee1b2a0ec269fb2ae1e850da20bc60d787c8f228ce3cd40327b113cb534e9e61faf80c4299913e3a02b0db5e7968a8a9e8aa -MISC metadata.xml 494 SHA256 167240e11d6a37600d1b71d53e3d7fefd67700ab1ad10c7b4d3bc04adde84431 SHA512 30c3c4b8bc1e898934caf7de5528b6088130fd094386f5e0804c45cb7d9b85a06fc50fd9b4c0ac584ac26167d380525ed3382a61bf02043efdf3fa4dbbd14757 WHIRLPOOL 9b5c7ad3f0e08e3d680592550d0431fc942bbd06b142779494dbcb65b449bc5b8db5aebe709ca208fc748ae5c506a2d9c673bdad0a132902a692d9f6822dfbc2 +MISC ChangeLog 3456 SHA256 cab34a5c726521d5bfacc1e9fcca6508e08299cf4b111aeadbe8d50b6f5aa418 SHA512 b5df4385206bf04f25b00c3436219fc29b8163ce07fe78fde103b563c952c4b2062b493588fa0c818c93ecbb780077a104d3d8ad8efa1477c45f167ec316090b WHIRLPOOL 48ca998333af822abd49c51fde1f48deb47f810ed996b268184696ed27723a2cb98300205ed9e3aaac08fa954af4103ad309b295bf5a9c58e0e29679574e418b +MISC metadata.xml 432 SHA256 6a52434c09eee2a0f15828741529501793882a7fde13968aa48dc2f46eb378a2 SHA512 6b3e638f249abf69a0a6ad5ecc5af7751a7ef662958b9dabf41aff5c5136851c25eb70b3452a981e53a384ae04f47a36fdb870b9615cdc6e8d93e4955be71e4c WHIRLPOOL f3219864f34d682f1630eb47bbb8931a7abaed0bb3c52e8721041fe12df2d2a7694b4e5976392f1edd1bb0752a93f3fe1e3935e5b57ff298d401c1976fdb1caa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJSeBFIAAoJELp701BxlEWfZ9EP/2s4DDOzN4xvFsaiJ7smyxYW -9mbxnOllXHiP0XE3PxUlvpcig3XBmyaZyAUp0W0aKE2ehImxOf6F6kA02oKWtJ8A -skU1Sx3+9A8tAvJue2hgfy/IAQaSS/6Ll1XTcXmtt/V8WFNvk1X+erl9T1Z4yvP3 -3isI33T97vamMaDi+FrIDitPPOZQFubA8pmWs2OWsmJbcPqhB5zRBvS4dREU9MR7 -6o2AwQrEV5bcM+oNgMCKoRZr0XaNWH7KHsy+YRpYixch8WfLtShfJxl3j4oTawks -7Ua8SsX6IRuFIEj1u1JjcFnsbSf1crR1GkQaCCNQ8czkQC901Rz7eHjR0d86OWyQ -Jxsz8Z3edldOzSJQWyDRqyJFeq37NiKqqmhcKyC3Gi4TXdhSp5RNvDEb6V8XCSnU -W1rP5UiKF64HiNgVf8wOqZHY9xpvwXGBl0hg3y9YzqhJul7TDdQH/iswMERTrf2F -cxjCpWTVu5UbvB32dVD7JAUPw/iFugBU1ImDrdmCUF2fR3xdvQ3XPfhkaA83JQQI -PD+9NcBy4H6jgsPVm3cdSu4hdJQ5WV3yPh1CLN8YUBJpw5vfBty+D+29Z4vy5m3+ -bJizqt7gTpSVArp84P5jREij13JoB/GcF3+F7dWkjjGslro4ISZN5ZvvR8ukUWWz -vqaohKOjNRnRWzMNVoeF -=UL5Y +iQIcBAEBCAAGBQJS5U3nAAoJENXLsxwXqFxy9MoP/2K0koGxxmsnIhSK8emPr8xO +jC6TL4g5ZykE61RR3hx1HI/5GDJ3p1ezpeutHnX9QyRPYbfhPxO7A9dzYZ9Rdl36 +lpwZB2G68QNb9EobFUGL44OAtpAGSt08Njvy16KbxqVxxLn3A0e0ED9n16YCsLqi +hkuFty14bz3raO2keYVqwsEeaffyPqjoOtcTnpZ8kiIVii8vdGPx0GGF8GExKVhz +iNqihnfg9a9wfVk68dNnTZvJxpyElrVqwxKgeKJyGinZ4sTDBUtHfGTLPezXs3VZ +G0ZTHgXuNo+rVPzStTJYkgHc935GG/aibxT+HAjIhw/UGKGNdmFZWiGx8+CY8clo +OI2wJgb9/fSVhDz4jWPWiWZGWJsV8vww0xc3pId16fdXSPom80iDR83Rtfu71E5f +hEH7LrvQqtacSd8+pp618MhCXwA1QsfLgEG79AQ2hQTUYauIbe3A2KPS15wcXhoZ +nIy5toc6eg9NsH/mmMSsq2S7lXEQuN/ueKyFpxJW2kY/Fc6XwV90Th92R/Z515VA +8hCkWthyBOWlDDp/eYWhSZsHIqfPL/vTD1LgkeOcs+onJiPRDFfWvh99kD+JdYxL +Xrjs8y2/SgFCRhN7QXy1jIKJYfB92teifWisdHFPMs5tciItFnwAS53g8lSsqLrZ +FvF3qRrLZSDjHx1ZHsc6 +=QoVY -----END PGP SIGNATURE----- diff --git a/dev-qt/qtopenvg/metadata.xml b/dev-qt/qtopenvg/metadata.xml index 472a8cbc7148..ae3a5c33f61f 100644 --- a/dev-qt/qtopenvg/metadata.xml +++ b/dev-qt/qtopenvg/metadata.xml @@ -3,7 +3,6 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Build with support for exceptions</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> </use> diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.4.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.4.ebuild deleted file mode 100644 index 77e4ba010053..000000000000 --- a/dev-qt/qtopenvg/qtopenvg-4.8.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/qtopenvg-4.8.4.ebuild,v 1.1 2013/03/02 15:32:11 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The OpenVG module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="qt3support" - -DEPEND=" - media-libs/mesa[egl,openvg] - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/openvg - src/plugins/graphicssystems/openvg" - - QT4_EXTRACT_DIRECTORIES=" - include/QtCore - include/QtGui - include/QtOpenVG - src/corelib - src/gui - src/openvg - src/plugins - src/3rdparty" - - QCONFIG_ADD="openvg" - QCONFIG_DEFINE="QT_OPENVG" - - qt4-build_pkg_setup -} - -src_configure() { - gltype="desktop" - - myconf+=" - -openvg -egl - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # touch the available graphics systems - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die -} diff --git a/dev-qt/qtphonon/ChangeLog b/dev-qt/qtphonon/ChangeLog index 655594998eab..702d64cfe2c7 100644 --- a/dev-qt/qtphonon/ChangeLog +++ b/dev-qt/qtphonon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtphonon -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.7 2013/11/11 14:00:49 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.8 2014/01/26 18:04:46 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtphonon-4.8.4.ebuild, + metadata.xml: + Cleanup. 11 Nov 2013; Jeroen Roovers <jer@gentoo.org> qtphonon-4.8.5.ebuild: Stable for HPPA (bug #488536). diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest index 363084f096ee..c1ae65dac0b8 100644 --- a/dev-qt/qtphonon/Manifest +++ b/dev-qt/qtphonon/Manifest @@ -1,16 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtphonon-4.8.4.ebuild 1351 SHA256 5ac1e778b83b1cd7443aab1ab442c902c210c9e0f09be793b57f56b81ec7c554 SHA512 e6b7770cf693b8b11d358dc48521b57692092d3e44bdf776e8c56af537bcbe0f70345a629ada2d7506f29391c772c85be77d7b810492658b6790dedee9edba2e WHIRLPOOL d0aaf6de1e1d1679420b2ecb2c146b8c4d8d0133af4c79b4e96f8ea01fe831d7351f61bdee95315d3f5efd5da316a2c0c42b775b38ddbe1abe3b488c8d7606af EBUILD qtphonon-4.8.5.ebuild 1272 SHA256 a3e135ea302898e24d90df6e15fad490b6dc02073eae8eae54a32384f5eb1126 SHA512 8284d3ded749c219aa88c19c52fdec43418e24de9ffed4211dae3e1ac26dd8958abc91c8c7d1e692878eaff987c3b7526dab049243b60fe57d231485caeadaa5 WHIRLPOOL 016b6e4a4ad8ff1798fa0b3d3a8f5e2d06568eeea98cad248e3364d04c3bf9295bad60dadf7f27c2a192172facbbf8a8774086e251f1a483b539046efd863080 -MISC ChangeLog 17234 SHA256 a62e6813d605b318a3228af2fd0a9e7a500393bee25e6051f5d0a65002716de3 SHA512 425a86ce942e75dd2da7f7fad7a0173f88290b2af36598ef753b27e771cc32e87051d75d7b4f096d420bb9deefd7c4aaa3b32b178236862cca20ad5397405d45 WHIRLPOOL 05a5995d0351f39c361892618e5374e8a4ab30146e5f43ae6c1d08964fe9aeae34e6da7d97998b38c89ed58eca9280182b719f2a5431b4e68f66de0b2a186a39 -MISC metadata.xml 634 SHA256 b64e3e0518a5a597e682e29cb6e92e2bae0c8eed16c5b2de657bfae7be13decf SHA512 3a3387ebc1321f15311743a403a8df431f4655d1fc045284967fc9b2f354e4b313110f4f45f351509eb637c7640dc86bcdf0d06397b0319e1c795415f956bd6c WHIRLPOOL f9ce9ae051f3b08814d3ef34157fbec3402577dbcadc50b04d95c7c700da74ed78e6fdccd638a37b185ee667e0cfa9f2c66cdde130d32f753799f417177d2a49 +MISC ChangeLog 17337 SHA256 7352ce412905b54ef4455fe775553865fbc79f1e2aefc7bb14195fad4d1c2206 SHA512 9125e6ed240cfbecc007d4cbccc29382a8e176ce762e4d76f216a1847573cf4f656e523cbbf359166b06504920f97753109b94a57719637c9a52c424dd8bc1b0 WHIRLPOOL 2ea632d995cf2c02627eee5eeb4401ce82f46be2b8749750ce968ec812d375157fa2a6608db4e1a588e3d8b9aaca3a56b0366637c4989a9c4a1120c70e5add2a +MISC metadata.xml 575 SHA256 c94321b7e283133a9b2b5208a82bc22984e64f9eed83221e0ec44ff1970cfa5d SHA512 f56d9f18471c8c34fd037e5eafd2b556ac861c9e048025ca140bb884b6cd8ceb97a40a34287056825d88efebeccdbc9d3ab9524a480c87e4db02a2e73f09b5a5 WHIRLPOOL ef6150c0308cbfccfefb4d1522b84ac89151f337aac25501f665c49e61ea503c6205a12d01120e882823af6690fbfa4129955b2da34219ac59cb6b51d9bc15bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlKA4xMACgkQVWmRsqeSphProQCdFIqRLl2Xjr3U7fb2yZMoCWvn -HcoAn2FqhybChEymaZZE0TlBr0GfZ7nH -=5K51 +iQIcBAEBCAAGBQJS5U4/AAoJENXLsxwXqFxyimUQAIIxiy6g82ymhTMsM22QlUNQ +iko4OEUc2bylT9KH7/eY3CIdgFhhnHpqDIaobwAlJ3WhZWpGKmfsYSnUe08ilMBk +ccwffcC46yk/sr1kr6kGymmiuXMMtfjvZWbqVqXzffqZTZL2RtbGp6s3tXm4MRMS +GXBUOeSniV3Vt0MCyLYxiGM32VSNOlCkex9Tz92YPOUuWzfyqOO7pF0e8ZypdaiD +tehZpDGWoZUXC8tcSn+vzYkfuTIc2WHZC0SfYlZVmD48fdoquhjGncNvxe65MRc2 +p70H86/c13tQYL3CI6QNRTXHcHrFa9OuSAlpFFofWre5E5HabZKVKzUQ5IHv7Jp9 +bJffjFUyNLR0uD21FEggZYJVegr75+1SuQUWfJV5Y3SuCRH2rfhpyCJ+VIbYVMVU +oYa7IHpi0BhMS0GDiqQImGoLg0Ht4qAJemxm911rVnWbtPc+5dAX3T0ow8dtggzP +VXxmVDo714nABmoUJWv+vefCVlptwbnlApF0/qs3ACi+qqT8NHajAOerVbbk472Y +6OtGbh613k188K8HXwsiCobZ0FE3+wUDN+LM3VNNF+sl5Qmqu8Abmw4KgksP+zl+ +hWcQxtlQORdq9FCyBVMKkJpoll0SD3l7oZhrSQkOXNIALXpCsYcDIsrEtqM9LyhX +TT0MLpNXKnsgGReE/UL5 +=nZkE -----END PGP SIGNATURE----- diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml index 8f9551c3d809..7dfcbbfcc663 100644 --- a/dev-qt/qtphonon/metadata.xml +++ b/dev-qt/qtphonon/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.</flag> </use> diff --git a/dev-qt/qtphonon/qtphonon-4.8.4.ebuild b/dev-qt/qtphonon/qtphonon-4.8.4.ebuild deleted file mode 100644 index 2d40e2dfd279..000000000000 --- a/dev-qt/qtphonon/qtphonon-4.8.4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.4.ebuild,v 1.1 2013/03/02 15:32:28 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Phonon module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="dbus qt3support" - -DEPEND=" - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=] - !kde-base/phonon-kde - !kde-base/phonon-xine - !media-libs/phonon - !media-sound/phonon - !aqua? ( media-libs/gstreamer:0.10 - media-plugins/gst-plugins-meta:0.10 ) - aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] ) - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/phonon - src/plugins/phonon - tools/designer/src/plugins/phononwidgets" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src - tools" - - QCONFIG_ADD="phonon" - QCONFIG_DEFINE="QT_PHONON - $(use !aqua && echo QT_GSTREAMER)" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -phonon -phonon-backend -no-opengl -no-svg - $(qt_use dbus qdbus) - $(qt_use qt3support)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog index 323953bb1b42..5323aa668ac3 100644 --- a/dev-qt/qtscript/ChangeLog +++ b/dev-qt/qtscript/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtscript # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.13 2014/01/26 11:56:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.14 2014/01/26 18:06:28 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtscript-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtscript-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index d07b2cefa443..be589f19f425 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -2,26 +2,24 @@ Hash: SHA256 AUX 4.8.2-javascriptcore-x32.patch 1011 SHA256 7a20c0e70285f9506b2d1316ff7d034943e5a6885ed50c5364f276bc8e648d36 SHA512 d24778a440daf1bb9d3fd97c2fc0d55de3e80485054b26128a9050e8b940ccfe6fb694bc6ec94e1673e35c7ee50d1425945093268f7a642e71fefa354524868a WHIRLPOOL f4d475b353619a0c0c8cddfa506ea8f9d166230512540b84bdf4acbcbb046e155ae1bb2dd4d0e0a26f4c0c07011b430bafe8750230d7804e8a46e63135c674c5 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtscript-4.8.4.ebuild 1649 SHA256 a2d70cc93e2e8c4d4d5335c1f675fc87cbe0fb123fed68cb7a0f95dba7ae82c9 SHA512 86d5769dd7ad2c28584650bd7b39e6611c10141f8943ee1a15068612f429880e8bffde059bd232928606d0b973727a0f536a51b6eeec72d79e48e27ca92798c6 WHIRLPOOL ee8cb3adcf258a1408669d2fb88cf5ef797b25fb976d40b4b5512f602b36b80550f5c9c576ab821d7941bc9adcea7e3163397a0c704d4939b0a747fbefee379c EBUILD qtscript-4.8.5.ebuild 1649 SHA256 4dc17c15645a319de258d59b57e7c05423fe27bb4588384f55454a8d393b59c4 SHA512 9d472ac6f93b7daa2a0e1fe5d435f808d5016de7223696bb1bedc7f78f2ccb153a2acf1347b55a756e54c01cb74c7d257eb74c8920672ff4894f9f158e77513d WHIRLPOOL cd1d0f805f45da2b84f5223fd909125ec9f14f129ca72f7c843787ae96c987f078f4e7e2bb55c64142eeb5cf8eeadbb371aac4307809871c88e35ead603aa711 -MISC ChangeLog 19556 SHA256 4f7ae0de6299189232bb7cafdaa8b61928af685142997de50d8084c10788b12a SHA512 70cfbf8d5a58f9a06b7389ce2e9b99b21e43a3e9da10cdfb025f5baf6ef8451cb4da4fe91d73a2cc01ebdf1dd9a8232e4bc5f64a29276facba146df4f98ce773 WHIRLPOOL e2e48b14e733c24ac8ca476445dd26438f410ecc7e2d163e08fb76f0e597001c86250870406eb598f34547cdd93896dcafde7d73d5ff9377f5c369d9ff96b8fe -MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f +MISC ChangeLog 19659 SHA256 e50aa117bf4672509e7829d6b579bfa84f18e1f627a86bcb0a4d4006a10a66d7 SHA512 43007affb0d0893a34b52581886f89a133a8f212a96191bbf2065a206e644298d940aa8afcb139130ae6d5deacf785961297897a3367cf62cdb125e1374fd9fc WHIRLPOOL c2cb8f664e5fcfc6c395c778734484b804c2d414413a6fca56781b0713b3fef00c462c0894c304a92ec9fe97ad0f146a57619e8a8ef930567fdba16a53290074 +MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfUAAoJELp701BxlEWf9LkQALoO4enVs12ZMNFnPLeNAbVr -gPJ9UAh1khTeMHk6IY5eZfhMmYi43gEKHVdT+1U8RZnFbDc2EY2BfcVzjy8/LRpz -Y4rUtoY02RBWr1C6jCzSs4kdWSs2cwheUxB+BE93IWexOtSShW+dNxOHfyVX/M+8 -ximrbq9jlUEXAiZOmMC2cZrX4W3WG2AIXEP/EACKZcyhQcwj4P8J8ydRGLlBcQjP -Zw5URY+BPz/0OMwDv7jHDMQ1pw3btZysv2bO03C2g/PHjLWoCc8J1MBDTJZ5vzyO -8N8nRzIfCC17urS0sKjeJuHYxOzayNh6mN4X7GiWMybCnESqfqT8VrPW+D35s5Zd -+LewaR0beubIj3nyRF10WTFd1S79lPb+7/40Gh5oxuSqJs4Kn0WMfhLUksIDaNtX -iKiZkOHy0SQbfX0fHmBtqE1K18SiVaYBeiS20wJHP7hinMtNBP+3Qt1T08nckinJ -rQR/ZwZi5cJUKCRgfNqhsroJ6DIlTf72o7izbbo9UYQusKVbQ/Zx2wSfUWZM/BKi -RiOaZdhNv6SH9mwCf4tksfaKBAMOr9Uf02osuDRDpEDf7i9XSiiXWHvddlk2tEaX -4cnY1AH9ULX4+rHJ0ChUzfIjVTcMz4PqCoVLkRVTHi+Cs8T63ceXGIrwyLYmuhHc -hxk3TGqHenunEK9fkvmt -=Xvn6 +iQIcBAEBCAAGBQJS5U6lAAoJENXLsxwXqFxy08wP/3JM6zR9zX+bEc/ZwugbmORH +thSzvVfQHaM4rktW46ZgvYMovjQMymEh3wwNA2p2LoQmw7UbdyB0DdSDTLBsYIED +8riCpStzALKK78PDaHPCfQMJZeJ6fvWvAQyi0SUKScYJYpKUUK2v/lJhTUpoWKu6 +FMMgOd6FSOQWLwdsACHW0lJ4fw9cmTG15uZzCZU/VvoX5vhm2QYS0uEdXo10A6be +EwJjG2k+f4W0p/5p58Mko8k04O9SNj+4seKQs4FCi2e6+EuJhqhf9FUy0IqMxF7f +GbY0k/NUwklf66LvUUbY797MNxv6pTsVlRCWasHD7SgL4oDGTSbwq1Tr8UBSwtrZ +msJ8AIaRNahqNdujehMJ35MS7vALlbvvn+ybT3BcTmkGDFpU91i8oDlN8NBXeXmv +CV7oylIlYmQUwNmdmgH/6HPPw/rc0TJccosZY8w91v2Wg994pr9Hyf4I6+mT75t2 +UDBXBfujybqeUptgQua6+gtlZFppaXLiv8tJzwo6OwPZp6hcvYidWRH7Smb8gE1z +TEtS78v9HVkSLvODloFfou5l7rALbOxI4UlEV0E6f8vRTBbK6DQLD6N1xpG4Nd33 +M+JLA4+7mn78RHQQ7voHnihlP4dMqX9vb16jkG6F+mXt6tdj6zngenUlJ+GAJ1/F +5gTC5QeH50ojM7nEdVP7 +=FIA0 -----END PGP SIGNATURE----- diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml index 93e5fd3f1e69..e3ba68900f83 100644 --- a/dev-qt/qtscript/metadata.xml +++ b/dev-qt/qtscript/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qtscript/qtscript-4.8.4.ebuild b/dev-qt/qtscript/qtscript-4.8.4.ebuild deleted file mode 100644 index 27568664d47b..000000000000 --- a/dev-qt/qtscript/qtscript-4.8.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.4.ebuild,v 1.3 2013/04/08 15:18:21 pesa Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The QtScript module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="iconv +jit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/script" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtScript - src/3rdparty/javascriptcore - src/corelib" - - QCONFIG_ADD="script" - QCONFIG_DEFINE="QT_SCRIPT" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(qt_use iconv) - $(qt_use jit javascript-jit) - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama - -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif - -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg - -no-gtkstyle" - - qt4-build_src_configure -} - -src_install() { - qt4-build_src_install - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private - find "${S}"/src/script -type f -name "*_p.h" -exec doins {} + -} diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog index b618299f6ca6..5ba57f32b3f5 100644 --- a/dev-qt/qtsql/ChangeLog +++ b/dev-qt/qtsql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtsql # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.12 2014/01/26 11:56:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.13 2014/01/26 18:08:37 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtsql-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtsql-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index feebe591f5a6..7678ac050333 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtsql-4.8.4.ebuild 2491 SHA256 4dd62ade7813d080e94bef6783eff012239b37170205996d10c9d4870d0dbfb5 SHA512 1cf89734f4323bde026921ea82fb7a86e0fffde761fedab44a72c6acd2f664c9395be638554ebde044b207b8e4d33d102a4904b122ad1a3a5057dc99fc61cc71 WHIRLPOOL 493d3118c0c1775121083f6ad351d40d7856c6572732c6683bd8061d2883b6e91113074e9be58e49070b920edeb6f3d83b6612429ad188f48900b6eeef9be189 EBUILD qtsql-4.8.5.ebuild 2489 SHA256 92c0f2de46f73a5d211e39ff47a749c19055ab1f4822a6ffab839cbed6962192 SHA512 18c5833ad609ab5cb6ee7a387bc82d437668a7fc2a89c5a556dbcdd0b85b99484edf5dec23b7e74b59c3762b519d8f992f66fd9405576b5355276c3fc39281fc WHIRLPOOL ca18b091bc6ff37db51ae820df032e86b8a2e3ea2ad20d89dc8e331c6200da9300a2a466d710a240d81bc7256d6a17997cc61ef1bf441d092492972672c9ec75 -MISC ChangeLog 20810 SHA256 e4d6785de5a00304f19e5fdd6710b9357b6920bd9abd0bac8f934aaa01556c0c SHA512 396905038d355a35f9b280ed0ab419d1e88aa2d21b68273bf403f00e5ac3bcde5c1f924b638f6490d08bd8faa5a90ea6b5179becc27ef5621c41b14738189d2c WHIRLPOOL f4c2d74b7dad64d82e1515d692e11b5ee1f17efd4bcfa6385df2604eff82775316487edde4d6adc63d27f8ef187aa43e2eb9889d663382fde7989bf6e09c4416 -MISC metadata.xml 557 SHA256 c5a26c7fba2094066fe31576bf73427ff216fd6b7f85421101e5466424dfff4a SHA512 8b78c0325ccf4439d87f9de6e6bb032e20caef10d5cd126d266c928f0deeac2fb9fc77fcce7c763fb3133a8cce907fe8f9462fab74fe8509a85f4edf49769960 WHIRLPOOL 9b15e75ae1e15f7a140e49c85efea8ebbda065cffd09588f391fa2e4d801ca36e965e9fd04f5e91d53f9a88bab5e1cc0153a0319c6fb5cf0483fcd671296b79e +MISC ChangeLog 20910 SHA256 915cf220b20729a8178c53ca150e44be3e4410f07b112dd30ac8a0b0c25d46a6 SHA512 51c18d46094b03083eb84127bf5e3d275c26417e5a6c39b1530a5a87638e4b5158a0399deafeeb6ee3839dc94cfe820f8e6fc5baaec2292bcfd340737989a144 WHIRLPOOL a17b2c877831f0aba2bbe6604571e0c83dcc3e78869eff6004f82a4fdf8da178ccaa5eab049452331a4b6d9a8ba8553de4048e7a36249f1d6eacd82fdf6c61bb +MISC metadata.xml 498 SHA256 8230210e1dcf6ca2c2fa13ecf8bb5bfcfac5b01c071f39fc1f68c823cee0c69f SHA512 de6e6b4f90c865c1ca751c48cc193fa7a13633b2f6bc45a167abd244590d46b92158d1cf7ea1a2eb1774862c4b74f6eb10e242279fbb6e5d2c9aba6902b6c9bd WHIRLPOOL 50c496785e07f6da0bedbfd45d77c44fe55450f38cd1880ebb993ab4ea2025bef77b2c0832c2ef13ad735d20d0023d3e20891a3ae0d668f885f332d6a93a5a40 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfXAAoJELp701BxlEWfgnYP/j0RaRz9tEM+Kcu1GOmUBWnJ -2ehEFv8xrKpZhlfGyuiN4ktUSx1IOct6O4p8DsVeooc3kkcwlxHxywEPN/E+FGCH -+1ey/El9chGqwrRLuqaWG/3TYJBhcBXzBmlVq6VYpUHzAqil+a66S5/NICPdjs6G -AxzER75DJbLTO19scpcQdqb1RQFM5YC5JqCNEV1sBoXEfQLIvTPqmvL9ip/iN96H -DzPjZbB23GJSiCDEsFBFKYtAAUH1l+uBnOySxVAUDBAnZzwbqhcMD5O0IBu2fUFO -6AvuTNg3A7V9A5kakESqDpCZVyUNSRRlYJE7Vbn2NRHb7Tv21ocUlRe8W5qfBU2Z -OCtFzRfJE/q7lteqfmvIyoPwQ9Zr4Ofj6Cd4QAW6bnX7m9Oz7KPP2gU6RaXaoyEc -aG3kBB1KYCZ1s+BGgrSBQGgWGLorD6L5U9dLaCEfT6lVXqu4bDWWA84TOeieveai -vjrHmj3i2VZ7cDjJ+wkEgamI4BAPmnxa4z4vpfRkgq6AWknFZ6t30OFrtWB9qayQ -JBcCerSa3MKZsolNGmcrQkr4U1BXSg1TgvR29pDuS8TmeRQFg3JzkZEM5WzuwhMa -J9rZ36TBR/e5NIA7/W/+MxprGGnBQCFhKt51+dHcRotB3h93r15eFvoNT7tYv5+7 -96ufAk4xeCxzrlSK2Bca -=23kN +iQIcBAEBCAAGBQJS5U8mAAoJENXLsxwXqFxySd8QAJLE+o+z9MqEOSoWX+DO/soA +j8rltjGO5wRXe+almTbKSfHzsLB0KPEx5xgiDKF4/uRC/EDeKl2kiICExyc5gpr8 +21k5nzjNSx3Wxwm1VuRIHnycGSZ/B/SXrNizBFeBrQ2kDnnqJQSbmbfGVOtzxEU8 +bhotVINvRzmaqTLxU8o/FzFIg5lTa7ZVqNleYbzddl98yVO+iUOmnERno6ZDCip6 +HK96gQ7YNKKfLp9jntr8BcXwHeTGccQsoqQcD1Bs2J1gD2N8y7of7fVNQws4L3bf +hwmY+murDugFPlQAKFINpUy6+V28r6o4hHbJ48XWJOMaBfYcMxdFKfTF1y5m+mdJ +2e4JqNdXiMsYADLgu/vj2r3TQDhQXlwoiR1SnbZm29b+7W01yfERXKL69a+22K9B +dm9PIayzl/dhEnndYLMT+aBngXnKjMwKjRsZ0JmrkGYYkdS9foXrIZXEWT9sw8D6 +UhKkSQTmwMBIlWOP0NAb0GLYtRGh/BHB+19KWjsDnCzkyhHwEVmt1hJENPaaJvb2 +cGeJbQ21ntN7+TImZ42bZXOGVR48jfBgquLQQek2/PdVjwxY3l0YkIZ3rPtJ2l/7 +yV/QBBq6P8Z6YlcT1dD+GBExRCWcBo0rTo9tZ+rnNkUynRuS5Zt/WfNKvcwi6J9t +SU9XIz6Emn0jBlnCG5pt +=y8Pe -----END PGP SIGNATURE----- diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml index ef71de9072e7..9ef8b3e81654 100644 --- a/dev-qt/qtsql/metadata.xml +++ b/dev-qt/qtsql/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> </use> <upstream> diff --git a/dev-qt/qtsql/qtsql-4.8.4.ebuild b/dev-qt/qtsql/qtsql-4.8.4.ebuild deleted file mode 100644 index 2559f5da4bbf..000000000000 --- a/dev-qt/qtsql/qtsql-4.8.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.4.ebuild,v 1.1 2013/03/02 15:34:06 yngwin Exp $ - -EAPI=4 - -inherit multilib qt4-build - -DESCRIPTION="The SQL module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite" - -REQUIRED_USE=" - || ( firebird freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] - firebird? ( dev-db/firebird ) - freetds? ( dev-db/freetds ) - mysql? ( virtual/mysql ) - oci8? ( dev-db/oracle-instantclient-basic ) - odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/sql - src/plugins/sqldrivers" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtSql - src/src.pro - src/corelib - src/plugins - src/tools/tools.pro" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - $(qt_use firebird sql-ibase plugin) - $(qt_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") - $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) - -no-sql-db2 - -no-sql-sqlite2 - -no-sql-symsql - $(qt_use qt3support) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - -no-glib" - - qt4-build_src_configure -} diff --git a/dev-qt/qtsvg/ChangeLog b/dev-qt/qtsvg/ChangeLog index 081d04f709a0..2ae04c8ce58c 100644 --- a/dev-qt/qtsvg/ChangeLog +++ b/dev-qt/qtsvg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtsvg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.12 2014/01/26 11:56:09 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.13 2014/01/26 18:09:32 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtsvg-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtsvg-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 7f59fe36e21e..b6f9c9d12f9a 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtsvg-4.8.4.ebuild 1494 SHA256 525ddff38425239a826416843fba84c1e25b40ca5375a02e0bba6dc61b705848 SHA512 230031e7652435cb4afac622f6f0cc8d838d9245b58f4278b354af4def1295f07e01df5570fd974bf014dfdcff24656215b79104dc826459c3e3d7c94e7a274b WHIRLPOOL b995aa493eb5c9d0fbd6f3c9e74f1ed616612f50148c37386a97f4564e1b1eb763089e7e6420b5cb414fdba9b0e1a6bc2865b23c3c63f1db90903bf58c5083bd EBUILD qtsvg-4.8.5.ebuild 1492 SHA256 2a63796f92c2320f51f5981618079b3e1e34baecba2a65230f35695e4743138b SHA512 b1642d376047ebe9b640a2d2ecb4886b69afab0465700f1d38885f7951e547825f8f55d2cf25e8a14544151fb1990d4968719a9ba00311be1287184927e3e0f4 WHIRLPOOL 4606c6934b0e858e1107821216318da23787e3d9d2ca71414f33fe975907deaf8109b53b5d0f6d163c6194ad4147bbffbfc6f54f4c1cc95fad79cf48b54c2572 -MISC ChangeLog 17108 SHA256 670230d2f85a4287912d1eb35380f485003e42227628667e0f17e9f061c39350 SHA512 b8bc744e2b3b37fc627184d6ea3ab3341228dd787c03042de7e73957464725a5470c8d031869954ba6217cdfd40b27a84b0f7b8c3cba4ee222e5f6b7fbb39738 WHIRLPOOL 3e08cc9d83d5724ba14102f70b165b3f54d93ee77d0aafa5abe66e29704f6383f7689cee9301a6cbd5a297ed6ee9a350de45211513141af9dba4dd5e34812689 -MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f +MISC ChangeLog 17208 SHA256 f0c6ddebfa07c918c6b11e1ebad5f7fa54dcdf8834dc54ac5237250e9e8f1678 SHA512 b070d3e89553041ebf17cbe331df46a76175764c161a46b437b84e394d98b2853fcc2d08ae8fcae82687715186835f2f0ee34d8843713b2d72a9054dcfe32d9f WHIRLPOOL 0c00420d3e242097f6717e14e95e5432d0ca06bb2c0b12416e1966ea7e53eb2563494adc29d6cddd866ea5969c88cb43448bea62aebc837ffcac871432797dc8 +MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfaAAoJELp701BxlEWfnNYQAMKPCOcYfj5MFvVfai5pGD+d -ea3segeHufvv0w52Flo6bxcomW3HhYXvYHq9WvJGmt1l3KrrwNC7JFatkJu6eYpK -2zDOfw0TvDK336Z4cW/ZSwliZqxRfVGkmA8JhPFcfGannfvNuUFp0xlOTa+XyJo0 -h2qFW1sZuiLIyXm+NF1ofL5xZgX7hQhXH3sbAy+5Ak62GOpH2cmlW6sbGq6kiiiT -cHK2y+JhUzOHRYzHE62y2eb6GVO2y+Ip5t4FIlmaLwDCDczIV2xGT6NRx2+wmtMq -hbBFa+8SyeCAavrGkfHINVi4I0LU/axTgzrl9ETkHVqTD/CmfLTJyVghIHVByft7 -s3udSI2cgrW2x6k82N7luFa8j21oFJhrA8NpWbM7Pw6cdrCyGYVAz5cyqOEeLTZX -d9+aeNmDnI+P4FENMogBedfnx3fwjJSpBMhBegTeZWUYfZ4JYxlDX8YOE+204Jj3 -3v/3mxbG58/CMCu2cOhYOcyRQocZwlrgfELQAu8iQaWfAtsu6eAHoojtBZLSlne7 -o1LvzkmWQLdJ3fBQVLxpvMdW/CiWvIntNR/9a6H3N/NTC18OxPYpl0JLmFHetQA8 -wgpHReggtJjO0rZdM5UBF/084yhgbDludsRBxVpJLQhUqUyAhzbenxM53DEOb6C0 -o9Pvdr8lfkOy08+bhMAH -=+Z7u +iQIcBAEBCAAGBQJS5U9dAAoJENXLsxwXqFxyyHEP/jVvzcw3WHKFSLk0njBhhTvl +ioQFuOmyogATFCKLwmC1NeTI8rOTLTwXN/rBZ/9ljXrYdUHZVTgOx3ZFpLmUJe3q +TlReXBH+PpB0IRungK8l/bCPyef6X+zeq54ZurIFQU/6lZCvWxZYMWw7BL6Ne11n +qiSq0T4bjEAsnN5HLxTfvfslhyssHC4llJ48UnrNorO3lE5jEY3wPjCWh4TVN5Vo +Ldh8OK9bTPzTty0PpvsXsZelRoqGgUqavsTQNoGsjdu/R2A+NXSbnUNEDdj7JOQ/ +/7D2CpjsU9pvMye1WaE/Y5ldECqtYmLGbF7hGtD6ua70PJpA2jRbDhdy+FAEkl8J +ekZJYkaty/JYR1LZHqxCfYACJ64EgsIJ+9SRks5CV909bDbOefKM3ptwrEzzSZgP +UriYnS9IXOyOKgbEFOWYi7XRjWhLknTfz9n6ew+/Ez3x4+Tvkc49yk82RNFN6A2S +UKHobt5oRTaltTY9zKVQ2fSzvnw23iLqO4MeTC3szjkB3OpPz3jRlCCKDieGOCXy +cTq/s9xRICCcj5edPp8G6RcG670XpJDll8tWCzcTgfAMUNX/VoUjVO4FFlkxGupU +VFtzVvx7nEM2M6nJ1gD7EdBFZSZ4vX7klaFL6Q4fGYylxCdYDnXkOC402bkVQFQT +LEWagW5BBbZuXgZnH9ET +=ccEP -----END PGP SIGNATURE----- diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml index 93e5fd3f1e69..e3ba68900f83 100644 --- a/dev-qt/qtsvg/metadata.xml +++ b/dev-qt/qtsvg/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qtsvg/qtsvg-4.8.4.ebuild b/dev-qt/qtsvg/qtsvg-4.8.4.ebuild deleted file mode 100644 index 718e2c1b1099..000000000000 --- a/dev-qt/qtsvg/qtsvg-4.8.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.4.ebuild,v 1.1 2013/03/02 15:34:24 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The SVG module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+accessibility" - -DEPEND=" - sys-libs/zlib - ~dev-qt/qtcore-${PV}[aqua=,debug=] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/svg - src/plugins/imageformats/svg - src/plugins/iconengines/svgiconengine" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtSvg - include/Qt - include/QtGui - include/QtCore - include/QtXml - src/corelib - src/gui - src/plugins - src/xml - src/3rdparty" - - QCONFIG_ADD="svg" - QCONFIG_DEFINE="QT_SVG" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -svg - $(qt_use accessibility) - -no-xkb -no-xrender - -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm - -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-fontconfig -no-glib -no-gtkstyle" - - qt4-build_src_configure -} diff --git a/dev-qt/qttest/ChangeLog b/dev-qt/qttest/ChangeLog index 0c261dd0caf8..533e6041c247 100644 --- a/dev-qt/qttest/ChangeLog +++ b/dev-qt/qttest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qttest # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.12 2014/01/26 11:56:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.13 2014/01/26 18:10:33 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qttest-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qttest-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index d56a26ef7a39..989a874711c3 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qttest-4.8.4.ebuild 1235 SHA256 ced6461feb1d20ceec0f5995be1d80a553b0478a5120bf6a9fd58266d452f4ad SHA512 a4a7bc57dbacd7bf8d18aa5a2d153eb4a74640adac216688f0b50edc94b9ccb1bd16a2e13ba6d098cd3bda4e0890db2fd0f82fdf7769ed64c3073ae8f2a72a55 WHIRLPOOL 661a7dde32cabcd7bdf21cf38be3fbce4d1bfbe926b1574843a7a219cc5e811b256897d1226e3aca70664c048bc12ed07ed19af03ecc6634cee7bbca2bae3310 EBUILD qttest-4.8.5.ebuild 1235 SHA256 9af9796bbe211556c571dfbbd5df2345537f8256d14575e4f744129c0584f518 SHA512 06fd671a287d1ed6be3ea851900b7fa8a33e322f6a174191d7129dc617e389c38f9802960ad54b589561c05c244afff5f1aa70a8cd654038c0341238b70113a6 WHIRLPOOL 65b770349dc32825c820385f0eab705a0e5b4115633487e03b92fa3ae9f31f6355719624a5f41b402b0acc404c6e48d20e9f51eb2ae49fb86f82a0e98bef11a3 -MISC ChangeLog 17191 SHA256 456c5ddb18036678b169584d5e7812d5d126627db6e16eefd155f981505bd4d1 SHA512 7791bbf2be5fd1ae170824693d0d0789d24a8f8c0adc19905ecac4dff166749b3d2aa504590d9f4c2073bbb4d0b81abc9a53e6ed8c010749e3aad1b98db56d2a WHIRLPOOL 2c5592a54dfa5d11083c4a9d4dac5a4d6e638845f4843ed8870b399b56cb5780e76102c0e72ad9809d26be17010e90573c3b82b47875683f8a03c40978fb5925 -MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f +MISC ChangeLog 17292 SHA256 e325714adb1fe1877f4e71ccea43ca99b010fde641f5d69ae9cf5f25b50d4ff0 SHA512 8eeb36a3636e433766e53ae40be93507466fa679ff05c8132728dc2dc22753a87dc8283408c6460847b541624fcddf3463819886efb448a7df83e684ecd2ab19 WHIRLPOOL b963f71740269c16da153303bf192affcae398bb002c068a163f35e0b826fc909a9d3ce139ee53a91d8fc9fcbd370ae8d68319d11e25386eef731b633e426606 +MISC metadata.xml 425 SHA256 0165b386b79e8935b55fb9bc09aeba60faa381f5814541f4dde08d3cdca907f7 SHA512 69227945f6fc3cb4b72f7753545605ec5665a21a7c009ec889648fa93871f9923011734af82af09e3370dd9fec664875d1892002f5ade5189a05ea33c134f12e WHIRLPOOL e3ff695a907a21fc3ededf7c260d7be52b7555e88d763ae5d8c2afa6ebb941f80430909a8864f41cda3a6d96f07135b583b4f85afff231d4f76bf50bc061ba9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfdAAoJELp701BxlEWflVYP/37EGvSdPwMJOi+r9xqOn7/z -vTCUcm+n07GvUdPenn/sEKp8Xzs0a+YxM4qBhUGhjaJ+9ntFMaKomcTAdmUhs31a -FQ9pFZXROwMUXiSHl/QAj84sW619XlBYAjtmrAtcSYn1/aLhpGgXWCAlQpuFHiMm -4wtqTooH6P6CB18G2J3pVCFzmRfiayokWXRjKcwT457joT4WsHZcsFx9WQ8XJmJf -ox7mXIWERdV14DuDgr5Ony+FBf1DlADsHzYDekN+qpIr2rAoL7KchhhRQgBMTsU6 -UjXkLNfA19+d1mNXHgyknnzs7R3UiLYO6SVvv3udL1nIWfDfOaQ87JAO+XTQisBK -4hWKumVfXatNSju5QuK99guiTziQQigqf6BtyPUfwy5N3KjR78daHGsr49slCYZa -ixkEBzsT1mGqlSw9P7BetRjKCsTSCQoglKsjJbvf4kFtXV2JPkhQ1QoytLHgSKKc -yM9HRKAH/cRiAoJ796jSQ76FKSDRsThy5ng92FlmFhfwlfz3/JteurA5GJe3xrJY -3tzSQILZsc1mdAmVSmwoh2xCmyFUy0pypli55fwFeWuKltbp43mVQY2zOdf+I2p4 -TzMtfytHt7QlPo9vbBaH/c9sBTiBhX694KyJbISgMJ8MyfffvABzGJbrg4qe+l7/ -GraRnW+KuQbtdHCEmrzG -=PYyh +iQIcBAEBCAAGBQJS5U+aAAoJENXLsxwXqFxyCzAP/j0vBVQJ7iuw8vOZq8VJk4mn +SlVp9mlr/qz1CO5Px2TzTMLHZsaNRX5P27nPaF3A0CIvwsYbCq8Y+Swqh97/hckZ +yY2ST7n7GpcZ/xayPAH//kY0mTLXKGWjN1xF3jlxCzJJsWHsc/NciDCkA63vLkLV +YuZUQv6lbG9ubGMV+iOuzWKTL93BRteoJpTSnMLmwca8Mew/CB6qLDPOjKPv0KN5 +h8UR+T6pZQLdKvm1IJwOA0ishPhafLfwmSln7d3PtY4HeRk3kNdU7QTRXGqqE6pq +DO+SX/Hdvy4Gzi413GW9cU+9R0xRT6ZcTOQaDQFPQYzboe2Y9A7ei3f28LoabfOw +E2t9amaoEEs1lBxBWTmjRl7DWvkOSgqM3RcM0rxR/Oc4Zo6aU9WRDah8e9zaeHXN +3VAStu7N+X8tVV7aoEbL3yz47iwHkU0D6piEBayJpeGZSYzEB08dQr80mRFrza2h +J0NSts8YLsQHbH+BhCsR4z9IuiYNu4XITxEV28DQgDAZT+mY+ga963rxKTBR0it+ +klTTDbQ6BWZm5s8YHApRTD1r5+SBcXt0ewBYQoYwoZeRtI3Qwcw0JoDXTnGpfjEp +6wqwCtRzO+s9hf41QzlRiVy7AljlsmHNQQnY4cfSUHOr58zg4QLkEabcNLGVceU7 +LEkhky6m4Hxm51rlj79+ +=bneR -----END PGP SIGNATURE----- diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml index 93e5fd3f1e69..e3ba68900f83 100644 --- a/dev-qt/qttest/metadata.xml +++ b/dev-qt/qttest/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> diff --git a/dev-qt/qttest/qttest-4.8.4.ebuild b/dev-qt/qttest/qttest-4.8.4.ebuild deleted file mode 100644 index f7a7b43c39b1..000000000000 --- a/dev-qt/qttest/qttest-4.8.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.4.ebuild,v 1.2 2013/04/08 15:24:42 pesa Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The QtTest module for unit testing Qt applications and libraries" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/testlib" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtTest - include/QtCore - src/corelib" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor - -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-svg" - - qt4-build_src_configure -} diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog index 56f787752e3c..2a88e81f955b 100644 --- a/dev-qt/qtwebkit/ChangeLog +++ b/dev-qt/qtwebkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.10 2014/01/26 11:56:15 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.11 2014/01/26 18:11:46 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtwebkit-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtwebkit-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest index 76238bae0b0e..09f8a015c00f 100644 --- a/dev-qt/qtwebkit/Manifest +++ b/dev-qt/qtwebkit/Manifest @@ -3,26 +3,24 @@ Hash: SHA256 AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80 AUX qtwebkit-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtwebkit-4.8.4.ebuild 2098 SHA256 b33c554b82a1db3a2a03b71931f7b139e2677713ac9c368d50df9017a257749c SHA512 263b20c71c7e2f4a15a1a3c0b3d9fd76c964af19ab8ac26f2464fb61854ffa9c6caa56e2231f6a7b8754b844d52302d24434757674198dde2be2accda65bf632 WHIRLPOOL ab9787f11a9c4c8554577e5362e878195e65131b7c5a37e8f40c96b093bea7798a1306517f0fb91999c1b9ea0da3d411ebb3d819867489bbb5c6cffdc1ef2227 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109 -MISC ChangeLog 27008 SHA256 7bd8d70229abd568d8cdd8ff1dc77f480b2e4a87341795f2476ed1f122e8601b SHA512 ebfbf1b5c314586094d6462c2d4852959fad3f84c2bbd3b43e59c976278918652635a999ccc47851ac783d9b2b516dd8d27c78133603dc02b2f1fb99507f5404 WHIRLPOOL ffa3b7757ada235f000f09e921a65e0d112cf1570e44a0e5882ee96a4398ee9304ae6e7c338903fbca678d17bdc9ef08d3f566877061b8f2d4b513e0a4ea7ca0 -MISC metadata.xml 522 SHA256 6f4c021a3440a17b85509b316089ef738dfad8ed92297c2f5c652be44f4c17cf SHA512 79883d12a8eb849f3657fd6df06df92bc78b30bc845cedcb69255bf6b5dab58ef3029581a03a251bc7afcf3574391c92907118242b1f9afa75f0cc5ebfc92754 WHIRLPOOL bd2a4c8981de43707177e6cfb56942d19ca3c3351ff03e535468fcf1063ea48280aae36edb04d307f6d870ad5e3c6d4245e6cfab3c632f81ba58c909f9346130 +MISC ChangeLog 27111 SHA256 782701fdfc1c84fd11c258107705ac30bac91b6d35aaeca7c1197aeda2b0926f SHA512 c55efae3f8df93dc8dc470b2ce4be4eeeefcf2ae41d670450ff58ae55d62d595a79efb053ea718a19dd8185548d7188f2abbfbd7360891b94c1cdb075658e7c3 WHIRLPOOL 3aa277cc152d74e8f21dcf1e1e3e7d0abc39b2ed5078f54bf0db5c8749fe25ca549dc88c7a15c27b1fd4764ca59ef19670214a080310895c93e2414e2293283d +MISC metadata.xml 525 SHA256 0c477d490dfb2ca50c83d371b239386cb816d895fe7c2affc5b566bf5101f2a1 SHA512 4feebdf4efe4dd835ad863c5fe6ceeb4348dfc3ca75714a0c5b9651f8b2e07e68bec1541a15cbf631716df101374bbeba8e93e48fd2d763f9cef2d61f3da2709 WHIRLPOOL 17d9e5ab460cbc147b35df5b2f8fc4a8ba0de29f71cfca5e606c7e79ddac7413b85688564546a642020094de8574577f0379c0598072dc530e9eb3ddddd26de3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfgAAoJELp701BxlEWfsTMQAKKv3NDBmAIzfRc0kVhG1L1Y -2J94VTLAgt48Ql136ZLN87dg+q4XCQiZBnKuhgrLYDGzVQf3oCLc+Oeh5s09/jCe -9FKPWDJogSwT3a5kyEnyN6M6m8KVfnyLP1v3RXx7QnpgFJLBMoytUSmy1ebolYDy -wnrmLzeEOGFLp1nGbpw4JjS0N7wostR2wqU2RwnC9X5jLGJh7G4E0jPIqeMV3P2d -V4OnpAsMOAjzDFFI5zz3ciq7akxEO8+citEKLydEtBHtwUHyGwpYRc9tHCatlBG9 -d2Hx0PTJcEaWbvjG5B62evvqyi5tHZffOyk1BIaqdr49c2QfokDWb4Y+X959AYwZ -2kH7aGRBZfuMPjGmxCs+by8vyRBW/jKt/Cmr+LLxe3Ye8C4o5psWg1IOM/+k/KQT -yvs4mAT+6j1m9q+CPvy3m+wRVMtlCxF6NyCJTgebi4IQrNjuORXh3b7Pbc1C2zC+ -Wf4mB7xE7uhveBNwzzVeACiew69VC4U4cCsUP0LHx0FQStNgg7iMCwrPthxXiEGg -PKOHnBVn7/KoMqKyLHsI+Pt7q6g7rd4z8QBPrtAQRCgzmWPdxhphL1qnQQprGEfn -lAh6f9VWJVgjq2fF+lZMqH4X3kzzBJc4WPl21WEnVd8kf8uJBSVUVb6tk0yiqapM -WObO/79jrCnTXzwrjgdh -=RmlI +iQIcBAEBCAAGBQJS5U/jAAoJENXLsxwXqFxyyI0P/1/e9kIh6jgXoX5abrBgBoTJ +eeh0PumvXZK246VZKjegTcA53LmaNySP6uD++yCUuku1RYe3FJEfQwpP4AvaBJb3 +8BIoKPGGca2eLYcOAgfg2t6pV56xkYHvQVxj2lXv1d5JljI30X7P6Gy2OpOaImpL +C3eOapLBPNAT5VxCmamJ/LRtBAbRbx0aqBxUvwaOCErpeDrir/rCIn6DLHO8di7N +hUBLBou7KQqcKE3h1XcswPjgjDXdOFXWd0ovUAPgQobjJVYiBQviRm4gv/rTX4Bo +RNfIpZXUIxQzzwCBG9aHo70Y5ceEYnSr/sQyixnmogWg5+pd51JfNOKyfi5/lC06 +o543PgXsnSujyBh8z3whuphKQeSQdCH/CFh5CYPE9Zjh0YFRUpOFFv93mGjMcl8V +2URpBySi/L4Dhu23uJ/2hQ9IxBIIfZToaj2DUrT24oe2LK5p9fW0S8BAvnuecP49 +3OIgSpVH4YTA2yd7LOWL5PFrpXE+hMXE+pjxD9UlJQg6d5mjZlEiFAk6RiRGIH7X +Z7poW8DFkZR3EhiabCiuDmp1pRQj1AmTbJE5H2iv4Eaht3y4g7e6Gc5Ikw3x7zK5 +fhAdzXQuEiwwVmLziwQBs7wl7kcSxY1WEHUNo1WleFJhDP3iuUKrhfR8zSWAHade +Kg74zjQfvfWOyB2CbcPc +=Z8yF -----END PGP SIGNATURE----- diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml index 62d0753a9cf2..f27cab7392ff 100644 --- a/dev-qt/qtwebkit/metadata.xml +++ b/dev-qt/qtwebkit/metadata.xml @@ -4,7 +4,7 @@ <herd>qt</herd> <use> <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> + inside the event loop (recommended by upstream)</flag> <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag> </use> <upstream> diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.4.ebuild deleted file mode 100644 index ae87ae392ff4..000000000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.4.ebuild,v 1.2 2013/10/20 22:57:46 pesa Exp $ - -EAPI=4 - -inherit qt4-build flag-o-matic - -DESCRIPTION="The WebKit module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - dev-db/sqlite:3 - x11-libs/libX11 - x11-libs/libXrender - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl] - ~dev-qt/qtgui-${PV}[aqua=,debug=] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] - gstreamer? ( - dev-libs/glib:2 - dev-libs/libxml2:2[!icu?] - >=media-libs/gstreamer-0.10.36:0.10 - >=media-libs/gst-plugins-base-0.10.36:0.10 - ) - icu? ( dev-libs/icu ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt - tools/designer/src/plugins/qwebview" - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools" - - QCONFIG_ADD="webkit" - QCONFIG_DEFINE="QT_WEBKIT" - - qt4-build_pkg_setup -} - -src_prepare() { - # Fix version number in generated pkgconfig file, bug 406443 - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build_src_prepare -} - -src_configure() { - myconf+=" - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0)" - - qt4-build_src_configure -} diff --git a/dev-qt/qtxmlpatterns/ChangeLog b/dev-qt/qtxmlpatterns/ChangeLog index 6ff43cf9afeb..55ae569e0b22 100644 --- a/dev-qt/qtxmlpatterns/ChangeLog +++ b/dev-qt/qtxmlpatterns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtxmlpatterns # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.12 2014/01/26 11:56:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.13 2014/01/26 18:14:08 pesa Exp $ + + 26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtxmlpatterns-4.8.4.ebuild, + metadata.xml: + Cleanup. 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtxmlpatterns-4.8.5.ebuild: Stable for ia64, wrt bug #494728 diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest index de5093c8fc80..6b605f6c58fe 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtxmlpatterns-4.8.4.ebuild 1077 SHA256 4b6e0c9dc61b324a5e7a15167f7654ee41431ab2b009df0736fb0deed73d0765 SHA512 d54125c1a337fa0da3c752a777c76ba1190f5b18df4af299dfef4903a0c718191bb22d966dc74207bd12763a3cd7ac2affd12dd7ae771259bf6bad03548b0444 WHIRLPOOL db6580c33c7fe5aaff793cd4041b509130540a320bd7bb325bf70176a71aa826f7df0fb6d3a433e33f197113c04105bf0d677e9ac049e46dfd584540d464b70b EBUILD qtxmlpatterns-4.8.5.ebuild 1075 SHA256 c33c5f8360d91c36f8ec9d97c00ccfbd5dc5e605d21da27de47a538fda7f614d SHA512 e5cfa8cd414fc6056a32a73c0d45355ec649023a4a7660dc21b59148e75c35cddf65f31b290d052f4686d0f5f3c6dad1f4b0ea26f8ae3bbeb25b56d42af33dc1 WHIRLPOOL fe19f8437802a8617f088c2eed8d554cc127e68151eda0fa3ade53b36a760b55fa593f0eb8811ea1dd58894f7a1747c66d01acdaa17389b678d7005026f36813 -MISC ChangeLog 18886 SHA256 fdbe465848e268526f3bb702baac955ba75b0749c7210fa97df44c9f7680d24a SHA512 9891ce9de0825d6ec212ce54de4fbf11288005486d05024e21a8dae6e891e4a0fd8e2d457615ac291dc8450052923fad3c63a7296a599aea675f3d958c687934 WHIRLPOOL d7e81d7cbdb9d4149da46aedf45ae9ed38dc8c0e08e8b538326099777abe00999302651b700fea92690ee5ff4b3e079ac9f219d6e7c0fa5ceeb04c373da8d838 -MISC metadata.xml 355 SHA256 606f8fd49a8b418a4de318e62c5d44040136a2c0a4ebbb1eafa8395795d49255 SHA512 95241a16bde7d1487f04aba1043a79983deedc6aa9dcde317be2752f17fd9ec130a30caf32d9dd53f8b5ede7cc992af793fee90786ce7de9233d40e0d93741d1 WHIRLPOOL cbec0d7c8d7a68a3cf9c4020e601ceff9d5fed7211274269af68d0ecc6c3a7f286a192f31b00fd2a36dd4eeef38732a673c66f6bdb6fa4f8fd55e08c0f55a89f +MISC ChangeLog 18994 SHA256 bfadc5aa0713475be77895d927a8580dd8adeedf1c0ba94c16449d8d39bc7bd6 SHA512 b1a46aedc963bfb671d83b1e17a36089ee732fd3015112a065863ba5987a1721c99a8bc9d7d5e947444e13ea1955761e31062501dec3248a9096ba90b094d82d WHIRLPOOL f19fcc122e58416b348d101bd87cb9158ee8d48827f78ed49fb56c60dfd97375c512c0d400c1b557269c5e016daaa2d8b80afa4d8d6d194b7ccb766fb130298c +MISC metadata.xml 278 SHA256 b40d27ec38de59770fb4357426f91d724a19d9c44c08befff30bf690fb60700e SHA512 a010d457a0cf21d55debeac9c7980386fbda32bc8ecd3c762ffb3a86547171d8e6b05ea40a683745bfced014e5b6b487b50f9f312101dc83bb52ee0451170f6f WHIRLPOOL bc06f6795ae04f64c505bbfa57a28a92ac86357cf9c4861c9edaf07185d0c038125337df4546162e22164c323dab5f36c3ce5c0748a5fa93fd5b7aaf89bf3d3c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5PfjAAoJELp701BxlEWfQjEP/0y7TnWMjqBEtjib2awIjIK8 -7R7RlliniF79mqMs31vowH2SIjOpgYbRiEEthOjAepqMVDtLZgzzemn6buIQdH+t -sLIYxNaIy27wWDSSYoszhusoLtuKCmSMv3cZU6iVZ7dYlbmF8hpT6lLjKlJIdiUg -KH2xRQl8PJQXQiVvYGV+xxF2jRp9f4D2ewxYrtt/OvS1zGql5t22FCUGcPOd9oto -YPEUuo7FpzGCBdbo79X6T3kic6vHiaObY5eoOpi8TGckxyIXvL/4tXq9LPdIQIiv -riwpZ+IiBO8EJ1usJR/h68lgaB+tjns65rGWtHonir93WgOOWvOhVJqI1577kXRQ -M0hhWFXgLvU01c0ZGOTWSIJ4tyZd/Fdc7BAZLCbCttNWyL277GeYHpBTuRHopM6k -0bAXZE5QxRVdH79VIldChkuaO4lqFkreAUP5NiN6k8D8Fc54p2dBMxm9Sk9OFt+L -1pYCDs7uVufxagt+RepiZLGJ7deQ4HYbau/Sg/jNh1sBTYpD1lc6V8AFVpkaoAtf -Aw+0I/oONVQaWbSS/75jHCwtSVNrJvGNvOZURTVxKBsPmQJhd3gB48KuXQPLZ+W9 -LgaBWh1ZjiKnD5iXqaxC+/vmazlM5Hm6G3MBASqDLlT8zp2CfahpmHwXQs1Ioexs -mOicvxIywh+x+qawtn7O -=UZo/ +iQIcBAEBCAAGBQJS5VBxAAoJENXLsxwXqFxyH6wP/jHPUGjCFLrMuZ40S4Fz68hG +ZZ/LPGbfqQxbK2uHsXbFfnAYCwbwwJtfbgVYhd2QjwlOSR8yHiTCkKxeO9WCmt+e +QKcn4ndhjlMu56Rj1xZzJHpR4R/JCWsto8qrMTCjgUs5EtsCodCGyk9PB6R02AQm +jgkguk4zTAI41vrTscOB5n3IHpVj4Fl1o23Oe5o89RinwIeGANfLm10d6gMuKlYB +YodfMxr6rjgeF5MABmaHM27bXu6ueX//KATsL5NH9AZsTGIEIynzXVwR6eP9WO7x +uRLTRM/2oi7wzxoQfSToJILg5bxvCUiuwyhmVPISuNyhSIr828G2CLz7PU0IhwSU +f9gh99BOGG4oqZ1+dnP64+NGRY7jfLFrZUqeba5KRDKzF/sJdmHSS8pnATJZkIzk +YOcT9na2WfINB/SjeMIp2uRsvFUJvWUgwGAuDJppDPtpSE1+kuHM9GtC1H2hASjE +UC8ertaXJXUQt1ce8RIxw6BgMfjTUFgyNETTqNbB4aq6H2NlnSeKFKw5Nx4DW5po +mwkC4rTt9erhuxjCma6CjuvYQ0lbESiojqFp/u81vpPPMBb/+9bGAp4FWUCKNfWp +1kEJD/KZXS4bMSBnMkGodq9GhPKUWSEJQT8DILy/zIoQt3N54XZwxUtOE5fHQyzF ++c5uEb77PrmDM5o1Kn0A +=p8Pd -----END PGP SIGNATURE----- diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml index ea23dae891b1..84c092740c8d 100644 --- a/dev-qt/qtxmlpatterns/metadata.xml +++ b/dev-qt/qtxmlpatterns/metadata.xml @@ -2,9 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>qt</herd> - <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> - </use> <upstream> <bugs-to>https://bugreports.qt-project.org/</bugs-to> <doc>http://qt-project.org/doc/</doc> diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.4.ebuild deleted file mode 100644 index adaf91160996..000000000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.4.ebuild,v 1.1 2013/03/02 15:36:27 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The XmlPatterns module for the Qt toolkit" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=] -" -RDEPEND="${DEPEND}" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/xmlpatterns - tools/xmlpatterns - tools/xmlpatternsvalidator" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/QtCore - include/QtNetwork - include/QtXml - include/QtXmlPatterns - src/network - src/xml - src/corelib" - - QCONFIG_ADD="xmlpatterns" - QCONFIG_DEFINE="QT_XMLPATTERNS" - - qt4-build_pkg_setup -} - -src_configure() { - myconf+=" -xmlpatterns" - - qt4-build_src_configure -} |