diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-09 18:06:48 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-09 18:06:48 +0000 |
| commit | 7ec81e10814ea36d8725e425a9b33323ffcf9e23 (patch) | |
| tree | a20e3e93372c4f8a24f47f3a032d7c9897076237 /sci-geosciences | |
| parent | Add missing deps wrt #216426 (diff) | |
| download | historical-7ec81e10814ea36d8725e425a9b33323ffcf9e23.tar.gz historical-7ec81e10814ea36d8725e425a9b33323ffcf9e23.tar.bz2 historical-7ec81e10814ea36d8725e425a9b33323ffcf9e23.zip | |
Make dependencies compatible with split Qt:4.
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/marble/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-geosciences/marble/Manifest | 14 | ||||
| -rw-r--r-- | sci-geosciences/marble/marble-0.4.ebuild | 12 |
3 files changed, 25 insertions, 8 deletions
diff --git a/sci-geosciences/marble/ChangeLog b/sci-geosciences/marble/ChangeLog index 613dc0e635e0..d5bab87d73ef 100644 --- a/sci-geosciences/marble/ChangeLog +++ b/sci-geosciences/marble/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/marble -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/marble/ChangeLog,v 1.5 2007/10/30 13:52:46 cryos Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/marble/ChangeLog,v 1.6 2008/04/09 18:06:48 ingmar Exp $ + + 09 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> marble-0.4.ebuild: + Make dependencies compatible with split Qt:4. 30 Oct 2007; Marcus D. Hanwell <cryos@gentoo.org> marble-0.4.ebuild: Fix conditional error - always evaluated to true. Bug 197501. diff --git a/sci-geosciences/marble/Manifest b/sci-geosciences/marble/Manifest index ad505f577ae5..20656d13dd3d 100644 --- a/sci-geosciences/marble/Manifest +++ b/sci-geosciences/marble/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST marble-0.3.tar.gz 6554280 RMD160 9464b75f956e8582b2f742c1ab58b3673d9a5372 SHA1 7b33374979274deae8d84f16c579c8a8e435a048 SHA256 cf26dbff64dac2ab8ba22b03a89a8bb885e784e0b516668b97d3ba7e716ebfa4 DIST marble-0.4.tar.bz2 10310242 RMD160 ccb48bf3442566cc415fdfc2edc3d4a10a3ffb33 SHA1 426728ccc19749cc73b91b4bb91fed677554be3f SHA256 45cf26243dfdf28905e534466a01927be54ddfc0eb99db27787e726f7831e0b8 EBUILD marble-0.3.ebuild 819 RMD160 0b56ffa6a7c4548dc18a0b90d9296e5d074f7198 SHA1 b2314492212fc65ab67be3d76dc982073c1b1efa SHA256 6a94a2548d3932217f1775cb25cb7811f0bb83040a91e1f72aa2e2bb21cfcd34 -EBUILD marble-0.4.ebuild 984 RMD160 3a9a7154006a48ceeecfe7062de1bd7adeeba234 SHA1 3f73de6d22e0e9f8c66e500325289e72c6a1f254 SHA256 50db182b0b6647e8fd3ae9c0a66712cbe1f513eeb7672d19b8e926a41578b758 -MISC ChangeLog 790 RMD160 d59fcd097b07447dd834f950b1db2736bbdb8fc8 SHA1 8da564563865ef4b6ade017b9e1b11bee2bea748 SHA256 84414a8a955d95c9b5105d1a86a35e6a7a971857dac1d9de13f638e7b319f5e9 +EBUILD marble-0.4.ebuild 1053 RMD160 a84cd9bb4d2580940f0bf013480de98805464da9 SHA1 67c4576b3fa3dfbbaf3c03c11a3e6bdf0a6a11ee SHA256 17a07065a652a27b8c2c108f6e057aa517a1673ccb98037bc401970fce71b2ae +MISC ChangeLog 911 RMD160 36c429a309a48d5cb46f587ac0b338b477c088b4 SHA1 8a01789dda4984e141b4f137a5440d6653a926a1 SHA256 ba8958a7b244206e9414b49aac7f8f9f41869be074d857dac41fafeb0a497f5b MISC metadata.xml 645 RMD160 0bfa9b91b0b2ff8db1526e84b52bc5ab3985ded9 SHA1 df095f354288ef2fc26894018dce0a625c8dc799 SHA256 05bbce19efeb1de8013abea6e2655bc89e998211088ce2e7b9052af5302dc8d5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkf9BaQACgkQB18eXLOpYdm43QCcDqWJljsGrpr/QQOsdptpQbty +5tEAoKOS+v6fmCNfq9WzHweGgY9ecdFr +=0l3E +-----END PGP SIGNATURE----- diff --git a/sci-geosciences/marble/marble-0.4.ebuild b/sci-geosciences/marble/marble-0.4.ebuild index 16cbfdc21509..1cbd74141f21 100644 --- a/sci-geosciences/marble/marble-0.4.ebuild +++ b/sci-geosciences/marble/marble-0.4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/marble/marble-0.4.ebuild,v 1.2 2007/10/30 13:52:46 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/marble/marble-0.4.ebuild,v 1.3 2008/04/09 18:06:48 ingmar Exp $ +EAPI="1" inherit toolchain-funcs multilib DESCRIPTION="Free 3D desk globe and world atlas" @@ -13,7 +14,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=x11-libs/qt-4.2.3" +RDEPEND=" + || ( ( x11-libs/qt-gui:4 + x11-libs/qt-svg:4 ) + >=x11-libs/qt-4.2.3:4 )" DEPEND="${RDEPEND} >=dev-util/cmake-2.4.5" @@ -36,5 +40,5 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" } |