fixed freewrl.desktop as per bug 495108

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 34 insertions, 12 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 5143b05ab5d0..adeb24d9132c 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.52 2013/08/09 13:42:13 axs Exp $
+# $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:
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 22c653be06b4..22456baaa358 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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
 DIST freewrl-1.22.13.1.tar.bz2 1830305 SHA256 29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192 WHIRLPOOL 58d301f4f3c1d145b041bb626c8af18954d9cd3da88f348d2341928c2ff050b15e077855b1ef5a2fe18b2218b8d2f8a75e229ca5bf5d683c0c98e4ed132f71cd
 EBUILD freewrl-1.22.13-r1.ebuild 4484 SHA256 30a6a5334ea57c14e4338987ba1700be6258b019ec0c8dddfbb418346dca53bf SHA512 04314af88ce9f656bd3fb655cc63ba6fe7828bf610d8c91fdf11a0c76faab9bcd8d0936ff915f716ba36b97865a5a9cbd32697615150f3249962603ef660c98a WHIRLPOOL b6f8b255d6c3b19d33f4743b3c1825f562245df3f6998e538e6fd1ae259933a0c7a131add833c8f0c10a4988899d05d79cdb3e19e10889f75b6ea71252ac1449
-EBUILD freewrl-1.22.13-r2.ebuild 4485 SHA256 ee774c63b72ce3b9eed9dba5475b601ef5c1a265f38caaab6956031738f2c8df SHA512 bd8c538e67bb82ebc07075856fbe726aab628e8dd06c19955377859b828be6686678c36f1a683594d92295bb12fc507150fcc0092b0aa442082d60d951508dcf WHIRLPOOL b50237a4ea5c00ba3ed0d46c08547c739c169cd5c8051ab6dce10146a464ac226d04871941da93a4c247033149f4217782655532280cb851291688aa8353ded8
-EBUILD freewrl-9999.ebuild 4735 SHA256 c66a86553c5e5e923f9b5941df9cd564d7f80d4db521f7bfaf279c03edd6b67d SHA512 45aa887d65e14d6119bb13f1ebec30cec416e742a94f6819c193367433a501ea15b7a501644f888edab8d214aa46a15a691f9e5dbbf25e3dc065163644e9604f WHIRLPOOL 27ed7f1f94daa6333cbf1acbcd2ea0534ebd168b51d6d37a3e3464990ff79c2ec5cdf05a4f0e50a869c65a48c98b0fc907416f57e7d8630047b595937fee06a5
-MISC ChangeLog 8083 SHA256 055364079f698a275cd01daab6da038dbe77af05a8466b1fe8b3788eec22dcd0 SHA512 5605836d706cd87b086563646f22bb79055d3d37a688fc84ab3887f1564c93ad7e37383bb3041698d490efc855d1cba313ff05369e475148cf32b0ca0f56f4ec WHIRLPOOL d7c42c486ce87cb97430534fd235a3db2964e738b03c196a8012e0f50753f60d57abc8b2e9f4f89ddbcb3dfde861e28e5a16e11c61aabb3a77a0ff4fb5e0dfa6
+EBUILD freewrl-1.22.13-r3.ebuild 4526 SHA256 693dff5797fb73fbc1fee26f75be741ad6ccdccbbd147aaecabbbfe50c41211e SHA512 3da6115aa105d3eab3c0de5fa6a2cb17bed70b72171868cc59c971d53ddbe3911a553942e3502e5534d6165918245e81a1ccb57277a91635d5b62acf94dd8a2c WHIRLPOOL ca349ae431c2061dde894a334f3b6fcb4176c5f4ec769c9b0d8bc8c0bb5e3b4c8bdf51c2a6add4ede4e2e19ad8f7fc123af5d783c73aacc5a4d3cfc4bb52d69a
+EBUILD freewrl-9999.ebuild 4766 SHA256 de3abfdc53179406b38dc977aaec9021873fe6fa11a408a6f3b8f081b057c28f SHA512 c42fbd14d951ed364ce29487abef6b03fba4e1b401f3071339ecf62cc076b25c5fa373e65e38a036cde16bc0bcf8b243d20302c0f23391722b33f69c9b594a3e WHIRLPOOL fed3edb8866ef868a7785a55b08e6bad46f06bd8277f76dba45990a1edcf6d95de9f483fdf648cb44c857ea5f9e8dfb131eab302aed6cad888e0ab512ecd7c3a
+MISC ChangeLog 8329 SHA256 bc2064b96d0ce58050ac9368cae9c23b503155f9bf4d1efdc79f4486e8d70831 SHA512 e94abf921d19153f01b85758da547e7ce84d146ac12054f9d6c576f20305b45d96b094823aba43a44bba922db80c0350c71c33fe2a090d73791fcdd1cc212ef6 WHIRLPOOL 6222756ca7c32f6f917bf9e516a46bcc7b6ff1499cded1fd8de4f0bd8ef8a6ff4a00b458820f2ac069a64fc3632bdfaae285e3b5ac122d9d10cb4e6f6784175b
 MISC metadata.xml 547 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37 SHA512 0aaab59986ebcf9e64ef7ae5e1ff32e7e3a07de5e095245a1e2b1676c85f5e23f32a56da37f60dfb3cc6ba1c2f1837d792c2fc8ee9c5418f89c04d30345df877 WHIRLPOOL 8decb4e0059bb3075e79ad43e39640b1d28daebad84157f47320bb23f426dcba9ad062d262466b320e240c933999411c6e822b0a740eb93d2c363d2e304608b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIE8ccACgkQ2ugaI38ACPDg/AD/UivvPquRvISU3/cGULZTAV8x
-EPbKezzTmUvJLdOQR2sBAKV/xXNLmvs4OnpruL8XKljqTzdLmQUNK/vrNkjiQ/s4
-=kXyE
+iF4EAREIAAYFAlK4YuMACgkQ2ugaI38ACPDEjgD+KEysMbXvcutIk3cdW0HUkRUu
+BWmZWfZnbWlrRp//m/oA/jhyoQx/tOt1gDE4Jj8QJmegsLg1Wq8l44L+63vEeggb
+=CJbr
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
new file mode 100644
index 000000000000..6d620b7ab94b
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
@@ -0,0 +1,11 @@
+--- 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/freewrl-1.22.13-r2.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
index 15cddc34eb21..f82a52194771 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r2.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-1.22.13-r2.ebuild,v 1.2 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.1 2013/12/23 16:20:49 axs Exp $
 
 EAPI=5
 
@@ -50,6 +50,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${P}-desktop.patch
 }
 
 src_configure() {
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 9817df094e74..63e8c0753f69 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/08/09 13:42:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.3 2013/12/23 16:20:49 axs Exp $
 
 EAPI=5
 
@@ -70,13 +70,15 @@ 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=( mozjs17 mozjs187 mozjs185 )
+	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
@@ -111,7 +113,7 @@ src_configure() {
 		$(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-target=motif" "--with-target=x11") \
 		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
 }