diff options
author | Alexander Huemer <alexander.huemer@sbg.ac.at> | 2009-06-28 17:14:48 +0200 |
---|---|---|
committer | Alexander Huemer <alexander.huemer@sbg.ac.at> | 2009-06-28 17:14:48 +0200 |
commit | acb81982b61c3a803ea20b5cd86439cf9897035a (patch) | |
tree | 41839fafe15c7645323a339f687e38ce0c66af49 | |
parent | bumped x11-libs/qt-svg to latest ~ (4.5.2) (diff) | |
download | multilib-portage-acb81982b61c3a803ea20b5cd86439cf9897035a.tar.gz multilib-portage-acb81982b61c3a803ea20b5cd86439cf9897035a.tar.bz2 multilib-portage-acb81982b61c3a803ea20b5cd86439cf9897035a.zip |
bumped x11-libs/qt-test to latest ~ (4.5.2)
-rw-r--r-- | metadata/cache/x11-libs/qt-test-4.4.2 | 6 | ||||
-rw-r--r-- | metadata/cache/x11-libs/qt-test-4.5.1 | 6 | ||||
-rw-r--r-- | metadata/cache/x11-libs/qt-test-4.5.2 | 22 | ||||
-rw-r--r-- | x11-libs/qt-test/Manifest | 3 | ||||
-rw-r--r-- | x11-libs/qt-test/files/qt-4.5-nolibx11.diff | 18 | ||||
-rw-r--r-- | x11-libs/qt-test/qt-test-4.5.2.ebuild | 34 |
6 files changed, 83 insertions, 6 deletions
diff --git a/metadata/cache/x11-libs/qt-test-4.4.2 b/metadata/cache/x11-libs/qt-test-4.4.2 index ba27bc98e..e6f96e2a5 100644 --- a/metadata/cache/x11-libs/qt-test-4.4.2 +++ b/metadata/cache/x11-libs/qt-test-4.4.2 @@ -1,14 +1,14 @@ ~x11-libs/qt-core-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper -~x11-libs/qt-core-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 sys-apps/abi-wrapper +~x11-libs/qt-core-4.4.2[lib32?] !<=x11-libs/qt-4.4.0_alpha:4 !<x11-libs/qt-assistant-4.4.2 !>x11-libs/qt-assistant-4.4.2-r9999 !<x11-libs/qt-core-4.4.2 !>x11-libs/qt-core-4.4.2-r9999 !<x11-libs/qt-dbus-4.4.2 !>x11-libs/qt-dbus-4.4.2-r9999 !<x11-libs/qt-demo-4.4.2 !>x11-libs/qt-demo-4.4.2-r9999 !<x11-libs/qt-gui-4.4.2 !>x11-libs/qt-gui-4.4.2-r9999 !<x11-libs/qt-opengl-4.4.2 !>x11-libs/qt-opengl-4.4.2-r9999 !<x11-libs/qt-phonon-4.4.2 !>x11-libs/qt-phonon-4.4.2-r9999 !<x11-libs/qt-qt3support-4.4.2 !>x11-libs/qt-qt3support-4.4.2-r9999 !<x11-libs/qt-script-4.4.2 !>x11-libs/qt-script-4.4.2-r9999 !<x11-libs/qt-sql-4.4.2 !>x11-libs/qt-sql-4.4.2-r9999 !<x11-libs/qt-svg-4.4.2 !>x11-libs/qt-svg-4.4.2-r9999 !<x11-libs/qt-test-4.4.2 !>x11-libs/qt-test-4.4.2-r9999 !<x11-libs/qt-webkit-4.4.2 !>x11-libs/qt-webkit-4.4.2-r9999 !<x11-libs/qt-xmlpatterns-4.4.2 !>x11-libs/qt-xmlpatterns-4.4.2-r9999 sys-apps/abi-wrapper 4 -http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2 +http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.4.2.tar.bz2 mirror://gentoo/qt-x11-opensource-src-4.4.2-headers.tar.bz2 http://www.trolltech.com/ || ( GPL-3 GPL-2 ) The testing framework module for the Qt toolkit. alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator -custom-cxxflags debug pch lib32 +debug pch lib32 diff --git a/metadata/cache/x11-libs/qt-test-4.5.1 b/metadata/cache/x11-libs/qt-test-4.5.1 index 6f4b9c648..8d8a581ab 100644 --- a/metadata/cache/x11-libs/qt-test-4.5.1 +++ b/metadata/cache/x11-libs/qt-test-4.5.1 @@ -1,14 +1,14 @@ ~x11-libs/qt-core-4.5.1[debug=,lib32?] sys-apps/abi-wrapper -~x11-libs/qt-core-4.5.1[debug=,lib32?] sys-apps/abi-wrapper +~x11-libs/qt-core-4.5.1[debug=,lib32?] !<x11-libs/qt-assistant-4.5.1 !>x11-libs/qt-assistant-4.5.1-r9999 !<x11-libs/qt-core-4.5.1 !>x11-libs/qt-core-4.5.1-r9999 !<x11-libs/qt-dbus-4.5.1 !>x11-libs/qt-dbus-4.5.1-r9999 !<x11-libs/qt-demo-4.5.1 !>x11-libs/qt-demo-4.5.1-r9999 !<x11-libs/qt-gui-4.5.1 !>x11-libs/qt-gui-4.5.1-r9999 !<x11-libs/qt-opengl-4.5.1 !>x11-libs/qt-opengl-4.5.1-r9999 !<x11-libs/qt-phonon-4.5.1 !>x11-libs/qt-phonon-4.5.1-r9999 !<x11-libs/qt-qt3support-4.5.1 !>x11-libs/qt-qt3support-4.5.1-r9999 !<x11-libs/qt-script-4.5.1 !>x11-libs/qt-script-4.5.1-r9999 !<x11-libs/qt-sql-4.5.1 !>x11-libs/qt-sql-4.5.1-r9999 !<x11-libs/qt-svg-4.5.1 !>x11-libs/qt-svg-4.5.1-r9999 !<x11-libs/qt-test-4.5.1 !>x11-libs/qt-test-4.5.1-r9999 !<x11-libs/qt-webkit-4.5.1 !>x11-libs/qt-webkit-4.5.1-r9999 !<x11-libs/qt-xmlpatterns-4.5.1 !>x11-libs/qt-xmlpatterns-4.5.1-r9999 sys-apps/abi-wrapper 4 -http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2 +http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2 http://www.qtsoftware.com/ || ( LGPL-2.1 GPL-3 ) The testing framework module for the Qt toolkit alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator -+iconv custom-cxxflags debug pch lib32 ++iconv debug pch lib32 diff --git a/metadata/cache/x11-libs/qt-test-4.5.2 b/metadata/cache/x11-libs/qt-test-4.5.2 new file mode 100644 index 000000000..05079aed4 --- /dev/null +++ b/metadata/cache/x11-libs/qt-test-4.5.2 @@ -0,0 +1,22 @@ +~x11-libs/qt-core-4.5.2[debug=,lib32?] sys-apps/abi-wrapper +~x11-libs/qt-core-4.5.2[debug=,lib32?] !<x11-libs/qt-assistant-4.5.2 !>x11-libs/qt-assistant-4.5.2-r9999 !<x11-libs/qt-core-4.5.2 !>x11-libs/qt-core-4.5.2-r9999 !<x11-libs/qt-dbus-4.5.2 !>x11-libs/qt-dbus-4.5.2-r9999 !<x11-libs/qt-demo-4.5.2 !>x11-libs/qt-demo-4.5.2-r9999 !<x11-libs/qt-gui-4.5.2 !>x11-libs/qt-gui-4.5.2-r9999 !<x11-libs/qt-opengl-4.5.2 !>x11-libs/qt-opengl-4.5.2-r9999 !<x11-libs/qt-phonon-4.5.2 !>x11-libs/qt-phonon-4.5.2-r9999 !<x11-libs/qt-qt3support-4.5.2 !>x11-libs/qt-qt3support-4.5.2-r9999 !<x11-libs/qt-script-4.5.2 !>x11-libs/qt-script-4.5.2-r9999 !<x11-libs/qt-sql-4.5.2 !>x11-libs/qt-sql-4.5.2-r9999 !<x11-libs/qt-svg-4.5.2 !>x11-libs/qt-svg-4.5.2-r9999 !<x11-libs/qt-test-4.5.2 !>x11-libs/qt-test-4.5.2-r9999 !<x11-libs/qt-webkit-4.5.2 !>x11-libs/qt-webkit-4.5.2-r9999 !<x11-libs/qt-xmlpatterns-4.5.2 !>x11-libs/qt-xmlpatterns-4.5.2-r9999 sys-apps/abi-wrapper +4 +http://get.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.2.tar.bz2 + +http://www.qtsoftware.com/ +|| ( LGPL-2.1 GPL-3 ) +The testing framework module for the Qt toolkit +~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator +iconv debug pch lib32 + + + +2 + +compile configure install postinst postrm preinst prepare setup unpack + + + + + diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest index 7d89f7ca1..31f7d9aea 100644 --- a/x11-libs/qt-test/Manifest +++ b/x11-libs/qt-test/Manifest @@ -1,5 +1,8 @@ +AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75 +DIST qt-x11-opensource-src-4.5.2.tar.bz2 116015284 RMD160 1af31d7fe66665e718f0c728b41becea9996fba7 SHA1 bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b SHA256 d26d94c9cb90dfe16a13b39ac7157f66ec9f5fbbf9d7faa57f7466157721f836 EBUILD qt-test-4.4.2.ebuild 1159 RMD160 6581bf5d4b027e5cd68b89c76568f3546c02171d SHA1 23b0495d87f3af8e11565e299a7e176ec42f9259 SHA256 8e53f1ce92ecfcd4e7ff7dbd0c22ea31b3bcd4a26fe50f91f8e2d6e20555aeb5 EBUILD qt-test-4.5.1.ebuild 1101 RMD160 0f99a8454dfe27fe76a46238ab410e51f5b0b333 SHA1 dff749946d8f9d15c90bb6486e0fa9759ba45519 SHA256 ae64dfa7766838d33ca19c99284a4c1e81f51617036e2ed3978642705aaffb6e +EBUILD qt-test-4.5.2.ebuild 1158 RMD160 328e37bd688fda83f4a383ee1588825f4e437443 SHA1 4ca0ccc6ccabd1ed718b1b899cd506b566b7dbf8 SHA256 91069fd80ba304f804578d42ae4a92797d400c6b500d0978fee7f1ff7f271239 diff --git a/x11-libs/qt-test/files/qt-4.5-nolibx11.diff b/x11-libs/qt-test/files/qt-4.5-nolibx11.diff new file mode 100644 index 000000000..f94be77b7 --- /dev/null +++ b/x11-libs/qt-test/files/qt-4.5-nolibx11.diff @@ -0,0 +1,18 @@ +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.5.2.ebuild b/x11-libs/qt-test/qt-test-4.5.2.ebuild new file mode 100644 index 000000000..e3a3ec571 --- /dev/null +++ b/x11-libs/qt-test/qt-test-4.5.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2009 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.5.2.ebuild,v 1.1 2009/06/27 19:23:05 yngwin Exp $ + +EAPI="2" +inherit qt4-build multilib-native + +DESCRIPTION="The testing framework module for the Qt toolkit" +SLOT="4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="iconv" + +DEPEND="~x11-libs/qt-core-${PV}[debug=,lib32?]" +RDEPEND="${DEPEND}" + +QT4_TARGET_DIRECTORIES="src/testlib" +QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} +include/QtTest/ +include/QtCore/ +src/corelib/" + +PATCHES=( + "${FILESDIR}/qt-4.5-nolibx11.diff" +) + +multilib-native_src_configure_internal() { + 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 +} |