Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
Date: Fri, 30 Apr 2021 14:07:42
Message-Id: 1619791650.b47ac519a97af446a852d6ac26b0d54e567a77b8.fordfrog@gentoo
1 commit: b47ac519a97af446a852d6ac26b0d54e567a77b8
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Thu Apr 29 15:08:57 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 14:07:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47ac519
7
8 dev-java/swt: removing unused slot
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
12 Closes: https://github.com/gentoo/gentoo/pull/20595
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 dev-java/swt/Manifest | 3 -
16 dev-java/swt/swt-4.2-r4.ebuild | 159 -----------------------------------------
17 2 files changed, 162 deletions(-)
18
19 diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
20 index a7bdcfce8ab..882aec4b4fd 100644
21 --- a/dev-java/swt/Manifest
22 +++ b/dev-java/swt/Manifest
23 @@ -6,6 +6,3 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e
24 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
25 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
26 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
27 -DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
28 -DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
29 -DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
30
31 diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
32 deleted file mode 100644
33 index 3b48a85ba05..00000000000
34 --- a/dev-java/swt/swt-4.2-r4.ebuild
35 +++ /dev/null
36 @@ -1,159 +0,0 @@
37 -# Copyright 1999-2021 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI="5"
41 -
42 -inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
43 -
44 -MY_PV="${PV/_rc/RC}"
45 -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
46 -MY_P="${PN}-${MY_PV}"
47 -
48 -DESCRIPTION="GTK based SWT Library"
49 -HOMEPAGE="http://www.eclipse.org/"
50 -SRC_URI="
51 - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
52 - ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
53 - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
54 - x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
55 - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
56 -
57 -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
58 -SLOT="4.2"
59 -KEYWORDS="~amd64 ~ppc64 ~x86"
60 -IUSE="cairo opengl"
61 -
62 -COMMON_DEPEND="
63 - >=dev-libs/atk-1.10.2
64 - >=dev-libs/glib-2.32
65 - >=x11-libs/gtk+-2.6.8:2
66 - x11-libs/libXtst
67 - cairo? ( >=x11-libs/cairo-1.4.14 )
68 - opengl? (
69 - virtual/glu
70 - virtual/opengl
71 - )"
72 -DEPEND="${COMMON_DEPEND}
73 - app-arch/unzip
74 - virtual/jdk:1.8
75 - virtual/pkgconfig
76 - x11-base/xorg-proto
77 - x11-libs/libX11
78 - x11-libs/libXrender
79 - x11-libs/libXt
80 - >=x11-libs/libXtst-1.1.0"
81 -RDEPEND="${COMMON_DEPEND}
82 - >=virtual/jre-1.4"
83 -
84 -S="${WORKDIR}"
85 -
86 -# JNI libraries don't need SONAME, bug #253756
87 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
88 -
89 -src_unpack() {
90 - local DISTFILE=${A}
91 - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
92 - unpack "./src.zip"
93 -
94 - # Cleanup the redirtied directory structure
95 - rm -rf about_files/ || die
96 -}
97 -
98 -java_prepare() {
99 - # Replace the build.xml to allow compilation without Eclipse tasks
100 - cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
101 - mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
102 -
103 - # Fix Makefiles to respect flags and work with --as-needed
104 - epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
105 -
106 - # Define missing g_thread_supported() to be 0.
107 - sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
108 -}
109 -
110 -src_compile() {
111 - # Drop jikes support as it seems to be unfriendly with SWT
112 - java-pkg_filter-compiler jikes
113 -
114 - local AWT_ARCH
115 - local JAWTSO="libjawt.so"
116 - if [[ $(tc-arch) == 'x86' ]] ; then
117 - AWT_ARCH="i386"
118 - elif [[ $(tc-arch) == 'ppc' ]] ; then
119 - AWT_ARCH="ppc"
120 - elif [[ $(tc-arch) == 'ppc64' ]] ; then
121 - AWT_ARCH="ppc64"
122 - else
123 - AWT_ARCH="amd64"
124 - fi
125 - if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
126 - export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
127 - elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
128 - export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
129 - elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
130 - export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
131 - else
132 - eerror "${JAWTSO} not found in the JDK being used for compilation!"
133 - die "cannot build AWT library"
134 - fi
135 -
136 - # Fix the pointer size for AMD64
137 - [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
138 -
139 - local platform="linux"
140 -
141 - use elibc_FreeBSD && platform="freebsd"
142 -
143 - # Bug #461784, g_thread_init is deprecated since glib-2.32.
144 - append-cflags -DNO__1g_1thread_1init
145 -
146 - local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
147 -
148 - einfo "Building AWT library"
149 - ${make} make_awt
150 -
151 - einfo "Building SWT library"
152 - ${make} make_swt
153 -
154 - einfo "Building JAVA-AT-SPI bridge"
155 - ${make} make_atk
156 -
157 - if use cairo ; then
158 - einfo "Building CAIRO support"
159 - ${make} make_cairo
160 - fi
161 -
162 - if use opengl ; then
163 - einfo "Building OpenGL component"
164 - ${make} make_glx
165 - fi
166 -
167 - einfo "Building JNI libraries"
168 - eant compile
169 -
170 - einfo "Copying missing files"
171 - cp -i "${S}/version.txt" "${S}/build/version.txt"
172 - cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
173 - "${S}/build/org/eclipse/swt/internal/" || die
174 -
175 - einfo "Packing JNI libraries"
176 - eant jar
177 -}
178 -
179 -src_install() {
180 - swtArch=${ARCH}
181 - use amd64 && swtArch=x86_64
182 - use x86-fbsd && swtArch=x86
183 -
184 - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
185 - use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
186 - sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
187 - use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
188 - sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
189 - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
190 -
191 - java-pkg_sointo /usr/$(get_libdir)
192 - java-pkg_doso *.so
193 -
194 - dohtml about.html
195 -}