summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <vlooe@web.de>2009-06-09 23:11:27 +0200
committerFlorian Fischer <vlooe@web.de>2009-06-09 23:11:27 +0200
commit6474c068bee43a94639afd044d69e601f9666a5c (patch)
treec65e0ab72826e3c8cac4a8521f911db6242cee65
parentsynced x11-libs/qt-assistant with portage tree (diff)
downloadmultilib-portage-6474c068bee43a94639afd044d69e601f9666a5c.tar.gz
multilib-portage-6474c068bee43a94639afd044d69e601f9666a5c.tar.bz2
multilib-portage-6474c068bee43a94639afd044d69e601f9666a5c.zip
synced x11-libs/qt-core with portage tree
-rw-r--r--metadata/cache/x11-libs/qt-core-4.5.12
-rw-r--r--x11-libs/qt-core/Manifest2
-rw-r--r--x11-libs/qt-core/qt-core-4.5.1.ebuild5
3 files changed, 4 insertions, 5 deletions
diff --git a/metadata/cache/x11-libs/qt-core-4.5.1 b/metadata/cache/x11-libs/qt-core-4.5.1
index 8cfe08335..e9247ea31 100644
--- a/metadata/cache/x11-libs/qt-core-4.5.1
+++ b/metadata/cache/x11-libs/qt-core-4.5.1
@@ -6,7 +6,7 @@ http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2
http://www.qtsoftware.com/
|| ( LGPL-2.1 GPL-3 )
The Qt toolkit is a comprehensive C++ application development framework
-alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
base eutils flag-o-matic multilib multilib-native portability qt4-build toolchain-funcs versionator
doc +glib +iconv +qt3support +ssl custom-cxxflags debug pch lib32
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index a465895bb..e9843e6c4 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -10,4 +10,4 @@ DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0df
DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
EBUILD qt-core-4.4.2-r2.ebuild 5741 RMD160 9f73e2a43141245c79d6c02b2055bd5bb122aa03 SHA1 082aaa76a6b9f78fbee487d74bc5a20265ff2063 SHA256 e6e786b5b5e7375fdfbf7745736899193ae6f1018f4d4633070e7282841f90e5
EBUILD qt-core-4.4.2.ebuild 5499 RMD160 fcaca1d1cdca17720359cac97ebbe2e4c43e30e5 SHA1 90e830f261dfd2ebfb47a9bbc573798251cb70da SHA256 87c4ece9fbdcc8406a031d7b6545c3932d944ddbe078fe85d5e7d125d2de8fd4
-EBUILD qt-core-4.5.1.ebuild 6608 RMD160 5b33c8e9117d50ac93f0e67c8475c4b99536264d SHA1 8556e931f30b0d9a95a84f13c3a7e8fc6515c9d5 SHA256 a9395134c6c183b665106ac93f2b3ae3efaea7ddc1548d0ea6b34c2e30faf14d
+EBUILD qt-core-4.5.1.ebuild 6600 RMD160 ccda1685cc584f747d860fca826a7b18ec757e24 SHA1 463ad0e68367b9ce62d692485475416318cd29ed SHA256 272f6086d71b4cc09040812715c5a055ec22cef5c9851b5578479f380db91f31
diff --git a/x11-libs/qt-core/qt-core-4.5.1.ebuild b/x11-libs/qt-core/qt-core-4.5.1.ebuild
index dcc61d83e..d11487d8d 100644
--- a/x11-libs/qt-core/qt-core-4.5.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.5.1.ebuild
@@ -1,13 +1,13 @@
# 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.1.ebuild,v 1.8 2009/05/29 16:27:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.1.ebuild,v 1.11 2009/06/08 22:27:04 jer Exp $
EAPI="2"
inherit qt4-build multilib-native
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="doc +glib +iconv +qt3support +ssl"
RDEPEND="sys-libs/zlib[lib32?]
@@ -203,7 +203,6 @@ multilib-native_src_install_internal() {
"${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)"