Does not automatically strip shared libraries any more.

(Portage version: 2.1.2_pre3)

4 files changed, 219 insertions, 1 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 212a43a36b79..bbcfc8f6c340 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2006/10/14 00:09:22 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.45 2006/10/15 12:04:15 betelgeuse Exp $
+
+*swt-3.2-r2 (15 Oct 2006)
+
+  15 Oct 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/swt-3.2-remove-stripping.patch, +swt-3.2-r2.ebuild:
+  Does not automatically strip shared libraries any more.
 
   14 Oct 2006; Joshua Nichols <nichoj@gentoo.org> swt-3.1-r1.ebuild:
   Added call to java-pkg_pkg_setup, for bug #142708
diff --git a/dev-java/swt/files/digest-swt-3.2-r2 b/dev-java/swt/files/digest-swt-3.2-r2
new file mode 100644
index 000000000000..f8f121537b2f
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.2-r2
@@ -0,0 +1,9 @@
+MD5 7128a79bbc837626d07f2c7264e784aa swt-3.2-gtk-linux-ppc.zip 2913359
+RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 swt-3.2-gtk-linux-ppc.zip 2913359
+SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062 swt-3.2-gtk-linux-ppc.zip 2913359
+MD5 2cba80d9bd247fd6985509d96c1540cd swt-3.2-gtk-linux-x86.zip 2935209
+RMD160 d9560445852020e7d755594c60ba01c7904b9924 swt-3.2-gtk-linux-x86.zip 2935209
+SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c swt-3.2-gtk-linux-x86.zip 2935209
+MD5 e373d904a4f67322b0c1419c22285a5b swt-3.2-gtk-linux-x86_64.zip 2841135
+RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 swt-3.2-gtk-linux-x86_64.zip 2841135
+SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665 swt-3.2-gtk-linux-x86_64.zip 2841135
diff --git a/dev-java/swt/files/swt-3.2-remove-stripping.patch b/dev-java/swt/files/swt-3.2-remove-stripping.patch
new file mode 100644
index 000000000000..f31cd8dc4abd
--- /dev/null
+++ b/dev-java/swt/files/swt-3.2-remove-stripping.patch
@@ -0,0 +1,29 @@
+--- make_linux.mak.old	2006-10-15 11:43:54.729350590 +0300
++++ make_linux.mak	2006-10-15 11:44:59.741467245 +0300
+@@ -46,7 +46,7 @@
+ 
+ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+ 
+-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared -s
++AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared 
+ 
+ ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
+ ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
+@@ -75,7 +75,7 @@
+ 	-I$(JAVA_HOME)/include/linux \
+ 	${GECKO_INCLUDES} \
+ 	${SWT_PTR_CFLAGS}
+-MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic \
++MOZILLALIBS = -shared  -Wl,--version-script=mozilla_exports -Bsymbolic \
+ 	${GECKO_LIBS}
+ 	
+ SWT_OBJECTS = swt.o callback.o
+@@ -96,7 +96,7 @@
+ 		-I$(JAVA_HOME)/include/linux \
+ 		-fPIC \
+ 		${SWT_PTR_CFLAGS}
+-LIBS = -shared -fPIC -s
++LIBS = -shared -fPIC 
+ 
+ 
+ all: make_swt make_atk make_gnome make_glx
diff --git a/dev-java/swt/swt-3.2-r2.ebuild b/dev-java/swt/swt-3.2-r2.ebuild
new file mode 100644
index 000000000000..abb8e6f42009
--- /dev/null
+++ b/dev-java/swt/swt-3.2-r2.ebuild
@@ -0,0 +1,174 @@
+# 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-r2.ebuild,v 1.1 2006/10/15 12:04:15 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_DMF="R-3.2-200606291905"
+MY_VERSION="3.2"
+
+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="cairo gnome seamonkey opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8
+		>=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*
+				)
+		seamonkey? (
+					>=www-client/seamonkey-1.0.2
+					>=dev-libs/nspr-4.6.2
+				)
+		opengl?	(
+					virtual/opengl
+					virtual/glu
+				)"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON}
+		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"
+
+	# Patch for GCC 4.x warnings
+	epatch "${FILESDIR}"/${PN}-3.2-gcc-4.x-warning-fix.patch
+
+	epatch "${FILESDIR}"/${PN}-3.2-remove-stripping.patch
+
+	if [[ ${ARCH} == "amd64" ]] ; then
+		epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86_64.patch
+	else
+		epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86.patch
+	fi
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	# 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"
+
+	einfo "Building JAVA-AT-SPI bridge"
+	emake -f make_linux.mak make_atk || die "Failed to build ATK support"
+
+	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 seamonkey ; then
+		export GECKO_SDK="$(pkg-config seamonkey-xpcom --variable=libdir)"
+		export GECKO_INCLUDES="-I/usr/$(get_libdir)/seamonkey/include/xpcom \
+								-I/usr/include/nspr \
+								-I/usr/$(get_libdir)/seamonkey/include/embed_base \
+								-I/usr/$(get_libdir)/seamonkey/include/string"
+		export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
+
+		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"
+	eant compile || die "Failed to compile JNI interfaces"
+
+	einfo "Copying missing files"
+	cp ${S}/version.txt ${S}/build/version.txt
+	cp ${S}/src/org/eclipse/swt/internal/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
+
+	einfo "Packing JNI libraries"
+	eant 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
+}