summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2007-12-22 16:30:25 +0000
committerCaleb Tennis <caleb@gentoo.org>2007-12-22 16:30:25 +0000
commit696f57fdb59fb11f026cf35dd346489ab34c5c4a (patch)
treea6abd7856c397874d358947c83e49d13cb56543a /x11-libs
parentSome new functions (diff)
downloadhistorical-696f57fdb59fb11f026cf35dd346489ab34c5c4a.tar.gz
historical-696f57fdb59fb11f026cf35dd346489ab34c5c4a.tar.bz2
historical-696f57fdb59fb11f026cf35dd346489ab34c5c4a.zip
New version, add an unset QMAKESPEC to src_compile and take advantage of new eclass stuff
Package-Manager: portage-2.1.3.16
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-core/Manifest8
-rw-r--r--x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild9
-rw-r--r--x11-libs/qt-script/Manifest8
3 files changed, 14 insertions, 11 deletions
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 6849af2b1635..2dfe6e0674ca 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,8 +1,8 @@
DIST qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137 RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 SHA1 e242dc542eb1424a51c47e7c80aaefd26668451c SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88
-EBUILD qt-core-4.4.0_rc1.ebuild 4272 RMD160 120bb8e23cf05d3add3926df6f91fc975e0743ac SHA1 bc669e1dde88f201449faf0c046ab6bb49538332 SHA256 9c2aff47856b99eea174d8d18e8c972b164a938a50d0842380625576515d585e
-MD5 641a2c5e15613185677e1d7d22dd0d87 qt-core-4.4.0_rc1.ebuild 4272
-RMD160 120bb8e23cf05d3add3926df6f91fc975e0743ac qt-core-4.4.0_rc1.ebuild 4272
-SHA256 9c2aff47856b99eea174d8d18e8c972b164a938a50d0842380625576515d585e qt-core-4.4.0_rc1.ebuild 4272
+EBUILD qt-core-4.4.0_rc1.ebuild 4323 RMD160 b085406fc5b0e81bc36987ff1cdbd2cefbd67191 SHA1 601beddfc41acbd182adc1408bc5248f8bf6d8ae SHA256 24b126395b55c9a7a30297d04ad55344af1917d64d1a05f6791424df6810bde9
+MD5 19891220304a268368846e8da8951f97 qt-core-4.4.0_rc1.ebuild 4323
+RMD160 b085406fc5b0e81bc36987ff1cdbd2cefbd67191 qt-core-4.4.0_rc1.ebuild 4323
+SHA256 24b126395b55c9a7a30297d04ad55344af1917d64d1a05f6791424df6810bde9 qt-core-4.4.0_rc1.ebuild 4323
MISC ChangeLog 347 RMD160 0ba45d8cf793fff418d88861a582e2aa6ec5f74c SHA1 8c251a48f738f2b541879b4795ce466d724e483e SHA256 68214470c89333b272a02751412480e807fc15f51ed29deab71cba378b059503
MD5 deadb8ca02e2a06484c85c7df33e94e2 ChangeLog 347
RMD160 0ba45d8cf793fff418d88861a582e2aa6ec5f74c ChangeLog 347
diff --git a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
index 56bda3121a56..1084553c8a47 100644
--- a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.4.0_rc1.ebuild,v 1.2 2007/12/21 20:55:35 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.3 2007/12/22 16:30:25 caleb Exp $
inherit qt4-build
@@ -30,11 +30,14 @@ DEPEND="${RDEPEND}
!=x11-libs/qt-4.1*
!=x11-libs/qt-4.0*"
+QT4_TARGET_DIRECTORIES="src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml src/network"
+
src_unpack() {
qt4-build_src_unpack
}
src_compile() {
+ unset QMAKESPEC
local myconf=$(standard_configure_options)
use ssl && myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
@@ -49,7 +52,7 @@ src_compile() {
echo ./configure ${myconf}
./configure ${myconf} || die
- build_directories src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml src/network
+ build_target_directories
}
src_install() {
@@ -122,4 +125,4 @@ pkg_setup() {
fi
fi
fi
-} \ No newline at end of file
+}
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index 7fd6e39fd0b7..3d02c18fc11e 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,8 +1,8 @@
DIST qt-x11-preview-opensource-src-4.4.0-tp1.tar.gz 56029137 RMD160 dd2dee9afaa9d16bdf5ca2bed82a3b9e2162bdd2 SHA1 e242dc542eb1424a51c47e7c80aaefd26668451c SHA256 1757416bda52c34ade3a49b5896bafe9e3cfe092d3180da32d520f94324c0b88
-EBUILD qt-script-4.4.0_rc1.ebuild 1388 RMD160 4e2190afe6e2f37d55fb6dd935dc39345823f49f SHA1 a57d2b7e9004accd43c2241cd27a29fb6232c164 SHA256 fc506ca533dfb13a1fb5cf3dd761be44f0f0ff5283194420fb9c048599f9c10b
-MD5 f9dd918dc8f53f0e8c1e87e240967696 qt-script-4.4.0_rc1.ebuild 1388
-RMD160 4e2190afe6e2f37d55fb6dd935dc39345823f49f qt-script-4.4.0_rc1.ebuild 1388
-SHA256 fc506ca533dfb13a1fb5cf3dd761be44f0f0ff5283194420fb9c048599f9c10b qt-script-4.4.0_rc1.ebuild 1388
+EBUILD qt-script-4.4.0_rc1.ebuild 1351 RMD160 8ba6af4cc7f849bc32f13adab475add8bb79acff SHA1 2e50618ba0cfc2213a072861980480b551da8c56 SHA256 c8ce24f5c08dfad6945f8a588233d1e37a7854b753214b920a07df992cf09e26
+MD5 dab64cc230e96d55845dcae5a6dba141 qt-script-4.4.0_rc1.ebuild 1351
+RMD160 8ba6af4cc7f849bc32f13adab475add8bb79acff qt-script-4.4.0_rc1.ebuild 1351
+SHA256 c8ce24f5c08dfad6945f8a588233d1e37a7854b753214b920a07df992cf09e26 qt-script-4.4.0_rc1.ebuild 1351
MISC ChangeLog 355 RMD160 df825c24751d18781ef66dd1c4795d183950605d SHA1 04c990703c3fd8249c3a9033352eabcc2cc3cdf1 SHA256 748829fdec9a2c0e2413d87a28427e94ce5bf5bfb210b3432526975c617eb602
MD5 997b0746397d22a84130f5e6fa283432 ChangeLog 355
RMD160 df825c24751d18781ef66dd1c4795d183950605d ChangeLog 355