diff options
author | Davide Pesavento <pesa@gentoo.org> | 2011-11-28 23:45:17 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2011-11-28 23:45:17 +0000 |
commit | 9eda78b41827eb457e039326c12a967786f29d32 (patch) | |
tree | be466ca5f32484ec534dc4ea7663aec13f770f25 /x11-libs/qt-demo | |
parent | Fix underlinking issue, bug 372119 (diff) | |
download | gentoo-2-9eda78b41827eb457e039326c12a967786f29d32.tar.gz gentoo-2-9eda78b41827eb457e039326c12a967786f29d32.tar.bz2 gentoo-2-9eda78b41827eb457e039326c12a967786f29d32.zip |
Remove Qt 4.7.3
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-demo')
-rw-r--r-- | x11-libs/qt-demo/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt-demo/files/qt-demo-4.5.0-fixes.patch | 22 | ||||
-rw-r--r-- | x11-libs/qt-demo/qt-demo-4.7.3.ebuild | 56 |
3 files changed, 5 insertions, 79 deletions
diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index b037456991f9..1b950dd5ad5f 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.75 2011/11/26 20:00:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.76 2011/11/28 23:45:17 pesa Exp $ + + 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> + -files/qt-demo-4.5.0-fixes.patch, -qt-demo-4.7.3.ebuild: + Remove Qt 4.7.3 26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest: Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass diff --git a/x11-libs/qt-demo/files/qt-demo-4.5.0-fixes.patch b/x11-libs/qt-demo/files/qt-demo-4.5.0-fixes.patch deleted file mode 100644 index 9ca45310fe9f..000000000000 --- a/x11-libs/qt-demo/files/qt-demo-4.5.0-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- demos/shared/arthurwidgets.cpp 2009-02-25 23:09:13.000000000 +0200 -+++ demos/shared/arthurwidgets.cpp 2009-03-05 02:31:04.290106276 +0200 -@@ -51,7 +51,7 @@ - #include <QTextBrowser> - #include <QBoxLayout> - --#include <private/qpixmapdata_p.h> -+#include "../../include/QtGui/private/qpixmapdata_p.h" - - extern QPixmap cached(const QString &img); - ---- examples/tools/plugandpaint/plugandpaint.pro 2009-02-25 23:09:15.000000000 +0200 -+++ examples/tools/plugandpaint/plugandpaint.pro 2009-03-05 02:31:45.372350805 +0200 -@@ -7,7 +7,7 @@ - mainwindow.cpp \ - paintarea.cpp \ - plugindialog.cpp --LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools -+LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -L plugins/ -lpnp_basictools - - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug diff --git a/x11-libs/qt-demo/qt-demo-4.7.3.ebuild b/x11-libs/qt-demo/qt-demo-4.7.3.ebuild deleted file mode 100644 index 4a91fbb58ae8..000000000000 --- a/x11-libs/qt-demo/qt-demo-4.7.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.7.3.ebuild,v 1.1 2011/05/10 20:05:38 tampakrap Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="Demonstration module of the Qt toolkit" -SLOT="4" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="kde qt3support" - -DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-core-${PV}:${SLOT}[aqua=,qt3support=] - ~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,webkit] - ~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,qt3support=] - ~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,qt3support=] - !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=] - media-libs/phonon[aqua=] ) ) - kde? ( media-libs/phonon[aqua=] ) - ~x11-libs/qt-script-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,qt3support=] - ~x11-libs/qt-svg-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-test-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=] - ~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]" - -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_configure() { - myconf="${myconf} $(qt_use qt3support)" - qt4-build_src_configure -} - -src_install() { - insinto "${QTDOCDIR#${EPREFIX}}"/src - doins -r "${S}"/doc/src/images || die "Installing images failed." - - qt4-build_src_install -} |