Revbump to change slot to 3.4 so that eclipse-3.3 still works, bug #241012. Swt 3.4_pre6 in slot 3 has to be downgraded or uninstalled first. Add x11-proto/inputproto to DEPEND, bug #215998.

Package-Manager: portage-2.1.4.4

3 files changed, 25 insertions, 10 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index ec43ed47f509..6bd14e82d20e 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.85 2008/04/03 09:35:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.86 2008/04/03 19:40:30 caster Exp $
+
+*swt-3.4_pre6-r1 (03 Apr 2008)
+
+  03 Apr 2008; Vlastimil Babka <caster@gentoo.org> -swt-3.4_pre6.ebuild,
+  +swt-3.4_pre6-r1.ebuild:
+  Revbump to change slot to 3.4 so that eclipse-3.3 still works, bug
+  #241012. Swt 3.4_pre6 in slot 3 has to be downgraded or uninstalled first.
+  Add x11-proto/inputproto to DEPEND, bug #215998.
 
   03 Apr 2008; Vlastimil Babka <caster@gentoo.org> swt-3.4_pre6.ebuild:
   Add a pkg_postinst elog about possibility of having to run eclipse-3.3
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 063480881c8a..ebb205775365 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -9,6 +9,6 @@ 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.ebuild 5989 RMD160 28a6e7a0d5ec2abfe3a103107514793bf2f6dbd2 SHA1 80e2f1b3342696e4cec71445e25f9a734e035047 SHA256 7e4fb5e828e700bd8a01ff885137a05e14f2f2067e5d20f403b36bd221f184b7
-MISC ChangeLog 14756 RMD160 0f2beb0db6a125b4b26612f058acfd45fb70e555 SHA1 f7306157a9e4861e6c39f69e36e98a6f9d5ff238 SHA256 4b5b3f06931c479e3ca76ec3b9f7115c6e9c5c3c1fdb0cc965c30220aef8d63a
+EBUILD swt-3.4_pre6-r1.ebuild 6238 RMD160 26c7ae4308477c580828af803987633ac0f45da2 SHA1 0956fd2af3b51849a45b68d5b3df896700189389 SHA256 67a335dddb61ec5b1112e2885751aefca0795f1e90f184679db3f3fc9b17d736
+MISC ChangeLog 15086 RMD160 98566dbb01e25b1f26f41d69cc07dadf3ae04cf8 SHA1 d2b8fe2bb54b5e38b295751c0020b88f576180bb SHA256 96fcda91c4f413e48534d334c7666f20e93bf9dff2bab7e67ed6737c6d3bd0b4
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
diff --git a/dev-java/swt/swt-3.4_pre6.ebuild b/dev-java/swt/swt-3.4_pre6-r1.ebuild
index efe8df5db688..befec9bd6eb9 100644
--- a/dev-java/swt/swt-3.4_pre6.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.ebuild,v 1.2 2008/04/03 09:35:34 caster Exp $
+# $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 $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ SRC_URI="x86? (
 			http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
 		)"
 
-SLOT="3"
+SLOT="3.4"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
@@ -61,6 +61,7 @@ DEPEND=">=virtual/jdk-1.4
 		x11-libs/libXrender
 		x11-libs/libXt
 		x11-proto/xextproto
+		x11-proto/inputproto
 		${COMMON}"
 
 RDEPEND=">=virtual/jre-1.4
@@ -69,6 +70,17 @@ 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"
@@ -213,8 +225,3 @@ src_install() {
 
 	dohtml about.html || die
 }
-
-pkg_postinst() {
-	elog "In case this swt upgrade prevents your eclipse-3.3 from starting,"
-	elog "try running it once with -clean parameter: 'eclipse-3.3 -clean'"
-}