diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2009-03-18 22:19:49 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2009-03-18 22:19:49 +0000 |
commit | 791e9f39682cc44288c383eefda82f0c71efdaac (patch) | |
tree | 65f57bd681459db6ea52c05a18b3c26e9d7b34f7 /x11-libs | |
parent | Marking nagios-plugins-snmp-0.6.0-r1 ~ppc for bug 256177 (diff) | |
download | gentoo-2-791e9f39682cc44288c383eefda82f0c71efdaac.tar.gz gentoo-2-791e9f39682cc44288c383eefda82f0c71efdaac.tar.bz2 gentoo-2-791e9f39682cc44288c383eefda82f0c71efdaac.zip |
Dropping 4.5.0_rc1
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt-core/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild | 204 |
2 files changed, 5 insertions, 205 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 8dbeec883bef..6bc1b2609229 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.36 2009/03/17 17:45:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.37 2009/03/18 22:19:49 hwoarang Exp $ + + 18 Mar 2009; Markos Chandras <hwoarang@gentoo.org> + -qt-core-4.5.0_rc1.ebuild: + Dropping 4.5.0_rc1 17 Mar 2009; Raúl Porcel <armin76@gentoo.org> qt-core-4.5.0.ebuild: Add ~arm wrt #262462 diff --git a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild deleted file mode 100644 index bed0c6c03841..000000000000 --- a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.8 2009/02/25 09:17:26 hwoarang Exp $ - -EAPI="2" -inherit qt4-build - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc +glib +iconv +qt3support +ssl" - -RDEPEND="sys-libs/zlib - glib? ( dev-libs/glib ) - ssl? ( dev-libs/openssl ) - !<x11-libs/qt-4.4.0:4" -DEPEND="${RDEPEND} - dev-util/pkgconfig" -PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )" - -QT4_TARGET_DIRECTORIES=" -src/tools/bootstrap -src/tools/moc/ -src/tools/rcc/ -src/tools/uic/ -src/corelib/ -src/xml/ -src/network/ -src/plugins/codecs/" - -# Most ebuilds inlude almost everything for testing -# Will clear out unneeded directories after everything else works OK -QT4_EXTRACT_DIRECTORIES=" -include/Qt/ -include/QtCore/ -include/QtNetwork/ -include/QtScript/ -include/QtXml/ -src/plugins/plugins.pro -src/plugins/qpluginbase.pri -src/src.pro -src/3rdparty/des/ -src/3rdparty/harfbuzz/ -src/3rdparty/md4/ -src/3rdparty/md5/ -src/3rdparty/sha1/ -src/script/ -translations/" - -pkg_setup() { - qt4-build_pkg_setup - - if has_version x11-libs/qt-core; then - # Check to see if they've changed the glib flag since the last time installing this package. - - if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then - ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." - ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." - elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then - ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." - ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." - fi - - # Check to see if they've changed the qt3support flag since the last time installing this package. - # If so, give a list of packages they need to uninstall first. - - if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then - local need_to_remove - ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - for x in sql opengl gui qt3support; do - local pkg="x11-libs/qt-${x}" - if has_version $pkg; then - need_to_remove="${need_to_remove} ${pkg}" - fi - done - if [[ -n ${need_to_remove} ]]; then - die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" - fi - elif ! use qt3support && built_with_use x11-libs/qt-core qt3support ; then - local need_to_remove - ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." - for x in sql opengl gui qt3support; do - local pkg="x11-libs/qt-${x}" - if has_version $pkg; then - need_to_remove="${need_to_remove} ${pkg}" - fi - done - if [[ -n ${need_to_remove} ]]; then - die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}" - fi - fi - fi -} - -src_unpack() { - if use doc; then - QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} - doc/" - QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - tools/qdoc3" - fi - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_src_unpack - - # Don't pre-strip, bug 235026 - for i in kr jp cn tw ; do - echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro - done -} - -src_prepare(){ - qt4-build_src_prepare - # bug #172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" - sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" -} - -src_configure() { - unset QMAKESPEC - - myconf="${myconf} - $(qt_use glib) - $(qt_use iconv) - $(qt_use ssl openssl) - $(qt_use qt3support)" - - myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr - -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng - -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns - -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl - -no-svg -no-gtkstyle" - - if ! use doc; then - myconf="${myconf} -nomake docs" - fi - - cp -f "${FILESDIR}"/moc.pro "${S}"/src/tools/moc/ - cp -f "${FILESDIR}"/rcc.pro "${S}"/src/tools/rcc/ - cp -f "${FILESDIR}"/uic.pro "${S}"/src/tools/uic/ - - qt4-build_src_configure -} - -src_compile() { - # bug #259736 - unset QMAKESPEC - qt4-build_src_compile -} - -src_install() { - dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed." - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed." - fi - - emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed" - - fix_library_files - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}/44qt4" - LDPATH=${libdirs:1} - EOF - doenvd "${T}/44qt4" - - dodir /${QTDATADIR}/mkspecs/gentoo - mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo || \ - die "Failed to move qconfig.pri" - - sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ - "${D}${QTHEADERDIR}"/Qt/qconfig.h || die "sed for qconfig.h failed." - - if use glib; then - QCONFIG_DEFINE="$(use glib && echo QT_GLIB) - $(use ssl && echo QT_OPENSSL)" - install_qconfigs - fi - - # remove some unnecessary headers - rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ -qatomic_macosx.h,\ -qatomic_windows.h,\ -qatomic_windowsce.h,\ -qt_windows.h} - - keepdir "${QTSYSCONFDIR}" -} |