summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-04-10 19:42:19 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-04-10 19:42:19 +0000
commite3a6ea57bbc6836146b7217987b07f79928b4544 (patch)
tree919af4a6f7abc323e8de9dac1f75d44036219ff1 /dev-java/gnu-classpath
parentamd64/x86 stable, bug #215150 (diff)
downloadhistorical-e3a6ea57bbc6836146b7217987b07f79928b4544.tar.gz
historical-e3a6ea57bbc6836146b7217987b07f79928b4544.tar.bz2
historical-e3a6ea57bbc6836146b7217987b07f79928b4544.zip
Add support for split qt4. Fixes bug #217173.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-java/gnu-classpath')
-rw-r--r--dev-java/gnu-classpath/ChangeLog6
-rw-r--r--dev-java/gnu-classpath/Manifest12
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild6
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index e3dd7737205a..02780f9abe35 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for dev-java/gnu-classpath
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.77 2008/04/09 21:26:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.78 2008/04/10 19:42:19 betelgeuse Exp $
09 Apr 2008; Markus Meier <maekke@gentoo.org>
gnu-classpath-0.97-r1.ebuild:
@@ -10,6 +10,10 @@
gnu-classpath-0.97.ebuild, gnu-classpath-0.97-r1.ebuild:
Fix deps on mozilla products
+ 10 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+ gnu-classpath-0.97-r1.ebuild:
+ Add support for split qt4. Fixes bug #217173.
+
*gnu-classpath-0.97-r1 (04 Mar 2008)
04 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index b3c761595d72..729e218a0207 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -10,14 +10,14 @@ DIST classpath-0.97.tar.gz 10262902 RMD160 3fcc0f0457ad90d3a6e6237202d671332d482
EBUILD gnu-classpath-0.90.ebuild 2477 RMD160 dee48d23556bae4aaef77cad7f89cbbd706035c7 SHA1 bef9be363d5cdf4be177d282ba549b2f1a31d4b7 SHA256 b5a9f580f34974c7ecf0c65c7f85bf1a151c9f6bf39580cec935ea9f89712f4d
EBUILD gnu-classpath-0.92.ebuild 2613 RMD160 5c293925c98dc096dbd509568f770ab98895a116 SHA1 9d441ac16615500761f8c7d4bcaa6b47222621ac SHA256 7d073a304bb3e986bb5f3256d31681771a3a62fdbff12ceec4a0389e5bc7ae27
EBUILD gnu-classpath-0.93.ebuild 3498 RMD160 6e7f05441f2a3de33f015564f66d634c4a711ef4 SHA1 3681bbd107a6088d75c71bf64762f6e000ff54d7 SHA256 9d8ba3bf15fc1500ac6e6200da94e94f8685c9587c0daca51af52a702fd1e972
-EBUILD gnu-classpath-0.97-r1.ebuild 3048 RMD160 e0b88aa1ca9982ba2c9f2becdfcf00b63fefe4d5 SHA1 72c82438c8419d95e731f2f4cbfaca9a2c095ace SHA256 a3c1c412f418290d08e1b45a1d1bde0d57e37e69f0d2f2bebd46bf41fc8d5bf0
+EBUILD gnu-classpath-0.97-r1.ebuild 3087 RMD160 e310e69175ef3539e68912cd4a61c5a9bf3ceb73 SHA1 66a5521bcffe7427a6d9f2e4f9820eec6fd5cebc SHA256 b76081f67df841b5dac158054a7efbbdb65bf06ea6193c77b3527a24b3ae0588
EBUILD gnu-classpath-0.97.ebuild 2892 RMD160 52d20e272d66b6f2b7b4bd87f4d844e799e5687a SHA1 88e941bcb021ea591bfe3cbc60856222f6081f40 SHA256 7101a80cb26a127c9dcfbab78fa15c47782b9fc3d6e0f530aea08090134c4e75
-MISC ChangeLog 11613 RMD160 79921c76ad198c3d0ffb2151fb858f1bab8e03e8 SHA1 55639dee0f82f6b087e4483dbcaeeb0743fc1f8c SHA256 775d1eba1abedb12ab0eb26ab940dc4290cd5a507080a7289044e64c10aa0465
+MISC ChangeLog 11751 RMD160 6a8d68061e524893d5f977a768214deab33aa11f SHA1 a5833e69982a319258a7f22681b64237f374faf6 SHA256 d1e0de8827431e6d94d10c9830b596a0c19443d2179da3d9d9735fc61d60fa6b
MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
-iEYEARECAAYFAkf9NJgACgkQkKaRLQcq0GKkfwCdEHh3qJgoHECZfkheIdy281dA
-TtgAoIkAvCHWJnWLotDJZtcYjdqw+h2q
-=VKiv
+iD8DBQFH/m2fcxLzpIGCsLQRAt3gAJ97ZvOn6+lfwesTdrKGX9A6NSjVKwCfR8g1
+rmyH/M3ZMQF7NXfkSJ8leZQ=
+=Pc44
-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
index 3cbf8810ab25..f879f441aa1e 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.3 2008/04/09 21:26:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.4 2008/04/10 19:42:19 betelgeuse Exp $
+
+EAPI=1
inherit eutils flag-o-matic multilib java-pkg-2
@@ -45,7 +47,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
=www-client/mozilla-firefox-bin-2*
)
)
- qt4? ( >=x11-libs/qt-4.1.0 )
+ qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )
xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
gstreamer? (
>=media-libs/gstreamer-0.10.10