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 | 61a00fd16d6f8b19fd45d8eadeb7805a8ed5557d (patch) | |
| tree | 6699579ae7304eab6e965954133acb7b431bd3f8 | |
| parent | dev-cpp/libgnomeuimm: Bump to 2.22.0 (upstream version bump, nothing new) (diff) | |
| download | gentoo-2-61a00fd16d6f8b19fd45d8eadeb7805a8ed5557d.tar.gz gentoo-2-61a00fd16d6f8b19fd45d8eadeb7805a8ed5557d.tar.bz2 gentoo-2-61a00fd16d6f8b19fd45d8eadeb7805a8ed5557d.zip | |
Use a blocker instead of dying in pkg_setup.
(Portage version: 2.1.5_rc2)
| -rw-r--r-- | dev-java/swt/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.4_pre6-r1.ebuild | 19 |
2 files changed, 11 insertions, 13 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/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" |