QA fixes

Signed-off-by: Igor Ulyanov <disinbox@gmail.com>

8 files changed, 1 insertions, 442 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
deleted file mode 100644
index adeb24d..0000000
--- a/media-gfx/freewrl/ChangeLog
+++ /dev/null
@@ -1,238 +0,0 @@
-# ChangeLog for media-gfx/freewrl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.53 2013/12/23 16:20:49 axs Exp $
-
-*freewrl-1.22.13-r3 (23 Dec 2013)
-
-  23 Dec 2013; Ian Stakenvicius <axs@gentoo.org>
-  +files/freewrl-1.22.13-desktop.patch, +freewrl-1.22.13-r3.ebuild,
-  -freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
-  fixed freewrl.desktop as per bug 495108
-
-  09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
-  freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
-  Adjusted deps for dev-lang/spidermonkey to ensure SLOT=0
-
-*freewrl-9999 (29 May 2013)
-
-  29 May 2013; Ian Stakenvicius <axs@gentoo.org> +freewrl-9999.ebuild:
-  added live ebuild. NOTE, upstream does NOT keep HEAD in a buildable state,
-  ymmv
-
-*freewrl-1.22.13-r2 (04 Nov 2012)
-
-  04 Nov 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
-  +freewrl-1.22.13-r2.ebuild:
-  reduce elog spam, add EAPI=5 ebuild with slot-operator dep on spidermonkey
-
-  24 Oct 2012; Ulrich Müller <ulm@gentoo.org> freewrl-1.22.13-r1.ebuild:
-  Update dependency after package move from x11-libs/openmotif to
-  x11-libs/motif.
-
-*freewrl-1.22.13-r1 (05 Sep 2012)
-
-  05 Sep 2012; Ian Stakenvicius <axs@gentoo.org> -freewrl-1.22.13.ebuild,
-  +freewrl-1.22.13-r1.ebuild:
-  revbump since the last patch was for a runtime issue instead of build-time
-  (thanks Ian)
-
-  29 Aug 2012; Ian Stakenvicius <axs@gentoo.org>
-  files/freewrl-1.22.13-fontconfig-match.patch:
-  fixed bad patch in last commit
-
-  29 Aug 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild,
-  +files/freewrl-1.22.13-fontconfig-match.patch:
-  fixed upstream bug id 3553666 re compatibility with fontconfig-2.90, thanks
-  to Ian Abbott for reporting
-
-  28 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild,
-  +files/freewrl-1.22.13-mozjs187-config.patch:
-  patched in support for spidermonkey-1.8.7
-
-  13 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild:
-  updated ebuild to use new upstream tarball, fixes minor build system issue
-  with plugin
-
-  08 Jun 2012; Zac Medico <zmedico@gentoo.org> freewrl-1.22.13.ebuild:
-  inherit multilib for get_libdir
-
-*freewrl-1.22.13 (06 Jun 2012)
-
-  06 Jun 2012; Ian Stakenvicius <axs@gentoo.org> -freewrl-1.22.12_pre2.ebuild,
-  +freewrl-1.22.13.ebuild:
-  New release + remove old
-
-  05 May 2012; Jeff Horelick <jdhore@gentoo.org> freewrl-1.22.12_pre2.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  01 Dec 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild:
-  fixed expat lib path error, bug 376863 (reopened)
-
-  22 Nov 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild,
-  metadata.xml:
-  fixed dependencies to rely directly on spidermonkey instead of optionally on
-  xulrunner, and to rely on npapi-sdk instead of xulrunner or firefox
-
-  13 Oct 2011; Ian Stakenvicius <axs@gentoo.org> ChangeLog:
-  Taking over maintainership, thanks Patrick!
-
-  29 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.10-r1.ebuild:
-  Remove old
-
-  28 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.9.ebuild,
-  -freewrl-1.22.10.ebuild:
-  Remove old
-
-*freewrl-1.22.12_pre2 (28 Jul 2011)
-
-  28 Jul 2011; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.12_pre2.ebuild,
-  metadata.xml:
-  Bump, modified ebuild by Ian
-
-  22 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  freewrl-1.22.10-r1.ebuild:
-  Fix spidermonkey version for the new versioning scheme
-
-  21 May 2011; Samuli Suominen <ssuominen@gentoo.org>
-  freewrl-1.22.10-r1.ebuild:
-  Use -lmozjs instead of -ljs and force at least spidermonkey >= 1.9 wrt
-  #361663 by Ian Stakenvicius.
-
-*freewrl-1.22.10-r1 (02 Apr 2011)
-
-  02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> freewrl-1.22.10.ebuild,
-  +freewrl-1.22.10-r1.ebuild:
-  Rename USE="static" to USE="static-libs" wrt #361659. Force spidermonkey as
-  javascript engine until xulrunner-2 support is available wrt #361663.
-
-  01 Apr 2011; Patrick Lauer <patrick@gentoo.org> freewrl-1.22.9.ebuild,
-  freewrl-1.22.10.ebuild:
-  Fixing xulrunner dep for #361289
-
-  28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> freewrl-1.22.9.ebuild,
-  freewrl-1.22.10.ebuild:
-  Use virtual/jpeg.
-
-*freewrl-1.22.10 (02 Nov 2010)
-
-  02 Nov 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.10.ebuild:
-  Bump for #343449
-
-  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> freewrl-1.22.9.ebuild:
-  Fix openmotif dependency.
-
-*freewrl-1.22.9 (26 Aug 2010)
-
-  26 Aug 2010; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.6-r1.ebuild,
-  -freewrl-1.22.8.ebuild, +freewrl-1.22.9.ebuild:
-  Bump
-
-  25 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  freewrl-1.22.6-r1.ebuild, freewrl-1.22.8.ebuild:
-  Fix references for pkgmove from www-client/mozilla-firefox ->
-  www-client/firefox
-
-*freewrl-1.22.8 (08 Jun 2010)
-
-  08 Jun 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.8.ebuild,
-  metadata.xml:
-  Bump, thanks to Ian for the patch
-
-  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
-  freewrl-1.22.6-r1.ebuild, +files/freewrl-1.22.6-libpng14.patch:
-  Fix building with libpng14.
-
-*freewrl-1.22.6-r1 (08 Feb 2010)
-
-  08 Feb 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.6-r1.ebuild,
-  +files/freewrl-1.22.6-xulrunner192-fixes.patch:
-  Fix for xulrunner-1.9.2 by Ian Stakenvicius, fixes #303183
-
-  01 Feb 2010; Markus Meier <maekke@gentoo.org> freewrl-1.22.5.ebuild:
-  x86 stable, bug #300602
-
-  14 Jan 2010; <hwoarang@gentoo.org> freewrl-1.22.5.ebuild:
-  Stable on amd64 wrt bug #300602
-
-*freewrl-1.22.6 (07 Jan 2010)
-
-  07 Jan 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.6.ebuild:
-  Bump
-
-  05 Oct 2009; Patrick Lauer <patrick@gentoo.org> metadata.xml:
-  Taking over package from hanno with ian as proxy maintainer
-
-*freewrl-1.22.5 (05 Oct 2009)
-
-  05 Oct 2009; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.5.ebuild,
-  metadata.xml:
-  Bump to 1.22.5, fixes #192840. Thanks to Ian Stakenvicius for the updated
-  ebuild
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  freewrl-1.16.1.ebuild, freewrl-1.18.10.ebuild, freewrl-1.18.14.ebuild,
-  freewrl-1.19.1.ebuild:
-  Drop virtual/x11 references.
-
-*freewrl-1.19.1 (02 Apr 2007)
-
-  02 Apr 2007; Hanno Boeck <hanno@gentoo.org> +freewrl-1.19.1.ebuild:
-  Version bump.
-
-*freewrl-1.18.14 (13 Feb 2007)
-
-  13 Feb 2007; Hanno Boeck <hanno@gentoo.org> +freewrl-1.18.14.ebuild:
-  Version bump.
-
-*freewrl-1.18.10 (17 Jan 2007)
-
-  17 Jan 2007; Hanno Boeck <hanno@gentoo.org> +files/freewrl-makefile,
-  +freewrl-1.18.10.ebuild:
-  Version bump and don't install fonts any more, depend on ttf-bitstream-vera
-  instead and set a symlink.
-
-  27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
-  -files/FreeWRL-1.06+gentoo_pd.diff, -freewrl-1.06.ebuild:
-  clean out old, non-modX ebuild
-
-  13 Feb 2006; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild,
-  freewrl-1.16.1.ebuild:
-  Virtuals for perl-core
-
-  18 Jan 2006; Hanno Boeck <hanno@gentoo.org> freewrl-1.16.1.ebuild:
-  Modular X dependencies.
-
-  14 Jan 2006; Hanno Boeck <hanno@gentoo.org> freewrl-1.16.1.ebuild:
-  Fails with parallel build, set MAKEOPTS to -j1.
-
-  30 Dec 2005; <mcumming@gentoo.org> freewrl-1.06.ebuild:
-  Migrating libnet to perl-core
-
-  20 Dec 2005; Hanno Boeck <hanno@gentoo.org> freewrl-1.06.ebuild:
-  Remove dep on saxon-bin (bug #109622).
-
-*freewrl-1.16.1 (20 Dec 2005)
-
-  20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
-  +files/freewrl-1.16.1-disable-rpm.patch,
-  +files/freewrl-1.16.1-plugin-install.patch,
-  +files/freewrl-1.16.1-use-java-home.patch, +freewrl-1.16.1.ebuild:
-  Version bump, thanks to basic in bug #74706.
-
-  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> freewrl-1.06.ebuild:
-  Remove GNUish cp -a call. Bug #103487.
-
-  25 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
-  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
-
-  24 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
-  dev-perl/Digest-MD5 => perl-core/Digest-MD5
-
-  01 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> freewrl-1.06.ebuild:
-  dev-java/saxon -> dev-java/saxon-bin
-
-*freewrl-1.06 (27 Jun 2004)
-
-  27 Jun 2004; Hanno Boeck <hanno@gentoo.org>
-  +files/FreeWRL-1.06+gentoo_pd.diff, +freewrl-1.06.ebuild:
-  User submitted ebuild from Denis Pitzalis in bug #22358.
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
deleted file mode 100644
index 01fe5e7..0000000
--- a/media-gfx/freewrl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX freewrl-1.22.13-desktop.patch 350 SHA256 09176fe7ef22d8d0a2381bfb70edbacc99967c03cdf8a7677f948a9ca1149efb SHA512 3e8a2e2275243ac55a0a62b105aeff1166a39798e34f94878b46e02fdacc038d386768e388529b550d755c737e574f988b2ffacbc64f224ed6e5d6d67de2b4e2 WHIRLPOOL b0b07aa8d0b7a4e181e2ae72f277c536bdb9f3e04670a021a3fd4222a6df06c81b8f72ab5fbfe4749a22865d7c65aa02d29cbe4e3821024387443fee62ab6764
-AUX freewrl-1.22.13-fontconfig-match.patch 666 SHA256 81ad402685aac3746a1d3fefe3ce77e46f0d7521e721d02f6ceb2fa60b9501c5 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5 WHIRLPOOL 991306f3174466a7505a85592db0b6196f0f55fe4d5b0cb70b72b20c101d7f637b4dac34c2fd9c6b5e627c7c88ccdfc8db4a2b91b863271699fd75d130b4c0b0
-AUX freewrl-1.22.13-mozjs187-config.patch 486 SHA256 340a489d70b1e0d450b779f35686f09c1a50ba62cd8de5bb34340dec8c5ad561 SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298 WHIRLPOOL f54fb2c381f9fcd0c284898d49c9fd10e0210ade9399a47f241c4657d0c0e6f00edcfb1c3624164ad884562a1eea905f4a59b64979d4110ba3404430eef10e67
-EBUILD freewrl-9999.ebuild 4587 SHA256 0ed3b773405477fadc892902f25f746b2a5ddefb02eb66e3fa746b530ef45566 SHA512 a20e6b9f5a86672892481add22402587853203ea17de4096570427bb47c6bda505ef1fcec045fba1a706593d2bf76d6a56bd6cd4279b08e9547c4e05732c1b67 WHIRLPOOL 0068810dd5cb2a42c879af4689a76b2ec8b9397a013eb9719f56bbeadd2d5fd1ac1ca84c99a8f94b4cbd2351f4239fcaca25f39da89780e2fadeef390a809b6d
-MISC ChangeLog 8329 SHA256 bc2064b96d0ce58050ac9368cae9c23b503155f9bf4d1efdc79f4486e8d70831 SHA512 e94abf921d19153f01b85758da547e7ce84d146ac12054f9d6c576f20305b45d96b094823aba43a44bba922db80c0350c71c33fe2a090d73791fcdd1cc212ef6 WHIRLPOOL 6222756ca7c32f6f917bf9e516a46bcc7b6ff1499cded1fd8de4f0bd8ef8a6ff4a00b458820f2ac069a64fc3632bdfaae285e3b5ac122d9d10cb4e6f6784175b
-MISC metadata.xml 547 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37 SHA512 0aaab59986ebcf9e64ef7ae5e1ff32e7e3a07de5e095245a1e2b1676c85f5e23f32a56da37f60dfb3cc6ba1c2f1837d792c2fc8ee9c5418f89c04d30345df877 WHIRLPOOL 8decb4e0059bb3075e79ad43e39640b1d28daebad84157f47320bb23f426dcba9ad062d262466b320e240c933999411c6e822b0a740eb93d2c363d2e304608b8
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
deleted file mode 100644
index 6d620b7..0000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/freewrl-1.22.13/data/freewrl.desktop	2009-06-08 06:26:21.000000000 -0400
-+++ b/freewrl-1.22.13/data/freewrl.desktop	2013-12-23 10:45:54.916307951 -0500
-@@ -3,7 +3,7 @@
- Name=FreeWRL
- Comment=View X3D and VRML files
- Exec=/usr/bin/freewrl
--Icon=freewrl.png
-+Icon=freewrl
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;Viewer;
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
deleted file mode 100644
index 36b844e..0000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/scenegraph/Component_Text.c	15 Aug 2012 13:31:45 -0000	1.56
-+++ src/lib/scenegraph/Component_Text.c	29 Aug 2012 14:18:43 -0000	1.57
-@@ -370,6 +370,7 @@
-     FcPattern *FW_fp=NULL;
-     FcPattern *FW_fm=NULL;
-     FcChar8 *FW_file=NULL;
-+    FcResult fcjunkresult;
-     #else
- 
-     if (!p->font_directory) {
-@@ -487,7 +488,7 @@
-     #ifdef HAVE_FONTCONFIG
-     FcConfigSubstitute(0,FW_fp,FcMatchPattern);
-     FcDefaultSubstitute(FW_fp);
--    if (!(FW_fm = FcFontMatch(0,FW_fp,0))) {
-+    if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) {
- 	/* do whatever is done when no match found */
- 	printf ("could not find font for id %x\n",num);
-     } else {
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
deleted file mode 100644
index 645a231..0000000
--- a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2012-06-13 13:17:43.000000000 -0400
-+++ b/configure.ac	2012-06-18 15:34:59.000000000 -0400
-@@ -192,6 +192,7 @@
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0])
-         ;;
-      *)
-+        AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9])
-         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8])
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
deleted file mode 100644
index 1f29e0b..0000000
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.3 2013/12/23 16:20:49 axs Exp $
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/Displacer/freewrl"
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.1.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 +glew java libeai motif +nsplugin osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	glew? ( media-libs/glew )
-	virtual/opengl
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
-	app-arch/unzip
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	if [[ ${PV} != "9999" ]]; then
-	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
-	epatch "${FILESDIR}"/${P}-mozjs187-config.patch
-	fi
-	epatch_user
-	S="${S}/freex3d/"
-}
-
-src_configure() {
-	eautoreconf
-	# 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
-		--without-glu
-		--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" ; 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[threadsafe] ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-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 glew) \
-		$(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/metadata.xml b/media-gfx/freewrl/metadata.xml
deleted file mode 100644
index 2dd4b2b..0000000
--- a/media-gfx/freewrl/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>axs@gentoo.org</email>
-	<name>Ian Stakenvicius</name>
-</maintainer>
-<use> 
-        <flag name='glew'>Enable glew extensions</flag>
-        <flag name='libeai'>Build EAI C library</flag>
-        <flag name='osc'>Allows for OSC-based control and communication between multiple freewrl instances</flag>
-        <flag name='java'>Build and install java EAI/SAI support library</flag>
-</use>
-</pkgmetadata>
diff --git a/sci-geosciences/osgearth/osgearth-9999.ebuild b/sci-geosciences/osgearth/osgearth-9999.ebuild
index 7345101..fb134f0 100644
--- a/sci-geosciences/osgearth/osgearth-9999.ebuild
+++ b/sci-geosciences/osgearth/osgearth-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph"
 HOMEPAGE="http://osgearth.org/"
 
 if [[ "${PV}" = "9999" ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://github.com/Displacer/osgearth.git"
 else
         SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz"