diff options
| -rw-r--r-- | dev-java/swt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.3.1.1-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.4-r4.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.5.1.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.5.ebuild | 5 |
6 files changed, 23 insertions, 14 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 855a4ee9430c..15e965a1e0d9 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/swt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.114 2009/11/07 11:19:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.115 2009/11/07 13:39:28 caster Exp $ + + 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> swt-3.3.1.1-r1.ebuild, + swt-3.4-r4.ebuild, swt-3.5.ebuild, swt-3.5.1.ebuild: + Update the deps to make sure there's XTest.h - bug #292244. 07 Nov 2009; Vlastimil Babka <caster@gentoo.org> swt-3.5.ebuild, swt-3.5.1.ebuild: diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index fc21abd5a99b..1dbdc78b0d07 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -18,11 +18,11 @@ DIST swt-3.5-gtk-linux-x86_64.zip 5021592 RMD160 c8488e650d9746d7653f67b036c52da DIST swt-3.5.1-gtk-linux-ppc.zip 4945691 RMD160 2bf8cecad4297c66d98cd1d6dd80a6a60429779c SHA1 59d1e8434e41b299b8c2ab4df557af4ebb64dcb6 SHA256 574d1f1f8f8a70f0f9df0d95d63477ec7fe8921e122b7d00b6ad7ae2c577d153 DIST swt-3.5.1-gtk-linux-x86.zip 4879027 RMD160 2b0723130751a700bbe14004587a5a4f801a07df SHA1 654744a3a2bc7eadfd807d2f1238580ac31571ee SHA256 83d1c457129c6722669ce9d7b4b1cb3511273e069c0dab5ae767b7d1c76e5815 DIST swt-3.5.1-gtk-linux-x86_64.zip 5067404 RMD160 e2468e864ff5da4d41834125f34adb616d4dfb41 SHA1 a2fadf02fad5553c37afb219daebbb4ccca2d6c4 SHA256 99bf7403e4f49ae56c073be582478a1bc4d9f79583f02e0d7a021f8ee71576ce -EBUILD swt-3.3.1.1-r1.ebuild 5851 RMD160 03097145b518eb5268b824dc42d7fdaa6092d47e SHA1 8ab01943694aeeef1d9f68e7563dd9837e7ce2c8 SHA256 d6e4b159a473dbab54ec3e45cde91e22163c2244e7d19ff9756b7de7c291f212 +EBUILD swt-3.3.1.1-r1.ebuild 5965 RMD160 684f0c3a0cfdbc472a16a4ed203b4a2e56152dea SHA1 cafe7211fdf764ca7556f9ab4cb57d96e880cb93 SHA256 ab81658c7ecbbf72e318496560945b132321926dbc58e1c1b37b8b496f64924a EBUILD swt-3.3.1.1.ebuild 6109 RMD160 daec9f9891b431a63191ebf80e5b7fcfa8a4abb1 SHA1 825c5d80258547bb4d076a8719bfc5f1f2092d21 SHA256 e8d203fef1f129c3a4222e870d8c377729399d0cef45e0bd1c4e6ba87f00b76e EBUILD swt-3.4-r2.ebuild 6120 RMD160 6ebeda7ba7a5501cb2bcc6dc9d4399629b4b0c3a SHA1 2feb7e28317486276e61c39c7ae298e07e74bf82 SHA256 c44f60b60d5181d9f5351d521e086ec710dc3478bc8be7458aad007ff6a4673b -EBUILD swt-3.4-r4.ebuild 6200 RMD160 4fbcb626d08d0e0aea4951b5a2f09af5978b7775 SHA1 40649ebbe24f89e29dd86065e23a61b7f2a89433 SHA256 9c3d75555ec637a33aa41c4c18244e3aa53b58845dc6b15922bb57e0e1c696c7 -EBUILD swt-3.5.1.ebuild 5906 RMD160 756d2d7f428ca9f428f17d2b0e64d9bb15382a9b SHA1 01d8f0a13287cf078dcff621171bf2734a774087 SHA256 602d2d8dcad6d7abee81f396b5b38d077aa5813eabc55efacf15df36d3b0c40f -EBUILD swt-3.5.ebuild 5902 RMD160 9c1cc474b00fd491f0fc347e2524d4db8d029f27 SHA1 b2c679c0564f714f2b45a3508e83a1a19241d9e1 SHA256 b1d2526e27b9ff199abbee71c6ba2603623485a04dad9b0407361bd8dc79825d -MISC ChangeLog 19726 RMD160 2b7371da329379134e720546abecb7ab2cecacdd SHA1 6148a98b02a4c17d5ae5aea515f991b5055d29a6 SHA256 fc05d30e9a57f29c1c03c76b71687de9a22ab0e323916bb59e8ff98314b72dc8 +EBUILD swt-3.4-r4.ebuild 6313 RMD160 6b0db8fe4d25674f599ae767a092d44ae4b1ad12 SHA1 64d07f47a4f5fb332a63274bcf9085fa5d0e578e SHA256 ed15935bc14cd988a0204e31713eb1f97b2cb64b785c03f71ec1d1080070bc7c +EBUILD swt-3.5.1.ebuild 6019 RMD160 74045b2f9f78fef27c9e4ee1333a694b3d1190bb SHA1 715649598547040141a5cbc0fdd3a85870ebcab0 SHA256 415c6b354665562413920d7d518e51e884d199bd56e54b95432521341cdf3536 +EBUILD swt-3.5.ebuild 6015 RMD160 87bb0294e88fe698dd272eea8ed21c5e578af51e SHA1 0fe6f9820605b3ea2657c0508a214ca54231eb4b SHA256 42c9843788c33c8a2ce6e21067fd4271a642a7ef36c87bf68670c5b1c8833559 +MISC ChangeLog 19918 RMD160 6d8b28520212ab7eccffef4c2df58f04a74c5862 SHA1 5c533dc3339a4d70f0be7a1a78dfadca35bc8513 SHA256 ff91704e9042e53310cc3cde34f34278cc15325fe4a794cb5ad4d85066a95e4c MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 diff --git a/dev-java/swt/swt-3.3.1.1-r1.ebuild b/dev-java/swt/swt-3.3.1.1-r1.ebuild index 96c7b8fe69a8..f35dbf9ce29d 100644 --- a/dev-java/swt/swt-3.3.1.1-r1.ebuild +++ b/dev-java/swt/swt-3.3.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1-r1.ebuild,v 1.6 2009/11/03 21:20:10 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1-r1.ebuild,v 1.7 2009/11/07 13:39:28 caster Exp $ EAPI="1" @@ -56,12 +56,14 @@ COMMON=">=dev-libs/glib-2.6 virtual/glu ) x11-libs/libXtst" + +# libXtst/xextproto is done like this due to the XTest.h move - bug #292244 DEPEND=">=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - x11-proto/xextproto + || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) dev-util/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-3.4-r4.ebuild b/dev-java/swt/swt-3.4-r4.ebuild index 9c3fb2a44217..8abff9a172ff 100644 --- a/dev-java/swt/swt-3.4-r4.ebuild +++ b/dev-java/swt/swt-3.4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4-r4.ebuild,v 1.5 2009/11/03 21:20:10 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4-r4.ebuild,v 1.6 2009/11/07 13:39:28 caster Exp $ EAPI="1" @@ -52,6 +52,7 @@ COMMON=">=dev-libs/glib-2.6 # Use a blocker to avoid file collisions when upgrading to the slotted version # We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT # so this is the only way to prevent collisions +# libXtst/xextproto is done like this due to the XTest.h move - bug #292244 DEPEND=">=virtual/jdk-1.4 !=dev-java/swt-3.4*:3 @@ -59,7 +60,7 @@ DEPEND=">=virtual/jdk-1.4 x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - x11-proto/xextproto + || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) x11-proto/inputproto dev-util/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-3.5.1.ebuild b/dev-java/swt/swt-3.5.1.ebuild index ca80d776c3d4..991ea0bb2996 100644 --- a/dev-java/swt/swt-3.5.1.ebuild +++ b/dev-java/swt/swt-3.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.1.ebuild,v 1.2 2009/11/07 11:19:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.1.ebuild,v 1.3 2009/11/07 13:39:28 caster Exp $ EAPI=2 @@ -52,13 +52,14 @@ COMMON=">=dev-libs/glib-2.6 # Use a blocker to avoid file collisions when upgrading to the slotted version # We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT # so this is the only way to prevent collisions +# libXtst/xextproto is done like this due to the XTest.h move - bug #292244 DEPEND=">=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - x11-proto/xextproto + || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) x11-proto/inputproto dev-util/pkgconfig ${COMMON}" diff --git a/dev-java/swt/swt-3.5.ebuild b/dev-java/swt/swt-3.5.ebuild index e1e47c6589bb..5f976012fb85 100644 --- a/dev-java/swt/swt-3.5.ebuild +++ b/dev-java/swt/swt-3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.ebuild,v 1.5 2009/11/07 11:19:27 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.ebuild,v 1.6 2009/11/07 13:39:28 caster Exp $ EAPI=2 @@ -52,13 +52,14 @@ COMMON=">=dev-libs/glib-2.6 # Use a blocker to avoid file collisions when upgrading to the slotted version # We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT # so this is the only way to prevent collisions +# libXtst/xextproto is done like this due to the XTest.h move - bug #292244 DEPEND=">=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt - x11-proto/xextproto + || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) x11-proto/inputproto dev-util/pkgconfig ${COMMON}" |