--- swt-3.2.2.ebuild	2007-05-02 20:15:13.000000000 +0200
+++ swt-3.3_rc6.ebuild	2007-05-02 20:27:17.000000000 +0200
@@ -4,24 +4,26 @@
 
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
 
-MY_DMF="R-${PV}-200702121330"
+MY_PV=${PV/_rc/M}
+MY_P=${P/_rc/M}
+MY_DMF="S-${MY_PV}-200703231616"
 # https://overlays.gentoo.org/svn/proj/java/other/swt-patches
-PATCHSET="${PN}-3.2.2-gentoo-patches"
+PATCHSET="${P}-gentoo-patches"
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="x86? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip
 		)
 		x86-fbsd? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip
 		)
 		amd64? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
 		)
 		ppc? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-ppc.zip
-		)
-		mirror://gentoo/${PATCHSET}.tar.bz2"
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
+		)"
+#		mirror://gentoo/${PATCHSET}.tar.bz2"
 
 SLOT="3"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
@@ -71,7 +73,7 @@
 	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
 	unpack ./src.zip
 
-	unpack "${PATCHSET}.tar.bz2"
+	#unpack "${PATCHSET}.tar.bz2"
 
 	# Cleanup the redirtied directory structure
 	rm -rf about_files/
@@ -82,7 +84,7 @@
 	mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources"
 
 	# apply all the patches, including arch-specific
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch
+	#EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch
 
 	sed -i "s/CFLAGS = -O -Wall/CFLAGS = ${CFLAGS} -Wall/" \
 		make_linux.mak \
@@ -95,7 +97,7 @@
 	cp make_linux.mak make_freebsd.mak
 
 	#  https://bugs.eclipse.org/bugs/show_bug.cgi?id=167173
-	epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
+	#epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
 }
 
 src_compile() {