[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/ - gentoo-commits

From:	James Le Cuirot <chewi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
Date:	Sat, 30 Jan 2016 10:48:21
Message-Id:	`1454150865.44b602563d2ef7b674af5165ff5c3ebb8d873cbe.chewi@gentoo`

1

commit:     44b602563d2ef7b674af5165ff5c3ebb8d873cbe

2

Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

3

AuthorDate: Sat Jan 30 10:10:27 2016 +0000

4

Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

5

CommitDate: Sat Jan 30 10:47:45 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b60256

7

8

dev-java/swt: Remove unneeded 3.6 SLOT

9

10

Only android-sdk-update-manager references it but also allows 3.7.

11

12

Package-Manager: portage-2.2.27

13

14

 dev-java/swt/Manifest         |   3 -

15

 dev-java/swt/swt-3.6.1.ebuild | 175 ------------------------------------------

16

 2 files changed, 178 deletions(-)

17

18

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest

19

index dff8fea..4a33e84 100644

20

--- a/dev-java/swt/Manifest

21

+++ b/dev-java/swt/Manifest

22

@@ -1,9 +1,6 @@

23

 DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501

24

 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd

25

 DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b

26

-DIST swt-3.6.1-gtk-linux-ppc.zip 5396609 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec SHA512 cee062224f8e5508d9f8d0a099535337c73a18338bb804a37dd79c11e7601ebd9455469300ad17fa2bd260b7ddddc673ac8d7e385250fcf55bf9f70af76b6c7b WHIRLPOOL 9a567eb65eee0e8f29da4eb53f0795469b92bfecddfc753f7e42915586b5b7fc2a33b1e2a5d43b41afd33d8f10e27716331195ede79315307c885fc24a58be39

27

-DIST swt-3.6.1-gtk-linux-x86.zip 5234373 SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef SHA512 89159a74b27f3afb31c1ce0360012b0d3f72649bac9f068ceb02a3447033a6d06ce5a434f6fa996a2455569b45d263f960e96a7de3860db8ed688b3554cb8a5f WHIRLPOOL 462a7e1bb706a3335ca623ee1a6f8edc429155fd50a678a4865322af07c5daf0dc6cc970b5369914134fba788031dfbdf9a690f719105d5d529f6921d5548aec

28

-DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94 SHA512 175d1827108168596ef5c68f1c9c5eef567f5b27aca8fe45374cc5fb2b59ee003a627edfcc24f34222abc078ec28d230535279bd79b04128cccb1e349d2bf0bb WHIRLPOOL 2d2eb7466a268553a6744e7e1f88402cfffd09fb5b0f00522253bd295e23eeb42ab4ab3d302267fb083c0391158124d3b6eca29c6a06c53d37b71560d91d0f24

29

 DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49

30

 DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f

31

 DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e111191b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63

32

33

diff --git a/dev-java/swt/swt-3.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild

34

deleted file mode 100644

35

index 07cf74c..0000000

36

--- a/dev-java/swt/swt-3.6.1.ebuild

37

+++ /dev/null

38

@@ -1,175 +0,0 @@

39

-# Copyright 1999-2016 Gentoo Foundation

40

-# Distributed under the terms of the GNU General Public License v2

41

-# $Id$

42

-

43

-EAPI=2

44

-

45

-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi

46

-

47

-MY_PV="${PV/_rc/RC}"

48

-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201009090800"

49

-MY_P="${PN}-${MY_PV}"

50

-

51

-DESCRIPTION="GTK based SWT Library"

52

-HOMEPAGE="http://www.eclipse.org/"

53

-SRC_URI="x86? (

54

-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip

55

-		)

56

-		x86-fbsd? (

57

-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip

58

-		)

59

-		amd64? (

60

-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip

61

-		)

62

-		ppc? (

63

-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip

64

-		)

65

-		ppc64? (

66

-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip

67

-		)"

68

-

69

-SLOT="3.6"

70

-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"

71

-KEYWORDS="amd64 ppc64 x86"

72

-

73

-IUSE="cairo gnome opengl"

74

-COMMON=">=dev-libs/glib-2.6

75

-		>=x11-libs/gtk+-2.6.8:2

76

-		>=dev-libs/atk-1.10.2

77

-		cairo? ( >=x11-libs/cairo-1.4.14 )

78

