Version bump.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 193 insertions, 3 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 1f4b17b5d8de..792cc67d2229 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/swt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.138 2011/11/17 23:23:50 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.139 2012/03/03 22:10:27 caster Exp $
+
+*swt-3.7.2 (03 Mar 2012)
+
+  03 Mar 2012; Vlastimil Babka <caster@gentoo.org> +swt-3.7.2.ebuild:
+  Version bump.
 
 *swt-3.7.1 (17 Nov 2011)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index ade4617ad48e..627544e35b7c 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -20,9 +20,13 @@ DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 RMD160 577c13612ce625d6aea97583cd511
 DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 RMD160 2c8c0f00b4f001a4b0680d587f037499d258303c SHA1 0ef380192e28f028cb94c67071cbad648aaedf5f SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c
 DIST swt-3.7.1-gtk-linux-x86.zip 5374283 RMD160 997e300ab267b6cbb5dc4f50610cecf752cf5417 SHA1 7d896033c84f2b0beef952aac0e2e0c73038c881 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942
 DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 RMD160 9e9a82027b93557f8f7e44fc54d090b74cd59373 SHA1 2d8e18bc53d8a2d6ff1af5a4226756a11f4a107d SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75
+DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 RMD160 7d044aa9ed1cb837f45c155716f0d0a883c1bd44 SHA1 0f5a4df4dda5f46010ad889255df500a1b9c9034 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e
+DIST swt-3.7.2-gtk-linux-x86.zip 5374609 RMD160 c4f26273b6ec94c64cf524f6cec25272ea2ed92c SHA1 1664a5d5b8121c2459ea78026cf58d986cd17f16 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183
+DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 RMD160 515ca487a45db99ad7274a1bfe4f7fc6e43ba6a0 SHA1 edda25d3aa0329e83489b8a7e224cd2cf11a0215 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443
 EBUILD swt-3.4-r4.ebuild 6405 RMD160 4ad6d6488f4904acbfc285274ee9e0cc2289b4e3 SHA1 fd1ad94c227c14a60ac1d8a5eb6ac4295c887693 SHA256 b3ecb5eb82b06ee87a1baeda71ccc4645990e67d2dbf4b7d55a7c78ff5c7ffc1
 EBUILD swt-3.5.2.ebuild 6107 RMD160 d002ba543a805c3aeea1913701dfb49e16fbcace SHA1 f5c5d8bf98a5616f99f8ead53c34ff4e0604f403 SHA256 b5de7f5e6bee9bf07eb13edd58a8396730064b35288cf76b00d503caceb79ae3
 EBUILD swt-3.6.1.ebuild 6115 RMD160 9a4c184b9b244a017d2d56a4d0a28a5fe8e493d9 SHA1 127df209058fab173691fe1758356d9b0eb71dbb SHA256 8e21e44ff7fdbc82b1836907a3d61583b8246b824ceb78404a0618c9ec516ca8
 EBUILD swt-3.7.1.ebuild 4783 RMD160 c9ce736d2da2b5c3aab874a30dd55d33a2d84fbe SHA1 a067fe1fd7679026f281c29437f7bfe5bdeac71f SHA256 0c5421e7c502999f9b19c97bf3667993e10060ff858a204b87003753b7212f4c
-MISC ChangeLog 23599 RMD160 302ab35e20a443d1d148ad4942955dcc89d42158 SHA1 f134e1f6c324e3f56472444a7e4e1770c106d03a SHA256 70ed40d64132220a08141add864ead8db42f05f5c9ab54d9888d5670d0331e48
+EBUILD swt-3.7.2.ebuild 4783 RMD160 77e07b289bb0763725c1e0b405d11e9d4a952b9c SHA1 7eb81917b1fba191e255395d89401ebda99b9bd3 SHA256 f520d690fc38c4f73c61e6f79b48d23a7ef19408983d092130c9354f2d13b619
+MISC ChangeLog 23712 RMD160 a192c3e88ed768cea27917f5f331bf3fd0927c68 SHA1 62d349b9e142282ff3ff9e732d08178071f8e24e SHA256 f326d78dcf844db743817639868eef3b72f8454af170693cebc934d75ede7cf4
 MISC metadata.xml 739 RMD160 83fe3784458a1ff5e09bcb117f600a83e26396e2 SHA1 43637624ef260cd5d8ca78894d2660ba07f2436f SHA256 be0193008928fb3cf3ffdcb34579aae6f5fcd8d6ed6122adbb1fe5865016a91e
diff --git a/dev-java/swt/swt-3.7.2.ebuild b/dev-java/swt/swt-3.7.2.ebuild
new file mode 100644
index 000000000000..df84248063df
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.2.ebuild,v 1.1 2012/03/03 22:10:27 caster Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl webkit"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				=gnome-base/libgnome-2*
+				=gnome-base/gnome-vfs-2*
+				=gnome-base/libgnomeui-2*
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		dev-util/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# 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"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html || die
+}