diff options
author | 2013-12-21 18:33:27 -0800 | |
---|---|---|
committer | 2013-12-21 18:33:27 -0800 | |
commit | ecede124f346d1d3b8f5a9e58c719a7ec932d3ad (patch) | |
tree | 2f16ae49e0a89fc81429e59101caf9f35e80e440 /dev-qt | |
parent | dev-qt/qtcore: update Manifest (diff) | |
download | gmt-ecede124f346d1d3b8f5a9e58c719a7ec932d3ad.tar.gz gmt-ecede124f346d1d3b8f5a9e58c719a7ec932d3ad.tar.bz2 gmt-ecede124f346d1d3b8f5a9e58c719a7ec932d3ad.zip |
dev-qt/qtgui: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-qt')
-rw-r--r-- | dev-qt/qtgui/Manifest | 2 | ||||
-rw-r--r-- | dev-qt/qtgui/qtgui-4.8.5-r2.ebuild | 113 |
2 files changed, 64 insertions, 51 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 667f531..9c93b9d 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -2,6 +2,6 @@ AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8e AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 -EBUILD qtgui-4.8.5-r2.ebuild 5570 SHA256 78d0f764f72eb4e37403c49534a4445d240d1386fc2042760be65f68d7ad6a37 SHA512 192e6162dba0717c5226d91989220be0140da232d4ed4b8768f23ed8b14a7956aff26104e426a1a71db6e64d2b8d783061e08b3a895098ddd2045fbfff5ef7cd WHIRLPOOL 9b18709f67fb4c495d4376b1f646567fc401068dec7910f88f6536e7bd32054d3bd827942da262b8ca1bfd593e4d368ee29f4b66e1c15aa8d11c1073d3c889d5 +EBUILD qtgui-4.8.5-r2.ebuild 6454 SHA256 692c29d66ecec4b3e3cb4136de2e77bf8d59089c336543335cccb07b8c81a99c SHA512 c6c7c97b31571edd7876d365712685dde797eb0b292bb619a290b41f2017137e514a1d05161b04a5ae9e0dbc82198be57f197a635a0c5b599ddecf692f78b589 WHIRLPOOL 055af384c20dac6daf514f50f9b2ff8c7d7b5b472310aca424f86a2be545c2f13db9a054f472c8e953a637249fe93f1d2b9e71d6c5b189db732a082a68a9aa12 MISC ChangeLog 34673 SHA256 3c00214e12bc1125effd3b08eaae57f8fd676dd7572be9796c18ac0201f185dd SHA512 bdcd6d1273a674989d8c93037f578cefd5265ce899dcfaa3e4dac8e87bc7f7678117a74c188beba24942fedfadccc43df5b10928b2ee882c79d8b267b35e505f WHIRLPOOL 8e0311dd23a2f7f9e02fc5058ffd3d08c15d9455e372ed4c79398e683f9d16980ed0d401dfc8b2fa7b5babf9b3cc194344a73075e05e101fec6c12bf1312e208 MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb diff --git a/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild index 9893120..b7866fc 100644 --- a/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild @@ -4,14 +4,14 @@ EAPI=5 -inherit eutils qt4-build +inherit eutils qt4-build-multilib DESCRIPTION="The GUI module for the Qt toolkit" 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" + KEYWORDS="~amd64" fi IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" @@ -21,53 +21,57 @@ REQUIRED_USE=" " # cairo[-qt4] is needed because of bug 454066 -RDEPEND=" +RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] ) app-admin/eselect-qtgraphicssystem - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg:0 + ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] + ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + media-libs/freetype:2[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg:0[${MULTILIB_USEDEP}] !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) + x11-libs/libICE[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) ) cups? ( net-print/cups ) - egl? ( media-libs/mesa[egl] ) + egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) gtkstyle? ( - x11-libs/cairo[-qt4] - x11-libs/gtk+:2[aqua=] + x11-libs/cairo[-qt4,${MULTILIB_USEDEP}] + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] ) - mng? ( >=media-libs/libmng-1.0.9 ) - nas? ( >=media-libs/nas-1.5 ) - tiff? ( media-libs/tiff:0 ) + mng? ( >=media-libs/libmng-1.0.9[${MULTILIB_USEDEP}] ) + nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) !<dev-qt/qthelp-4.8.5:4 " DEPEND="${RDEPEND} !aqua? ( - x11-proto/inputproto - x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto ) + x11-proto/inputproto[${MULTILIB_USEDEP}] + x11-proto/xextproto[${MULTILIB_USEDEP}] + xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) + xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] ) ) " -PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" +PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )" PATCHES=( "${FILESDIR}/${PN}-4.7.3-cups.patch" "${FILESDIR}/${P}-keyboard-shortcuts.patch" ) +MULTILIB_WRAPPED_HEADERS=( + /usr/include/qt4/Gentoo/gentoo-qtgui-qconfig.h +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/gui @@ -92,12 +96,11 @@ pkg_setup() { QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - qt4-build_pkg_setup + qt4-build-multilib_pkg_setup } -src_prepare() { - qt4-build_src_prepare - +ehook qt4-build-multilib-post_src_prepare qtgui_perabi_src_prepare +qtgui_perabi_src_prepare() { # Add -xvideo to the list of accepted configure options sed -i -e 's:|-xinerama|:&-xvideo|:' configure } @@ -122,9 +125,12 @@ src_configure() { -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" - [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 + qt4-build-multilib_src_configure +} - qt4-build_src_configure +ehook qt4-build-multilib-post_src_configure qtgui_perabi_src_configure +qtgui_perabi_src_configure() { + [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 if use gtkstyle; then sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" @@ -161,20 +167,8 @@ src_install() { QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC $(use xv && echo QT_XVIDEO)" - qt4-build_src_install - # install private headers - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ - else - insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private - fi - find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + - - if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then - # rerun to get links to headers right - fix_includes - fi + qt4-build-multilib_src_install # touch the available graphics systems dodir /usr/share/qt4/graphicssystems @@ -195,6 +189,25 @@ src_install() { fi } +ehook qt4-build-multilib-post_src_install qtgui_perabi_src_install +qtgui_perabi_src_install() { + einfo "performing per-abi postinstallation: ${ABI}" + + # install private headers + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + fi + find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + + + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + # rerun to get links to headers right + fix_includes + fi + +} + pkg_postinst() { qt4-build_pkg_postinst |