From 9e1eb2f9f1c226400acc9323e64d30102d7c3f6a Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Mon, 25 Feb 2008 14:27:09 +0000 Subject: [PATCH] remove older versions Package-Manager: portage-2.1.4.4 --- x11-libs/qt/ChangeLog | 6 +- x11-libs/qt/Manifest | 6 +- x11-libs/qt/files/qt-4.3.1-powerpc64.patch | 12 - x11-libs/qt/qt-4.3.1-r1.ebuild | 279 --------------------- x11-libs/qt/qt-4.3.2.ebuild | 275 -------------------- 5 files changed, 6 insertions(+), 572 deletions(-) delete mode 100644 x11-libs/qt/files/qt-4.3.1-powerpc64.patch delete mode 100644 x11-libs/qt/qt-4.3.1-r1.ebuild delete mode 100644 x11-libs/qt/qt-4.3.2.ebuild diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index fd6db69d67e2..82d4fe5190af 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.514 2008/02/25 14:24:44 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.515 2008/02/25 14:27:08 caleb Exp $ + + 25 Feb 2008; Caleb Tennis + -files/qt-4.3.1-powerpc64.patch, -qt-4.3.1-r1.ebuild, -qt-4.3.2.ebuild: + remove older versions *qt-4.3.4 (25 Feb 2008) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 16068e4b7a68..60ccabaca5a2 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -20,7 +20,6 @@ AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa S AUX qt-3.3.8-unicode-off-by-one.patch 328 RMD160 819e449f2e8682c25f33d6e105d093ddfdecc828 SHA1 98da33f1146df9229b57f20f31140b237df51eb8 SHA256 4b80c5b46178bed62ceebda1240197969aae2a0fb6eca6d294843372df11a111 AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 AUX qt-4.2.3-hppa-ldcw-fix.patch 986 RMD160 6435fcf447a2f13bbb9d3060a2712fcd35db622c SHA1 e199a2f8db72f798bd9b76a12c6dae3a9a436fac SHA256 fa69fc4498e9dba703f15c8bcb6c28ee3bfc62f078abae5714634b81817267d1 -AUX qt-4.3.1-powerpc64.patch 527 RMD160 81c98cbb206070515da84e2b8ead376d85750b9c SHA1 971cb3f8b3ce02ecc0c0a3bf33642886687c586b SHA256 ec85775524d8921a123f691304e73caaab9f382d29039642fd73897914a87435 AUX qt-4.3.1-unicode-off-by-one.patch 457 RMD160 27ebac8c8ae6700c3428f794066f1cdda19d4675 SHA1 713895b064e669a884f5236904659eb65aecc88e SHA256 cde6bd6bae54eb94cba96752deecb0e21e7f851d8de4a5fbf4ae2034d863f33b AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d AUX qt4/Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b @@ -31,17 +30,14 @@ DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 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.3.1.tar.gz 43118858 RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 SHA1 ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2 SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 EBUILD qt-3.3.4-r8.ebuild 10576 RMD160 24e821e4e3c0afa1945e3846e73065c7ac2f5e98 SHA1 d45683c76591d3ee2507a001a2caaf51449ae00d SHA256 843f2eb691d9403f4953b81eda236b5e994b70494b70f622813dc17a9b1f2113 EBUILD qt-3.3.8-r4.ebuild 11708 RMD160 6724bae8c4014075ff1a1ed7bbedbd381b1b00e7 SHA1 b9e14b41cbdd16afec4f16705fe2960a96541b68 SHA256 13f055f2f2aba0b4b7d97fdad5d0ad77fefa3998b9ffd508b40341c1887c3a14 -EBUILD qt-4.3.1-r1.ebuild 8793 RMD160 f5f90f333f97672d1f5b09352d93601d06202384 SHA1 d8a8a9477901f9a9ebcb0b251ccc8425c4653e62 SHA256 e555dd997aef10f12afa9949ae6d516a5a0dfbb3c52ef54edd7371b20a995a1f EBUILD qt-4.3.2-r1.ebuild 8764 RMD160 cb19ddd7a1899fa40ea7c94de2f57a807bbd00e5 SHA1 5d6a61498e9c943123a0a956737483094547b5c6 SHA256 48d72dea51fc12744d480b1bf898540bacc345fa7db4fb747d5875c790383532 -EBUILD qt-4.3.2.ebuild 8719 RMD160 392de20ba58716d70d4565f6c93794aaadc1e4a7 SHA1 d556acae2869c9c800fa7d5de9c615ffe100e922 SHA256 c1ac6de4acf5bc6c3b5bc864bf203cf4a2e50ed5eee4a84b2ebd0739f8301e7d EBUILD qt-4.3.3.ebuild 8698 RMD160 c70d1135506a270c0b19028f6466fe8384b266ce SHA1 8ddb314a28b8f06a23ae2fc892d5849d62ba1337 SHA256 4ab24199d787868d0f271bf7625e1b69b26d68fbe3324f7356bae3fe35080c20 EBUILD qt-4.3.4.ebuild 8704 RMD160 8649c9a38ede6be18de4bff94d9b04b96d9a6a4e SHA1 5f7e6d1eed994176b19e0e325e79aeb0b2e2adbb SHA256 82e95ab4a2d82b597138624c57c7fc24c9808156fb16ba1974ce78eedde9938e EBUILD qt-4.4.0_rc1.ebuild 725 RMD160 c8b939f143144a759c8d45a49ffc53567deda8a1 SHA1 094b42340e8aa448d26ad4cdcd4b6527aa079167 SHA256 5ac5dee55711c2ed4dfd91cae52fab9d6bf2b91d32add886b90a11f2a88f6c4f -MISC ChangeLog 37859 RMD160 6b4cd026a7cbdf40cf76c9eba305d2758ab97e0d SHA1 027455d8129cb77d79c7588fbf7848a2091ef0d2 SHA256 377d61479848c66854301567a3e690a6f7c0d42e3f6097a521269fecfa65d503 +MISC ChangeLog 38005 RMD160 8b70c7468b6850cd9e3e94e101d3cb70b5617a1c SHA1 013a6a6702cbe15842b9b6b956725b7e641e05a2 SHA256 a672bd4e932bea0aa45516e3a221ca33f16f975d1ab7fdb13ca0cf0a979ece70 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 diff --git a/x11-libs/qt/files/qt-4.3.1-powerpc64.patch b/x11-libs/qt/files/qt-4.3.1-powerpc64.patch deleted file mode 100644 index b11f8a63dee7..000000000000 --- a/x11-libs/qt/files/qt-4.3.1-powerpc64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN qt-x11-opensource-src-4.3.1.orig/src/corelib/arch/qatomic_powerpc.h qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h ---- qt-x11-opensource-src-4.3.1.orig/src/corelib/arch/qatomic_powerpc.h 2007-08-07 15:08:39.000000000 +0200 -+++ qt-x11-opensource-src-4.3.1/src/corelib/arch/qatomic_powerpc.h 2007-08-22 21:20:24.153357369 +0200 -@@ -44,7 +44,7 @@ - QT_BEGIN_HEADER - - #if defined(Q_CC_GNU) --#ifdef __64BIT__ -+#ifdef __powerpc64__ - # define LPARX "ldarx" - # define CMPP "cmpd" - # define STPCX "stdcx." diff --git a/x11-libs/qt/qt-4.3.1-r1.ebuild b/x11-libs/qt/qt-4.3.1-r1.ebuild deleted file mode 100644 index 277337a7401c..000000000000 --- a/x11-libs/qt/qt-4.3.1-r1.ebuild +++ /dev/null @@ -1,279 +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.1-r1.ebuild,v 1.4 2007/11/10 08:49:05 phreak 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 ppc64 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 - 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.2.3-hppa-ldcw-fix.patch - epatch ${FILESDIR}/qt-4.3.1-powerpc64.patch - - # Bug #182472 - epatch ${FILESDIR}/${P}-unicode-off-by-one.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 - - if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then - ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" - append-flags -fno-stack-protector - fi - - 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}/pkgconfig/*.pc - - # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: - sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.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.2.ebuild b/x11-libs/qt/qt-4.3.2.ebuild deleted file mode 100644 index bdb2f3b4503e..000000000000 --- a/x11-libs/qt/qt-4.3.2.ebuild +++ /dev/null @@ -1,275 +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.2.ebuild,v 1.10 2007/11/14 18:15:40 drac 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 ppc64 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 - 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.2.3-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 - - if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then - ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" - append-flags -fno-stack-protector - fi - - 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}" - - emake INSTALL_ROOT="${D}" install_subtargets || die - emake INSTALL_ROOT="${D}" install_qmake || die - emake INSTALL_ROOT="${D}" install_mkspecs || die - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs || die - fi - - # Install the translations. This may get use flagged later somehow - emake 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}/pkgconfig/*.pc - - # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: - sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.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" -} -- 2.26.2