diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-08-23 22:51:01 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-08-23 22:51:01 +0000 |
commit | 70dc56691b7f9527ba18fc73e424aeab278921a8 (patch) | |
tree | 8f9400ac9dacb0c8a0a62658386bcbf13bc27690 /x11-libs | |
parent | gpsbabel bump (diff) | |
download | gentoo-2-70dc56691b7f9527ba18fc73e424aeab278921a8.tar.gz gentoo-2-70dc56691b7f9527ba18fc73e424aeab278921a8.tar.bz2 gentoo-2-70dc56691b7f9527ba18fc73e424aeab278921a8.zip |
remove some older versions
(Portage version: 2.1.3.6)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.8-r2 | 6 | ||||
-rw-r--r-- | x11-libs/qt/files/digest-qt-4.3.0 | 3 | ||||
-rw-r--r-- | x11-libs/qt/files/digest-qt-4.3.0-r1 | 3 | ||||
-rw-r--r-- | x11-libs/qt/qt-3.3.8-r2.ebuild | 383 | ||||
-rw-r--r-- | x11-libs/qt/qt-4.3.0-r1.ebuild | 272 | ||||
-rw-r--r-- | x11-libs/qt/qt-4.3.0.ebuild | 272 |
7 files changed, 5 insertions, 940 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 3044eaff9885..b3738970e858 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,11 +1,15 @@ # 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.478 2007/08/23 17:47:56 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.479 2007/08/23 22:51:01 caleb Exp $ 23 Aug 2007; Markus Rothe <corsair@gentoo.org> +files/qt-4.3.1-powerpc64.patch, qt-4.3.1.ebuild: Added patch for ppc64 and mark ebuild ~ppc64; bug #178779 + 23 Aug 2007; Caleb Tennis <caleb@gentoo.org> -qt-3.3.8-r2.ebuild, + -qt-4.3.0.ebuild, -qt-4.3.0-r1.ebuild: + remove some older versions + 15 Aug 2007; Jeroen Roovers <jer@gentoo.org> qt-4.3.0-r2.ebuild: Stable for HPPA (bug #185446). diff --git a/x11-libs/qt/files/digest-qt-3.3.8-r2 b/x11-libs/qt/files/digest-qt-3.3.8-r2 deleted file mode 100644 index 5cda06f7046f..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.8-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124 -RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124 -SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124 -MD5 7f056a1fa246004cb3ec19fc11a88dc1 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 -RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 -SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 diff --git a/x11-libs/qt/files/digest-qt-4.3.0 b/x11-libs/qt/files/digest-qt-4.3.0 deleted file mode 100644 index 1f47068a30ba..000000000000 --- a/x11-libs/qt/files/digest-qt-4.3.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8012acea71b35c18247bd92c4721589d qt-x11-opensource-src-4.3.0.tar.gz 41955515 -RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 qt-x11-opensource-src-4.3.0.tar.gz 41955515 -SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 qt-x11-opensource-src-4.3.0.tar.gz 41955515 diff --git a/x11-libs/qt/files/digest-qt-4.3.0-r1 b/x11-libs/qt/files/digest-qt-4.3.0-r1 deleted file mode 100644 index 1f47068a30ba..000000000000 --- a/x11-libs/qt/files/digest-qt-4.3.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8012acea71b35c18247bd92c4721589d qt-x11-opensource-src-4.3.0.tar.gz 41955515 -RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 qt-x11-opensource-src-4.3.0.tar.gz 41955515 -SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 qt-x11-opensource-src-4.3.0.tar.gz 41955515 diff --git a/x11-libs/qt/qt-3.3.8-r2.ebuild b/x11-libs/qt/qt-3.3.8-r2.ebuild deleted file mode 100644 index cab467139d00..000000000000 --- a/x11-libs/qt/qt-3.3.8-r2.ebuild +++ /dev/null @@ -1,383 +0,0 @@ -# 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-3.3.8-r2.ebuild,v 1.11 2007/07/22 03:05:35 dberkholz Exp $ - -# *** Please remember to update qt3.eclass when revbumping this *** - -inherit eutils flag-o-matic toolchain-funcs - -SRCTYPE="free" -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." -HOMEPAGE="http://www.trolltech.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz - immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) - immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" -LICENSE="|| ( QPL-1.0 GPL-2 )" - -SLOT="3" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" - -DEPEND="x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libSM - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) - virtual/xft - media-libs/libpng - media-libs/jpeg - >=media-libs/libmng-1.0.9 - >=media-libs/freetype-2 - sys-libs/zlib - nas? ( >=media-libs/nas-1.5 ) - mysql? ( virtual/mysql ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/libpq ) - cups? ( net-print/cups )" -PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 - -pkg_setup() { - if use immqt && use immqt-bc ; then - ewarn - ewarn "immqt and immqt-bc are exclusive. You cannot set both." - ewarn "Please specify either immqt or immqt-bc." - ewarn - die - elif use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - export QTDIR=${S} - - CXX=$(tc-getCXX) - if [[ ${CXX/g++/} != ${CXX} ]]; then - PLATCXX="g++" - elif [[ ${CXX/icpc/} != ${CXX} ]]; then - PLATCXX="icc" - else - die "Unknown compiler ${CXX}." - fi - - case ${CHOST} in - *-freebsd*|*-dragonfly*) - PLATNAME="freebsd" ;; - *-openbsd*) - PLATNAME="openbsd" ;; - *-netbsd*) - PLATNAME="netbsd" ;; - *-darwin*) - PLATNAME="darwin" ;; - *-linux-*|*-linux) - PLATNAME="linux" ;; - *) - die "Unknown CHOST, no platform choosed." - esac - - # probably this should be '*-64' for 64bit archs - # in a fully multilib environment (no compatibility symlinks) - export PLATFORM="${PLATNAME}-${PLATCXX}" -} - -src_unpack() { - unpack ${A} - cd ${S} - - sed -i -e 's:read acceptance:acceptance=yes:' configure - - # Do not link with -rpath. See bug #75181. - find ${S}/mkspecs -name qmake.conf | xargs \ - sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' - - # Patch for uic includehint errors (aseigo patch) - epatch ${FILESDIR}/${P}-uic-fix.patch - - # Patch for mysql unload crash (Bug #171883) - epatch ${FILESDIR}/${P}-mysql-unload-crash.diff - - # KDE related patches - epatch ${FILESDIR}/0001-dnd_optimization.patch - epatch ${FILESDIR}/0002-dnd_active_window_fix.patch - epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch - epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff - epatch ${FILESDIR}/0047-fix-kmenu-widget.diff - epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch - - # ulibc patch (bug #100246) - epatch ${FILESDIR}/qt-ulibc.patch - - # xinerama patch: http://ktown.kde.org/~seli/xinerama/ - epatch "${FILESDIR}/${P}-seli-xinerama.patch" - - epatch ${FILESDIR}/utf8-bug-qt3.diff - - # Visibility patch, apply only on GCC 4.1 and later for safety - # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ - epatch "${FILESDIR}/${P}-visibility.patch" - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - fi - - if use ppc-macos ; then - epatch "${FILESDIR}/${PN}-3.3.5-macos.patch" - fi - - # known working flags wrt #77623 - use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" - # set c/xxflags and ldflags - strip-flags - append-flags -fno-strict-aliasing - 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}:" \ - -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ - -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ - -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ - -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ - ${S}/mkspecs/${PLATFORM}/qmake.conf || die - - if [ $(get_libdir) != "lib" ] ; then - sed -i -e "s:/lib$:/$(get_libdir):" \ - ${S}/mkspecs/${PLATFORM}/qmake.conf || die - fi -} - -src_compile() { - export SYSCONF=${D}${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "${HOME}/.qt" - - [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" - - # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. - use nas && myconf="${myconf} -system-nas-sound" - use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis" - use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" - 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/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" - use firebird && myconf="${myconf} -plugin-sql-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" - - myconf="${myconf} -system-zlib" - - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - use immqt-bc && myconf="${myconf} -inputmethod" - use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" - - if use ppc-macos ; then - myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared" - myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" - myconf="${myconf} -L${S}/lib -I${S}/include" - sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die - fi - - export YACC='byacc -d' - tc-export CC CXX - export LINK="$(tc-getCXX)" - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast -no-sql-odbc ${myconf} -dlopen-opengl || die - - emake src-qmake src-moc sub-src || die - - export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - emake sub-tools || die - - if use examples; then - emake sub-tutorial sub-examples || die - fi - - # Make the msg2qm utility (not made by default) - cd ${S}/tools/msg2qm - ../../bin/qmake - emake - - # Make the qembed utility (not made by default) - cd ${S}/tools/qembed - ../../bin/qmake - emake - -} - -src_install() { - # binaries - into ${QTBASE} - dobin bin/* - dobin tools/msg2qm/msg2qm - dobin tools/qembed/qembed - - # libraries - if use ppc-macos; then - # dolib is broken on BSD because of missing readlink(1) - dodir ${QTBASE}/$(get_libdir) - cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die - - cd ${D}/${QTBASE}/$(get_libdir) - for lib in libqt-mt* ; do - ln -s ${lib} ${lib/-mt/} - done - else - dolib.so lib/lib{editor,qassistantclient,designercore}.a - dolib.so lib/libqt-mt.la - dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0 - cd ${D}/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.5->3.3->3->.so - ln -s libqt-mt.so.${PV} libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.${PV} libqt.so.${PV} - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - fi - - # plugins - cd ${S} - local plugins=$(find plugins -name "lib*.so" -print) - for x in ${plugins}; do - exeinto ${QTBASE}/$(dirname ${x}) - doexe ${x} - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # prl files - sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl - insinto ${QTBASE}/$(get_libdir) - doins ${S}/lib/*.prl - - # pkg-config file - insinto ${QTBASE}/$(get_libdir)/pkgconfig - doins ${S}/lib/*.pc - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${libdir}" - done - - # environment variables - if use ppc-macos; then - cat <<EOF > ${T}/45qt3 -PATH=${QTBASE}/bin -ROOTPATH=${QTBASE}/bin -DYLD_LIBRARY_PATH=${libdirs:1} -QMAKESPEC=${PLATFORM} -MANPATH=${QTBASE}/doc/man -PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig -EOF - else - cat <<EOF > ${T}/45qt3 -PATH=${QTBASE}/bin -ROOTPATH=${QTBASE}/bin -LDPATH=${libdirs:1} -QMAKESPEC=${PLATFORM} -MANPATH=${QTBASE}/doc/man -PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig -EOF - fi - cat <<EOF > ${T}/50qtdir3 -QTDIR=${QTBASE} -EOF - - cat <<EOF > ${T}/50-qt3-revdep -SEARCH_DIRS="${QTBASE}" -EOF - - insinto /etc/revdep-rebuild - doins ${T}/50-qt3-revdep - - doenvd ${T}/45qt3 ${T}/50qtdir3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - insinto ${QTBASE}/tools/designer - doins -r tools/designer/templates - - insinto ${QTBASE} - doins -r translations - - keepdir ${QTBASE}/etc/settings - - if use doc; then - insinto ${QTBASE} - doins -r ${S}/doc - fi - - if use examples; then - find ${S}/examples ${S}/tutorial -name Makefile | \ - xargs sed -i -e "s:${S}:${QTBASE}:g" - - cp -r ${S}/examples ${D}${QTBASE}/ - cp -r ${S}/tutorial ${D}${QTBASE}/ - fi - - # misc build reqs - insinto ${QTBASE}/mkspecs - doins -r ${S}/mkspecs/${PLATFORM} - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - dodoc FAQ README README-QT.TXT changes* - if use immqt || use immqt-bc ; then - dodoc ${S}/README.immodule - fi -} - -pkg_postinst() { - echo - elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," - elog "or widgets for the Qt designer) are no longer recognized. If this situation" - elog "occurs you should recompile the packages providing these plugins," - elog "and you should also make sure that Qt and its plugins were compiled with the" - elog "same version of gcc. Packages that may need to be rebuilt are, for instance," - elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." - elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." - echo -} diff --git a/x11-libs/qt/qt-4.3.0-r1.ebuild b/x11-libs/qt/qt-4.3.0-r1.ebuild deleted file mode 100644 index 6b071981ad2c..000000000000 --- a/x11-libs/qt/qt-4.3.0-r1.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# 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-r1.ebuild,v 1.3 2007/08/03 13:42:48 gustavoz 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="~alpha ~amd64 ~hppa ~ia64 ~ppc sparc x86 ~x86-fbsd" - -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() { - local flag="$1" - local feature="$1" - local enableval= - - [[ -n $2 ]] && feature=$2 - [[ -n $3 ]] && enableval="-$3" - - useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" - 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}/qt-4.2.3-hppa-ldcw-fix.patch - epatch ${FILESDIR}/qt-4.3.0-alpha-threading.patch - - epatch${FILESDIR}/0185-fix-format-strings.diff - - 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}:" \ - -e "/CONFIG/s:$: nostrip:" \ - 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=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ - -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}/qmake - - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix - - 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 - - # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other - # cases. From bug #178535 - myconf="${myconf} -reduce-relocations" - - 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" - - myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)" - myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)" - myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)" - - use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info" - - 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 -I/opt/firebird/include" || 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" || myconf="${myconf} -no-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 - - myconf="-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}" - - echo ./configure ${myconf} - ./configure ${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" -} diff --git a/x11-libs/qt/qt-4.3.0.ebuild b/x11-libs/qt/qt-4.3.0.ebuild deleted file mode 100644 index f86fb69919cb..000000000000 --- a/x11-libs/qt/qt-4.3.0.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# 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.ebuild,v 1.17 2007/08/03 23:30:23 mr_bones_ 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="~alpha amd64 hppa ia64 ~ppc sparc x86 ~x86-fbsd" - -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}" - -RDEPEND="x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfont - x11-libs/libSM - xinerama? ( x11-libs/libXinerama ) - media-libs/fontconfig - >=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-libs/libXi x11-drivers/linuxwacom )" - -DEPEND="${RDEPEND} - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - input_devices_wacom? ( x11-proto/inputproto ) - dev-util/pkgconfig" - -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() { - local flag="$1" - local feature="$1" - local enableval= - - [[ -n $2 ]] && feature=$2 - [[ -n $3 ]] && enableval="-$3" - - useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" - 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}/qt-4.2.3-hppa-ldcw-fix.patch - epatch ${FILESDIR}/qt-4.3.0-alpha-threading.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}:" \ - -e "/CONFIG/s:$: nostrip:" \ - 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=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ - -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}/qmake - - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix - - 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 - - # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other - # cases. From bug #178535 - myconf="${myconf} -reduce-relocations" - - 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" - - myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)" - myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)" - myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)" - - use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info" - - 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 -I/opt/firebird/include" || 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" || myconf="${myconf} -no-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 - - myconf="-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}" - - echo ./configure ${myconf} - ./configure ${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" -} |