Remove old.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 12 insertions, 193 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 1e8188a91be1..1a9de6c911b6 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.152 2014/03/02 22:36:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.153 2014/03/08 16:55:33 tomwij Exp $
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> -swt-3.4-r4.ebuild:
+  Remove old.
 
   02 Mar 2014; Pacho Ramos <pacho@gentoo.org> swt-3.7.2-r1.ebuild:
   amd64 stable, bug #499478
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 8e6a898b2184..f5c05c88ce2a 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -15,9 +15,6 @@ AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 SHA256 6108e54fe7179fbace74f29b11270
 AUX swt-3.7.2-gio_launch-URI.patch 4287 SHA256 9d6ab97a06c190d1229168fb85dc10577c19b9d88ce6ae216eb8d1b803ae0752 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d WHIRLPOOL 0b9e8fc03d9e7ceb69b5ba8212b943bcf99501f57827aabba53cf3b5f241b0df111bc452f91485924616b4731d8d8dae436b2690ce5d0bbee56b6b8ab8d8ecda
 AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 SHA256 3aed5349c3c0cf1a2e63fdd4b40d053804ecbba7a5b798de73be36f64b42fb65 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1 WHIRLPOOL e9f21b6745422aa1ac74f25530f4ae829165b77c1843319a21aed59e8a7da27fdf803eaaad4acc49e5373ff7f2e7209f35bbe8cdc4ffe0e62ff576f03eb912c2
 AUX swt-4.2-manifest 739 SHA256 3c67656a0798cd6f464ce6db022fab04fa23ff3b07e7079d8c3364d950f8acc4 SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1 WHIRLPOOL 31f9e54ceb9640c0e3d1ac0c67bd290295a424997d8633be5d172b0467e9aac4b0b94420862864e29531ae3ef67610007729fba1b944bf22551cd8450d4326ff
-DIST swt-3.4-gtk-linux-ppc.zip 4616331 SHA256 227d3bdceba48cd245269cf689731dc3072898c34ed874501532c06ad3c5e9e8 SHA512 3d456cb0f7b0374382b1dba16a963d8a1f39f483ef385d35c26f15255b9fba2e45d50de644f68561be880c0983fe464e6877a5761555081b5e14125724aeb4b0 WHIRLPOOL 2c3785ec75d16f337159691fdd9d9b745eed9d24cee5e8deedcd9b0c1c9d192f4c148b856493c4fe41795036ef011d0dd2a6fb8cf7586c6ed127dfbb88ee9bcf
-DIST swt-3.4-gtk-linux-x86.zip 4548421 SHA256 c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4 SHA512 237cd5a5059da63348f68568f059503e8dafc77197d74270839f3cfc723de51308a9ae3133eac1028db86be173e68ab2b48347f1847e60fd9ee437fd1079179f WHIRLPOOL 96b84c48eddc8d6b85010ebafaae3571bd5f2da4cd7ba32c0a0b49bb232263bae381b6828eb4fa82a42f80a8a534433066bf7301721a3b0975758f72195622b4
-DIST swt-3.4-gtk-linux-x86_64.zip 4730884 SHA256 67013b409f21bcad6ba07c36977d526dd0642184d1068158da9cb9d23b95e34d SHA512 e5449ef57223653f486dbd6e0bbeec2ab86d3a39f87eef499eb1b439dfafee1afdfaf27dbc2225d73e9b42993efacec307e3e733a49a2cb87c98aa98b9d8678b WHIRLPOOL 0e3ac10e96a93a3e7b2c63b7639955b5975bb0c1189689501350b688b376d7aa7ebe4bb2031859202f0ff6309b96f273ac73974a4111405eeed9bae804640910
 DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501
 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd
 DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b
