diff options
| -rw-r--r-- | x11-libs/qt/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 16 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-4.3.0_rc1 | 3 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.3.0_rc1.ebuild | 252 |
4 files changed, 273 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 4e0f79213607..0712a8242eec 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.439 2007/05/03 11:25:09 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.440 2007/05/10 12:30:16 caleb Exp $ + +*qt-4.3.0_rc1 (10 May 2007) + + 10 May 2007; Caleb Tennis <caleb@gentoo.org> +qt-4.3.0_rc1.ebuild: + bump 03 May 2007; Caleb Tennis <caleb@gentoo.org> qt-3.3.4-r8.ebuild: readd amd64 as it likes this version for hardened as well diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 624005ac6c53..2457741b1164 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -116,6 +116,7 @@ DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b2 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 +DIST qt-x11-opensource-src-4.3.0rc1.tar.gz 41785034 RMD160 9c40c0c2ec02b8e5138b421ce3cef5aa252458b4 SHA1 990a7bc1fe92b0b1660d40e0e01f15439b2b0cc3 SHA256 dbddb4c85bff3732db5eb55b26ea557e7cb410c84dd01aa171cddcf8ae15d9fe EBUILD qt-3.3.4-r8.ebuild 10438 RMD160 e7f16971106ca4acf97dd1a4da2296a7adaf80a0 SHA1 cf7fe930d6028e803c89df65b915f25e03226e32 SHA256 4edbdcf7a9260686fa3de1597757100d0f6c7cbbf4546873d6e4bf472b0c77df MD5 3eaee3e6f7c020cc68787014e4c079f8 qt-3.3.4-r8.ebuild 10438 RMD160 e7f16971106ca4acf97dd1a4da2296a7adaf80a0 qt-3.3.4-r8.ebuild 10438 @@ -132,10 +133,14 @@ EBUILD qt-4.3.0_beta1.ebuild 8041 RMD160 0e1b6ccc0c915516997e7a729ae671cf5a759d3 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 28627 RMD160 9470021fef0b8eb3637d4e89a3ec8922833fbab9 SHA1 6927c50baf093d06a1cc6d1366e1f878393ecc00 SHA256 8def00b29fdfba1402a49e6fe254487a1da2613f82fa879a1af7f285463de82f -MD5 ec537a4440312d2b562a58201a8d1be9 ChangeLog 28627 -RMD160 9470021fef0b8eb3637d4e89a3ec8922833fbab9 ChangeLog 28627 -SHA256 8def00b29fdfba1402a49e6fe254487a1da2613f82fa879a1af7f285463de82f ChangeLog 28627 +EBUILD qt-4.3.0_rc1.ebuild 8034 RMD160 c8e208e176fdfb6aa22383bb6ac9f34a4fb49f40 SHA1 f8a4f74915478a67c983f5673d4d1b9bbbdec842 SHA256 e3f2a49003681f8a4ad7331a7445781e9b8bfee091c68734196ea3a09757c130 +MD5 c336e7071d15695ce1568f8a8c26a95c qt-4.3.0_rc1.ebuild 8034 +RMD160 c8e208e176fdfb6aa22383bb6ac9f34a4fb49f40 qt-4.3.0_rc1.ebuild 8034 +SHA256 e3f2a49003681f8a4ad7331a7445781e9b8bfee091c68734196ea3a09757c130 qt-4.3.0_rc1.ebuild 8034 +MISC ChangeLog 28733 RMD160 a7936e5822abbfa4ca25a04b9fd5a8e03697fb24 SHA1 70ba0050ac9fad37726879b0872b17494462f9ea SHA256 92c96fbba2bd229534f92e67bd014d8cf2e5ecce833016179ec6933f07dff315 +MD5 ed760e01a941840bd213a39cd376d2a4 ChangeLog 28733 +RMD160 a7936e5822abbfa4ca25a04b9fd5a8e03697fb24 ChangeLog 28733 +SHA256 92c96fbba2bd229534f92e67bd014d8cf2e5ecce833016179ec6933f07dff315 ChangeLog 28733 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -152,3 +157,6 @@ SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/di 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 +MD5 74c5d8963b72760cf03593aa31f0a627 files/digest-qt-4.3.0_rc1 298 +RMD160 9f008b709d0285f32f78663502b9ab0a284417ed files/digest-qt-4.3.0_rc1 298 +SHA256 613aa2a1702a999a6b1b6d448e3331c3a823c15c8759a90774f0cb34a98c0cca files/digest-qt-4.3.0_rc1 298 diff --git a/x11-libs/qt/files/digest-qt-4.3.0_rc1 b/x11-libs/qt/files/digest-qt-4.3.0_rc1 new file mode 100644 index 000000000000..714f0a083093 --- /dev/null +++ b/x11-libs/qt/files/digest-qt-4.3.0_rc1 @@ -0,0 +1,3 @@ +MD5 28f839b5fd3e475d995bbc0a2a8b24f1 qt-x11-opensource-src-4.3.0rc1.tar.gz 41785034 +RMD160 9c40c0c2ec02b8e5138b421ce3cef5aa252458b4 qt-x11-opensource-src-4.3.0rc1.tar.gz 41785034 +SHA256 dbddb4c85bff3732db5eb55b26ea557e7cb410c84dd01aa171cddcf8ae15d9fe qt-x11-opensource-src-4.3.0rc1.tar.gz 41785034 diff --git a/x11-libs/qt/qt-4.3.0_rc1.ebuild b/x11-libs/qt/qt-4.3.0_rc1.ebuild new file mode 100644 index 000000000000..69ba8f03f0e8 --- /dev/null +++ b/x11-libs/qt/qt-4.3.0_rc1.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_rc1.ebuild,v 1.1 2007/05/10 12:30:16 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/_rc/rc} +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" +} |