-		gnome?	(

79

-				=gnome-base/libgnome-2*

80

-				=gnome-base/gnome-vfs-2*

81

-				=gnome-base/libgnomeui-2*

82

-				)

83

-		opengl?	(

84

-			virtual/opengl

85

-			virtual/glu

86

-		)

87

-		x11-libs/libXtst"

88

-

89

-# Use a blocker to avoid file collisions when upgrading to the slotted version

90

-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT

91

-# so this is the only way to prevent collisions

92

-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244

93

-

94

-DEPEND=">=virtual/jdk-1.4

95

-		app-arch/unzip

96

-		x11-libs/libX11

97

-		x11-libs/libXrender

98

-		x11-libs/libXt

99

-		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )

100

-		x11-proto/inputproto

101

-		virtual/pkgconfig

102

-		${COMMON}"

103

-

104

-RDEPEND=">=virtual/jre-1.4

105

-	${COMMON}"

106

-

107

-S="${WORKDIR}"

108

-

109

-# JNI libraries don't need SONAME, bug #253756

110

-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"

111

-

112

-src_unpack() {

113

-	local DISTFILE=${A}

114

-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"

115

-	unpack "./src.zip"

116

-

117

-	# Cleanup the redirtied directory structure

118

-	rm -rf about_files/ || die

119

-}

120

-

121

-java_prepare() {

122

-	# Replace the build.xml to allow compilation without Eclipse tasks

123

-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"

124

-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"

125

-

126

-	# Fix Makefiles to respect flags and work with --as-needed

127

-	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch

128

-}

129

-

130

-src_compile() {

131

-	# Drop jikes support as it seems to be unfriendly with SWT

132

-	java-pkg_filter-compiler jikes

133

-

134

-	local AWT_ARCH

135

-	local JAWTSO="libjawt.so"

136

-	if [[ $(tc-arch) == 'x86' ]] ; then

137

-		AWT_ARCH="i386"

138

-	elif [[ $(tc-arch) == 'ppc' ]] ; then

139

-		AWT_ARCH="ppc"

140

-	elif [[ $(tc-arch) == 'ppc64' ]] ; then

141

-		AWT_ARCH="ppc64"

142

-	else

143

-		AWT_ARCH="amd64"

144

-	fi

145

-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then

146

-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"

147

-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then

148

-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"

149

-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then

150

-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"

151

-	else

152

-		eerror "${JAWTSO} not found in the JDK being used for compilation!"

153

-		die "cannot build AWT library"

154

-	fi

155

-

156

-	# Fix the pointer size for AMD64

157

-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64

158

-

159

-	local platform="linux"

160

-

161

-	use elibc_FreeBSD && platform="freebsd"

162

-

163

-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"

164

-

165

-	einfo "Building AWT library"

166

-	${make} make_awt || die "Failed to build AWT support"

167

-

168

-	einfo "Building SWT library"

169

-	${make} make_swt || die "Failed to build SWT support"

170

-

171

-	einfo "Building JAVA-AT-SPI bridge"

172

-	${make} make_atk || die "Failed to build ATK support"

173

-

174

-	if use gnome ; then

175

-		einfo "Building GNOME VFS support"

176

-		${make} make_gnome || die "Failed to build GNOME VFS support"

177

-	fi

178

-

179

-	if use cairo ; then

180

-		einfo "Building CAIRO support"

181

-		${make} make_cairo || die "Unable to build CAIRO support"

182

-	fi

183

-

184

-	if use opengl ; then

185

-		einfo "Building OpenGL component"

186

-		${make} make_glx || die "Unable to build OpenGL component"

187

-	fi

188

-

189

-	einfo "Building JNI libraries"

190

-	eant compile

191

-

192

-	einfo "Copying missing files"

193

-	cp -i "${S}/version.txt" "${S}/build/version.txt"

194

-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \

195

-		"${S}/build/org/eclipse/swt/internal/"

196

-

197

-	einfo "Packing JNI libraries"

198

-	eant jar

199

-}

200

-

201

-src_install() {

202

-	swtArch=${ARCH}

203

-	use amd64 && swtArch=x86_64

204

-	use x86-fbsd && swtArch=x86

205

-

206

-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF"

207

-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"

208

-

209

-	java-pkg_sointo /usr/$(get_libdir)

210

-	java-pkg_doso *.so

211

-

212

-	dohtml about.html || die

213

-}