@@ -33,7 +30,6 @@ DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 SHA256 a92498e1fcd001b91a5128a414263
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 SHA256 b853c9601ae0808634722976392319405bee53e6bc30864d0bfbf0507159d1db SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d WHIRLPOOL 8fe20ed46de94bb554205929fd142a2ac21aca543289a48cd6417f60f8a4d2d55062b7ebbda7f6712aabc6c7de8998c75c48eeffe73139c756e44e71c2ef84be
 DIST swt-4.2-gtk-linux-x86.zip 5561088 SHA256 e0e2977837c905b61219eb94544d89757ac3d01a88c3a81abff6d7446d48d9ac SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133 WHIRLPOOL ad4fd1113f6e4b2605433ac7a53aa416c29824164b97b2b3a3ceb61e6bc812108c38841b75c5ec6f9a093ed2b8a7c58bf883d701403e8399a18ccb2a8c214165
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 SHA256 f549bb8309e1523dd4d3867aaf6f0582cdbe5a504ae8aba52900fe6fdb63f336 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50 WHIRLPOOL 5f60bfe556d6551fdabe4184dfc5a4a9df250b10010d59200902017a9f9cbed379a557e5179232d05a8542d531542c3eb6d0afc57c752717dca7a9d7f4177e62
-EBUILD swt-3.4-r4.ebuild 5067 SHA256 0c9a46de38fc77c2dd14c5ef86a993a33342e2f31e57c15c17809e51339ca0eb SHA512 ced01aa0886104209e71213bfbe6379011d93ea6daebd826f92b9b5c9f23a824cab705aa6bdcc7443d357af46b6817c6338494c53834894da8d81a2375b5c5c8 WHIRLPOOL 1ac0a6af04807b60ce0491cc8512398e71dccf63e1bf270ad316707d65233750921ec31e9aa2e823898f10df3c8ab6c33fe854941da6c6c9ff254bbcf0677242
 EBUILD swt-3.5.2.ebuild 4766 SHA256 f9b0cabc4f2cd251e83d3ee092cf55e6fe4efa251b10d4809f43ed94e293aa9c SHA512 d64148196c59f811791851924ecd1d576ebf3faf589af7a57a77ee2973d5cbe9b75bb40fbd08855e93b51676de223c2215782e02403756044bced85984a08d9d WHIRLPOOL c8a232d15a2246f20d74209ec4a4bb748ad9746ef32830367e48c1cff088993cd46e34f778b49bd3b45ff1fcd10dc7a359f2e5485b94c9b07026986085d42910
 EBUILD swt-3.6.1.ebuild 4774 SHA256 2fa22bec72c95340565d8ae982a28ab646acf7d512ac42f724b2b034409808af SHA512 2f2a9433ee392a367324be0c56900fe89f3723e0095477fefb0e5a67fa806deeaafea72b1d7cfc9c850332ee5a7874d540d5b55b0556e3864d12729f201872d2 WHIRLPOOL ecb6e924a581d0652eac5d4dbee1ccebfa762182782d744d2f394782e46932704724cf27c7b67e0ff2c0057d353ebb3d139ee8393bf75c356a1a0fd37ee15aa5
 EBUILD swt-3.7.1.ebuild 4782 SHA256 f31f5bf1b5648d2d9b84961bc8dc9c7344f31b1a4f9526c8d60848641ac5881e SHA512 4f4224d34b3d4e1f64c4bae3c10b5721e4bee7b9c4f7ed7d5d117d1aa872b22fa833447b08ee321d80aafc35b54c310e362c63604d760a76a55133f943a07812 WHIRLPOOL c30705aa922aed6e12b9c57ee70902ceb89b5b3e2127730eea0ffd2b84743fec49000b482117c06b969c6452d81570611ca0a0d1dedd18b223ce3fe067c7f226
@@ -42,12 +38,16 @@ EBUILD swt-3.7.2.ebuild 4780 SHA256 8116026fb485ab02e4b389507bc47b42288657c96fff
 EBUILD swt-4.2-r1.ebuild 4823 SHA256 ed65ff9065013eadaf7c077190331cfa5925ecd0b910a9d059cbe3ba00028b04 SHA512 e5767016c0ff69280dc9092b8761a94399ee76498ad490b439e3663fa033b4b9dd6b92f03647d99b40f2b7ddd7bf91e6d4941ec00f79443c63309a47b373d425 WHIRLPOOL c40cddac4437023bf6dab64f3cc0b5ddbcfa3add8b406d51faebd21b8538b0cfd5719c7c529f3f29efe798e7fbc1773bfe4f0019e2ab767703c680247c308e8f
 EBUILD swt-4.2-r2.ebuild 4949 SHA256 d251c9ef019c2da0c791d22ce90839a76ee1c81da7212719e0b80d7120d0b550 SHA512 f8b086111c447fba40727ca46ed42e574fd8ef0edf947489c9e734d099808c0b5b783737d39e9c34e68a2c88f8bb9a5670ddfeb66e74f3a2501d5e6493ca018f WHIRLPOOL 2c4c538f5f88a5ad1a1f1ba3f5de29e0adc15f60d7ccdec85855b40eb9f2e168de15a5132b9777a6b252ba077e220af6d28e5c436a3387df03b7a3ec00b55ebc
 EBUILD swt-4.2.ebuild 4711 SHA256 3f3a41ca28a445b145a35598474b052d9c3779eb37ee1177e2f9213ddd096ae9 SHA512 c8680f9d561ca463fd25f199e017d32ecd75c0ad4bcc8f56fa2557a4a3acac4a8475abf0fadd861f16eabb3fd8058e2813f20eb70e3afff0c16a05a2f05fe396 WHIRLPOOL d357555e9478156dd73c5d6724970fabfd5724a5bdd37c70540c7e9846e3985ac34a49fcf87fedac890f56f717a3ec89a211288cb37debb978bd8abd39566b4f
