diff options
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-4.1.0-r1 | 1 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.1.0-r1.ebuild | 198 |
4 files changed, 208 insertions, 2 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index ace0b2a13c0b..3d6233ae1525 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.275 2006/01/03 12:12:06 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.276 2006/01/04 13:59:02 caleb Exp $ + +*qt-4.1.0-r1 (04 Jan 2006) + + 04 Jan 2006; Caleb Tennis <caleb@gentoo.org> +qt-4.1.0-r1.ebuild: + Revbump to change prefix to /usr, fixes pkgconfig files 03 Jan 2006; Caleb Tennis <caleb@gentoo.org> +files/qt-4.1.0-debug-and-release.diff, qt-3.3.4-r8.ebuild, diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index c3ebd9c2848f..c4fffbdc5879 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,4 +1,4 @@ -MD5 c72073684dfdb7bd11f4316609a21930 ChangeLog 4822 +MD5 bca6ce4592602d37fe2fc9f1f09525fd ChangeLog 4977 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138 @@ -7,6 +7,7 @@ MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166 MD5 7c3ccffe55767c77fab3a32c5bb296ac files/digest-qt-3.3.5 166 MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81 MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0 81 +MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r1 81 MD5 80e462c816f7784088a6395aedcf6de9 files/digest-qt-4.1.0_rc1 85 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278 @@ -24,5 +25,6 @@ MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 535413f7903ecea020dd6ae98fa3a8d3 qt-3.3.4-r8.ebuild 10353 MD5 9cb64e365be8153b3aa5d14291cc58cc qt-3.3.5.ebuild 10320 MD5 013f53daa2fbe33eec94e47726c9e853 qt-4.0.1.ebuild 5936 +MD5 23c48d64dd189c4b042ddbe16c0e5d9f qt-4.1.0-r1.ebuild 6236 MD5 646d36bb71f8b40f3f91ee8bed5e059a qt-4.1.0.ebuild 6251 MD5 6212755080bc0fd437c6e83d2db3ae82 qt-4.1.0_rc1.ebuild 6088 diff --git a/x11-libs/qt/files/digest-qt-4.1.0-r1 b/x11-libs/qt/files/digest-qt-4.1.0-r1 new file mode 100644 index 000000000000..87b17979288a --- /dev/null +++ b/x11-libs/qt/files/digest-qt-4.1.0-r1 @@ -0,0 +1 @@ +MD5 0e3982a54f56b6420d3062b20524410a qt-x11-opensource-src-4.1.0.tar.gz 25634393 diff --git a/x11-libs/qt/qt-4.1.0-r1.ebuild b/x11-libs/qt/qt-4.1.0-r1.ebuild new file mode 100644 index 000000000000..d026f6ae279d --- /dev/null +++ b/x11-libs/qt/qt-4.1.0-r1.ebuild @@ -0,0 +1,198 @@ +# 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.1.0-r1.ebuild,v 1.1 2006/01/04 13:59:02 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="|| ( QPL-1.0 GPL-2 )" +SLOT="4" +KEYWORDS="-*" +IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib" + +DEPEND="|| ( ( x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXfont + x11-proto/xextproto + x11-proto/inputproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + ) + virtual/x11 + ) + virtual/xft + >=media-libs/freetype-2 + png? ( media-libs/libpng ) + jpeg? ( media-libs/jpeg ) + mng? ( media-libs/libmng ) + nas? ( >=media-libs/nas-1.5 ) + odbc? ( dev-db/unixODBC ) + mysql? ( dev-db/mysql ) + firebird? ( dev-db/firebird ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups ) + zlib? ( sys-libs/zlib )" + +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/doc/${PF} + QTDOCDIR=${QTDATADIR}/doc + 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. Currently we only use + # linux-g++ or linux-g++-64, but others could be used for various platforms. + + if [[ $(get_libdir) == "lib" ]]; then + echo "linux-g++" + else + echo "linux-g++-64" + fi +} + +src_unpack() { + + unpack ${A} + cd ${S} + + 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} + epatch ${FILESDIR}/qt4-nomkdir.patch + epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff + epatch ${FILESDIR}/qt-4.1.0-debug-and-release.diff + + 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-and-release" || myconf="${myconf} -release" + 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" + + myconf="${myconf} -tablet -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 + + # The QtAssistant header files aren't installed..not sure why + #cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant + + 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 + + # 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 +PATH=${QTBINDIR} +ROOTPATH=${QTBINDIR} +LDPATH=${libdirs:1} +QMAKESPEC=$(qt_mkspecs_dir) +EOF + doenvd "${T}/44qt4" +} |