From 009dc0ca99ce72279bf103df05cccc65ec022495 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Mon, 22 Feb 2010 10:01:40 +0000 Subject: [PATCH] Forgot to set QT4LIB, see bug #306135 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- app-office/openoffice/ChangeLog | 6 +++++- app-office/openoffice/Manifest | 4 ++-- app-office/openoffice/openoffice-3.2.0.ebuild | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 45ffa7faae33..44892023c7cb 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.509 2010/02/21 17:11:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.510 2010/02/22 10:01:40 suka Exp $ + + 22 Feb 2010; Andreas Proschofsky + openoffice-3.2.0.ebuild: + Forgot to set QT4LIB, see bug #306135 21 Feb 2010; Andreas Proschofsky openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index f8cf7931fcb0..5532afeba7ea 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -48,6 +48,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 12709 RMD160 5048c04289d79c8c1a08eb89ed30c5cc036c4ece SHA1 c2d44b4ec85037a9a6431846c932f5eeb041a17d SHA256 d902269018198b8b39471b78f9769bc9791c69b2358031a5d27a9cfd1f9de0ad -MISC ChangeLog 105239 RMD160 c95483d0224dc9cc7d87502a63b1734da72eabec SHA1 869d3748932aa98e86d98585718833e15b23a64d SHA256 b276590990343d9779480545db18d22f4421cf98451874b61082d38c4230d400 +EBUILD openoffice-3.2.0.ebuild 12760 RMD160 72db5eaa8a0d81fcc409169ced9f213ccab93b8a SHA1 eb71bcbf2376587d64fc87de0e24b926f2f09df1 SHA256 56a42b8433e92c409e4482fbcbe22724a9a14c490ee9b802c7df3033b8c6d2a9 +MISC ChangeLog 105360 RMD160 c5182056b4f13ce3134b6cb8bac39e02d4ebfce6 SHA1 05533e6767186053c6a8f65245568bb7c8885a1b SHA256 06c73e9720383545aaeacec42f0ecd30cc1d8f8cdefd426afe0f5d000da5b3b4 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 538f3f04228f..ba649278b617 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.3 2010/02/21 17:11:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.4 2010/02/22 10:01:40 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -286,6 +286,7 @@ src_prepare() { src_configure() { use kde && export KDE4DIR="${KDEDIR}" + use kde && export QT4LIB="/usr/$(get_libdir)/qt4" # Use multiprocessing by default now, it gets tested by upstream export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/") -- 2.26.2