From bdd176da38e3819fa51fc57d3135cdff3ec7a061 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Mon, 4 Dec 2006 15:40:24 +0000 Subject: [PATCH] Adding qt-4.2.2 Package-Manager: portage-2.1.2_rc1-r1 --- x11-libs/qt/ChangeLog | 7 +- x11-libs/qt/Manifest | 16 ++- x11-libs/qt/files/digest-qt-4.2.2 | 3 + x11-libs/qt/qt-4.2.2.ebuild | 231 ++++++++++++++++++++++++++++++ 4 files changed, 252 insertions(+), 5 deletions(-) create mode 100644 x11-libs/qt/files/digest-qt-4.2.2 create mode 100644 x11-libs/qt/qt-4.2.2.ebuild diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 1c048e5e1669..da521030fa49 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # 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.394 2006/11/29 19:47:32 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.395 2006/12/04 15:40:24 caleb Exp $ + +*qt-4.2.2 (04 Dec 2006) + + 04 Dec 2006; Caleb Tennis +qt-4.2.2.ebuild: + Adding new 4.2.2 version 29 Nov 2006; Bryan Østergaard qt-4.1.4-r2.ebuild: Stable on Alpha. diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index b9e87ea2808d..3428ba57798c 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -112,6 +112,7 @@ DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b2 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c DIST qt-x11-opensource-src-4.2.1.tar.gz 37069122 RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 SHA1 ef4d109608ea32d318b009c89f298da3d362e3fb SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 +DIST qt-x11-opensource-src-4.2.2.tar.gz 37636491 RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 SHA1 8bee428d975f855ed02517763010002ca99715cc SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c EBUILD qt-3.3.4-r8.ebuild 10573 RMD160 c648cc4fa51e34201c03ef86af041a4ca524be93 SHA1 035d6a2f2582906a2a6df117d319d5fff0054014 SHA256 8b0019f5bf598e2b691d5323b8ee5aae1e3953b8b0c67af81f382fa912f8c9ca MD5 0c1ef9ce30d3214fee92848f874a1e52 qt-3.3.4-r8.ebuild 10573 RMD160 c648cc4fa51e34201c03ef86af041a4ca524be93 qt-3.3.4-r8.ebuild 10573 @@ -148,10 +149,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 -MISC ChangeLog 21808 RMD160 5553d597b3f4e5f04348d64b016349f43860fe43 SHA1 f6d716ab2a8b71fb1e353bd74566cc7a5661bda0 SHA256 c5febc5026791d8da2d84f5f248e24529a43f00b322fa2a29e6da000e82272ee -MD5 d4612149e506f5d2412e55a017149fe3 ChangeLog 21808 -RMD160 5553d597b3f4e5f04348d64b016349f43860fe43 ChangeLog 21808 -SHA256 c5febc5026791d8da2d84f5f248e24529a43f00b322fa2a29e6da000e82272ee ChangeLog 21808 +EBUILD qt-4.2.2.ebuild 7122 RMD160 09ce4ff84505f79aa24f20cddd41be592fbfa702 SHA1 99f681f713efc86c4a2c1929b9d4701db9da29cd SHA256 16cf86918f888e046f90956cf4102988020148d95ad8f73ce9b13b474d183e5c +MD5 d9c0e43cfecf9e8b9e6b31ad4c889dc5 qt-4.2.2.ebuild 7122 +RMD160 09ce4ff84505f79aa24f20cddd41be592fbfa702 qt-4.2.2.ebuild 7122 +SHA256 16cf86918f888e046f90956cf4102988020148d95ad8f73ce9b13b474d183e5c qt-4.2.2.ebuild 7122 +MISC ChangeLog 21925 RMD160 472ca5a6542e001d14bb0bbbaca4025ab672b43b SHA1 a1a64701d5cd76b63a6de4e66b885c4c606e6d72 SHA256 1e67a29883df8888a150bdfe2377bf742a31047e3df277c3642a52d75db84733 +MD5 75e32f73fd6b8d7fb8dcae0b1a8af59c ChangeLog 21925 +RMD160 472ca5a6542e001d14bb0bbbaca4025ab672b43b ChangeLog 21925 +SHA256 1e67a29883df8888a150bdfe2377bf742a31047e3df277c3642a52d75db84733 ChangeLog 21925 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -183,3 +188,6 @@ SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/di MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1-r1 289 RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1-r1 289 SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1-r1 289 +MD5 521080f3e0b421ab5ad25f9dc25b69f1 files/digest-qt-4.2.2 289 +RMD160 6d2f65f407b6e455d477a31d49d969eeaf6db6da files/digest-qt-4.2.2 289 +SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/digest-qt-4.2.2 289 diff --git a/x11-libs/qt/files/digest-qt-4.2.2 b/x11-libs/qt/files/digest-qt-4.2.2 new file mode 100644 index 000000000000..9207988c8e40 --- /dev/null +++ b/x11-libs/qt/files/digest-qt-4.2.2 @@ -0,0 +1,3 @@ +MD5 19f6374fe7924e33775cb87ee02669cb qt-x11-opensource-src-4.2.2.tar.gz 37636491 +RMD160 90d5f527e5f867cd8169f99634fe9e908339fc29 qt-x11-opensource-src-4.2.2.tar.gz 37636491 +SHA256 e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c qt-x11-opensource-src-4.2.2.tar.gz 37636491 diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild new file mode 100644 index 000000000000..0fa372b78ac0 --- /dev/null +++ b/x11-libs/qt/qt-4.2.2.ebuild @@ -0,0 +1,231 @@ +# 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.1 2006/12/04 15:40:24 caleb Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +SRCTYPE="opensource-src" +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://www.trolltech.com/" + +SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz" +S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} + +LICENSE="GPL-2" +SLOT="4" +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 xinerama zlib ${IUSE_INPUT_DEVICES}" + +DEPEND="x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXfont + x11-libs/libSM + x11-proto/xextproto + x11-proto/inputproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + virtual/xft + >=media-libs/freetype-2 + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + mng? ( >=media-libs/libmng-1.0.9 ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups ) + zlib? ( sys-libs/zlib ) + glib? ( dev-libs/glib ) + dbus? ( >=sys-apps/dbus-0.93 ) + input_devices_wacom? ( x11-drivers/linuxwacom )" + +pkg_setup() { + QTBASEDIR=/usr/$(get_libdir)/qt4 + QTPREFIXDIR=/usr + QTBINDIR=/usr/bin + QTLIBDIR=/usr/$(get_libdir)/qt4 + QTPCDIR=/usr/$(get_libdir)/pkgconfig + QTDATADIR=/usr/share/qt4 + QTDOCDIR=/usr/share/doc/${PF} + QTHEADERDIR=/usr/include/qt4 + QTPLUGINDIR=${QTLIBDIR}/plugins + QTSYSCONFDIR=/etc/qt4 + QTTRANSDIR=${QTDATADIR}/translations + QTEXAMPLESDIR=${QTDATADIR}/examples + QTDEMOSDIR=${QTDATADIR}/demos + + PLATFORM=$(qt_mkspecs_dir) + +} + +qt_use() { + useq ${1} && echo "-${1}" || echo "-no-${1}" + return 0 +} + +qt_mkspecs_dir() { + # Allows us to define which mkspecs dir we want to use. + local spec + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + spec="freebsd" ;; + *-openbsd*) + spec="openbsd" ;; + *-netbsd*) + spec="netbsd" ;; + *-darwin*) + spec="darwin" ;; + *-linux-*|*-linux) + spec="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + spec="${spec}-g++" + elif [[ ${CXX/icpc/} != ${CXX} ]]; then + spec="${spec}-icc" + else + die "Unknown compiler ${CXX}." + fi + + echo "${spec}" +} + +src_unpack() { + + unpack ${A} + cd ${S} +# 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 + + # Don't let the user go too overboard with flags. If you really want to, uncomment + # out the line below and give 'er a whirl. + strip-flags + replace-flags -O3 -O2 + + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + qmake.conf + + # Do not link with -rpath. See bug #75181. + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \ + qmake.conf + + # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib + sed -i -e "s:X11R6/::" qmake.conf + + cd ${S} + + if [[ "$(gcc-major-version)" == "4" ]]; then + einfo "Visibility support: auto" + else + einfo "Visibility support: disabled" + sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure + fi +} + +src_compile() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" + + myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)" + myconf="${myconf} $(qt_use opengl) $(qt_use nis)" + + use nas && myconf="${myconf} -system-nas-sound" + use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" + use png && myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng" + use jpeg && myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg" + use debug && myconf="${myconf} -debug -separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info" + use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" + + use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql" + use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql" + use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" + use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" + use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" + + 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 pch && myconf="${myconf} -pch" + + use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet" + + myconf="${myconf} -xrender -xrandr -xkb -xshape -sm" + + ./configure -stl -verbose -largefile \ + -platform ${PLATFORM} -xplatform ${PLATFORM} \ + -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \ + -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \ + -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \ + -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die + + emake sub-tools-all-ordered || die + if use examples; then + emake sub-examples-all-ordered || die + fi +} + +src_install() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die + + if use examples; then + make INSTALL_ROOT=${D} sub-examples-install_subtargets || die + make INSTALL_ROOT=${D} sub-demos-install_subtargets || die + fi + + make INSTALL_ROOT=${D} install_qmake || die + make INSTALL_ROOT=${D} install_mkspecs || die + + if use doc; then + make INSTALL_ROOT=${D} install_htmldocs || die + fi + + # Install the translations. This may get use flagged later somehow + make INSTALL_ROOT=${D} install_translations || die + + keepdir "${QTSYSCONFDIR}" + + sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la + sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl + sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc + + # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: + sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc + + # Move .pc files into the pkgconfig directory + dodir ${QTPCDIR} + mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR} + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:/usr/${libdir}/qt4" + done + + cat > "${T}/44qt4" << EOF +LDPATH=${libdirs:1} +QMAKESPEC=$(qt_mkspecs_dir) +EOF + doenvd "${T}/44qt4" +} -- 2.26.2