1	commit: 44b602563d2ef7b674af5165ff5c3ebb8d873cbe
2	Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3	AuthorDate: Sat Jan 30 10:10:27 2016 +0000
4	Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5	CommitDate: Sat Jan 30 10:47:45 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b60256
7
8	dev-java/swt: Remove unneeded 3.6 SLOT
9
10	Only android-sdk-update-manager references it but also allows 3.7.
11
12	Package-Manager: portage-2.2.27
13
14	dev-java/swt/Manifest \| 3 -
15	dev-java/swt/swt-3.6.1.ebuild \| 175 ------------------------------------------
16	2 files changed, 178 deletions(-)
17
18	diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
19	index dff8fea..4a33e84 100644
20	--- a/dev-java/swt/Manifest
21	+++ b/dev-java/swt/Manifest
22	@@ -1,9 +1,6 @@
23	DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501
24	DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd
25	DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b
26	-DIST swt-3.6.1-gtk-linux-ppc.zip 5396609 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec SHA512 cee062224f8e5508d9f8d0a099535337c73a18338bb804a37dd79c11e7601ebd9455469300ad17fa2bd260b7ddddc673ac8d7e385250fcf55bf9f70af76b6c7b WHIRLPOOL 9a567eb65eee0e8f29da4eb53f0795469b92bfecddfc753f7e42915586b5b7fc2a33b1e2a5d43b41afd33d8f10e27716331195ede79315307c885fc24a58be39
27	-DIST swt-3.6.1-gtk-linux-x86.zip 5234373 SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef SHA512 89159a74b27f3afb31c1ce0360012b0d3f72649bac9f068ceb02a3447033a6d06ce5a434f6fa996a2455569b45d263f960e96a7de3860db8ed688b3554cb8a5f WHIRLPOOL 462a7e1bb706a3335ca623ee1a6f8edc429155fd50a678a4865322af07c5daf0dc6cc970b5369914134fba788031dfbdf9a690f719105d5d529f6921d5548aec
28	-DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94 SHA512 175d1827108168596ef5c68f1c9c5eef567f5b27aca8fe45374cc5fb2b59ee003a627edfcc24f34222abc078ec28d230535279bd79b04128cccb1e349d2bf0bb WHIRLPOOL 2d2eb7466a268553a6744e7e1f88402cfffd09fb5b0f00522253bd295e23eeb42ab4ab3d302267fb083c0391158124d3b6eca29c6a06c53d37b71560d91d0f24
29	DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49
30	DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f
31	DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e111191b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63
32
33	diff --git a/dev-java/swt/swt-3.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild
34	deleted file mode 100644
35	index 07cf74c..0000000
36	--- a/dev-java/swt/swt-3.6.1.ebuild
37	+++ /dev/null
38	@@ -1,175 +0,0 @@
39	-# Copyright 1999-2016 Gentoo Foundation
40	-# Distributed under the terms of the GNU General Public License v2
41	-# $Id$
42	-
43	-EAPI=2
44	-
45	-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
46	-
47	-MY_PV="${PV/_rc/RC}"
48	-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201009090800"
49	-MY_P="${PN}-${MY_PV}"
50	-
51	-DESCRIPTION="GTK based SWT Library"
52	-HOMEPAGE="http://www.eclipse.org/"
53	-SRC_URI="x86? (
54	- http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
55	- )
56	- x86-fbsd? (
57	- http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
58	- )
59	- amd64? (
60	- http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
61	- )
62	- ppc? (
63	- http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
64	- )
65	- ppc64? (
66	- http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
67	- )"
68	-
69	-SLOT="3.6"
70	-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
71	-KEYWORDS="amd64 ppc64 x86"
72	-
73	-IUSE="cairo gnome opengl"
74	-COMMON=">=dev-libs/glib-2.6
75	- >=x11-libs/gtk+-2.6.8:2
76	- >=dev-libs/atk-1.10.2
77	- cairo? ( >=x11-libs/cairo-1.4.14 )
78	- gnome? (
79	- =gnome-base/libgnome-2*
80	- =gnome-base/gnome-vfs-2*
81	- =gnome-base/libgnomeui-2*
82	- )
83	- opengl? (
84	- virtual/opengl
85	- virtual/glu
86	- )
87	- x11-libs/libXtst"
88	-
89	-# Use a blocker to avoid file collisions when upgrading to the slotted version
90	-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
91	-# so this is the only way to prevent collisions
92	-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
93	-
94	-DEPEND=">=virtual/jdk-1.4
95	- app-arch/unzip
96	- x11-libs/libX11
97	- x11-libs/libXrender
98	- x11-libs/libXt
99	- \|\| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
100	- x11-proto/inputproto
101	- virtual/pkgconfig
102	- ${COMMON}"
103	-
104	-RDEPEND=">=virtual/jre-1.4
105	- ${COMMON}"
106	-
107	-S="${WORKDIR}"
108	-
109	-# JNI libraries don't need SONAME, bug #253756
110	-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
111	-
112	-src_unpack() {
113	- local DISTFILE=${A}
114	- unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" \|\| die "Unable to extract distfile"
115	- unpack "./src.zip"
116	-
117	- # Cleanup the redirtied directory structure
118	- rm -rf about_files/ \|\| die
119	-}
120	-
121	-java_prepare() {
122	- # Replace the build.xml to allow compilation without Eclipse tasks
123	- cp "${FILESDIR}/build.xml" "${S}/build.xml" \|\| die "Unable to update build.xml"
124	- mkdir "${S}/src" && mv "${S}/org" "${S}/src" \|\| die "Unable to restructure SWT sources"
125	-
126	- # Fix Makefiles to respect flags and work with --as-needed
127	- epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
128	-}
129	-
130	-src_compile() {
131	- # Drop jikes support as it seems to be unfriendly with SWT
132	- java-pkg_filter-compiler jikes
133	-
134	- local AWT_ARCH
135	- local JAWTSO="libjawt.so"
136	- if [[ $(tc-arch) == 'x86' ]] ; then
137	- AWT_ARCH="i386"
138	- elif [[ $(tc-arch) == 'ppc' ]] ; then
139	- AWT_ARCH="ppc"
140	- elif [[ $(tc-arch) == 'ppc64' ]] ; then
141	- AWT_ARCH="ppc64"
142	- else
143	- AWT_ARCH="amd64"
144	- fi
145	- if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
146	- export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
147	- elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
148	- export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
149	- elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
150	- export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
151	- else
152	- eerror "${JAWTSO} not found in the JDK being used for compilation!"
153	- die "cannot build AWT library"
154	- fi
155	-
156	- # Fix the pointer size for AMD64
157	- [[ ${ARCH} == "amd64" \|\| ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
158	-
159	- local platform="linux"
160	-
161	- use elibc_FreeBSD && platform="freebsd"
162	-
163	- local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
164	-
165	- einfo "Building AWT library"
166	- ${make} make_awt \|\| die "Failed to build AWT support"
167	-
168	- einfo "Building SWT library"
169	- ${make} make_swt \|\| die "Failed to build SWT support"
170	-
171	- einfo "Building JAVA-AT-SPI bridge"
172	- ${make} make_atk \|\| die "Failed to build ATK support"
173	-
174	- if use gnome ; then
175	- einfo "Building GNOME VFS support"
176	- ${make} make_gnome \|\| die "Failed to build GNOME VFS support"
177	- fi
178	-
179	- if use cairo ; then
180	- einfo "Building CAIRO support"
181	- ${make} make_cairo \|\| die "Unable to build CAIRO support"
182	- fi
183	-
184	- if use opengl ; then
185	- einfo "Building OpenGL component"
186	- ${make} make_glx \|\| die "Unable to build OpenGL component"
187	- fi
188	-
189	- einfo "Building JNI libraries"
190	- eant compile
191	-
192	- einfo "Copying missing files"
193	- cp -i "${S}/version.txt" "${S}/build/version.txt"
194	- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
195	- "${S}/build/org/eclipse/swt/internal/"
196	-
197	- einfo "Packing JNI libraries"
198	- eant jar
199	-}
200	-
201	-src_install() {
202	- swtArch=${ARCH}
203	- use amd64 && swtArch=x86_64
204	- use x86-fbsd && swtArch=x86
205	-
206	- sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF"
207	- java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
208	-
209	- java-pkg_sointo /usr/$(get_libdir)
210	- java-pkg_doso *.so
211	-
212	- dohtml about.html \|\| die
213	-}

Gentoo Archives: gentoo-commits