version bump from upstream

Package-Manager: portage-2.1_pre10-r3

4 files changed, 208 insertions, 13 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index fbd5b83d4150..fe4780317763 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.33 2006/02/04 06:06:05 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.34 2006/05/07 07:07:09 compnerd Exp $
+
+*swt-3.2_rc2 (07 May 2006)
+
+  07 May 2006; Saleem Abdulrasool <compnerd@gentoo.org> +swt-3.2_rc2.ebuild:
+  Version bump from upstream
 
   04 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.1-r1.ebuild,
   swt-3.2_pre1.ebuild:
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 20ec5e3c0552..7ed4c7bfcbc4 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,30 +1,54 @@
-MD5 950e73a1e8803566015805797f461ad0 ChangeLog 5894
-RMD160 b58b49dcfb09d923f2cff42a30292018f6d10d75 ChangeLog 5894
-SHA256 f5b2840286673f48091ffa5b05ffabb6b02a0c1be978619d0b38e1165d7ef040 ChangeLog 5894
+AUX SWTMessages.properties 2085 RMD160 b5fa0ed87e757fd29b316520ff46894a249f62ea SHA1 95c5bd698dc1836785b8f13d39b0a14b2db0fb53 SHA256 33a3ca048da1c6563f10a60212e881227bb47e11a29a4cc7c6ce67ebaf20fb7b size 2085
 MD5 ad4aa305806513ab198281b6e485fbbc files/SWTMessages.properties 2085
 RMD160 b5fa0ed87e757fd29b316520ff46894a249f62ea files/SWTMessages.properties 2085
 SHA256 33a3ca048da1c6563f10a60212e881227bb47e11a29a4cc7c6ce67ebaf20fb7b files/SWTMessages.properties 2085
+AUX build.xml 476 RMD160 c2cd2ce905d85c464f03cd71478cde8d84344aa1 SHA1 773e8fda2c2bd1eb435cbf2c6e786c7b1e79d8ae SHA256 9a329f77f4df1a7cd6c185a9e37836edfcffd47c2837cda22d1888dee3d356e3 size 476
 MD5 c964f0ff0b83afdfd76d872821540574 files/build.xml 476
 RMD160 c2cd2ce905d85c464f03cd71478cde8d84344aa1 files/build.xml 476
 SHA256 9a329f77f4df1a7cd6c185a9e37836edfcffd47c2837cda22d1888dee3d356e3 files/build.xml 476
-MD5 f44b31e69437bd5e2d23af0b1c93d410 files/digest-swt-3.1-r1 786
-RMD160 729b3a18da91a00f2db7477f7c610a2d05433043 files/digest-swt-3.1-r1 786
-SHA256 290e1cf269d4076845987a0d0620b8392f6ba940135db59a539a8bfaa85ec6a0 files/digest-swt-3.1-r1 786
-MD5 2506579efc943516ed8099585d38181c files/digest-swt-3.2_pre1 804
-RMD160 1762ea2c201b0dfabb931a7f0f1c951fb7a0e75a files/digest-swt-3.2_pre1 804
-SHA256 a20bc6cbd867638b80f8295733bd06b79ec7bb14ed04bfc7b735512dfb3fcc9b files/digest-swt-3.2_pre1 804
+AUX swt-cairo-0.9.2-amd64.patch 8325 RMD160 658b6b620cbf202afd438f3d5d7f834444df2c67 SHA1 82a57ad5a5ab98b487f9474264d1524e82e4a473 SHA256 1e21b11b59618036099619fac480d3ed657f0b27fa4cac59230b4866241d641b size 8325
 MD5 b246c6ca2f33a241ab92d5a8c74da665 files/swt-cairo-0.9.2-amd64.patch 8325
 RMD160 658b6b620cbf202afd438f3d5d7f834444df2c67 files/swt-cairo-0.9.2-amd64.patch 8325
 SHA256 1e21b11b59618036099619fac480d3ed657f0b27fa4cac59230b4866241d641b files/swt-cairo-0.9.2-amd64.patch 8325
+AUX swt-cairo-0.9.2.patch 8692 RMD160 1f54b2869d37eeec074713959e7e1a87b2451508 SHA1 189c640764d7f71451cff74490bd086916a5e1aa SHA256 fc4b637d6bd1590593f00ded5c1d42c0235cd441751c891ec2608c0bd654bf6c size 8692
 MD5 86a056e193ce8f351e3b12d7f5751861 files/swt-cairo-0.9.2.patch 8692
 RMD160 1f54b2869d37eeec074713959e7e1a87b2451508 files/swt-cairo-0.9.2.patch 8692
 SHA256 fc4b637d6bd1590593f00ded5c1d42c0235cd441751c891ec2608c0bd654bf6c files/swt-cairo-0.9.2.patch 8692
-MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541
-RMD160 33bb464b6275a77003697575eb0b7489136b8c3a metadata.xml 541
-SHA256 8b1a4fe91adab457d55e0ba84ad35f19c39a0fea87ac552168bd9cbe3c796aa7 metadata.xml 541
+DIST swt-3.1-gtk-linux-ppc.zip 2525054 RMD160 4796a87735da329bcb9a3ed0678990ac8bd84237 SHA256 31901755e2273afedc0b4722c2c7df2bf473aed29b6c39cc7497cd797f67826e size 2525054
+DIST swt-3.1-gtk-linux-x86.zip 2643472 RMD160 c0082baccd6a8cb4c173eef81497455397727007 SHA256 9a12c6e0377836c277e0268b94d66b8f1a6dd46c5a51720353ec209a2956c25f size 2643472
+DIST swt-3.1-gtk-linux-x86_64.zip 2702033 RMD160 77b14d72810615f43edb0193e54c8702714b9947 SHA256 5314bd993327ea6e6646a437dde034d574d2e4c66e96ca6a12815fca807458ce size 2702033
+DIST swt-3.2M1-gtk-linux-ppc.zip 2542441 RMD160 c66c7adb5ae6e92721e8c5d5587d30ea2256b0a8 SHA256 704112b8774cad633e6d00d5a072c113628b34e7560fd878435c3928aee0dd7b size 2542441
+DIST swt-3.2M1-gtk-linux-x86.zip 2666543 RMD160 5051883dad54fd3f2fcd18617e413811f84c0ad9 SHA256 0a5c46879990ba86439e56d1807e032e9eb1bc72923fbd72a66e18e37e2493f8 size 2666543
+DIST swt-3.2M1-gtk-linux-x86_64.zip 2725513 RMD160 02e96f91c5bd473b612b53b73f8a38a070d7df3e SHA256 17ee4bed6440b0e76623e2498934539dc367ca00f5d211f87deeec214f34e7a8 size 2725513
+DIST swt-3.2RC2-gtk-linux-ppc.zip 2902121 RMD160 43b4e79796a2ae6b0726b7713b9267228cce5f29 SHA256 0e5ca130872c9e9ad61a59cf35d4031198eb12e2a97c5edd44e382fff8c460e9 size 2902121
+DIST swt-3.2RC2-gtk-linux-x86.zip 2925435 RMD160 9b9f96c9cd3bf0be7fbf48fb5e214b712552bc10 SHA256 c7f9bb6f1d6a019ffdc9dc0c486fd7f6d0eed1b528cbb05eb71468d403ac34e4 size 2925435
+DIST swt-3.2RC2-gtk-linux-x86_64.zip 2828002 RMD160 65246c119a51567fb0e1ac308536d4e50218a256 SHA256 a39d7c62ab76fe73422bf1128dba7ae2e3d210c3a395d922a87c1872c33f8a6f size 2828002
+EBUILD swt-3.1-r1.ebuild 5134 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 SHA1 f1cec1ae2eccb440cca5c98893426e4288d44ba9 SHA256 cf3dcba06645c17931a76cceed12b4b9fa7c5342efe8607fadb1237ba9193f54 size 5134
 MD5 b4b7d6f6a73cc928573c5059606ed87c swt-3.1-r1.ebuild 5134
 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 swt-3.1-r1.ebuild 5134
 SHA256 cf3dcba06645c17931a76cceed12b4b9fa7c5342efe8607fadb1237ba9193f54 swt-3.1-r1.ebuild 5134
+EBUILD swt-3.2_pre1.ebuild 5245 RMD160 debe0e896d88db90135e05f9fe7805d0b3a5f724 SHA1 293ad77d7ca3c09511598af46e691d1f276696d7 SHA256 b37a0a9d5b88cc782ca95df7f0a464645347b4836d29ec2a5a469bef78880df9 size 5245
 MD5 c2ba2580e8fd395f5b1056ef63215e6e swt-3.2_pre1.ebuild 5245
 RMD160 debe0e896d88db90135e05f9fe7805d0b3a5f724 swt-3.2_pre1.ebuild 5245
 SHA256 b37a0a9d5b88cc782ca95df7f0a464645347b4836d29ec2a5a469bef78880df9 swt-3.2_pre1.ebuild 5245
