From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-java/icedtea-web/Manifest | 14 +--- dev-java/icedtea-web/files/README.gentoo-r1 | 56 -------------- .../files/icedtea-web-1.6-javadoc.patch | 11 --- .../files/icedtea-web-1.6-launchers.patch | 79 ------------------- .../icedtea-web/files/icedtea-web-1.6-no-hg.patch | 49 ------------ .../files/icedtea-web-1.6-respect-ldflags.patch | 20 ----- .../files/icedtea-web-1.6-unused-libs.patch | 20 ----- dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild | 88 ---------------------- dev-java/icedtea-web/icedtea-web-1.6.2.ebuild | 86 --------------------- dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild | 5 +- dev-java/icedtea-web/metadata.xml | 5 -- 11 files changed, 5 insertions(+), 428 deletions(-) delete mode 100644 dev-java/icedtea-web/files/README.gentoo-r1 delete mode 100644 dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch delete mode 100644 dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch delete mode 100644 dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch delete mode 100644 dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch delete mode 100644 dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch delete mode 100644 dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild delete mode 100644 dev-java/icedtea-web/icedtea-web-1.6.2.ebuild (limited to 'dev-java/icedtea-web') diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index 9b0baa31ef22..617976a659ba 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1,15 +1,5 @@ -AUX README.gentoo-r1 2328 BLAKE2B 3a9e2be2a241eeebe501c3c97d55c9bd65b3bb1c0b33abeed13dcea238f4c981e3aa173cb385cb15ea184e1ec2d696e630b8b1c497daadb2a79b3e8e287b4600 SHA512 bac787d49827e651fa9a87a2d8a8a64fb714282f569474ebf69712bd2a329c12f7d6fed2b015467c857b66cc0c9e10e7e60ab2186de00f8f3ac6e72353b76628 AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86db295b5ee86f133e5c5c98997b7089f78850cdab38fc841647144474efd95c21d079223062dd9a9cc SHA512 0a844f4b180cfb447e267d9783a50f7785bb3458b5fa04e92b74ace3412b9af0f326adfe92929a3166fdfb37f6ee03553f7b7f097f14eab1c7927d25f5d722db -AUX icedtea-web-1.6-javadoc.patch 463 BLAKE2B 8c6bd88fb3255acfebf91e764bdf4f1677a12d7ea03dbcdd47514ab2d1b240cbc810b8e670c1bb472176323b346ee3a5ddf9aa359bbc1771848334357ad0cb25 SHA512 faa9b4cd96bd6658a9f55ebf7a5f3b75db65a6a813489739df2b8e903bc62cab2cf222a936a52230ff91943263e3ccc303ed7abe4fe8da7bf89a2eed95b3e66d -AUX icedtea-web-1.6-launchers.patch 3136 BLAKE2B b11e4cb0c8c53e8509e68d30bc3190d8846e742e725cc4918fa08979102bca5d6ef643bf6a524f596a0ed9e0d98722227824bd39f1e84859c4680fc17228b057 SHA512 585a8e12a438f884f6b3c24aacb04a7330bf65388c18a51697c17041f5dfa3df3a24474d5d6b2dc43886dafabf0a05e525ef40ac8247c726797750dcb25d5d92 -AUX icedtea-web-1.6-no-hg.patch 2254 BLAKE2B 9939f85cc1234056de045ca8d85f256e5315d0c603a5ec8a2dc026b62a1ee1fdc142db832ebab32cea698a17172257e3eb88f427f966f9e385ba626bd257550d SHA512 22e30347bbb759b60b954acafb8a920e23f673915e89eb13ad9917b6669e8059d52aacb0b90874427376730840e8ed954b14e2de65e8b594a10616b999863523 -AUX icedtea-web-1.6-respect-ldflags.patch 667 BLAKE2B 215247a834785e592d66717d9c88bc4c04a5adb93bb026460ca1bf729a692cb675a950e17a665086aa6b3699ef9406fe70d26c5455d44eccd7b6dd542a0f0a58 SHA512 23903931c48e47cd78d1d73cf2bd5e06249e26939bbef4f41f09d3c3d69d0418e65fe83be542807452ed41bebfd88d2081d731f03dfbd4950495fc16dc9edb1e -AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547b34527c845acf285b4ed1a4c66cbfd48a815391c9662e9a19b7f699199c8d37c160c9452af6e192f9e3c3af8e240d6cbe7 SHA512 215242b418159a8ab3d1523f1ef0765d40212feb572441719a830251fc602620f29a254a5734ab08a6b7a902bc1f27060bbf638826e2291305966edfd3062b74 DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad -DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9 -DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7 DIST icedtea-web-1.8.4.tar.gz 2358591 BLAKE2B a62a88cfce49f473a0ab768ca386c4733d69fd3b603b29a8d5e7478b33030e2d016a0577bfc0fa4657bb0b3f99a2524d1b46cad7a8e4f97c1404eff5ca218613 SHA512 d155ec6ed9a007b2c59fd09fed9f4005a79640016ae62287eab7076c05b5ddd56d07b0ff86babf732f1bb82653fc0f7cf434550eabdaac8d666e64feabe4f890 -EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255 -EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067 -EBUILD icedtea-web-1.8.4-r1.ebuild 2402 BLAKE2B 84299c51d0eb13327b0b8e61913632cca1e11cbb001bfe95df8f38c91d1bed67f4f185fa83a150d34bff5ce9af0ff5b126639a2215a270f35e1421c6b93b1567 SHA512 b7dcebf90e912183b8dffc25b38dd15be014d19ae9d1f84be45a7b2910b4f11d2c5a183534ecdeb16c52258f0f448a692ed7e54ce0af1ee07467f9b26c6d9166 -MISC metadata.xml 742 BLAKE2B 77af156387b358bd5d7193c7ff3d1860ad18dd4f3b65eb2a4437f4278222b61dcd821e3ac680e49f49e28cffac46a880d6b1820bafca47a82ee6f27e4accc70e SHA512 10f58fcaced19937c90c9fbf9b23bb7d8cea129d14261d95c9d8cff24ffa0faa52435ff34577636eb9fd7257e62f71c4f93f856cb9d3af19b0226eb9a0c01f64 +EBUILD icedtea-web-1.8.4-r1.ebuild 2412 BLAKE2B 908ed64b517a4ef3288a112a4051f9e8da8a99333232ed51ec26c58b39d11123ae38ccc0f0f70a213e452f3dd9634831bf9c6ce591119ad2ddfca8794467f281 SHA512 14b3cdc5db7503201e7eaaceb1ecd23628be9b7565022bc538c7abd732de9e16e35bf08024f0b03f0c751fd519ca3b3944944ba900f6d44c6b05bfb2d971485b +MISC metadata.xml 469 BLAKE2B 54ea817d083181e4eaa9b3c3fdad63c7a6b2621290226de6eacce93f5f299f654fb3b9afdf9e4f33f3d26811b532924241278fa934d6bf239587ed8f5d378b8f SHA512 44ad5d5bda997b2640380c24c71e57345ec609dd4b847375b640865a55f28c89b8124ba734756668f5008ff59bf41b014b5e0099b5ec37be43b2ab882e17cbef diff --git a/dev-java/icedtea-web/files/README.gentoo-r1 b/dev-java/icedtea-web/files/README.gentoo-r1 deleted file mode 100644 index 219e14e7f7c3..000000000000 --- a/dev-java/icedtea-web/files/README.gentoo-r1 +++ /dev/null @@ -1,56 +0,0 @@ -Browser plugin --------------- - -The IcedTea browser plugin (NPPlugin) is now made immediately -available to supporting browsers without the need for eselect. Note -that Chromium-based browsers no longer support NPAPI-based plugins -since the code was removed in September 2015. The list of supporting -browsers is shrinking but still includes Firefox as of version 46. - -JVM selection -------------- - -By default, IcedTea's browser plugin and Web Start uses the JVM -selected via eselect or the GENTOO_VM environment variable. Note that -this doesn't have to be an IcedTea JVM. An Oracle JVM will also -work. The choice can be overridden using the itweb-settings -program. Simply blank out the field to restore the default behaviour. - -Coexistence with Oracle's plugin --------------------------------- - -The IcedTea browser plugin can no longer be installed alongside -Oracle's plugin. This used to be possible thanks to eselect -java-nsplugin but this was removed in an effort to simplify things. No -one is likely to need both, especially with plugins being all but -outlawed these days. To avoid any blockers, simply enable the nsplugin -USE flag on icedtea-web or the Oracle packages, but not both. - -If you're wondering why we don't just leave plugin selection to the -browser, it's because Firefox (and probably others) only allows you to -disable all the Java plugins together, not individually. - -Coexistence with Oracle's Web Start ------------------------------------ - -/usr/bin/javaws, the executable used to launch JNLP files from a -browser, will always use IcedTea's implementation over Oracle's when -icedtea-web is installed, regardless of which JVM has been -selected. This is primarily for consistency with the browser -plugin. If you want to use Oracle's implementation then simply -uninstall icedtea-web. - -32-bit plugin on 64-bit systems -------------------------------- - -This is no longer supported as the 64-bit plugin can launch a 32-bit -JVM. Other reasons for running a 32-bit browser on a 64-bit system -have long passed. - -32-bit JVM on 64-bit systems ----------------------------- - -The emul-linux-x86-java package was removed in 2015 with the migration -to full multilib. icedtea-bin now provides this feature via the -multilib USE flag. Once installed, using the 32-bit variant is simply -a case of selecting that VM as described above. diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch deleted file mode 100644 index f69db9b6f582..000000000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.6-javadoc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 -+++ Makefile.am 2016-01-01 14:00:49.857225492 +0000 -@@ -652,7 +652,7 @@ - - stamps/netx-docs.stamp: - if ENABLE_DOCS -- $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $( _OPTS) \ -+ $(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \ - -d ${abs_top_builddir}/docs/netx -sourcepath $(NETX_SRCDIR) \ - -doctitle 'IcedTea-Web: NetX API Specification' \ - -windowtitle 'IcedTea-Web: NetX ' \ diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch deleted file mode 100644 index 57f793a2ff30..000000000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.6-launchers.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- launcher/launchers.in.orig 2015-09-11 14:02:04.252280131 +0100 -+++ launcher/launchers.in 2015-12-18 23:06:35.721135526 +0000 -@@ -7,7 +7,7 @@ - BINARY_LOCATION=@BIN_LOCATION@ - SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ - PROGRAM_NAME=@PROGRAM_NAME@ --CP=@JRE@/lib/rt.jar:@JRE@/lib/jfxrt.jar -+CP=$(java-config -r) - - CONFIG_HOME=$XDG_CONFIG_HOME - if [ "x$CONFIG_HOME" = "x" ] ; then ---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2015-09-11 14:02:04.219279754 +0100 -+++ plugin/icedteanp/IcedTeaNPPlugin.cc 2015-12-19 22:35:23.479775591 +0000 -@@ -137,8 +137,7 @@ - static DIR *data_directory_descriptor; - - // Fully-qualified appletviewer default executable and rt.jar --static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java"; --static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar"; -+static const char* appletviewer_default_executable = ICEDTEA_WEB_JAVA; - //javaws name and binary - static const char* javaws_bin_property = "-Dicedtea-web.bin.location=" JAVAWS_BIN; - static const char* javaws_name_property = "-Dicedtea-web.bin.name=" JAVAWS_NAME; -@@ -298,7 +297,15 @@ - PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str()); - } - } -- return appletviewer_default_rtjar; -+ gchar *stdout; -+ if (g_spawn_command_line_sync("java-config -r", &stdout, NULL, NULL, NULL)) { -+ std::string result = g_strchomp(stdout); -+ g_free(stdout); -+ return result; -+ } else { -+ PLUGIN_ERROR("Failed to query jre bootclasspath with java-config.\n"); -+ return ""; -+ } - } - - static void cleanUpDir(){ ---- plugin/icedteanp/IcedTeaParseProperties.cc.orig 2015-09-11 14:02:04.220279765 +0100 -+++ plugin/icedteanp/IcedTeaParseProperties.cc 2015-12-19 23:06:05.095409132 +0000 -@@ -151,7 +151,15 @@ - } - - string default_java_properties_file(){ -- return ICEDTEA_WEB_JRE "/lib/"+default_file_ITW_deploy_props_name; -+ gchar *stdout; -+ if (g_spawn_command_line_sync("java-config -o", &stdout, NULL, NULL, NULL)) { -+ string result = g_strchomp(stdout); -+ g_free(stdout); -+ return result+"/lib/"+default_file_ITW_deploy_props_name; -+ } else { -+ PLUGIN_ERROR("Failed to query jre location with java-config.\n"); -+ return ""; -+ } - } - - -@@ -224,7 +232,7 @@ - dest = custom_jre_file; - return true; - } -- } else { -+ } else if (!default_java_file.empty()) { - if(IcedTeaPluginUtilities::file_exists(default_java_file)) { - dest = default_java_file; - return true; ---- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 -+++ Makefile.am 2015-12-19 22:37:35.460518630 +0000 -@@ -353,7 +353,7 @@ - -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ - -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \ - -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ -- -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \ -+ -DICEDTEA_WEB_JAVA="\"$(JAVA)\"" \ - -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \ - $(GLIB_CFLAGS) \ - $(MOZILLA_CFLAGS) \ diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch deleted file mode 100644 index a76780e500cb..000000000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.6-no-hg.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- html-gen.sh.orig 2015-09-11 14:02:04.250280108 +0100 -+++ html-gen.sh 2016-01-01 14:13:46.693307166 +0000 -@@ -67,13 +67,18 @@ - if [ -z "$CHANGESETS" ] || [ "$CHANGESETS" -lt 0 ]; then CHANGESETS=10; fi - - NEWS_ITEMS=2 --REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" -+ -+if [ -d .hg ]; then -+ REPO_URL="$(hg paths default | sed -r 's/.*icedtea.classpath.org\/(.*)/\1/')" -+else -+ unset REPO_URL -+fi - - start_time="$(date +%s.%N)" - - cd html-gen - --print_debug "Generating HTML content for javaws -about for $REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" -+print_debug "Generating HTML content for javaws -about${REPO_URL:+ for }$REPO_URL. $CHANGESETS changesets, $NEWS_ITEMS news items" - print_debug "Starting sed substitutions" - for FILE in NEWS AUTHORS COPYING ChangeLog - do -@@ -99,7 +104,9 @@ - sed -i '5i
Jam Icon

