From 09ef07f58f8a7e1316f563b5a29ad2973529b294 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Tue, 5 Dec 2006 13:13:29 +0000 Subject: [PATCH] Can just use -confirm-license now instead of saying yes to the prompt 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, 14 insertions(+), 13 deletions(-) diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 377782102339..dafff49fdbde 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.399 2006/12/04 20:32:24 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.400 2006/12/05 13:13:29 caleb Exp $ + + 05 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: + Can just use -confirm-license now instead of saying yes to the prompt 04 Dec 2006; Caleb Tennis qt-4.2.2.ebuild: Qt configuration seems to do a lot with pkgconfig, so we need to dep on it diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 6e635a404f72..8eefc34624b1 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -133,14 +133,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 7335 RMD160 debb10164dd47edf601bf7b273bd78e408d05a80 SHA1 f73af3bf421cad6420ecbbc41fd641761afbb493 SHA256 f6f77f589fa7f70395041094ef3df60e95ff8d6e3591bdeeb988d5df223cad7b -MD5 d3bb04feae99e6b65b845f23db9083b0 qt-4.2.2.ebuild 7335 -RMD160 debb10164dd47edf601bf7b273bd78e408d05a80 qt-4.2.2.ebuild 7335 -SHA256 f6f77f589fa7f70395041094ef3df60e95ff8d6e3591bdeeb988d5df223cad7b qt-4.2.2.ebuild 7335 -MISC ChangeLog 22538 RMD160 5bea9c8244dd66014c8aaa46af560b89e7c746f5 SHA1 bad8f80cbf7af2f408fb2358a985297936abb13b SHA256 0a282e660d5efd2b954feffcb1a19422fc752b78204ea32df7bf76667174fc23 -MD5 1f9dbab4e9526554bd196ffa5f43ec96 ChangeLog 22538 -RMD160 5bea9c8244dd66014c8aaa46af560b89e7c746f5 ChangeLog 22538 -SHA256 0a282e660d5efd2b954feffcb1a19422fc752b78204ea32df7bf76667174fc23 ChangeLog 22538 +EBUILD qt-4.2.2.ebuild 7294 RMD160 036c17ebd84b7b545981249426649af7541717e1 SHA1 3d3cd472c1958ccf0483b4511247bf2d0d380074 SHA256 a476e38c8b06a23be0bb2a3928e5883619a42f7a8f4a62d6292ffffcdce6e1c6 +MD5 6eac51c48f73c1abc24e7446a1f48393 qt-4.2.2.ebuild 7294 +RMD160 036c17ebd84b7b545981249426649af7541717e1 qt-4.2.2.ebuild 7294 +SHA256 a476e38c8b06a23be0bb2a3928e5883619a42f7a8f4a62d6292ffffcdce6e1c6 qt-4.2.2.ebuild 7294 +MISC ChangeLog 22675 RMD160 1572a3a9297094b7f9fb500b563d80bd65066e07 SHA1 d6988f3d3f186ff0da983b0d01254b9d0e2d23fe SHA256 965bdf21262585921a01a023dd9de7793bbeeed96b6db3c422885099d379be1e +MD5 e26acb9771f39c3dc543ea82a5c982ff ChangeLog 22675 +RMD160 1572a3a9297094b7f9fb500b563d80bd65066e07 ChangeLog 22675 +SHA256 965bdf21262585921a01a023dd9de7793bbeeed96b6db3c422885099d379be1e ChangeLog 22675 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 948434fe0593..3b3213944db4 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.4 2006/12/04 20:32:24 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.5 2006/12/05 13:13:29 caleb Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -109,8 +109,6 @@ src_unpack() { # epatch ${FILESDIR}/qt4-parisc-linux.diff epatch ${FILESDIR}/qt-4.1.4-sparc.patch - sed -i -e 's:read acceptance:acceptance=yes:' configure - cd mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags @@ -174,7 +172,7 @@ src_compile() { myconf="${myconf} -xrender -xrandr -xkb -xshape -sm" - ./configure -stl -verbose -largefile \ + ./configure -stl -verbose -largefile -confirm-license \ -platform ${PLATFORM} -xplatform ${PLATFORM} \ -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \ -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \ -- 2.26.2