diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/swt/swt-4.37.ebuild | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/dev-java/swt/swt-4.37.ebuild b/dev-java/swt/swt-4.37.ebuild index 32f456cfe82e..6ad352a2caed 100644 --- a/dev-java/swt/swt-4.37.ebuild +++ b/dev-java/swt/swt-4.37.ebuild @@ -60,7 +60,7 @@ RDEPEND="${COMMON_DEP} HTML_DOCS=( ../about.html ) JAVA_RESOURCE_DIRS="../resources" -JAVA_SRC_DIR="../src" +JAVA_SRC_DIR="../org" PATCHES=( "${FILESDIR}/swt-4.37-as-needed-and-flag-fixes.patch" ) @@ -72,16 +72,15 @@ src_unpack() { src_prepare() { default #780585 java-pkg-2_src_prepare - # .css stuff is essential at least for running net-p2p/biglybt - unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die - java-pkg_clean cd .. || die - mkdir resources src || die "mkdir failed" - find org -type f -name '*.java' | - xargs cp --parent -t src -v \ - || die "copying resources failed" - find org -type f ! -name '*.java' | - xargs cp --parent -t resources -v \ + mkdir -p resources/META-INF src || die "mkdir failed" + # save SWT-OS and SWT-Arch attributes from original MANIFEST.MF + unzip swt.jar META-INF/MANIFEST.MF -d . || die "failed to extract manifest" + grep '^SWT-OS\|^SWT-Arch' META-INF/MANIFEST.MF \ + > resources/META-INF/MANIFEST.MF || die "MANIFEST.MF" + java-pkg_clean + find org -type f ! -name '*.java' ! -name 'package.html' | + xargs cp --parent -t resources \ || die "copying resources failed" cp version.txt resources || die "adding version.txt failed" } |