diff options
author | Davide Pesavento <pesa@gentoo.org> | 2011-11-28 23:54:28 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2011-11-28 23:54:28 +0000 |
commit | 601d6d0d223b9abc872d50a594025f9789db7eba (patch) | |
tree | 459a549e73320660ca44e5f466fa4ae7ad4fe8d2 /x11-libs | |
parent | Remove Qt 4.7.3 (diff) | |
download | gentoo-2-601d6d0d223b9abc872d50a594025f9789db7eba.tar.gz gentoo-2-601d6d0d223b9abc872d50a594025f9789db7eba.tar.bz2 gentoo-2-601d6d0d223b9abc872d50a594025f9789db7eba.zip |
Remove Qt 4.7.3
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt-test/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt-test/files/qt-4.5-nolibx11.diff | 18 | ||||
-rw-r--r-- | x11-libs/qt-test/qt-test-4.7.3.ebuild | 34 |
3 files changed, 5 insertions, 53 deletions
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 05b8079d5f53..4115af9f43c7 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.92 2011/11/26 20:04:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.93 2011/11/28 23:54:28 pesa Exp $ + + 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -files/qt-4.5-nolibx11.diff, + -qt-test-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-test/files/qt-4.5-nolibx11.diff b/x11-libs/qt-test/files/qt-4.5-nolibx11.diff deleted file mode 100644 index f94be77b742d..000000000000 --- a/x11-libs/qt-test/files/qt-4.5-nolibx11.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure ---- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300 -+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300 -@@ -4733,14 +4733,6 @@ - X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" - fi - -- # Check we actually have X11 :-) -- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then -- echo "Basic XLib functionality test failed!" -- echo " You might need to modify the include and library search paths by editing" -- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." -- exit 1 -- fi -- - # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) - if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then diff --git a/x11-libs/qt-test/qt-test-4.7.3.ebuild b/x11-libs/qt-test/qt-test-4.7.3.ebuild deleted file mode 100644 index 3d23e5551cc5..000000000000 --- a/x11-libs/qt-test/qt-test-4.7.3.ebuild +++ /dev/null @@ -1,34 +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-test/qt-test-4.7.3.ebuild,v 1.1 2011/05/10 20:08:56 tampakrap Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The testing framework module for the Qt toolkit" -SLOT="4" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="iconv" - -DEPEND="~x11-libs/qt-core-${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="${myconf} $(qt_use iconv) -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" - qt4-build_src_configure -} |