Bump squashmount, sundtek-tv, noscript

11 files changed, 53 insertions, 5 deletions

diff --git a/media-tv/sundtek-tv/ChangeLog b/media-tv/sundtek-tv/ChangeLog
index ca12c0e9..dc9d01fa 100644
--- a/media-tv/sundtek-tv/ChangeLog
+++ b/media-tv/sundtek-tv/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sundtek-tv-150411.190910 (07 Jun 2015)
+
+  07 Jun 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Make /etc/ld.so.preload optional:
+  Introduce USE=ld-preload-file and USE=ld-preload-env and output usage details
+
 *sundtek-tv-150411.190910 (15 Apr 2015)
 
   15 Apr 2015; Martin Väth <martin@mvath.de>:
diff --git a/media-tv/sundtek-tv/Manifest b/media-tv/sundtek-tv/Manifest
index e611bbd2..0c684b15 100644
--- a/media-tv/sundtek-tv/Manifest
+++ b/media-tv/sundtek-tv/Manifest
@@ -1 +1 @@
-DIST sundtek_installer_150411.190910.sh 26917847 SHA256 d6375f3cc3d24ba2beeadddbae37c6e5e41848739850c9ae48bbf3e22034890c SHA512 efa07e58c95d6378376848fbaff57f1d441af82906b8c90a3c506241ee6fa49b1eb85cf33949571418f5703af0ae2d338951b5e5d13eb21b4cc6cd052e311715 WHIRLPOOL ef4751abab0ce16993104ab4a55d50caeffcaac62a779d281e47b74ba69c4462b560fc953cab33507b605b24fcf5c56b2c0e24051b41358c7d96f6a1ee332032
+DIST sundtek_installer_150606.044721.sh 26989907 SHA256 f9028af584170dd68cb17f1cfefbea8701d3b357570406f24a7ddffb97a43a99 SHA512 a4b658ff0e42b7d7a8c734f5811e5eda82e79f0fe477f1a298cd59f9679fe3b327fe5e826aeea8c7b6ce33231f172637d4715985a22309d764b982c2da81648c WHIRLPOOL c3fe90a6d56c9ef02d9b6c70ae72701cb1d4dc9eed36fcc2b91ead8fe012ec0980930dac5bf7a139eb4d599227a702dbcf6f8d13859bfeae83f035321791d656
diff --git a/media-tv/sundtek-tv/metadata.xml b/media-tv/sundtek-tv/metadata.xml
index 2acce007..3a906d81 100644
--- a/media-tv/sundtek-tv/metadata.xml
+++ b/media-tv/sundtek-tv/metadata.xml
@@ -15,5 +15,7 @@
 	</upstream>
 	<use>
 		<flag name="pax_kernel">Mark package which is necessary if you use a PAX kernel</flag>
+		<flag name="ld-preload-file">Install /etc/ld.so.preload</flag>
+		<flag name="ld-preload-env">Install LD_PRELOAD in /etc/env.d/50sundtek-tv</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-tv/sundtek-tv/sundtek-tv-150411.190910.ebuild b/media-tv/sundtek-tv/sundtek-tv-150606.044721.ebuild
index f2432eb9..6b474fed 100644
--- a/media-tv/sundtek-tv/sundtek-tv-150411.190910.ebuild
+++ b/media-tv/sundtek-tv/sundtek-tv-150606.044721.ebuild
@@ -17,7 +17,7 @@ RESTRICT="mirror strip"
 LICENSE="sundtek"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="pax_kernel"
+IUSE="ld-preload-env +ld-preload-file pax_kernel"
 RDEPEND="!<sys-apps/openrc-0.13"
 DEPEND="pax_kernel? ( || ( sys-apps/elfix sys-apps/paxctl ) )"
 
@@ -114,7 +114,29 @@ src_prepare() {
 	mkdir etc/revdep-rebuild || die
 	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${mybinprefix}/bin/audio/libpulse.so\"" \
 		>etc/revdep-rebuild/50-sundtek-tv
-	echo "/${mylibdir}/libmediaclient.so" >etc/ld.so.preload
+	if use ld-preload-file
+	then	echo "/${mylibdir}/libmediaclient.so" >etc/ld.so.preload
+	fi
+	if use ld-preload-env
+	then	mkdir etc/env.d
+		echo "LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\"" >etc/env.d/50sundtek-tv
+	fi
+	DOC_CONTENTS="${DOC_CONTENTS}
+You have to put /${mylibdir}/libmediaclient.so into /etc/ld.so.preload
+or to export LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\"
+before you start a multimedia applications like mplayer or mpv which should
+be able to access the sundtek device.
+
+This happens with USE=ld-preload-file or with ld-preload-env (in the global
+environment), respectively.
+
+However, such a global setting in some cases this gives warnings when
+32-bit applications are used.
+
+Thus, it might be a good idea to do it only locally by writing
+corresponding wrapper scripts for those multimedia applications you
+want to use with sundtek-tv.
+"
 	ln -sfn mediaclient.video mediaclient.audio
 	ln -sfn mediaclient.video mediaclient.dvb
 	epatch_user
@@ -157,4 +179,10 @@ pkg_postinst() {
 	}
 	false chmod 6111 "${EPREFIX}/opt/bin/mediasrv" || \
 	elog "You might need to chmod 6111 ${EPREFIX}/opt/bin/mediasrv"
+	if ! use ld-preload-file
+	then	if use ld-preload-env
+		then	elog "You might have to call env-update and source /etc/profile"
+		else	elog "You need to set LD_PRELOAD locally, see /usr/share/doc/${PF}/README.gentoo*"
+		fi
+	fi
 }
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3c59d6f1..2a332b55 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -66,6 +66,8 @@ games-rpg/magus:pngcrush - Use pngcrush for opimizing png before installation
 games-rpg/magus:postgres - Use postgresql instead of sqlite
 games-rpg/magus:seamonkey - Depend on seamonkey browser instead of firefox
 media-gfx/pqiv:gtk2 - Use gtk:2 instead of gtk:3
