From f1e7756dd5e1d6adc3a5f4cbeb54a1269ccd66e9 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Mon, 4 Dec 2006 18:25:56 +0000 Subject: [PATCH] make the qt3 use flag into qt3support (for qt4 only) Package-Manager: portage-2.1.2_rc2-r5 --- x11-libs/qt/ChangeLog | 5 ++++- x11-libs/qt/Manifest | 16 ++++++++-------- x11-libs/qt/qt-4.2.2.ebuild | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 12363a71b2f7..183665e33079 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.397 2006/12/04 18:18:50 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.398 2006/12/04 18:25:56 caleb Exp $ + + 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + make the qt3 use flag into qt3support (for qt4 only) 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: Fix up sqlite and sqlite3 use flags to pull in proper dependencies and use diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 6e91dbff0cf0..ef76b57c6001 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -137,14 +137,14 @@ EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1 MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901 SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901 -EBUILD qt-4.2.2.ebuild 7301 RMD160 4531cda1e20e54e56dfa4e56b19d138fb1e3eaa4 SHA1 acfe59c2c7047f23f688d81856ec16317227edf8 SHA256 8f4dda0665d94a87a29ac5511b5e1ad09443d3e8053fbd7a45ffa48bbbd2043e -MD5 e89cda99c0bc3f7722b9542661abbaae qt-4.2.2.ebuild 7301 -RMD160 4531cda1e20e54e56dfa4e56b19d138fb1e3eaa4 qt-4.2.2.ebuild 7301 -SHA256 8f4dda0665d94a87a29ac5511b5e1ad09443d3e8053fbd7a45ffa48bbbd2043e qt-4.2.2.ebuild 7301 -MISC ChangeLog 22276 RMD160 77ec4f2672c1e2dd254c4d0b2e107c274df7c858 SHA1 ce1d5b02c4f5542ce1e43461c330dc5046f3506f SHA256 28de3f164d2bacfdb4b3d01ac7e97b5c902e6edf2c5698a1e208cae256dd0de4 -MD5 c44fa74998f9f7b4cf72c4cf1f6bc9c3 ChangeLog 22276 -RMD160 77ec4f2672c1e2dd254c4d0b2e107c274df7c858 ChangeLog 22276 -SHA256 28de3f164d2bacfdb4b3d01ac7e97b5c902e6edf2c5698a1e208cae256dd0de4 ChangeLog 22276 +EBUILD qt-4.2.2.ebuild 7315 RMD160 2995cc0675708b4161dcd04e21057f266c5d509f SHA1 7608af80931091716100b7656832f71d2f36da51 SHA256 b16ef4cb7ef18118f7dd446b3a779dbdd779f3684a52ae7d197161c279653c85 +MD5 a405720e08b687dec830b47bfa7bb837 qt-4.2.2.ebuild 7315 +RMD160 2995cc0675708b4161dcd04e21057f266c5d509f qt-4.2.2.ebuild 7315 +SHA256 b16ef4cb7ef18118f7dd446b3a779dbdd779f3684a52ae7d197161c279653c85 qt-4.2.2.ebuild 7315 +MISC ChangeLog 22396 RMD160 edd50684d71baa960b84aa08fa702fd62882bd0b SHA1 67c6941b5cc4b4180ba1511fea6ae5a49b2eb05b SHA256 09383ad3ab4f52b0238029360ade01facce25e0df3abe6696564f6d67b2676f8 +MD5 b59eea52eba40e65979bded87f34fa42 ChangeLog 22396 +RMD160 edd50684d71baa960b84aa08fa702fd62882bd0b ChangeLog 22396 +SHA256 09383ad3ab4f52b0238029360ade01facce25e0df3abe6696564f6d67b2676f8 ChangeLog 22396 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild index b2e556ab4c38..7b8d44e2f88b 100644 --- a/x11-libs/qt/qt-4.2.2.ebuild +++ b/x11-libs/qt/qt-4.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.2 2006/12/04 18:18:50 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.3 2006/12/04 18:25:56 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE_INPUT_DEVICES="input_devices_wacom" -IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3 sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}" +IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}" DEPEND="x11-libs/libXrandr x11-libs/libXcursor @@ -165,7 +165,7 @@ src_compile() { use dbus && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus" use glib && myconf="${myconf} -glib" || myconf="${myconf} -no-glib" - use qt3 && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support" + use qt3support && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support" use pch && myconf="${myconf} -pch" -- 2.26.2