Updated icecat ebuild

2 files changed, 20 insertions, 18 deletions

diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 01f4d99..8c50dc6 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,9 +1,9 @@
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX icon/icecat.desktop 248 RMD160 2249c7199cfed7add7d2b598a838f860b09b7f68 SHA1 b63221cc232baaa9a599ae38be9aa979fa642bb0 SHA256 a1a8af175b2a0389530d534e3d90de2323abccd4a848b0f2bd65d23566c9a146
-EBUILD icecat-3.5.2.ebuild 8640 RMD160 26813e2c4ca4197440127c79f8a95d7378168361 SHA1 d99a63304e764b1c33a19137dabdb2a698ba8d02 SHA256 df5b65e6cda992e9f99ba55442dd2fb0d3e30316bd844488cedde313e78d9ff7
+EBUILD icecat-3.5.2-r1.ebuild 8774 RMD160 354401fe817fa91c17abd3c18a37bb25ace8e189 SHA1 81b88839892fa02bbe9213faf311e570404c994e SHA256 ce3cb0a801f626f31a1690c8350287d53fa60a47dd4e54cec7dfc64ee81a52ee
 DIST icecat-3.5.2.tar.bz2 43511090 RMD160 36da80745e43e4e8afdc7b0f1f0e3c4ac1bc6b7c SHA1 3153ceb58c520dc6844380c9e82fd7f6400e796c SHA256 ea3a8d097ab33714275dcb8a92b45dd383e1277c41380ff54807a909df0da1c2
-DIST mozilla-firefox-3.5-patches-0.1.tar.bz2 6764 RMD160 e108f204ecb5e816d9f1a67cb37338731c7a007c SHA1 20e26e77bffeb4cf9bbce07cb11fec908b112128 SHA256 173f2b7860f9263bc97beee9cc9e8104b118d9079d8f264b45605798f1119b31
+DIST mozilla-firefox-3.5.2-patches-0.1.tar.bz2 7585 RMD160 521654db29da32baea833c6ffea2c9d5647b4bba SHA1 2e10464baaa07fe2505d98137f96f72a965f5b0c SHA256 6c2dd771098352d7b977ce9d478edbc952e0c92790d5b33f4459defb88503141
 DIST mozilla-firefox-3.5.2-af.xpi 121080 RMD160 8e25517b287c960190013fab1e4157b719c36079 SHA1 ea4510eeb1c9d359513daa982f120684b3a5837f SHA256 a3bec1a60394da74a0a77d3894c80c3964fbdb9cecf756cf2f1f5e800a66eb36
 DIST mozilla-firefox-3.5.2-ar.xpi 131390 RMD160 ac5fabed32af73898d60cc0f37833414fab94afc SHA1 beed4c053133a0fdb680cfb41eb765afbbffc1d7 SHA256 d35ec81374825ecb57ed7d5b76019337696d91d0d78fe90fcac1c0f34dd2ba6c
 DIST mozilla-firefox-3.5.2-as.xpi 134203 RMD160 f4e3b6c42d7a8abf020f08128492afe4caa52636 SHA1 185cba88f5549d33dc832c2d4841f4986db1fca9 SHA256 a372de12f9ce9e20989b45d00fb0a9d65fca208d282201a9f5c81038411bb5ca
diff --git a/www-client/icecat/icecat-3.5.2.ebuild b/www-client/icecat/icecat-3.5.2-r1.ebuild
index d1cf485..30603e3 100644
--- a/www-client/icecat/icecat-3.5.2.ebuild
+++ b/www-client/icecat/icecat-3.5.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension versionator
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension
 
 LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
 es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
@@ -13,11 +13,12 @@ ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
 
 XUL_PV="1.9.1.2"
-MAJ_PV="$(get_version_component_range 1-2)"
+DESKTOP_PV="3.5"
+MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI
+MY_PV="${PV/_/}" # Handle rcs for SRC_URI
 FIREFOX_PN="mozilla-firefox"
 FIREFOX_P="${FIREFOX_PN}-${PV}"
-#PATCH="${FIREFOX_PN}-${PV}-patches-0.1"
-PATCH="${FIREFOX_PN}-${MAJ_PV}-patches-0.1"
+PATCH="${FIREFOX_PN}-${PV}-patches-0.1"
 
 DESCRIPTION="GNU project's edition of Mozilla Firefox"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
@@ -28,13 +29,13 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa java mozdevelop restrict-javascript" # qt-experimental
 
 FIREFOX_REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-SRC_URI="mirror://gnu/gnuzilla/${PV}/${P}.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2"
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
 		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${FIREFOX_REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${FIREFOX_P}-${X}.xpi )"
+			linguas_${X/-/_}? ( ${FIREFOX_REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${FIREFOX_P}-${X}.xpi )"
 	fi
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# english is handled internally
@@ -205,7 +206,7 @@ src_configure() {
 	#mozconfig_use_extension mozdevelop venkman
 
 	# IUSE qt-experimental
-#	if use qt-experimental; then
+#	if use qt-experimental ; then
 #		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
 #		ewarn "Usage is at your own risk"
 #		ewarn "Known to be broken. DO NOT file bugs."
@@ -235,8 +236,7 @@ src_configure() {
 	#
 	####################################
 
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
 }
 
 src_compile() {
@@ -258,11 +258,11 @@ src_install() {
 
 	# Install icon and .desktop for menu entry
 	newicon "${S}"/browser/base/branding/icon48.png icecat-icon.png
-	newmenu "${FILESDIR}"/icon/icecat.desktop ${P}.desktop
+	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
 
 	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${P}.desktop
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
 	fi
 
 	# Create /usr/bin/icecat
@@ -273,13 +273,15 @@ exec "${MOZILLA_FIVE_HOME}"/icecat "\$@"
 EOF
 
 	fperms 0755 /usr/bin/icecat
+	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
 
-	#Enable very specific settings not inherited from xulrunner
+	# Enable very specific settings not inherited from xulrunner
 	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || die "failed to cp xulrunner-default-prefs.js"
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
+		die "failed to cp xulrunner-default-prefs.js"
 
 	# Plugins dir
-	ln -s "${D}"/usr/$(get_libdir)/{nsbrowser,${PN}}/plugins
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
 }
 
 pkg_postinst() {