+media-tv/sundtek-tv:ld-preload-env - Install LD_PRELOAD in /etc/env.d/50sundtek-tv
+media-tv/sundtek-tv:ld-preload-file - Install /etc/ld.so.preload
 media-tv/sundtek-tv:pax_kernel - Mark package which is necessary if you use a PAX kernel
 net-misc/sshstart:keychain - Pull in keychain as dependency. Not required, but recommended for smoother operation.
 sys-apps/less:less-select - Add the less-select feature (additional options and a binary helper).
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
index 6c78b52c..4a593f3f 100644
--- a/sys-fs/squashmount/ChangeLog
+++ b/sys-fs/squashmount/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squashmount-12.0.0 (07 Jun 2015)
+
+  07 Jun 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *squashmount-11.0.1 (24 May 2015)
 
   24 May 2015; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squashmount/Manifest b/sys-fs/squashmount/Manifest
index ab68a4f5..f036bbed 100644
--- a/sys-fs/squashmount/Manifest
+++ b/sys-fs/squashmount/Manifest
@@ -1 +1 @@
-DIST squashmount-v11.0.1.tar.gz 59208 SHA256 6861dc70791a7e1a803ce7404465423b3ed748f807db8d7589e9abef77bc42bd SHA512 8248a121638f086ddd3cfd2bdc42ca91153e434582bf81a51fc2aa4d335a41f4eabc65c4da5e5a28ec6ae78e843bc72eedbf8166353705cdb5fb22dda9e90817 WHIRLPOOL 906524e09ec2d2ae84c13c45ef5756763c316885360c71e8688d8ba66ce5ac6e91a2954711495ffa52edea51552180164295d2ed235c82d6d99ba84aee8b7651
+DIST squashmount-v12.0.0.tar.gz 60244 SHA256 1f5aeb8455e16888b5c136e97200f4fe2e5f679e666c8f53429a5f3dc0e07c4d SHA512 16f020bcca0fec18103cf7e9cde21a71b913973b7f69fe83dc9e9efa726d0aabb296b92b5e22ebccf9a5899d68930c03f50423a82370080087c0cd1670934a3a WHIRLPOOL 709927cf895778a44285a295caa790c518a8964640998d5ca72c222d4e518d3633229a87132cf19f01ea78cb5cfe12a29ed1e2fa2172ce00152bb070ba63e118
diff --git a/sys-fs/squashmount/squashmount-11.0.1.ebuild b/sys-fs/squashmount/squashmount-12.0.0.ebuild
index ba8c5b09..ba8c5b09 100644
--- a/sys-fs/squashmount/squashmount-11.0.1.ebuild
+++ b/sys-fs/squashmount/squashmount-12.0.0.ebuild
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 25de2b1e..e1ea161d 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*noscript-2.6.9.26 (07 Jun 2015)
+
+  07 Jun 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
 *noscript-2.6.9.24 (24 May 2015)
 
   24 May 2015; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index c8c24278..f22f6b47 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.9.24.xpi 546549 SHA256 7f95fe893dfaca26ea35dde3b64cfc33e543dcc39f7d2e710c2998e7cb374610 SHA512 4d185e30af456f9fcaf289e684c7a400eb8a07458fbf0b22c787429653a1713159c48999f1b322ec9374c2f9fc69b6822fba154ddcf778b6b2f925b018b93fbb WHIRLPOOL 74d8899e8352d71d2b37adbdd0fae5365cecdef548a4a914b9bfd3702456747f8108260bd48f3a7a986c08d397672f57a88c182205b635e459644ff24706a574
+DIST noscript-2.6.9.26.xpi 548855 SHA256 b549aa3f71935249098b99c9bdb379e049d9daf876bbd887bd096f54d36c8c3d SHA512 3db1ecb4c04a291539e65823ce2031d7115b71c52ba0051a97771b0ac8378eccfe1b6179b2543301c27a36b4e53d82bb3ff8b9b433d427b8a81e5a455bbcff69 WHIRLPOOL 76fe46aadb9765703c1fbefa9cd5c50b6cc4151dfa58d2930e6e4d3a023585db66febe6bf532cd5d21fa07495ccfaeba34106c7c5b868d2a7de9cf6608f31ed7
diff --git a/www-plugins/noscript/noscript-2.6.9.24.ebuild b/www-plugins/noscript/noscript-2.6.9.26.ebuild
index 82dc8b3b..82dc8b3b 100644
--- a/www-plugins/noscript/noscript-2.6.9.24.ebuild
+++ b/www-plugins/noscript/noscript-2.6.9.26.ebuild