diff options
author | Michael Palimaka <kensington@gentoo.org> | 2012-12-29 13:46:07 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2012-12-29 13:46:07 +0000 |
commit | b96da28c4ffef53f7557bc1e2e6bbe21ceebcd2d (patch) | |
tree | 12d6493299a3bb4e649fc4472a3ea319d37305ad /x11-libs/qt-qt3support | |
parent | Remove old. (diff) | |
download | gentoo-2-b96da28c4ffef53f7557bc1e2e6bbe21ceebcd2d.tar.gz gentoo-2-b96da28c4ffef53f7557bc1e2e6bbe21ceebcd2d.tar.bz2 gentoo-2-b96da28c4ffef53f7557bc1e2e6bbe21ceebcd2d.zip |
Remove old.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'x11-libs/qt-qt3support')
-rw-r--r-- | x11-libs/qt-qt3support/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch | 50 | ||||
-rw-r--r-- | x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild | 44 | ||||
-rw-r--r-- | x11-libs/qt-qt3support/qt-qt3support-4.8.1.ebuild | 42 | ||||
-rw-r--r-- | x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild | 50 | ||||
-rw-r--r-- | x11-libs/qt-qt3support/qt-qt3support-4.8.3.ebuild | 46 |
6 files changed, 7 insertions, 233 deletions
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index 942435d6a2cc..9d7929a7ec54 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.141 2012/12/29 08:47:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.142 2012/12/29 13:46:07 kensington Exp $ + + 29 Dec 2012; Michael Palimaka <kensington@gentoo.org> + -files/4.8.2-qatomic-x32.patch, -qt-qt3support-4.7.4.ebuild, + -qt-qt3support-4.8.1.ebuild, -qt-qt3support-4.8.2.ebuild, + -qt-qt3support-4.8.3.ebuild: + Remove old. 29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> qt-qt3support-4.8.4.ebuild: Stable for alpha, wrt bug #445956 diff --git a/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch deleted file mode 100644 index 5f352b1acc83..000000000000 --- a/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <davidepesa@gmail.com> -Date: Thu, 14 Jun 2012 00:44:43 +0200 -Subject: [PATCH] Fix qatomic inline asm for x32 ABI. - -Drop the 'q' suffix from x86_64 asm instructions. It's not needed, -because the assembler can automatically determine the proper size -based on the target, and it is in fact causing compilation failures -on x32. - -Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/corelib/arch/qatomic_x86_64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h -index c2627c8..dc78140 100644 ---- a/src/corelib/arch/qatomic_x86_64.h -+++ b/src/corelib/arch/qatomic_x86_64.h -@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu - { - unsigned char ret; - asm volatile("lock\n" -- "cmpxchgq %3,%2\n" -+ "cmpxchg %3,%2\n" - "sete %1\n" - : "=a" (newValue), "=qm" (ret), "+m" (_q_value) - : "r" (newValue), "0" (expectedValue) -@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu - template <typename T> - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue) - { -- asm volatile("xchgq %0,%1" -+ asm volatile("xchg %0,%1" - : "=r" (newValue), "+m" (_q_value) - : "0" (newValue) - : "memory"); -@@ -192,7 +192,7 @@ template <typename T> - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) - { - asm volatile("lock\n" -- "xaddq %0,%1" -+ "xadd %0,%1" - : "=r" (valueToAdd), "+m" (_q_value) - : "0" (valueToAdd * sizeof(T)) - : "memory"); --- -1.7.10 - diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild deleted file mode 100644 index 501b3d411ecc..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.7.4.ebuild,v 1.5 2012/04/03 21:48:32 jer Exp $ - -EAPI="3" -inherit qt4-build - -DESCRIPTION="The Qt3 support module for the Qt toolkit" -SLOT="4" -KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="+accessibility kde phonon" - -DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support] - ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support] - phonon? ( - !kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,debug=] - media-libs/phonon[aqua=,gstreamer] ) ) - kde? ( media-libs/phonon[aqua=,gstreamer] ) )" - -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" - - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - qt4-build_pkg_setup -} - -src_configure() { - myconf="${myconf} -qt3support - $(qt_use phonon gstreamer) - $(qt_use phonon) - $(qt_use accessibility)" - qt4-build_src_configure -} diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.1.ebuild deleted file mode 100644 index 0b472e55fb82..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.8.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.1.ebuild,v 1.9 2012/07/08 17:54:41 armin76 Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt3 support module for the Qt toolkit" -SLOT="4" -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" -IUSE="+accessibility" - -DEPEND=" - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] - ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,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/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild deleted file mode 100644 index e81cdc032004..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild,v 1.10 2012/10/14 16:58:19 armin76 Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt3 support 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=" - ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support] - ~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-qatomic-x32.patch" -) - -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/x11-libs/qt-qt3support/qt-qt3support-4.8.3.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.3.ebuild deleted file mode 100644 index 8ebde5ff2d3d..000000000000 --- a/x11-libs/qt-qt3support/qt-qt3support-4.8.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.3.ebuild,v 1.2 2012/09/16 04:38:35 yngwin Exp $ - -EAPI=4 - -inherit qt4-build - -DESCRIPTION="The Qt3 support 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=" - ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support] - ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support] - ~x11-libs/qt-sql-${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 -} |