Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freewrl/
Date: Fri, 28 Aug 2015 20:35:54
Message-Id: 1440794097.5b68706a43106a106e13c8fa3431c3bcb2b0ef32.axs@gentoo
1 commit: 5b68706a43106a106e13c8fa3431c3bcb2b0ef32
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 20:28:51 2015 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 20:34:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b68706a
7
8 media-gfx/freewrl: version bump, add missing deps to live ebuild
9
10 Package-Manager: portage-2.2.20.1
11
12 media-gfx/freewrl/Manifest | 1 +
13 .../{freewrl-9999.ebuild => freewrl-3.0.0.ebuild} | 21 +++++++++++----------
14 media-gfx/freewrl/freewrl-9999.ebuild | 21 +++++++++++----------
15 3 files changed, 23 insertions(+), 20 deletions(-)
16
17 diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
18 index 80dab2c..8cb009e 100644
19 --- a/media-gfx/freewrl/Manifest
20 +++ b/media-gfx/freewrl/Manifest
21 @@ -1,2 +1,3 @@
22 DIST freewrl-1.22.13.1.tar.bz2 1830305 SHA256 29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192 WHIRLPOOL 58d301f4f3c1d145b041bb626c8af18954d9cd3da88f348d2341928c2ff050b15e077855b1ef5a2fe18b2218b8d2f8a75e229ca5bf5d683c0c98e4ed132f71cd
23 DIST freewrl-2.3.3.1.tar.gz 1731651 SHA256 71ed11f5f3b4b6a1d2fc740e8e3ed62a83b484c9695968fac5e30db14dbb6fef SHA512 e205e8d11a3650ddf4f7dd089bdca36fc1879424c88392229ca8c0d532ebc4662f4f2e3bc491a0a1d6300e78c55cebbb57eeef2145a8c96c727c35dfb2a7d00a WHIRLPOOL d61f65b9f0db94f73760d6b1800be5f77f9898e2305ec93cc43aa8a8631e5d002602a1b79bbec91d30a040479ae01530cb470cb411d803ff8f04c3792e35e545
24 +DIST freewrl-3.0.0.tar.bz2 1567282 SHA256 91ab2e8fda840c2d52951f9833fe280080fab8eabd725dcccae1a9f3506c3ceb SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0 WHIRLPOOL 78734eaa5f5cd7d3dd6bb6c7dff5621ecee2d5aba9f6fc1ce0cdbc851bdf2f58bb4f6416f0e7ad2fbb04122dda4687a2764f46819b83217951e8d1207b88c0f7
25
26 diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-3.0.0.ebuild
27 similarity index 94%
28 copy from media-gfx/freewrl/freewrl-9999.ebuild
29 copy to media-gfx/freewrl/freewrl-3.0.0.ebuild
30 index f1c85f6..b2efb48 100644
31 --- a/media-gfx/freewrl/freewrl-9999.ebuild
32 +++ b/media-gfx/freewrl/freewrl-3.0.0.ebuild
33 @@ -23,16 +23,21 @@ LICENSE="GPL-3"
34 SLOT="0"
35 IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
36
37 -COMMONDEPEND="x11-libs/libXau
38 - x11-libs/libXdmcp
39 - x11-libs/libXext
40 +COMMONDEPEND="x11-libs/libICE
41 + x11-libs/libSM
42 x11-libs/libX11
43 - motif? ( x11-libs/motif )
44 + x11-libs/libXext
45 + x11-libs/libXmu
46 + x11-libs/libXt
47 + x11-libs/libXxf86vm
48 + motif? ( x11-libs/motif:0= )
49 !motif? ( x11-libs/libXaw )
50 media-libs/mesa
51 virtual/opengl
52 - media-libs/libpng
53 - virtual/jpeg
54 + media-libs/freealut
55 + media-libs/openal
56 + media-libs/libpng:0=
57 + virtual/jpeg:0=
58 media-libs/imlib2
59 >=media-libs/freetype-2
60 media-libs/fontconfig
61 @@ -53,10 +58,6 @@ RDEPEND="${COMMONDEPEND}
62 sox? ( media-sound/sox )"
63
64 src_prepare() {
65 - if [[ ${PV} != "9999" ]]; then
66 - epatch "${FILESDIR}"/${P}-fontconfig-match.patch
67 - epatch "${FILESDIR}"/${P}-mozjs187-config.patch
68 - fi
69 epatch_user
70 eautoreconf
71 }
72
73 diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
74 index f1c85f6..b2efb48 100644
75 --- a/media-gfx/freewrl/freewrl-9999.ebuild
76 +++ b/media-gfx/freewrl/freewrl-9999.ebuild
77 @@ -23,16 +23,21 @@ LICENSE="GPL-3"
78 SLOT="0"
79 IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
80
81 -COMMONDEPEND="x11-libs/libXau
82 - x11-libs/libXdmcp
83 - x11-libs/libXext
84 +COMMONDEPEND="x11-libs/libICE
85 + x11-libs/libSM
86 x11-libs/libX11
87 - motif? ( x11-libs/motif )
88 + x11-libs/libXext
89 + x11-libs/libXmu
90 + x11-libs/libXt
91 + x11-libs/libXxf86vm
92 + motif? ( x11-libs/motif:0= )
93 !motif? ( x11-libs/libXaw )
94 media-libs/mesa
95 virtual/opengl
96 - media-libs/libpng
97 - virtual/jpeg
98 + media-libs/freealut
99 + media-libs/openal
100 + media-libs/libpng:0=
101 + virtual/jpeg:0=
102 media-libs/imlib2
103 >=media-libs/freetype-2
104 media-libs/fontconfig
105 @@ -53,10 +58,6 @@ RDEPEND="${COMMONDEPEND}
106 sox? ( media-sound/sox )"
107
108 src_prepare() {
109 - if [[ ${PV} != "9999" ]]; then
110 - epatch "${FILESDIR}"/${P}-fontconfig-match.patch
111 - epatch "${FILESDIR}"/${P}-mozjs187-config.patch
112 - fi
113 epatch_user
114 eautoreconf
115 }