From: Caleb Tennis Date: Tue, 1 May 2007 13:48:40 +0000 (+0000) Subject: bump for new beta X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1339f0be724adb94a7851af1a01ffe3382399de;p=gentoo.git bump for new beta Package-Manager: portage-2.1.2.4 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 19dda38cde5d..a6fb2fc76170 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.437 2007/04/28 16:56:36 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.438 2007/05/01 13:48:40 caleb Exp $ + +*qt-4.3.0_beta1 (01 May 2007) + + 01 May 2007; Caleb Tennis +qt-4.3.0_beta1.ebuild: + Bump for new beta 28 Apr 2007; Sven Wegener qt-3.3.4-r8.ebuild, qt-3.3.8-r2.ebuild: diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index fe5863d2b7d0..a9fecd78a5bd 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623 @@ -118,6 +115,7 @@ DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b +DIST qt-x11-opensource-src-4.3.0beta.tar.gz 41041032 RMD160 8097e68f14858477602312c1477a6c5d0aa9752b SHA1 4727bf6f31b03045aa435be649d6efac59f241df SHA256 ac16defbafa67c8059eefabcd5a410b13c77ae4676bf108cfc456eb54ebc53e8 EBUILD qt-3.3.4-r8.ebuild 10435 RMD160 3ad7c30958cc8937c14e870992ee05ce7621df37 SHA1 d727dde621aa5463bfecbb8d2b19db34877dc99c SHA256 86b759674e63d89cf15fb2d48ab33017adf254fd0b3d8844f0b821c6a7c24027 MD5 6f322408c142474e82fcaa96fec3ac85 qt-3.3.4-r8.ebuild 10435 RMD160 3ad7c30958cc8937c14e870992ee05ce7621df37 qt-3.3.4-r8.ebuild 10435 @@ -130,10 +128,14 @@ EBUILD qt-4.2.3-r1.ebuild 7856 RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 S MD5 73dbcb21eb75b0cac5609776ccc2b7cc qt-4.2.3-r1.ebuild 7856 RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 qt-4.2.3-r1.ebuild 7856 SHA256 ee0cd48cbff455f8207226e566b3353e655397c963d2690a56dee5285b4b92e9 qt-4.2.3-r1.ebuild 7856 -MISC ChangeLog 28379 RMD160 32693a10607c930362f5f5563e977140e043dcc6 SHA1 cb3d38cb1e3152a764de1aa8f89cbc809f4a4f30 SHA256 59303eb62b30fb022cf200e14208f1cae64f47a964d8654200fba7d007f28e26 -MD5 48c5e68a11752a8283bccaacd975ac42 ChangeLog 28379 -RMD160 32693a10607c930362f5f5563e977140e043dcc6 ChangeLog 28379 -SHA256 59303eb62b30fb022cf200e14208f1cae64f47a964d8654200fba7d007f28e26 ChangeLog 28379 +EBUILD qt-4.3.0_beta1.ebuild 8041 RMD160 0e1b6ccc0c915516997e7a729ae671cf5a759d3d SHA1 83e10c3185773e32e84b75cf441fd4657122037a SHA256 36dee62d0bfbd6874e9d901f4a96aa19c3169812e5fcded342b7e1c00b7ab132 +MD5 36bcfb4b8fec9946fc564c5548d96741 qt-4.3.0_beta1.ebuild 8041 +RMD160 0e1b6ccc0c915516997e7a729ae671cf5a759d3d qt-4.3.0_beta1.ebuild 8041 +SHA256 36dee62d0bfbd6874e9d901f4a96aa19c3169812e5fcded342b7e1c00b7ab132 qt-4.3.0_beta1.ebuild 8041 +MISC ChangeLog 28499 RMD160 c55f00664a2fed23057d0fee7800a0526e4d9a36 SHA1 fd3195dff1b9af1c9806ea5a0c88ba9b32d3c56d SHA256 df4c294954e7f89953fac9632bd5a57fb8e6485207cfc778fb61a71da88e0028 +MD5 02382630ca62e09024c15d97e323c1f5 ChangeLog 28499 +RMD160 c55f00664a2fed23057d0fee7800a0526e4d9a36 ChangeLog 28499 +SHA256 df4c294954e7f89953fac9632bd5a57fb8e6485207cfc778fb61a71da88e0028 ChangeLog 28499 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -147,10 +149,6 @@ SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/di MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3-r1 289 RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3-r1 289 SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3-r1 289 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGM3zZI1lqEGTUzyQRAusZAJ0aNYPsbCfXHwzT0bNYkiH8w7LY5wCeLUGv -Gf8u3AKBnsGIEUpHQCSS2RA= -=nNZI ------END PGP SIGNATURE----- +MD5 bec05d0ea71cba5eb4a6999f2f9da34a files/digest-qt-4.3.0_beta1 301 +RMD160 6c8ffe21711bccf820b1c259da47f56ab97c5b40 files/digest-qt-4.3.0_beta1 301 +SHA256 cd964ceace88ed3fe59f20aacbf1dbb359f13a16669bbe853275b427a4c8a4f1 files/digest-qt-4.3.0_beta1 301 diff --git a/x11-libs/qt/files/digest-qt-4.3.0_beta1 b/x11-libs/qt/files/digest-qt-4.3.0_beta1 new file mode 100644 index 000000000000..9051f8cf6dcc --- /dev/null +++ b/x11-libs/qt/files/digest-qt-4.3.0_beta1 @@ -0,0 +1,3 @@ +MD5 cab2e0829f57f9c301aa9b7241cf9546 qt-x11-opensource-src-4.3.0beta.tar.gz 41041032 +RMD160 8097e68f14858477602312c1477a6c5d0aa9752b qt-x11-opensource-src-4.3.0beta.tar.gz 41041032 +SHA256 ac16defbafa67c8059eefabcd5a410b13c77ae4676bf108cfc456eb54ebc53e8 qt-x11-opensource-src-4.3.0beta.tar.gz 41041032 diff --git a/x11-libs/qt/qt-4.3.0_beta1.ebuild b/x11-libs/qt/qt-4.3.0_beta1.ebuild new file mode 100644 index 000000000000..67dc58bde56e --- /dev/null +++ b/x11-libs/qt/qt-4.3.0_beta1.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0_beta1.ebuild,v 1.1 2007/05/01 13:48:40 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/" + +MY_PV=${PV/_beta1/beta} +SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz" + +S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV} + +LICENSE="|| ( QPL-1.0 GPL-2 )" +SLOT="4" +KEYWORDS="~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 qt3support sqlite sqlite3 ssl tiff 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 + dev-util/pkgconfig + 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 ) + tiff? ( media-libs/tiff ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + sqlite3? ( =dev-db/sqlite-3* ) + sqlite? ( =dev-db/sqlite-2* ) + 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-1.0.2 ) + ssl? ( dev-libs/openssl ) + 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}/qt-4.1.4-sparc.patch + epatch ${FILESDIR}/qt4-sqlite-configure.patch + # epatch ${FILESDIR}/${P}-hppa-ldcw-fix.patch + + cd ${S}/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 + + # The trolls moved the definitions of the above stuff for g++, so we need to edit those files + # separately as well. + cd ${S}/mkspecs/common + + 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}:" \ + g++.conf + + # Do not link with -rpath. See bug #75181. + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf + + # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib + sed -i -e "s:X11R6/::" linux.conf + + cd ${S} + +} + +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)" + + # Disable visibility explicitly if gcc version isn't 4 + if [[ "$(gcc-major-version)" != "4" ]]; then + myconf="${myconf} -no-reduce-exports" + fi + + 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 tiff && myconf="${myconf} -system-libtiff" || myconf="${myconf} -no-libtiff" + use debug && myconf="${myconf} -debug -no-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 sqlite3 && myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite" + use sqlite && myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2" + 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 qt3support && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support" + use ssl && myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl" + + use pch && myconf="${myconf} -pch" + + use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet" + + myconf="${myconf} -xrender -xrandr -xkb -xshape -sm" + + if ! use examples; then + myconf="${myconf} -nomake examples" + fi + + ./configure -stl -verbose -largefile -confirm-license \ + -platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \ + -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 all || die +} + +src_install() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + make INSTALL_ROOT=${D} install_subtargets || die + 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}/pkgconfig/*.pc ${D}/${QTPCDIR} + + # Install .desktop files, from bug #174033 + insinto /usr/share/applications + doins ${FILESDIR}/qt4/*.desktop + + # 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" +}