Added version with optional media-libs/alsa-oss support.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 114 insertions, 9 deletions

diff --git a/www-client/mozilla-launcher/ChangeLog b/www-client/mozilla-launcher/ChangeLog
index 7bd072d06eed..7ff0f65d0edc 100644
--- a/www-client/mozilla-launcher/ChangeLog
+++ b/www-client/mozilla-launcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/mozilla-launcher
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.40 2006/07/07 17:24:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/ChangeLog,v 1.41 2006/09/03 10:20:34 nelchael Exp $
+
+*mozilla-launcher-1.52-r1 (03 Sep 2006)
+
+  03 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mozilla-launcher-1.52-aoss.patch, +mozilla-launcher-1.52-r1.ebuild:
+  Added version with optional media-libs/alsa-oss support.
 
   07 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   mozilla-launcher-1.52.ebuild:
diff --git a/www-client/mozilla-launcher/Manifest b/www-client/mozilla-launcher/Manifest
index ed57c8f4d5f7..b64aee99a257 100644
--- a/www-client/mozilla-launcher/Manifest
+++ b/www-client/mozilla-launcher/Manifest
@@ -13,6 +13,10 @@ AUX mozilla-launcher-1.41-multilib.patch 1457 RMD160 7d65044892d4677f4e90778e156
 MD5 be5a0ad8bb87165cb87a3b52b109b0f5 files/mozilla-launcher-1.41-multilib.patch 1457
 RMD160 7d65044892d4677f4e90778e156d8ceb23185dd4 files/mozilla-launcher-1.41-multilib.patch 1457
 SHA256 a710ded88c9cec7abb5462996621ac908df9312e1dd452ca7b266f8db12331d5 files/mozilla-launcher-1.41-multilib.patch 1457
+AUX mozilla-launcher-1.52-aoss.patch 1489 RMD160 c2d26bcc48b4273675819a9da7221d4110efaf2e SHA1 4261362b7986e76977db25a41117e22e9c1584c6 SHA256 65d0463d4861d6a56d60d145557c643e718da24987a265a25243ca8a739e7162
+MD5 ee1dbb0e10c3a4aac52fa7c71d4956fe files/mozilla-launcher-1.52-aoss.patch 1489
+RMD160 c2d26bcc48b4273675819a9da7221d4110efaf2e files/mozilla-launcher-1.52-aoss.patch 1489
+SHA256 65d0463d4861d6a56d60d145557c643e718da24987a265a25243ca8a739e7162 files/mozilla-launcher-1.52-aoss.patch 1489
 DIST mozilla-launcher-1.49.bz2 6079 RMD160 244eb3cd289eb73ee16b28f72f9a386e95328a89 SHA256 bc623457b4c8712dd657fc3e9bb4d8181396682e6fbc3e15184d00aa22f3d6ed
 DIST mozilla-launcher-1.51.bz2 6137 RMD160 ecfdea20a09ce6ebdbff281d1dd4f0f8d35a4708 SHA256 11bd8e2c3e71a5967617f61f200f201befe78de9d6eb34260c9364b254b7c30c
 DIST mozilla-launcher-1.52.bz2 6142 RMD160 ca267cacb6b84b3b16f97ee3c16836329d4e818b SHA1 a42547ecf64006ccdf8426c5e9901b43d98d1dff SHA256 9da6dcdbf3a19e904fe15d765cb9ff12a64d8033aa8ec64121af7b60f335b3b6
@@ -24,14 +28,18 @@ EBUILD mozilla-launcher-1.51.ebuild 966 RMD160 e80d07035a9a4e7c3ad6e15756cf61cbc
 MD5 950528cbd514d567e67fb85f378bd1d6 mozilla-launcher-1.51.ebuild 966
 RMD160 e80d07035a9a4e7c3ad6e15756cf61cbc715e7f5 mozilla-launcher-1.51.ebuild 966
 SHA256 17b2eed78e703917c2eb462e16b537b22e30501ebfd3bbe5b679592f358da466 mozilla-launcher-1.51.ebuild 966
