From: Petteri Räty Date: Sun, 19 Nov 2006 18:41:27 +0000 (+0000) Subject: Version bump and removed old revision. Fixes bug #155649. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09d4763f86f9d6b7611a677abb34c844281e3613;p=gentoo.git Version bump and removed old revision. Fixes bug #155649. Package-Manager: portage-2.1.2_rc2 --- diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index f28bb4bb5aa4..065731feba79 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458 @@ -18,28 +21,42 @@ AUX swt-3.2-remove-stripping.patch 896 RMD160 71172237544b61942784b91c30a917b0d1 MD5 4afd88780d3b774d9a5bbdc374981840 files/swt-3.2-remove-stripping.patch 896 RMD160 71172237544b61942784b91c30a917b0d12586e3 files/swt-3.2-remove-stripping.patch 896 SHA256 72c26a580a835103d7801018295cb6390473c804a7114796f464ddf5bc9f1983 files/swt-3.2-remove-stripping.patch 896 +AUX swt-3.2.1-remove-stripping.patch 1045 RMD160 f06a4c040532abd2eb9894c49dfffa5d0d4a2261 SHA1 68eb328ff2d6882a347c8e9708c9e86cbe199916 SHA256 6c6854f4a416eadd8fcf1cce5771d86169662b6566c41f87a9a7a38faf58c746 +MD5 3451b236486fdeae2ad7fba3067d354a files/swt-3.2.1-remove-stripping.patch 1045 +RMD160 f06a4c040532abd2eb9894c49dfffa5d0d4a2261 files/swt-3.2.1-remove-stripping.patch 1045 +SHA256 6c6854f4a416eadd8fcf1cce5771d86169662b6566c41f87a9a7a38faf58c746 files/swt-3.2.1-remove-stripping.patch 1045 DIST swt-3.2-gtk-linux-ppc.zip 2913359 RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 SHA1 b0fb2ce02983be18d6d9d7df033a168a1c92d2a3 SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062 DIST swt-3.2-gtk-linux-x86.zip 2935209 RMD160 d9560445852020e7d755594c60ba01c7904b9924 SHA1 1d6d0cd4624c93ae005053681731cbaf3d4a2e52 SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c DIST swt-3.2-gtk-linux-x86_64.zip 2841135 RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 SHA1 afd11534a90b2f547fb87c5cf6edea205c0a7d92 SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665 -EBUILD swt-3.2-r1.ebuild 5157 RMD160 6c5528a3cfa66b9257035d5365e98d46552ea686 SHA1 eb5a8049c7686157a6f73ed49b6b1582f0ff01e6 SHA256 b66a696dbfb7c5a292c213137344444ded9178096e8e73cda23d854dcf2e1456 -MD5 f8f8443719030602e815c84341b3188c swt-3.2-r1.ebuild 5157 -RMD160 6c5528a3cfa66b9257035d5365e98d46552ea686 swt-3.2-r1.ebuild 5157 -SHA256 b66a696dbfb7c5a292c213137344444ded9178096e8e73cda23d854dcf2e1456 swt-3.2-r1.ebuild 5157 +DIST swt-3.2.1-gtk-linux-ppc.zip 3043491 RMD160 0246bacb58dc294719435fe6104a84aa512436f8 SHA1 219f91e28cf72517d40958c539658a6ccef58651 SHA256 267e116f59f72d0b701d60a6bf3c410f81c51e7d468862ecbcf34e7bf4e3b096 +DIST swt-3.2.1-gtk-linux-x86.zip 3118312 RMD160 950f1e68c82e6e208ffd6ceeff027e5fa1002d73 SHA1 b1e95288321944bb070bee2bdf4faec8e1aeb275 SHA256 940a5dd90131fe2fa02bcf04374dc168a136100d058042732272ca8e61349e78 +DIST swt-3.2.1-gtk-linux-x86_64.zip 2997030 RMD160 742593d51259b5d41d946558ea0743faf122b17f SHA1 163f48796aff2172b89b7b4cc0d5201ccc49b796 SHA256 f7cda0d51a0b01954b96821b1a1053f7b76760286f82756b87963caae2c93cb5 EBUILD swt-3.2-r2.ebuild 5223 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf SHA1 2966ea0ecc5407044352d5f63dceb8f604553c80 SHA256 3515363ece683ebe30dfeac298ef951e9039b5ca93dcd1c2f23aee53696da65f MD5 d3342ff6d0af3a1ac9c7aa29166167aa swt-3.2-r2.ebuild 5223 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf swt-3.2-r2.ebuild 5223 SHA256 3515363ece683ebe30dfeac298ef951e9039b5ca93dcd1c2f23aee53696da65f swt-3.2-r2.ebuild 5223 -MISC ChangeLog 8604 RMD160 3fbe89bb54a6c92edf99ea672b1a00edaf2dce10 SHA1 bfb5067e0c000d4a525e78c6bf8103d01d5f9dcd SHA256 f681e97610f67a480fdb478df9d5ce045b41784e28f63807f06c2d0b8e4abdc6 -MD5 a52ef0755cf9ae683d2a5bbd85381020 ChangeLog 8604 -RMD160 3fbe89bb54a6c92edf99ea672b1a00edaf2dce10 ChangeLog 8604 -SHA256 f681e97610f67a480fdb478df9d5ce045b41784e28f63807f06c2d0b8e4abdc6 ChangeLog 8604 -MISC metadata.xml 441 RMD160 e68f7e60f4cb2267cd2503208a03065fdded3a6e SHA1 b00f857f9ee9dcebfa89bf9482a0a8e71d6837dd SHA256 8884ab0355871326768b025cfeb0bb561e6988b1bc903ee48a62c25edbce03f4 -MD5 c1b2934f0e36e5ea669bd4d3351a1f15 metadata.xml 441 -RMD160 e68f7e60f4cb2267cd2503208a03065fdded3a6e metadata.xml 441 -SHA256 8884ab0355871326768b025cfeb0bb561e6988b1bc903ee48a62c25edbce03f4 metadata.xml 441 -MD5 8bd1dc15426b016e6e25cd7af5143fa8 files/digest-swt-3.2-r1 786 -RMD160 606e3a5f2cd82b21193f5f444d2b5f2f46a8d710 files/digest-swt-3.2-r1 786 -SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/digest-swt-3.2-r1 786 +EBUILD swt-3.2.1.ebuild 5001 RMD160 05b699658f9eb09a76b191861a04c3fa27225d8b SHA1 a031aa5fb75923dd3babd5df64ce55d9c54e39e2 SHA256 bccafa6b511ecf2a64ef4e7af759a840b72212999f3d099ebab92cf41cc172f4 +MD5 7ef05177a8a1ebe96f3f704d2da16c11 swt-3.2.1.ebuild 5001 +RMD160 05b699658f9eb09a76b191861a04c3fa27225d8b swt-3.2.1.ebuild 5001 +SHA256 bccafa6b511ecf2a64ef4e7af759a840b72212999f3d099ebab92cf41cc172f4 swt-3.2.1.ebuild 5001 +MISC ChangeLog 8832 RMD160 318f2d9aa8efff0a9f76184e47390711b4faa4d6 SHA1 19b67c137bccdc930433c77a7d045efe132ef7fa SHA256 cd3676bf6afba5ba1722e3f6052b1aded39b6986eeda50a622e29deabd0f372d +MD5 9ea993ea8fad75b5befedd4407a521d3 ChangeLog 8832 +RMD160 318f2d9aa8efff0a9f76184e47390711b4faa4d6 ChangeLog 8832 +SHA256 cd3676bf6afba5ba1722e3f6052b1aded39b6986eeda50a622e29deabd0f372d ChangeLog 8832 +MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 +MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440 +RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440 +SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 metadata.xml 440 MD5 8bd1dc15426b016e6e25cd7af5143fa8 files/digest-swt-3.2-r2 786 RMD160 606e3a5f2cd82b21193f5f444d2b5f2f46a8d710 files/digest-swt-3.2-r2 786 SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/digest-swt-3.2-r2 786 +MD5 66029eeb02848204a262a57b31418061 files/digest-swt-3.2.1 804 +RMD160 c037c4c830973c81fe4bafdd0b02bc75333d6492 files/digest-swt-3.2.1 804 +SHA256 c4b185231fb5aafd9b653a4915407eaedd7f216856ae38d380b8346ce5c3f83f files/digest-swt-3.2.1 804 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFYKVQcxLzpIGCsLQRAuapAJwMtBgVGwfne77LQ8Xapwgy0LHh8ACbBY8W +a4k5DoBHYNFVCkJfYt4beQU= +=FFhp +-----END PGP SIGNATURE----- diff --git a/dev-java/swt/files/digest-swt-3.2-r1 b/dev-java/swt/files/digest-swt-3.2-r1 deleted file mode 100644 index f8f121537b2f..000000000000 --- a/dev-java/swt/files/digest-swt-3.2-r1 +++ /dev/null @@ -1,9 +0,0 @@ -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/swt-3.2-r1.ebuild b/dev-java/swt/swt-3.2-r1.ebuild deleted file mode 100644 index 38d36422813f..000000000000 --- a/dev-java/swt/swt-3.2-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# 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-r1.ebuild,v 1.5 2006/09/23 04:27:50 nichoj 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 - - 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 -}