Revert swt:3 removal; bug 282289 was outdated, two new packages depend on it now
authorNirbheek Chauhan <nirbheek@gentoo.org>
Sat, 26 Jun 2010 10:55:35 +0000 (10:55 +0000)
committerNirbheek Chauhan <nirbheek@gentoo.org>
Sat, 26 Jun 2010 10:55:35 +0000 (10:55 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
RepoMan-Options: --force

dev-java/swt/ChangeLog
dev-java/swt/Manifest
dev-java/swt/files/swt-3.3-manifest [new file with mode: 0644]
dev-java/swt/swt-3.3.1.1-r1.ebuild [new file with mode: 0644]

index 3d09a35a1df8140e74a3b0c2229db2a7557ad664..6eea1fbac77a049d867c6080f8e3a229ba863c1b 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.125 2010/06/26 10:45:18 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.126 2010/06/26 10:55:35 nirbheek Exp $
+
+  26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +swt-3.3.1.1-r1.ebuild, +files/swt-3.3-manifest:
+  Revert swt:3 removal; bug 282289 was outdated, two new packages depend on
+  it now
 
   26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   -swt-3.3.1.1-r1.ebuild, -files/swt-3.3-manifest:
index e9664b471faa0ee2ba2d93bdeb805db517901f2d..d25f51174c03a7e9bcaa1d7d56f3729799e38b46 100644 (file)
@@ -1,17 +1,22 @@
 AUX as-needed-and-flag-fixes.patch 7229 RMD160 dcd699249c0a1ecfeecc2f31acf584b6ee0501e1 SHA1 6faadbf3f7a5182f0cd950210794e7634e135e70 SHA256 016a810cc9649235fcab73467a056240b712d5557663b7756d4de64c939256ee
 AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
 AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
+AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae
 AUX swt-3.4-manifest 753 RMD160 c56ff2fcaf42d35af618a60273c9f6580adc0d79 SHA1 052261ea0c4f6758959fcd4e2718feabbed4273e SHA256 6401f555a867cba47463a36d3c150f7cf5962ac85be53e14c43a88eadf74c94e
 AUX swt-3.4-xulrunner-1.9.1-amd64.patch 12209 RMD160 329f773705d7ade1c9129fdf297f94d61635dd71 SHA1 59897d0b9aba895b6b8ef733dc044e3f87a92869 SHA256 485ea48f096c433a951691e087019cbc2c1b2d119a01fef2b57e33d98e9bd1b2
 AUX swt-3.4-xulrunner-1.9.1.patch 12209 RMD160 5ead70a50e586e4343eafff5fe96e64141c18a5e SHA1 68f53ff07faa202113b0748aef2de4b9010af65b SHA256 08e4ed334b37347ad9ea267264b46fb6700d57aef4d7817efbabfcb11de82d9c
 AUX swt-3.5-manifest 752 RMD160 7929539d58df2c3655eb640b708e81fa20e70e43 SHA1 1fd24b815a169e52b364a742180e8137ca1add97 SHA256 8ad9d69aa58e533cc03b9ccf3d8e0356505c357aaeb14968bf146f94d8b79be9
+DIST swt-3.3.1.1-gtk-linux-ppc.zip 4517854 RMD160 026315045217f20d4a69120c5214003efacdf332 SHA1 4ce9701c75c552e6d7ca2de7563dc44eb51908b7 SHA256 6c1cf5607facd1fd6f684c39d9a99db9739e984c1b4e5d81d9500236d4ff2cdc
+DIST swt-3.3.1.1-gtk-linux-x86.zip 4451797 RMD160 86a44dd3dd6f38b75a20de4a3fe98db38f163c9d SHA1 411d441ac47b7639b48f6094cb9bfe56f6958943 SHA256 5d4a7a524990aed7180fa954abfa5ed610dbead796e91677ca5274fbcd6b9dac
+DIST swt-3.3.1.1-gtk-linux-x86_64.zip 4625538 RMD160 3bbece2ca1820ea7a5b3b10dc637b62f69fe0dc8 SHA1 70b5780233fdf7aae7633e4990922405f5a2e2f9 SHA256 8f153de11f84d7259dbaf5425a54d4c92858b981cacbb38d3c28b7ced8c138d5
 DIST swt-3.4-gtk-linux-ppc.zip 4616331 RMD160 72104330e6e56db2ed91b37b1b08294c256dd0d8 SHA1 adf491f8abbd6a5fabfea246ed192b28a05ba05f SHA256 227d3bdceba48cd245269cf689731dc3072898c34ed874501532c06ad3c5e9e8
 DIST swt-3.4-gtk-linux-x86.zip 4548421 RMD160 b0c575d8d60af272629517f2c833b013fa340f12 SHA1 0eb201d5e9f4bda02555c92571ed54ef2d87bce1 SHA256 c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
 DIST swt-3.4-gtk-linux-x86_64.zip 4730884 RMD160 17207c7fda0589c1153867fab73afaa777d39c69 SHA1 f6b5b90c71d7ac1793937c2eecf7fb4f2e2a4045 SHA256 67013b409f21bcad6ba07c36977d526dd0642184d1068158da9cb9d23b95e34d
 DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 RMD160 4849fec03de7b41f8190703f78cdc44f0424676e SHA1 ab6184e95b57de857f9f6dfaba8368c83ca18e8c SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28
 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 RMD160 e18809a878c6c660bcf08d36cb9433f4803acd99 SHA1 f5a9c156a43b76b9dfa5d1ff515862a59ec4eb58 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7
 DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 RMD160 32aca7c0ad9ced672efa1a1a94bdccd3a1b90450 SHA1 4d23e02e60054b5f26cf96abfe3f09d4c4cb0812 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7
+EBUILD swt-3.3.1.1-r1.ebuild 5819 RMD160 4650ed7ff6f2de5cc823a365f4d14021d406fbcf SHA1 5cb9ad0c9c3e9dbc2243b6a8c56792f885a1154f SHA256 05afba9d1a651074a28fa3d86d3ff448d7426dc379de95784ffd70484063f21a
 EBUILD swt-3.4-r4.ebuild 6313 RMD160 7b9617b2499358289afb4665c76249f4a6ccf5f3 SHA1 2689f78427bc6e260b4c00de817adafc48e825cf SHA256 d72edb3516a67633a5ae98b47cf4c9602d55a2402b80a2f9267518c729ee0d1d
 EBUILD swt-3.5.2.ebuild 6023 RMD160 8375f29f20f7c2174542b673757ea67e08a35f3e SHA1 2fb2ec0bde456d65c749771a60c742aeb5f30266 SHA256 bc7a24bcb98d7602b4fb509b7d7cd5ed8ac620666d54ac0d68472e0107e053f9
-MISC ChangeLog 21178 RMD160 b917c4aff57d9012f90c076d65a870e3fb83b2b6 SHA1 9aed9a3d303ab0d24cceaf18d78b02c49c057697 SHA256 3226287418509ae624ecdd4877477d5f99df9f9047bfdf6f18ed67cf2785b07f
+MISC ChangeLog 21369 RMD160 41bb1bad0b091c6e499040d9583c42bc8ecba98f SHA1 10cd7e555d9bf12fbaaaf22eca453e02775545b1 SHA256 49d08ce6b5cd405d8f3651cd04aec5a5fd9843149f3c9d0c527696839039e87b
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
diff --git a/dev-java/swt/files/swt-3.3-manifest b/dev-java/swt/files/swt-3.3-manifest
new file mode 100644 (file)
index 0000000..2a0f5c8
--- /dev/null
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.3.0
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
\ No newline at end of file
diff --git a/dev-java/swt/swt-3.3.1.1-r1.ebuild b/dev-java/swt/swt-3.3.1.1-r1.ebuild
new file mode 100644 (file)
index 0000000..d3936c1
--- /dev/null
@@ -0,0 +1,212 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1-r1.ebuild,v 1.11 2010/06/26 10:55:35 nirbheek Exp $
+
+EAPI="1"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-200710231652"
+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-ppc.zip
+               )"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE="cairo firefox gnome opengl xulrunner"
+COMMON=">=dev-libs/glib-2.6
+               >=x11-libs/gtk+-2.6.8
+               >=dev-libs/atk-1.10.2
+               cairo? ( >=x11-libs/cairo-1.0.2 )
+               gnome?  (
+                                       =gnome-base/libgnome-2*
+                                       =gnome-base/gnome-vfs-2*
+                                       =gnome-base/libgnomeui-2*
+                               )
+               firefox? ( !xulrunner? (
+                       =www-client/mozilla-firefox-2*
+                       >=dev-libs/nspr-4.6.2
+               ) )
+               xulrunner? (
+                       net-libs/xulrunner:1.8
+                       >=dev-libs/nspr-4.6.2
+               )
+               opengl? (
+                       virtual/opengl
+                       virtual/glu
+               )
+               x11-libs/libXtst"
+
+# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
+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/xextproto-7.1 )
+               dev-util/pkgconfig
+               ${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+               ${COMMON}"
+
+S="${WORKDIR}"
+
+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
+
+       # 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.patch
+
+       # kill some strict-aliasing warnings
+       epatch "${FILESDIR}/${PN}-3.3-callback-pointer-dereferencing.patch"
+}
+
+get_gecko() {
+       local gecko
+
+       # order here match the logic in DEPEND and USE flag descriptions
+       use firefox && gecko="firefox"
+       use xulrunner && gecko="xulrunner"
+
+       echo ${gecko}
+}
+
+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"
+       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' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+
+       local platform="linux"
+
+       use elibc_FreeBSD && platform="freebsd"
+
+       local make="emake -f make_${platform}.mak NO_STRIP=y"
+
+       einfo "Building AWT library"
+       ${make} make_awt || die "Failed to build AWT support"
+
+       einfo "Building SWT library"
+       ${make} make_swt || die "Failed to build SWT support"
+
+       einfo "Building JAVA-AT-SPI bridge"
+       ${make} make_atk || die "Failed to build ATK support"
+
+       if use gnome ; then
+               einfo "Building GNOME VFS support"
+               ${make} make_gnome || die "Failed to build GNOME VFS support"
+       fi
+
+       local gecko="$(get_gecko)"
+       if [[ ${gecko} ]]; then
+               einfo "Building the Mozilla component against ${gecko}"
+               #local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
+               local inc="$(pkg-config ${gecko}-xpcom --cflags)"
+               local libs="$(pkg-config ${gecko}-xpcom --libs)"
+               MOZILLA_INCLUDES="${inc}" \
+               MOZILLA_LIBS="${libs}" \
+                       ${make} make_mozilla || die "Failed to build ${gecko} support"
+               if [[ "${gecko}" = "xulrunner" ]]; then
+                       XULRUNNER_INCLUDES="${inc}" \
+                       XULRUNNER_LIBS="${libs}" \
+                               ${make} make_xulrunner || die "Failed to build ${gecko} support"
+               fi
+       fi
+
+       if use cairo ; then
+               einfo "Building CAIRO support"
+               ${make} make_cairo || die "Unable to build CAIRO support"
+       fi
+
+       if use opengl ; then
+               einfo "Building OpenGL component"
+               ${make} make_glx || die "Unable to build OpenGL component"
+       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/"
+
+       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}-3.3-manifest" > 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
+
+       local gecko="$(get_gecko)"
+       if [[ -n "${gecko}" ]]; then
+               local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)"
+               java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+       fi
+
+       dohtml about.html || die
+}
+
+pkg_postinst() {
+       local gecko="$(get_gecko)"
+       if [[ -n "${gecko}" ]]; then
+               local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)"
+               elog "You built swt with ${gecko} support. For your custom applications please set"
+               elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
+       fi
+}