commit:     1646ada2285f277f83042ea17a45a336f7e64172
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 22:00:04 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 30 22:00:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1646ada2

media-gfx/freewrl: Remove last-rited package

Bug: https://bugs.gentoo.org/446508
Bug: https://bugs.gentoo.org/678776
Bug: https://bugs.gentoo.org/682600
Bug: https://bugs.gentoo.org/787407
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/freewrl/Manifest                         |   1 -
 .../freewrl/files/freewrl-3.0.0-fno-common.patch   |  11 --
 media-gfx/freewrl/freewrl-3.0.0-r1.ebuild          | 143 --------------------
 media-gfx/freewrl/freewrl-9999.ebuild              | 144 ---------------------
 media-gfx/freewrl/metadata.xml                     |  23 ----
 profiles/package.mask                              |   6 -
 6 files changed, 328 deletions(-)

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
deleted file mode 100644
index f8254aa54db..00000000000
--- a/media-gfx/freewrl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 
84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3
 SHA512 
12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0

diff --git a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch 
b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
deleted file mode 100644
index e3fbc2d736e..00000000000
--- a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/desktop.c
-+++ b/src/lib/desktop.c
-@@ -233,7 +233,7 @@ enum {
-       url2file_task_spawn,
- } url2file_task_tactic;
- 
--enum {
-+typedef enum {
-       file2blob_task_chain,
-       file2blob_task_spawn,
-       file2blob_task_enqueue,

diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild 
b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
deleted file mode 100644
index 545457a3552..00000000000
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
-       S="${WORKDIR}/${P}/freex3d"
-else
-       SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXmu
-       x11-libs/libXt
-       x11-libs/libXxf86vm
-       motif? ( x11-libs/motif:0= )
-       !motif? ( x11-libs/libXaw )
-       media-libs/mesa
-       virtual/opengl
-       media-libs/freealut
-       media-libs/openal
-       media-libs/libpng:0=
-       virtual/jpeg:0=
-       media-libs/imlib2
-       >=media-libs/freetype-2
-       media-libs/fontconfig
-       curl? ( net-misc/curl )
-       osc? ( media-libs/liblo )
-       opencl? ( virtual/opencl )
-       dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-       virtual/pkgconfig
-       java? ( >=virtual/jdk-1.4 )
-       nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-       media-fonts/dejavu
-       app-arch/unzip
-       virtual/imagemagick-tools
-       java? ( >=virtual/jre-1.4 )
-       sox? ( media-sound/sox )"
-
-src_prepare() {
-       epatch_user
-       epatch "${FILESDIR}"/${P}-fno-common.patch
-       eautoreconf
-}
-
-src_configure() {
-       # list of js libs without .pc support, to disable ./configure 
auto-checking
-       local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js 
seamonkey-js )
-       # list of .pc supported spidermonkeys, to disable ./configure 
auto-checking
-       local spidermonkeys_pc=( mozjs187 mozjs185 )
-
-       local myconf="--enable-fontconfig
-               --without-expat
-               --with-x
-               --with-imageconvert=/usr/bin/convert
-               --with-unzip=/usr/bin/unzip
-               --disable-mozjs-17.0
-               ${spidermonkeys[@]/#/ --disable-}"
-
-       if has_version "<dev-lang/spidermonkey-1.8.5" ; then
-               # spidermonkey pre-1.8.5 has no pkg-config, so override 
./configure
-               myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
-               JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-               if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-                       # spidermonkey-1.8 changed the name of the lib
-                       JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-               else
-                       JAVASCRIPT_ENGINE_LIBS="-ljs"
-               fi
-               if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$($(tc-getPKG_CONFIG) --cflags nspr)"
-                       JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs 
nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-               fi
-               export JAVASCRIPT_ENGINE_CFLAGS
-               export JAVASCRIPT_ENGINE_LIBS
-       fi
-       if use nsplugin; then
-               myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-               myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-       fi
-       econf   ${myconf} \
-               $(use_enable curl libcurl) \
-               $(use_with opencl OpenCL) \
-               $(use_enable debug) $(use_enable debug thread_colorized) \
-               $(use_enable libeai) \
-               $(use_enable java) \
-               $(use_enable nsplugin plugin) \
-               $(use_enable osc) \
-               $(use_enable static-libs static) \
-               $(use_enable sox sound) \
-               $(usex sox "--with-soundconv=/usr/bin/sox") \
-               $(usex motif "--with-target=motif" "--with-target=x11") \
-               $(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       if use java; then
-               insinto /usr/share/${PN}/lib
-               doins src/java/java.policy
-               java-pkg_regjar src/java/vrml.jar
-               # install vrml.jar as a JRE extension
-               dodir /usr/java/packages/lib/ext
-               dosym /usr/share/${PN}/lib/vrml.jar 
/usr/java/packages/lib/ext/vrml.jar
-               if ! has_version "media-gfx/freewrl[java]" ; then
-               elog "Because vrml.jar requires access to sockets, you will 
need to incorporate the"
-               elog "contents of /usr/share/${PN}/lib/java.policy into your 
system or user's default"
-               elog "java policy:"
-               elog "  cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-               fi
-       fi
-
-       # remove unneeded .la files (as per Flameeyes' rant)
-       cd "${D}"
-       rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               elog "By default, FreeWRL expects to find the 'firefox' binary 
in your include"
-               elog "path.  If you do not have firefox installed or you wish 
to use a different"
-               elog "web browser to open links that are within VRML / X3D 
files, please be sure to"
-               elog "specify the command via your BROWSER environment 
variable."
-       fi
-}

diff --git a/media-gfx/freewrl/freewrl-9999.ebuild 
b/media-gfx/freewrl/freewrl-9999.ebuild
deleted file mode 100644
index 3e3d9594c1e..00000000000
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://git.code.sf.net/p/freewrl/git";
-       EGIT_BRANCH="develop"
-       S="${WORKDIR}/${P}/freex3d"
-else
-       SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
-       KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc rbp +sox static-libs"
-
-COMMONDEPEND="x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXmu
-       x11-libs/libXt
-       x11-libs/libXxf86vm
-       motif? ( x11-libs/motif:0= )
-       !motif? ( x11-libs/libXaw )
-       media-libs/mesa
-       virtual/opengl
-       media-libs/freealut
-       media-libs/openal
-       media-libs/libpng:0=
-       virtual/jpeg:0=
-       media-libs/imlib2
-       >=media-libs/freetype-2
-       media-libs/fontconfig
-       curl? ( net-misc/curl )
-       osc? ( media-libs/liblo )
-       opencl? ( virtual/opencl )
-       rbp? ( dev-games/ode:0=[double-precision] )
-       dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-       virtual/pkgconfig
-       java? ( >=virtual/jdk-1.4 )
-       nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-       media-fonts/dejavu
-       app-arch/unzip
-       virtual/imagemagick-tools
-       java? ( >=virtual/jre-1.4 )
-       sox? ( media-sound/sox )"
-
-src_prepare() {
-       epatch_user
-       eautoreconf
-}
-
-src_configure() {
-       # list of js libs without .pc support, to disable ./configure 
auto-checking
-       local spidermonkeys=( mozilla-js )
-       # list of .pc supported spidermonkeys, to disable ./configure 
auto-checking
-       local spidermonkeys_pc=( mozjs187 mozjs185 )
-
-       local myconf="--enable-fontconfig
-               --without-expat
-               --with-x
-               --with-imageconvert=/usr/bin/convert
-               --with-unzip=/usr/bin/unzip
-               --with-javascript=spidermonkey
-               ${spidermonkeys[@]/#/ --disable-}"
-
-       if has_version "<dev-lang/spidermonkey-1.8.5:0" ; then
-               # spidermonkey pre-1.8.5 has no pkg-config, so override 
./configure
-               myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
-               JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-               if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-                       # spidermonkey-1.8 changed the name of the lib
-                       JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-               else
-                       JAVASCRIPT_ENGINE_LIBS="-ljs"
-               fi
-               if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-                       JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE 
$($(tc-getPKG_CONFIG) --cflags nspr)"
-                       JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs 
nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-               fi
-               export JAVASCRIPT_ENGINE_CFLAGS
-               export JAVASCRIPT_ENGINE_LIBS
-       fi
-       if use nsplugin; then
-               myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-               myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-       fi
-       econf   ${myconf} \
-               $(use_enable curl libcurl) \
-               $(use_with opencl OpenCL) \
-               $(use_enable debug) $(use_enable debug thread_colorized) \
-               $(use_enable libeai) \
-               $(use_enable java) \
-               $(use_enable nsplugin plugin) \
-               $(use_enable osc) \
-               $(use_enable rbp) \
-               $(use_enable static-libs static) \
-               $(use_enable sox sound) \
-               $(usex sox "--with-soundconv=/usr/bin/sox") \
-               $(usex motif "--with-target=motif" "--with-target=x11") \
-               $(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       if use java; then
-               insinto /usr/share/${PN}/lib
-               doins src/java/java.policy
-               java-pkg_regjar src/java/vrml.jar
-               # install vrml.jar as a JRE extension
-               dodir /usr/java/packages/lib/ext
-               dosym /usr/share/${PN}/lib/vrml.jar 
/usr/java/packages/lib/ext/vrml.jar
-               if ! has_version "media-gfx/freewrl[java]" ; then
-               elog "Because vrml.jar requires access to sockets, you will 
need to incorporate the"
-               elog "contents of /usr/share/${PN}/lib/java.policy into your 
system or user's default"
-               elog "java policy:"
-               elog "  cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-               fi
-       fi
-
-       # remove unneeded .la files (as per Flameeyes' rant)
-       cd "${D}"
-       rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]]; then
-               elog "By default, FreeWRL expects to find the 'firefox' binary 
in your include"
-               elog "path.  If you do not have firefox installed or you wish 
to use a different"
-               elog "web browser to open links that are within VRML / X3D 
files, please be sure to"
-               elog "specify the command via your BROWSER environment 
variable."
-       fi
-}

diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
deleted file mode 100644
index 46c0887e1b1..00000000000
--- a/media-gfx/freewrl/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <!-- maintainer-needed -->
-       <longdescription>
-FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a 
traditional Xorg application 
-and a nsbrowser plugin for use with many available web browsers.  The package 
depends heavily on OpenGL 
-support for rendering.  When developing your 3D world or model, you can 
program with GLSL Shaders using the 
-X3D Shaders Component, put your model exactly where you want them with the 
Geospatial Component, or just 
-throw triangles to the screen as Extrusions, IndexedFaceSets, TriangleSets, 
Circle2D, Disk2D, Spheres, Boxes, 
-Cubes; the list goes on and on.  With royalty free open standards, your models 
will continue to render, year after year. 
-</longdescription>
-       <use>
-               <flag name="libeai">Build EAI C library</flag>
-               <flag name="opencl">Enable OpenCL support</flag>
-               <flag name="osc">Allows for OSC-based control and communication 
between multiple freewrl instances</flag>
-               <flag name="rbp">Enable support for Rigid Body Physics</flag>
-               <flag name="java">Build and install java EAI/SAI support 
library</flag>
-       </use>
-       <upstream>
-               <remote-id type="sourceforge">freewrl</remote-id>
-       </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index f9521236c43..1e1e9a077e2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -406,12 +406,6 @@ dev-java/cldc-api
 # Removal on 2021-05-31
 www-plugins/google-talkplugin
 
-# Andreas Sturmlechner <[email protected]> (2021-05-01)
-# Unmaintained, java depends on deprecated JDK-7, nsplugin is dead.
-# Multiple bugs: #446508, #678776, #682600, #787407
-# Removal on 2021-05-31
-media-gfx/freewrl
-
 # Michał Górny <[email protected]> (2021-05-01)
 # The following packages have not been ported to Python 3.8, and are
 # therefore going to be removed when support for Python 3.7 target is

Reply via email to