+EBUILD swt-3.2_rc2.ebuild 4595 RMD160 0952334e470de49936f4e50775ece01b508d753a SHA1 890f027a85cdfe58441e26925a495623ad4693b8 SHA256 6067d91c7a775fa025c65fcb3de0a494ce6de6c5b10aedd432ee359899ae7af9 size 4595
+MD5 59af6e182f6b2d334b8d5b3dca5a774a swt-3.2_rc2.ebuild 4595
+RMD160 0952334e470de49936f4e50775ece01b508d753a swt-3.2_rc2.ebuild 4595
+SHA256 6067d91c7a775fa025c65fcb3de0a494ce6de6c5b10aedd432ee359899ae7af9 swt-3.2_rc2.ebuild 4595
+MISC ChangeLog 6029 RMD160 c700721b742978253e0781ae73419a28e91955eb SHA1 2ed3baa5295962d36db284af4a829ae897bdc332 SHA256 13b4a1154447256e109e6e09ed9b45437fa012958179853026a7be6aa15baee0 size 6029
+MD5 477d7aa064d70161766d504feada6fb9 ChangeLog 6029
+RMD160 c700721b742978253e0781ae73419a28e91955eb ChangeLog 6029
+SHA256 13b4a1154447256e109e6e09ed9b45437fa012958179853026a7be6aa15baee0 ChangeLog 6029
+MISC metadata.xml 541 RMD160 33bb464b6275a77003697575eb0b7489136b8c3a SHA1 d8f32b4f5af20f823913c2568f104eb152e265ab SHA256 8b1a4fe91adab457d55e0ba84ad35f19c39a0fea87ac552168bd9cbe3c796aa7 size 541
+MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541
+RMD160 33bb464b6275a77003697575eb0b7489136b8c3a metadata.xml 541
+SHA256 8b1a4fe91adab457d55e0ba84ad35f19c39a0fea87ac552168bd9cbe3c796aa7 metadata.xml 541
+MD5 f44b31e69437bd5e2d23af0b1c93d410 files/digest-swt-3.1-r1 786
+RMD160 729b3a18da91a00f2db7477f7c610a2d05433043 files/digest-swt-3.1-r1 786
+SHA256 290e1cf269d4076845987a0d0620b8392f6ba940135db59a539a8bfaa85ec6a0 files/digest-swt-3.1-r1 786
+MD5 2506579efc943516ed8099585d38181c files/digest-swt-3.2_pre1 804
+RMD160 1762ea2c201b0dfabb931a7f0f1c951fb7a0e75a files/digest-swt-3.2_pre1 804
+SHA256 a20bc6cbd867638b80f8295733bd06b79ec7bb14ed04bfc7b735512dfb3fcc9b files/digest-swt-3.2_pre1 804
+MD5 bf80eeca2f4fdf664b27174472696629 files/digest-swt-3.2_rc2 813
+RMD160 079814b8d4d4ee990258848ea2dea78e2f17d6b7 files/digest-swt-3.2_rc2 813
+SHA256 df635494127111ee5a9851fa28d829c814817c6d17542c23af6404086594eec4 files/digest-swt-3.2_rc2 813
diff --git a/dev-java/swt/files/digest-swt-3.2_rc2 b/dev-java/swt/files/digest-swt-3.2_rc2
new file mode 100644
index 000000000000..418b9117b6ff
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.2_rc2
@@ -0,0 +1,9 @@
+MD5 88f0b44c44fa145a3bc9cb92e50836fd swt-3.2RC2-gtk-linux-ppc.zip 2902121
+RMD160 43b4e79796a2ae6b0726b7713b9267228cce5f29 swt-3.2RC2-gtk-linux-ppc.zip 2902121
+SHA256 0e5ca130872c9e9ad61a59cf35d4031198eb12e2a97c5edd44e382fff8c460e9 swt-3.2RC2-gtk-linux-ppc.zip 2902121
+MD5 e1b465bee8b7fc8cdc059e93861af799 swt-3.2RC2-gtk-linux-x86.zip 2925435
+RMD160 9b9f96c9cd3bf0be7fbf48fb5e214b712552bc10 swt-3.2RC2-gtk-linux-x86.zip 2925435
+SHA256 c7f9bb6f1d6a019ffdc9dc0c486fd7f6d0eed1b528cbb05eb71468d403ac34e4 swt-3.2RC2-gtk-linux-x86.zip 2925435
+MD5 a4dfa2251062ae21112a7ea4a07650c7 swt-3.2RC2-gtk-linux-x86_64.zip 2828002
+RMD160 65246c119a51567fb0e1ac308536d4e50218a256 swt-3.2RC2-gtk-linux-x86_64.zip 2828002
+SHA256 a39d7c62ab76fe73422bf1128dba7ae2e3d210c3a395d922a87c1872c33f8a6f swt-3.2RC2-gtk-linux-x86_64.zip 2828002
diff --git a/dev-java/swt/swt-3.2_rc2.ebuild b/dev-java/swt/swt-3.2_rc2.ebuild
new file mode 100644
index 000000000000..af86f512c802
--- /dev/null
+++ b/dev-java/swt/swt-3.2_rc2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2_rc2.ebuild,v 1.1 2006/05/07 07:07:09 compnerd Exp $
+
+inherit eutils java-pkg
+
+MY_DMF="S-3.2RC2-200604281315"
+MY_VERSION="3.2RC2"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86.zip )
+		 amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86_64.zip )
+		 ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-ppc.zip )"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="accessibility cairo gnome mozilla opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8
+		accessibility? ( >=dev-libs/atk-1.10.2 )
+		||	(
+				(
+					x11-libs/libX11
+					x11-libs/libXtst
+				)
+				virtual/x11
+			)
+		cairo? ( >=x11-libs/cairo-1.0.2 )
+		gnome?	(
+					=gnome-base/libgnome-2*
+					=gnome-base/gnome-vfs-2*
+					=gnome-base/libgnomeui-2*
+				)
+		mozilla? ( >=net-libs/gecko-sdk-1.7 )
+		opengl?	(
+					virtual/opengl
+					virtual/glu
+				)"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON}
+		>=dev-util/pkgconfig-0.9
+		  dev-java/ant-core
+		  app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4
+		 ${COMMON}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unzip -jq "${DISTDIR}/${A}" "*src.zip" || die "unable to extract distfile"
+
+	# Unpack the sources
+	einfo "Unpacking src.zip to ${S}"
+	unzip -q src.zip || die "Unable to extract sources"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/
+	rm -f .classpath .project
+
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp ${FILESDIR}/build.xml ${S}/build.xml || die "Unable to update build.xml"
+	mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources"
+}
+
+src_compile() {
+	JAVA_HOME=$(java-config -O)
+
+	# Identify the AWT path
+	# The IBM VMs and the GNU GCC implementations do not store the AWT libraries
+	# in the same location as the rest of the binary VMs.
+	if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/jre/bin
+	elif [[ ! -z "$(java-config --java-version | grep 'GNU libgcj')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/$(get_libdir)
+	else
+		if [[ ${ARCH} == 'x86' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+		elif [[ ${ARCH} == 'ppc' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/ppc
+		else
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+		fi
+	fi
+
+	# Fix the GTK+ Library path
+	export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) -lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+
+	einfo "Building AWT library"
+	emake -f make_linux.mak make_awt || die "Failed to build AWT support"
+
+	einfo "Building SWT library"
+	emake -f make_linux.mak make_swt || die "Failed to build SWT support"
+
+	if use accessibility ; then
+		einfo "Building JAVA-AT-SPI bridge"
+		emake -f make_linux.mak make_atk || die "Failed to build ATK support"
+	fi
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		emake -f make_linux.mak make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use mozilla ; then
+		export GECKO_INCLUDES="$(gecko-sdk-config --cflags)"
+
+		einfo "Building the Mozilla component"
+		emake -f make_linux.mak make_mozilla || die "Failed to build Mozilla support"
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		emake -f make_linux.mak make_cairo || die "Unable to build CAIRO support"
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		emake -f make_linux.mak make_glx || die "Unable to build OpenGL component"
+	fi
+
+	einfo "Building JNI libraries"
+	ant compile || die "Failed to compile JNI interfaces"
+
+	einfo "Creating missing files"
+	cp ${FILESDIR}/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
+	echo -n "version 3.231" >> ${S}/build/version.txt
+
+	einfo "Packing JNI libraries"
+	ant jar || die "Failed to create JNI jar"
+}
+
+src_install() {
+	java-pkg_dojar swt.jar
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html
+}
+
+pkg_postinst() {
+	if use cairo; then
+		ewarn
+		ewarn "CAIRO Support is experimental! We are not responsible if"
+		ewarn "enabling support for CAIRO corrupts your Gentoo install,"
+		ewarn "if it blows up your computer, or if it becomes sentient"
+		ewarn "and chases you down the street yelling random binary!"
+		ewarn
+		ebeep 5
+	fi
+}