' AUTHORS.html - echo "" >> AUTHORS.html - --REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) -+if [ -n "${REPO_URL}" ]; then -+ REVS=(`hg log -l"$CHANGESETS" | grep 'changeset:' | cut -d: -f3 | tr '\n' ' '`) -+fi - - print_debug "Done. Starting formatting (bolding, mailto and hyperlink creation)" - -@@ -132,9 +139,11 @@ - if [[ "$LINE" =~ $date_regex* ]] # Matches line starting with eg 2013-07-01 - then - html_space="\ \ " -- REV="${REVS["$COUNTER"]}" -- # Turn the date into a hyperlink for the revision this changelog entry describes -- LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") -+ if [ -n "${REPO_URL}" ]; then -+ REV="${REVS["$COUNTER"]}" -+ # Turn the date into a hyperlink for the revision this changelog entry describes -+ LINE=$(echo "$LINE" | sed -r "s|($date_regex)($html_space.*$html_space.*)|\1\2|") -+ fi - COUNTER="$(( COUNTER + 1 ))" - fi - if [ "$COUNTER" -gt "$CHANGESETS" ] # Cut to ten changesets diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch deleted file mode 100644 index 1d03b7c4fd16..000000000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 -+++ Makefile.am 2015-12-18 21:37:43.328862431 +0000 -@@ -344,7 +344,7 @@ - $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc - mkdir -p $(PLUGIN_DIR) && \ - cd $(PLUGIN_DIR) && \ -- $(CXX) $(CXXFLAGS) \ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ - $(DEFS) $(VERSION_DEFS) \ - -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ - -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -@@ -362,7 +362,7 @@ - - $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) - cd $(PLUGIN_DIR) && \ -- $(CXX) $(CXXFLAGS) \ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ - $(PLUGIN_OBJECTS) \ - $(GLIB_LIBS) \ - $(MOZILLA_LIBS) \ diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch deleted file mode 100644 index b0dc15d32c78..000000000000 --- a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.ac.orig 2015-09-11 14:02:04.250280108 +0100 -+++ configure.ac 2016-02-18 09:36:04.684624293 +0000 -@@ -55,17 +55,6 @@ - IT_SET_VERSION - IT_CHECK_XULRUNNER_VERSION - --AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) --dnl Check for libX11 headers and libraries. --PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) --if test "x${X11_FOUND}" = xno --then -- AC_MSG_ERROR([Could not find x11 - \ -- Try installing libX11-devel.]) --fi --AC_SUBST(X11_CFLAGS) --AC_SUBST(X11_LIBS) -- - dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin - dnl IT563 - NetX uses sun.security code - dnl IT605 - NetX depends on sun.misc.HexDumpEncoder diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild deleted file mode 100644 index ce19e653d3c5..000000000000 --- a/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -README_GENTOO_SUFFIX="-r1" - -inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc64 x86" -IUSE="doc javascript nsplugin tagsoup test" -RESTRICT="test" - -CDEPEND="javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( >=dev-libs/glib-2.16:2= ) - tagsoup? ( dev-java/tagsoup:0 )" - -DEPEND="${CDEPEND} - app-arch/zip - >=virtual/jdk-1.7 - virtual/pkgconfig - nsplugin? ( net-misc/npapi-sdk ) - test? ( >=dev-java/junit-4.8:4 )" - -RDEPEND="${CDEPEND} - >=app-eselect/eselect-java-0.2.0 - >=virtual/jre-1.7 - nsplugin? ( - !dev-java/oracle-jdk-bin[nsplugin] - !dev-java/oracle-jre-bin[nsplugin] - )" - -src_prepare() { - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779 - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780 - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855 - epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch - - if java-pkg_is-vm-version-ge "1.8" ; then - sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - local tagsoup - use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)" - - local config=( - # Rename javaws to itweb-javaws as eselect java-vm manages - # javaws to prevent a clash with Oracle's implementation. - --program-transform-name='s/^javaws$/itweb-javaws/' - --libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins - --with-java="${EPREFIX}"/usr/bin/java - --with-jdk-home="${JAVA_HOME}" - $(use_enable doc docs) - $(use_enable nsplugin plugin) - $(use_with javascript rhino) - $(use_with tagsoup tagsoup "${tagsoup}") - ) - - # See bug #573060. - xdg_environment_reset - - # Rely on the --with-jdk-home option given above. - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf "${config[@]}" -} - -src_compile() { - default -} - -src_install() { - default - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild deleted file mode 100644 index d680ff97d0cb..000000000000 --- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -README_GENTOO_SUFFIX="-r1" - -inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils - -DESCRIPTION="FOSS Java browser plugin and Web Start implementation" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" -LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="doc javascript nsplugin tagsoup test" -RESTRICT="test" - -CDEPEND="javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( >=dev-libs/glib-2.16:2= ) - tagsoup? ( dev-java/tagsoup:0 )" - -DEPEND="${CDEPEND} - app-arch/zip - >=virtual/jdk-1.7 - virtual/pkgconfig - nsplugin? ( net-misc/npapi-sdk ) - test? ( >=dev-java/junit-4.8:4 )" - -RDEPEND="${CDEPEND} - >=app-eselect/eselect-java-0.2.0 - >=virtual/jre-1.7 - nsplugin? ( - !dev-java/oracle-jdk-bin[nsplugin] - !dev-java/oracle-jre-bin[nsplugin] - )" - -src_prepare() { - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855 - epatch "${FILESDIR}"/${PN}-1.6-{launchers,respect-ldflags,unused-libs}.patch - - if java-pkg_is-vm-version-ge "1.8" ; then - sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - local tagsoup - use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)" - - local config=( - # Rename javaws to itweb-javaws as eselect java-vm manages - # javaws to prevent a clash with Oracle's implementation. - --program-transform-name='s/^javaws$/itweb-javaws/' - --libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins - --with-java="${EPREFIX}"/usr/bin/java - --with-jdk-home="${JAVA_HOME}" - $(use_enable doc docs) - $(use_enable nsplugin plugin) - $(use_with javascript rhino) - $(use_with tagsoup tagsoup "${tagsoup}") - ) - - # See bug #573060. - xdg_environment_reset - - # Rely on the --with-jdk-home option given above. - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf "${config[@]}" -} - -src_compile() { - default -} - -src_install() { - default - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild index 59471a081976..caabab18f661 100644 --- a/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.8.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz $(cargo_crate_uris ${CRATES})" LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ppc64 x86" IUSE="doc" # tests require ton of java deps we don't have packaged/working @@ -23,6 +23,7 @@ RESTRICT="test" BDEPEND=" app-arch/zip + sys-devel/bc virtual/jdk:1.8 virtual/pkgconfig virtual/rust diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml index ebaf03b08ffb..9f30040ec416 100644 --- a/dev-java/icedtea-web/metadata.xml +++ b/dev-java/icedtea-web/metadata.xml @@ -8,11 +8,6 @@ FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea. - - Enable support for using proxy auto config (PAC) files. - Enable the browser plugin (NPPlugin). - Depend on dev-java/tagsoup which allows parsing malformed .jnlp files - AdoptOpenJDK/IcedTea-Web -- cgit v1.2.3