From 5857ce879d0dd51ff514a4c5c29eb85c4f9d009a Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 26 Jan 2014 18:14:09 +0000 Subject: Cleanup. Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x17A85C72 --- dev-qt/qtdemo/ChangeLog | 8 ++- dev-qt/qtdemo/Manifest | 32 +++++------ dev-qt/qtdemo/metadata.xml | 3 +- dev-qt/qtdemo/qtdemo-4.8.4.ebuild | 114 -------------------------------------- 4 files changed, 22 insertions(+), 135 deletions(-) delete mode 100644 dev-qt/qtdemo/qtdemo-4.8.4.ebuild (limited to 'dev-qt/qtdemo') 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 -qtdemo-4.8.4.ebuild, + metadata.xml: + Cleanup. 28 Dec 2013; Davide Pesavento 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 @@ qt - Build Qt using the C++11 standard Build QtDBus examples and demos Build QtDeclarative examples and demos Add support for exceptions - like catching them - inside the event loop (recommended by Nokia) + inside the event loop (recommended by upstream) Build QtMultimedia examples and demos Build QtOpenGL examples and demos Build QtOpenVG examples and demos 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 -} -- cgit v1.2.3-65-gdbad