diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-04-11 23:50:15 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-04-11 23:50:15 +0000 |
| commit | b8007407f2350485fea48a518d762096068c67e5 (patch) | |
| tree | 2c47087ec437c2135f5078019a00128c832c8f40 /dev-java/swt | |
| parent | dev-cpp/libgnomeuimm: Bump to 2.22.0 (upstream version bump, nothing new) (diff) | |
| download | historical-b8007407f2350485fea48a518d762096068c67e5.tar.gz historical-b8007407f2350485fea48a518d762096068c67e5.tar.bz2 historical-b8007407f2350485fea48a518d762096068c67e5.zip | |
Use a blocker instead of dying in pkg_setup.
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'dev-java/swt')
| -rw-r--r-- | dev-java/swt/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/swt/Manifest | 14 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.4_pre6-r1.ebuild | 19 |
3 files changed, 23 insertions, 15 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 9dbce2b187cd..e383dc792247 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/swt # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.87 2008/04/05 12:00:50 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.88 2008/04/11 23:50:15 betelgeuse Exp $ + + 11 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> swt-3.4_pre6-r1.ebuild: + Use a blocker instead of dying in pkg_setup. 05 Apr 2008; Vlastimil Babka <caster@gentoo.org> ChangeLog: Correct bug numbers in previous log. diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index dce6e803854f..3ccdc6482384 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae @@ -9,6 +12,13 @@ DIST swt-3.4M6-gtk-linux-ppc.zip 4579850 RMD160 70ac000cddce0d22c80a431226977afd DIST swt-3.4M6-gtk-linux-x86.zip 4512008 RMD160 c1f2cf741c9cdfcd88d500dbf06f24c7e15d364d SHA1 31177f1c6efbdf123f1e91f3596d9da3d44b21ad SHA256 7a91c8ed7cc7c4ceedf55d19a51bb2ee7c29cb803209e0d2a0fa0126b0fa084c DIST swt-3.4M6-gtk-linux-x86_64.zip 4693690 RMD160 2c318f8c709b0204d9d51d4a068edf770b6607c9 SHA1 ee2cb5fe47a08a772f47c3480af99ddf260c1fbe SHA256 a4111d115098fcb85680866e779ef1109c12c94d85f0ecc37fc865b59939bd26 EBUILD swt-3.3.1.1.ebuild 5812 RMD160 c015046aeed0c22d7ba50e8f95e4e04c8ae16a9b SHA1 a95a40c473ab7411171c098c94b0b985ce72eb70 SHA256 28655ab9b6c7e94e0fca16cca2f1515ef04670cf0c6e0a25dc4f0172ac58be43 -EBUILD swt-3.4_pre6-r1.ebuild 6238 RMD160 26c7ae4308477c580828af803987633ac0f45da2 SHA1 0956fd2af3b51849a45b68d5b3df896700189389 SHA256 67a335dddb61ec5b1112e2885751aefca0795f1e90f184679db3f3fc9b17d736 -MISC ChangeLog 15210 RMD160 a7d9a0d55831958e4128e9147bc164273e5ca4de SHA1 56fc1b5a46abbd0fbad2b98f92a57798e00631ef SHA256 10e22f1c64ee8570ca815b4e701cc6e1b1a3c271fe59288db1c34e5f6f21af96 +EBUILD swt-3.4_pre6-r1.ebuild 6089 RMD160 a61b5dea36f82941773e01bb182a0326bbc7c4b8 SHA1 4dc6ec94fa973445fe80473da9b8a81079599c63 SHA256 c18ce01a28d5e3cee0ca4bc625ba94b1c910f1c963d1a3b60b51dcfb542d5041 +MISC ChangeLog 15339 RMD160 0a4c53dbbe8a7150a2941b59fb23db8faaa0bb3d SHA1 177cbfa3c7d87f64b6bd4fb69aa9e4f603a6a358 SHA256 2926e628ff199b8166d4f332e2fcabcbb5664775174326e26ce17e0aea4a3118 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkf/+UAACgkQcxLzpIGCsLR+dwCgizaMw3GjAQqZL18JIzh4xuL5 +S0EAoJhtljXU8TbEzSbecc0bm2Ghy8up +=MSd7 +-----END PGP SIGNATURE----- diff --git a/dev-java/swt/swt-3.4_pre6-r1.ebuild b/dev-java/swt/swt-3.4_pre6-r1.ebuild index befec9bd6eb9..0d7c68a32dbd 100644 --- a/dev-java/swt/swt-3.4_pre6-r1.ebuild +++ b/dev-java/swt/swt-3.4_pre6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild,v 1.1 2008/04/03 19:40:30 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild,v 1.2 2008/04/11 23:50:15 betelgeuse Exp $ EAPI="1" @@ -55,7 +55,13 @@ COMMON=">=dev-libs/glib-2.6 virtual/opengl virtual/glu )" + +# 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 + DEPEND=">=virtual/jdk-1.4 + !=dev-java/swt-3.4*:3 app-arch/unzip x11-libs/libX11 x11-libs/libXrender @@ -70,17 +76,6 @@ RDEPEND=">=virtual/jre-1.4 S="${WORKDIR}" -pkg_setup() { - java-pkg-2_pkg_setup - # We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT - # so this is the only way to prevent collisions - if has_version =dev-java/swt-3.4_pre6; then - elog "Please uninstall or downgrade dev-java/swt-3.4_pre6 first" - elog "before installing this version." - die "Please uninstall or downgrade dev-java/swt-3.4_pre6" - fi -} - src_unpack() { local DISTFILE="${A}" unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile" |