+EBUILD mozilla-launcher-1.52-r1.ebuild 1021 RMD160 684a8d4f06191b7c5154632c7bf278c0ddc57094 SHA1 631001ff5575696ff1df02f4342544383a05e74f SHA256 0163c3cf6b2697a9aeafdbb9882ca0f7cb564274526c6c17bcd1af77cab213ad
+MD5 8696e3be4e40aaec3a5acc45cb262cb0 mozilla-launcher-1.52-r1.ebuild 1021
+RMD160 684a8d4f06191b7c5154632c7bf278c0ddc57094 mozilla-launcher-1.52-r1.ebuild 1021
+SHA256 0163c3cf6b2697a9aeafdbb9882ca0f7cb564274526c6c17bcd1af77cab213ad mozilla-launcher-1.52-r1.ebuild 1021
 EBUILD mozilla-launcher-1.52.ebuild 976 RMD160 4146193ebaadda2bb14bd4b5f48b182b98bc7f4b SHA1 9b9d87d930542ab53b755cff511e2383ef626a8e SHA256 71f088dec02e3852a81836c7f80762af72797656cb97ed6cf99b3303d50e0496
 MD5 3f954c6720dc5d499de325981899c648 mozilla-launcher-1.52.ebuild 976
 RMD160 4146193ebaadda2bb14bd4b5f48b182b98bc7f4b mozilla-launcher-1.52.ebuild 976
 SHA256 71f088dec02e3852a81836c7f80762af72797656cb97ed6cf99b3303d50e0496 mozilla-launcher-1.52.ebuild 976
-MISC ChangeLog 17612 RMD160 033da104ec295fc1f0a93fb701d5b4bdc439850b SHA1 26cc9b698b330c096905a337d23bf0e880fffb32 SHA256 81b59700830957d36bb27f35403e4737c4ebebb3c7996b2ecc95d0c2210bfe3b
-MD5 a86674e61a13339a301581a34e78bb57 ChangeLog 17612
-RMD160 033da104ec295fc1f0a93fb701d5b4bdc439850b ChangeLog 17612
-SHA256 81b59700830957d36bb27f35403e4737c4ebebb3c7996b2ecc95d0c2210bfe3b ChangeLog 17612
+MISC ChangeLog 17842 RMD160 9262379019fbbd24eaa93cc5cdaa45506f33ef32 SHA1 834a80352a00587e95f74aae6939aaf9a948e2f2 SHA256 89c85f8d7d6b87d6943e9196e7a3376b106bc5e57abe9361cd8a21ef2c1dac71
+MD5 5a417083bf6b4b285235d455bd3538ce ChangeLog 17842
+RMD160 9262379019fbbd24eaa93cc5cdaa45506f33ef32 ChangeLog 17842
+SHA256 89c85f8d7d6b87d6943e9196e7a3376b106bc5e57abe9361cd8a21ef2c1dac71 ChangeLog 17842
 MISC metadata.xml 222 RMD160 565c994ddf58dfb018228cc6c4bff776522d3373 SHA1 7c29eb31906ff738525ca857951bd0e98ee9d90e SHA256 07f3fe1fb1af952e38a0b0c581c994fb7566833a96f832a965fbac340f064e5b
 MD5 cc0891c820a717f0335919e48e686cbe metadata.xml 222
 RMD160 565c994ddf58dfb018228cc6c4bff776522d3373 metadata.xml 222
@@ -45,10 +53,13 @@ SHA256 7fdcb12229d71ca9567536250c5e193239fd6aaf30d001082cfcf1f2a5299047 files/di
 MD5 c9441175ceccc5e8ff56d65ed4e517da files/digest-mozilla-launcher-1.52 250
 RMD160 d198a7ded69d9eb640670d0e681d7611d84b1763 files/digest-mozilla-launcher-1.52 250
 SHA256 271598770c0ea331910ccbc8d2b5583851347c999c098e175a88b2f89e633260 files/digest-mozilla-launcher-1.52 250
+MD5 c9441175ceccc5e8ff56d65ed4e517da files/digest-mozilla-launcher-1.52-r1 250
+RMD160 d198a7ded69d9eb640670d0e681d7611d84b1763 files/digest-mozilla-launcher-1.52-r1 250
+SHA256 271598770c0ea331910ccbc8d2b5583851347c999c098e175a88b2f89e633260 files/digest-mozilla-launcher-1.52-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFErpjSAiZjviIA2XgRAkPMAKDuB7P9hStQfd9gccqNgXT79r2WpQCcD3Vp
-8JtsHudrg8tI0eIZ6Qb0e+A=
-=L44d
+iD8DBQFE+qyAgo/w9rxVVVERAmptAKCI2x86KtpFJ+bP6gF3Trycd+JbwgCfSmyP
+OV1CCFKR56qit/n8Y8H9oEQ=
+=aYI1
 -----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.52-r1 b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.52-r1
