betelgeuse    08/04/11 23:50:16

  Modified:             swt-3.4_pre6-r1.ebuild ChangeLog
  Log:
  Use a blocker instead of dying in pkg_setup.
  (Portage version: 2.1.5_rc2)

Revision  Changes    Path
1.2                  dev-java/swt/swt-3.4_pre6-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild?r1=1.1&r2=1.2

Index: swt-3.4_pre6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swt-3.4_pre6-r1.ebuild	3 Apr 2008 19:40:30 -0000	1.1
+++ swt-3.4_pre6-r1.ebuild	11 Apr 2008 23:50:15 -0000	1.2
@@ -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 @@
 			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 @@
 
 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"



1.88                 dev-java/swt/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/swt/ChangeLog?r1=1.87&r2=1.88

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog	5 Apr 2008 12:00:50 -0000	1.87
+++ ChangeLog	11 Apr 2008 23:50:15 -0000	1.88
@@ -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@g.o> swt-3.4_pre6-r1.ebuild:
+  Use a blocker instead of dying in pkg_setup.
 
   05 Apr 2008; Vlastimil Babka <caster@g.o> ChangeLog:
   Correct bug numbers in previous log.



-- 
gentoo-commits@g.o mailing list