diff options
author | 2013-02-28 12:13:30 +0100 | |
---|---|---|
committer | 2013-02-28 12:13:30 +0100 | |
commit | 37635a48dc7d4ecf4aa79497512fe0dd3073d042 (patch) | |
tree | 3b738eecfa5c4d580fbb0627959b6a30fbc666ef /x11-libs | |
parent | dropped dev-haskell/sha (diff) | |
download | eroen-37635a48dc7d4ecf4aa79497512fe0dd3073d042.tar.gz eroen-37635a48dc7d4ecf4aa79497512fe0dd3073d042.tar.bz2 eroen-37635a48dc7d4ecf4aa79497512fe0dd3073d042.zip |
Getting out of flag-filtering business.
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt-core/Manifest | 5 | ||||
-rw-r--r-- | x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch | 11 | ||||
-rw-r--r-- | x11-libs/qt-core/metadata.xml | 21 | ||||
-rw-r--r-- | x11-libs/qt-core/qt-core-4.8.4-r1.ebuild | 182 | ||||
-rw-r--r-- | x11-libs/qt-core/qt-core-4.8.4.ebuild | 182 |
5 files changed, 0 insertions, 401 deletions
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest deleted file mode 100644 index 38b54c0..0000000 --- a/x11-libs/qt-core/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba -DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 -EBUILD qt-core-4.8.4-r1.ebuild 5088 SHA256 6ef2e87bf0e1a17992e900eb4ebc2d70f1560800d50927fe055f903df3536505 SHA512 c109c08d7c0583a41e547f20097d1697822ed862ff7ab5442158e886ffc612c92aa68c7879b838f3798d631b859c874d838a8cb0df808cfffd831815c2cd0bac WHIRLPOOL 55c715d4a31790970c4f4c9006b6489c70857f6e358a0360699b4f34b99f743ff85bd6fb0c702f2d18d4cc3347157a3ce93b731177d39f3abe01799debccc40f -EBUILD qt-core-4.8.4.ebuild 5081 SHA256 4595d057d4600bd097f964ba19b29c4b40cdc58e24f67a6d232abba0a0af605e SHA512 f68e9902ca65dabec56362cf38bfbe12e0d78605873f2805a7e298fa2ac91ea3a5bb981d7b87bef4d1914950fd422f9cd8b017a305a60549f44bee6aa2c853a8 WHIRLPOOL dcdf398ffd28d035be00a6de744fc35ef267a04827f731c1bf83c4dddae57f4a36f3f0f85f7edf40559607b4aba3e2241c5c2dfad4919b6d8c4bbd12a0a92555 -MISC metadata.xml 962 SHA256 5e48f820fb8a186626c8816f7f143667495a43bdc5e2765f628c2134c0034638 SHA512 c1598a11c993175dcc9fbb6c3af19bafca74a39122c1d769b6f0cfb73a168e729d14edc46adcb2ccb638c3eecb10dad5a58f9070c178b86447a6ccdd2eba5fa0 WHIRLPOOL f10d5b7a5f20535d3d7e410d9a923afb34e2fc8151c45aab8035a326127a3cd511f2ff843f0094495a53c200b2242635e8d8f52e9dd08d7850014957b872e812 diff --git a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch b/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch deleted file mode 100644 index 8d92ca9..0000000 --- a/x11-libs/qt-core/files/moc-workaround-for-boost-1.48.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200 -@@ -187,6 +187,7 @@ - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551 - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml deleted file mode 100644 index 1f5cff9..0000000 --- a/x11-libs/qt-core/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>qt</herd> - <use> - <flag name="c++0x">Build Qt using the C++11 standard</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by Nokia)</flag> - <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> - <flag name="optimized-qmake">Enable qmake optimization</flag> - <flag name="private-headers">Install the private header files required - by some QtCreator plugins</flag> - <flag name="qpa">Build a window system agnostic implementation of Qt</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt-project.org/</bugs-to> - <doc>http://qt-project.org/doc/</doc> - </upstream> -</pkgmetadata> diff --git a/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild b/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild deleted file mode 100644 index a16c146..0000000 --- a/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2013 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.8.4-r1.ebuild,v 1.1 2013/01/03 15:30:58 kensington Exp $ - -EAPI=5 - -inherit qt4-build flag-o-matic - -filter-flags -fgraphite-identity - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49:= ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 - !x11-libs/qt:4 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-boost-1.48.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - 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/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # 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 - - 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" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - 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" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild deleted file mode 100644 index ccbabcc..0000000 --- a/x11-libs/qt-core/qt-core-4.8.4.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2012 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.8.4.ebuild,v 1.1 2012/12/05 03:14:14 yngwin Exp $ - -EAPI=4 - -inherit qt4-build flag-o-matic - -filter-flags "-fgraphite-identity" - -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -SLOT="4" -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi -IUSE="+glib iconv icu qt3support ssl" - -DEPEND=" - sys-libs/zlib - glib? ( dev-libs/glib:2 ) - icu? ( >=dev-libs/icu-49 ) - ssl? ( dev-libs/openssl ) - !<x11-libs/cairo-1.10.2-r2 - !x11-libs/qt:4 -" -RDEPEND="${DEPEND}" -PDEPEND=" - qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] ) -" - -PATCHES=( - "${FILESDIR}/moc-workaround-for-boost-1.48.patch" -) - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/xml - src/network - src/plugins/codecs - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - 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/3rdparty/easing - src/3rdparty/zlib_dependency.pri - src/declarative - src/gui - src/script - tools/shared - tools/linguist/shared - translations" - - qt4-build_pkg_setup -} - -src_prepare() { - # 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 - - 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" - - # bug 427782 - sed -i -e "/^CPPFLAGS/s/-g//" \ - "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" - sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ - -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ - "${S}/configure" || die "sed configure setBootstrapVariable failed" -} - -src_configure() { - myconf+=" - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support)" - - qt4-build_src_configure -} - -src_install() { - dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} - - install_directories src/{corelib,xml,network,plugins/codecs} - - emake INSTALL_ROOT="${D}" install_mkspecs - - # install private headers - insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private - find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + - - # use freshly built libraries - local DYLD_FPATH= - [[ -d "${S}"/lib/QtCore.framework ]] \ - && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) - DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ - LD_LIBRARY_PATH="${S}/lib" \ - "${S}"/bin/lrelease translations/*.ts \ - || die "generating translations failed" - insinto "${QTTRANSDIR#${EPREFIX}}" - doins translations/*.qm - - setqtenv - fix_library_files - - # List all the multilib libdirs - local libdirs= - for libdir in $(get_all_libdirs); do - libdirs+=":${EPREFIX}/usr/${libdir}/qt4" - done - - cat <<-EOF > "${T}"/44qt4 - LDPATH="${libdirs:1}" - EOF - doenvd "${T}"/44qt4 - - dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo - mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ - || die "failed to move qconfig.pri" - - # Framework hacking - if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then - # TODO: do this better - sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ - "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ - || die "sed for qconfig.h failed." - dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo - else - 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" - fi - - QCONFIG_DEFINE="QT_ZLIB" - install_qconfigs - - # remove .la files - prune_libtool_files - - keepdir "${QTSYSCONFDIR#${EPREFIX}}" - - # Framework magic - fix_includes -} |