new file mode 100644
index 000000000000..dce77d320cf7
--- /dev/null
+++ b/www-client/mozilla-launcher/files/digest-mozilla-launcher-1.52-r1
@@ -0,0 +1,3 @@
+MD5 300a02d68c26a59a76eb72f24f251816 mozilla-launcher-1.52.bz2 6142
+RMD160 ca267cacb6b84b3b16f97ee3c16836329d4e818b mozilla-launcher-1.52.bz2 6142
+SHA256 9da6dcdbf3a19e904fe15d765cb9ff12a64d8033aa8ec64121af7b60f335b3b6 mozilla-launcher-1.52.bz2 6142
diff --git a/www-client/mozilla-launcher/files/mozilla-launcher-1.52-aoss.patch b/www-client/mozilla-launcher/files/mozilla-launcher-1.52-aoss.patch
new file mode 100644
index 000000000000..173ae6babd84
--- /dev/null
+++ b/www-client/mozilla-launcher/files/mozilla-launcher-1.52-aoss.patch
@@ -0,0 +1,47 @@
+--- -	2006-08-15 16:37:08.286834431 +0200
++++ mozilla-launcher-1.52	2006-08-15 16:37:05.000000000 +0200
+@@ -139,7 +139,7 @@
+     *fox)
+       export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+-      mozbin=$MOZILLA_FIVE_HOME/firefox-bin
++	  mozbin="/usr/bin/aoss $MOZILLA_FIVE_HOME/firefox-bin"
+       ;;
+ 
+     *mozilla)
+@@ -186,7 +186,7 @@
+     *fox-bin)
+       export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/firefox"}
+       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
+-      mozbin=$MOZILLA_FIVE_HOME/firefox-bin
++      mozbin="/usr/bin/aoss $MOZILLA_FIVE_HOME/firefox-bin"
+       ;;
+ 
+     *mozilla-bin)
+@@ -215,7 +215,7 @@
+   esac
+ 
+   # Make sure we got something
+-  if [[ -z $mozbin || ! -f $mozbin ]]; then
++  if [[ -z "$mozbin" ]]; then
+     echo "$0: can't find the browser :-(" >&2
+     return 1
+   fi
+@@ -417,7 +417,7 @@
+   # compreg.dat and/or chrome.rdf will screw things up if it's from an
+   # older version.  http://bugs.gentoo.org/show_bug.cgi?id=63999
+   for f in ~/{.,.mozilla/}${zero%-bin}/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
+-    if [[ -f ${f} && ${f} -ot ${mozbin} ]]; then
++    if [[ -f ${f} && ${f} -ot "${mozbin}" ]]; then
+       echo "Removing ${f} leftover from older ${zero%-bin}"
+       rm -f "${f}"
+     fi
+@@ -447,7 +447,7 @@
+         MOZ_NO_REMOTE=1 "$mozbin" "$@" &
+         ;;
+       *)
+-        "$mozbin" "$@" &
++        $mozbin "$@" &
+         ;;
+     esac
+   fi
diff --git a/www-client/mozilla-launcher/mozilla-launcher-1.52-r1.ebuild b/www-client/mozilla-launcher/mozilla-launcher-1.52-r1.ebuild
new file mode 100644
index 000000000000..2366c6e19a16
--- /dev/null
+++ b/www-client/mozilla-launcher/mozilla-launcher-1.52-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-launcher/mozilla-launcher-1.52-r1.ebuild,v 1.1 2006/09/03 10:20:34 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Script that launches mozilla or firefox"
+HOMEPAGE="http://dev.gentoo.org/~agriffis/dist/"
+SRC_URI="mirror://gentoo/${P}.bz2
+		http://dev.gentoo.org/~anarchy/dist/${P}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="aoss"
+
+DEPEND=""
+RDEPEND="|| ( x11-apps/xdpyinfo virtual/x11 )
+	aoss? ( media-libs/alsa-oss )"
+
+S=${WORKDIR}
+
+src_install() {
+	use aoss && epatch "${FILESDIR}/${P}-aoss.patch"
+	exeinto /usr/libexec
+	newexe ${P} mozilla-launcher || die
+}
+
+pkg_postinst() {
+	local f
+
+	find ${ROOT}/usr/bin -maxdepth 1 -type l | \
+	while read f; do
+		[[ $(readlink ${f}) == mozilla-launcher ]] || continue
+		einfo "Updating ${f} symlink to /usr/libexec/mozilla-launcher"
+		ln -sfn /usr/libexec/mozilla-launcher ${f}
+	done
+}