diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-18 13:37:57 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-07-18 13:37:57 +0000 |
| commit | 74e932dfc0b35208fcc9e60538e713dce124b106 (patch) | |
| tree | d4bb5e54daa73e81e834d6366a791b929ad76627 /dev-java | |
| parent | e63b13131dd780b825e024160122cb96a2486adc (diff) | |
| download | baldeagleos-repo-74e932dfc0b35208fcc9e60538e713dce124b106.tar.gz baldeagleos-repo-74e932dfc0b35208fcc9e60538e713dce124b106.tar.xz baldeagleos-repo-74e932dfc0b35208fcc9e60538e713dce124b106.zip | |
Adding metadata
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/antlr/antlr-4.5.3-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/gson/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/gson/gson-2.7-r1.ebuild | 22 | ||||
| -rw-r--r-- | dev-java/swt/swt-4.10-r2.ebuild | 26 |
4 files changed, 11 insertions, 40 deletions
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild index 3c70f1210ae3..b9cfe8237899 100644 --- a/dev-java/antlr/antlr-4.5.3-r1.ebuild +++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest index 464459fa1405..2f13307216b1 100644 --- a/dev-java/gson/Manifest +++ b/dev-java/gson/Manifest @@ -1,2 +1 @@ -DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0 diff --git a/dev-java/gson/gson-2.7-r1.ebuild b/dev-java/gson/gson-2.7-r1.ebuild deleted file mode 100644 index 54f042e16ae5..000000000000 --- a/dev-java/gson/gson-2.7-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN}-parent-${PV}" -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java library to convert JSON to Java objects and vice-versa" -HOMEPAGE="https://github.com/google/gson" -SRC_URI="https://github.com/google/${PN}/archive/${MY_P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="2.6" -KEYWORDS="~amd64 ~ppc64 ~x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${PN}-${MY_P}" -JAVA_SRC_DIR="${PN}/src/main/java" diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index 8c3986977dbe..291a35848865 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -87,23 +87,17 @@ 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) == 'ppc64' ]] ; then - # no big-endian support - AWT_ARCH="ppc64le" - 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)" - elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/lib" - else + IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) + + for libpath in "${ldpaths[@]}"; do + if [[ -f "${libpath}/${JAWTSO}" ]]; then + export AWT_LIB_PATH="${libpath}" + break + fi + done + + if [[ -z "${AWT_LIB_PATH}" ]]; then eerror "${JAWTSO} not found in the JDK being used for compilation!" die "cannot build AWT library" fi |