[gentoo-commits] repo/gentoo:master commit in: media-gfx/freewrl/

[Ian Stakenvicius]

commit:     5b68706a43106a106e13c8fa3431c3bcb2b0ef32
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 20:28:51 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 20:34:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b68706a

media-gfx/freewrl: version bump, add missing deps to live ebuild

Package-Manager: portage-2.2.20.1

 media-gfx/freewrl/Manifest                          |  1 +
 .../{freewrl-9999.ebuild => freewrl-3.0.0.ebuild}   | 21 +++++++++++----------
 media-gfx/freewrl/freewrl-9999.ebuild               | 21 +++++++++++----------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 80dab2c..8cb009e 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,2 +1,3 @@
 DIST freewrl-1.22.13.1.tar.bz2 1830305 SHA256 
29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8 SHA512 
6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192
 WHIRLPOOL 
58d301f4f3c1d145b041bb626c8af18954d9cd3da88f348d2341928c2ff050b15e077855b1ef5a2fe18b2218b8d2f8a75e229ca5bf5d683c0c98e4ed132f71cd
 DIST freewrl-2.3.3.1.tar.gz 1731651 SHA256 
71ed11f5f3b4b6a1d2fc740e8e3ed62a83b484c9695968fac5e30db14dbb6fef SHA512 
e205e8d11a3650ddf4f7dd089bdca36fc1879424c88392229ca8c0d532ebc4662f4f2e3bc491a0a1d6300e78c55cebbb57eeef2145a8c96c727c35dfb2a7d00a
 WHIRLPOOL 
d61f65b9f0db94f73760d6b1800be5f77f9898e2305ec93cc43aa8a8631e5d002602a1b79bbec91d30a040479ae01530cb470cb411d803ff8f04c3792e35e545
+DIST freewrl-3.0.0.tar.bz2 1567282 SHA256 
91ab2e8fda840c2d52951f9833fe280080fab8eabd725dcccae1a9f3506c3ceb SHA512 
12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
 WHIRLPOOL 
78734eaa5f5cd7d3dd6bb6c7dff5621ecee2d5aba9f6fc1ce0cdbc851bdf2f58bb4f6416f0e7ad2fbb04122dda4687a2764f46819b83217951e8d1207b88c0f7

diff --git a/media-gfx/freewrl/freewrl-9999.ebuild 
b/media-gfx/freewrl/freewrl-3.0.0.ebuild
similarity index 94%
copy from media-gfx/freewrl/freewrl-9999.ebuild
copy to media-gfx/freewrl/freewrl-3.0.0.ebuild
index f1c85f6..b2efb48 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0.ebuild
@@ -23,16 +23,21 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
 
-COMMONDEPEND="x11-libs/libXau
-       x11-libs/libXdmcp
-       x11-libs/libXext
+COMMONDEPEND="x11-libs/libICE
+       x11-libs/libSM
        x11-libs/libX11
-       motif? ( x11-libs/motif )
+       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/libpng
-       virtual/jpeg
+       media-libs/freealut
+       media-libs/openal
+       media-libs/libpng:0=
+       virtual/jpeg:0=
        media-libs/imlib2
        >=media-libs/freetype-2
        media-libs/fontconfig
@@ -53,10 +58,6 @@ RDEPEND="${COMMONDEPEND}
        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
        eautoreconf
 }

diff --git a/media-gfx/freewrl/freewrl-9999.ebuild 
b/media-gfx/freewrl/freewrl-9999.ebuild
index f1c85f6..b2efb48 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -23,16 +23,21 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
 
-COMMONDEPEND="x11-libs/libXau
-       x11-libs/libXdmcp
-       x11-libs/libXext
+COMMONDEPEND="x11-libs/libICE
+       x11-libs/libSM
        x11-libs/libX11
-       motif? ( x11-libs/motif )
+       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/libpng
-       virtual/jpeg
+       media-libs/freealut
+       media-libs/openal
+       media-libs/libpng:0=
+       virtual/jpeg:0=
        media-libs/imlib2
        >=media-libs/freetype-2
        media-libs/fontconfig
@@ -53,10 +58,6 @@ RDEPEND="${COMMONDEPEND}
        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
        eautoreconf
 }