-MISC ChangeLog 26048 SHA256 ed04449f29f91ff207181c12d2371f364a90f3ce649100b126e585a466de9909 SHA512 bdf0957f168b437d89dc1008c97910e22640d7b8b424885e91dea24e0e762d7b2057846d980d13023e32f5eca31a20ddef909ad6bb5b11df863dda01208073f7 WHIRLPOOL 868c73f6163abdcada80f52bb38b749d60005b814f1a76d15e46fea8018bf3a06c36b402a3a4e2f5908fec731ecdd30f3eab2918badf42b7287364f85d8abf5f
+MISC ChangeLog 26131 SHA256 e91058a88c7c4b7bffcfaa3f02c1b7b62887ff74e9fa36930819ed9240a2c8a5 SHA512 32b0010ee0dd4dc7ce8b6ae81dde8bcbe2aa8b408b7b65a896c4f13a51ed33ac1f0e267970d70ec55d2ffc7253657aabe46764475fb959321f6ee8aeea6e112c WHIRLPOOL f264a47eddc9a736f1d8abd18bc811856ecee159446b488b346d8495fe6c91784df24df1b92849e4a78f6972e0ce8612eec228fe18553e30f4fc17b3b0f7ebed
 MISC metadata.xml 578 SHA256 1e4845acfd81dc03aba0b504ac5c3307bf8d8a3bf666ece773fc483e458eaea0 SHA512 2b9ed1965582b5cd8371b473a296d620005273c82b393f5f32c3c45ce65926330bb75e4a312256c21bdb3f69a9c2a4b99f18e9396a349ba17ba94ebe647e5b8a WHIRLPOOL a32177b01a02581a0b4762e31cdf8029a88fc7e57ec9809c9a8156326a843e604a861e8f5f7bb44d8adc9e1c0c09eebb58d8d6ffd613ae531f99d6f1113cf044
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMTsmMACgkQCaWpQKGI+9QnfACghFIv4zMOwcQacR5IlS4r/Lyv
-zZcAn2QOR2++NcHcepQ0QDDhzW3b6KYm
-=8DI9
+iQEcBAEBCAAGBQJTG0tmAAoJEJWyH81tNOV9YjMH/2CH+jn0lYgJ+8h5v67Cw9Ar
+vrif5zOp1dkbRzpJE2hdq4Yy8uFexSDwbZFZPxyjjsCQMtANJPLYx7GR2HCz33wp
+ZsAOekUVxY/YDCt+lIYXjDjACiLEK5KIJzRnmvpXjaNdaMWhuAnot378gz4kNqgI
+3+iqf/6qKEw6OYae04krmuXiueXSyx+wR7Pm2EM4F69VLF/0ZsF8YD6lKidDWNiN
+7DBTliG828AUwfS7TMT+XgMDJJS0mCjQLhO1EUnkEJj2dpuI0e6Ah853EgEJiBh/
+S88HrAfcOkhnDsVkmtleh9RHshQrfnj5eWwdhqKVWJd8SNwuY0UEzc/sanptrug=
+=rquX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/swt/swt-3.4-r4.ebuild b/dev-java/swt/swt-3.4-r4.ebuild
deleted file mode 100644
index 4baafe3fee5c..000000000000
--- a/dev-java/swt/swt-3.4-r4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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.4-r4.ebuild,v 1.11 2012/05/03 07:42:51 jdhore Exp $
-
-EAPI="1"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_pre/M}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-200806172000"
-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
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)"
-
-SLOT="3.4"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="cairo gnome opengl"
-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
-		)
-		x11-libs/libXtst"
-
-# Use a blocker to avoid file collisions when upgrading to the slotted version
-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
-# so this is the only way to prevent collisions
-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
-
-DEPEND=">=virtual/jdk-1.4
-		!=dev-java/swt-3.4*:3
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
-		x11-proto/inputproto
-		virtual/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
-
-	# 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"
-
-	# bug 241400
-	if use amd64 || use ppc64; then
-		epatch "${FILESDIR}/${PN}-3.4-xulrunner-1.9.1-amd64.patch"
-	else
-		epatch "${FILESDIR}/${PN}-3.4-xulrunner-1.9.1.patch"
-	fi
-}
-
-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=-DSWT_PTR_SIZE_64
-
-	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 || 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
-
-	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.4-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
-
-	dohtml about.html || die
-}