update sqlite dep to handle system sqlite properly

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 275 insertions, 12 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 803632478576..245b44a83576 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.14 2010/02/06 13:18:13 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.15 2010/02/13 12:35:56 anarchy Exp $
+
+*icecat-3.6-r1 (13 Feb 2010)
+
+  13 Feb 2010; <anarchy@gentoo.org> +icecat-3.6-r1.ebuild:
+  update sqlite dep to handle system sqlite properly
 
   06 Feb 2010; Harald van Dijk <truedfx@gentoo.org> icecat-3.6.ebuild:
   Use rebranded translation files: modifying the Firefox ones in the ebuild
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index bdf250d13db0..5bc48cd4369c 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
@@ -310,13 +307,7 @@ DIST mozilla-firefox-3.6-patches-0.6.tar.bz2 5201 RMD160 d721f5b7070b978e61b27c1
 EBUILD icecat-3.5.4.ebuild 8393 RMD160 e5253acbe15e071cce5bbda2d28114563479130b SHA1 3d64a740b7ab381cab937139845827b7721c9708 SHA256 265bca504ed3123c92a6c177f847e604b906af8d998727e0d7d403978edcbb97
 EBUILD icecat-3.5.5.ebuild 8395 RMD160 f6edff429e48e77629d9fc6645fd31000765cb5b SHA1 2a30d5c81d5c6c5c168eced51c2265024df48c59 SHA256 7563e5986f1412ce746f8c93c17690e9c0df096a7f2e0ee21c6907519269db54
 EBUILD icecat-3.5.6.ebuild 8407 RMD160 d6c47cbfa490f6bf3e7eaa02cd6d7fe2d9431e4a SHA1 257c74b816bf90564ec1e041c1bc73f284b568a7 SHA256 7a03e71d1fb65aaa98811fcd5e33b2d3d71d670bf2c3a6cba53c6fa5f2a3c48b
+EBUILD icecat-3.6-r1.ebuild 8238 RMD160 b34ccf777a965bcaef7698d31de037e8dd72b65c SHA1 be9dc336a6dfe4406d0ccd7a27a905c54196f07e SHA256 2fa9d996c98b8aca84bde1405b5791fd8ee3ef12a743ada5b6540becf848e121
 EBUILD icecat-3.6.ebuild 8169 RMD160 b6687d14d27b547349508e7a4cbc5c0b77fe10df SHA1 82797f7a04108f5f26cf5a617fac01cdd3afd811 SHA256 e6497a25e97763a05a3dac132a4247b6a91551b34888127ff7653682dd2ce2e0
-MISC ChangeLog 2175 RMD160 1ed5ac871d633ae2fc4fbd58043cec0edaaac089 SHA1 6b856946aca489ddf1ceb86fdd4fdd1c1c2c7a27 SHA256 93c73cdbade416e59d444916eef1d72239513b710d6ccfabba45e777ad8c07f4
+MISC ChangeLog 2318 RMD160 f7d15b909d59803702d5f7bfae2f3895749aa907 SHA1 58fc97dafe3e15393e7554acbae8d01ef6a14a76 SHA256 881d841261a0a0825c30ce556db7a25563fdaee8d3c1d90e38b3d98400ad4a42
 MISC metadata.xml 593 RMD160 2c4d2e01f7ddd71e1142ece3d2f25bab558b4236 SHA1 134150c4e5cb74526658595d79968a3026a463e6 SHA256 ef7f3bbda963dac920a669cdd524efb607bcfabdd210c5460c46c7ed9ef4ac94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkttbDYACgkQwnQyISwouHzysgCcCIJVHyEOuNlg71lx677noTOZ
-VQwAn0zxOkO7McS/X5k3oLG7mC46AAdp
-=EwzU
------END PGP SIGNATURE-----
diff --git a/www-client/icecat/icecat-3.6-r1.ebuild b/www-client/icecat/icecat-3.6-r1.ebuild
new file mode 100644
index 000000000000..d455ddcf09c5
--- /dev/null
+++ b/www-client/icecat/icecat-3.6-r1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6-r1.ebuild,v 1.1 2010/02/13 12:35:56 anarchy Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
+
+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
+ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
+ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW"
+# Malformed install.rdf: ta-LK
+
+NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
+
+XUL_PV="1.9.2"
+MAJ_XUL_PV="1.9.2"
+MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
+DESKTOP_PV="3.6"
+MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
+FIREFOX_PN="mozilla-firefox"
+FIREFOX_P="${FIREFOX_PN}-${PV}"
+PATCH="${FIREFOX_PN}-3.6-patches-0.6"
+
+DESCRIPTION="GNU project's edition of Mozilla Firefox"
+HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa java libnotify wifi"
+
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2
+	http://svn.savannah.gnu.org/viewvc/trunk/icecat/browser/app/profile/firefox.js?root=gnuzilla&r1=86&r2=94&view=patch -> icecat-3.6-prefs.patch"
+LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.4
+	>=dev-libs/nspr-4.8
+	>=app-text/hunspell-1.2
+	>=dev-db/sqlite-3.6.22-r2[fts3,secure-delete]
+	alsa? ( media-libs/alsa-lib )
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )
+	~net-libs/xulrunner-${XUL_PV}[java=,wifi=,libnotify=]"
+
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	dev-util/pkgconfig"
+
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack icecat-${MY_PV}.tar.bz2 ${PATCH}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Integrate rebranding
+	sed -i "s|/mozilla-firefox|/icecat|" \
+		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
+
+	# Fix preferences location
+	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix media build failure
+	epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"
+
+	# Fix prefs
+	epatch "${DISTDIR}/icecat-3.6-prefs.patch"
+
+	# Fix rebranding
+	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+
+	# We need to re-patch this because autoreconf overwrites it
+	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
+}
+
+src_configure() {
+	# We will build our own .mozconfig
+	rm "${S}"/.mozconfig
+
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Specific settings for icecat
+	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
+	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
+	mozconfig_annotate '' --with-branding=browser/branding/unofficial
+	mozconfig_annotate '' --disable-official-branding
+	mozconfig_annotate '' --with-user-appdir=.icecat
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=browser
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate 'sqlite' --enable-system-sqlite
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-system-lcms
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --with-system-libxul
+	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
+
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+
+	# Other browser-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
+	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/${PN}-${DESKTOP_PV}.desktop
+	fi
+
+	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
+
+	# 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 icecat-default-prefs.js"
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+}
+
+pkg_postinst() {
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "any package that fails to build warrants a bug report."
+	elog
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}