cleanup

Package-Manager: portage-2.0.51.22-r2

4 files changed, 19 insertions, 286 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 6ca25883c3cc..f75abb208cc3 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.61 2005/08/04 21:51:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.62 2005/08/06 17:58:02 anarchy Exp $
+
+  06 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-firefox-1.0.5-r1.ebuild:
+  cleanup of tree
 
   04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
   mozilla-firefox-1.0.5-r1.ebuild, mozilla-firefox-1.0.6-r2.ebuild,
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 7a4cc99ba9e2..9a157bd2b026 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,35 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 35c99aa1fe6480d5eea0373b2b37d4e6 mozilla-firefox-1.0.6-r4.ebuild 9532
-MD5 ca51312b2a34997b44bd926e6e57c818 ChangeLog 28215
-MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
-MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
-MD5 30c377e2f099a5d844ce1f866c6a7bc1 mozilla-firefox-1.0.5-r1.ebuild 8775
+MD5 701d8580f8487aa590ffaf9b9b4a5264 ChangeLog 28321
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131
-MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451
+MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
+MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
+MD5 35c99aa1fe6480d5eea0373b2b37d4e6 mozilla-firefox-1.0.6-r4.ebuild 9532
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
 MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382
-MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101
-MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5-r1 302
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451
+MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
-MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
-MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447
-MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
-MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
 MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520
-MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
 MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
+MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
+MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
+MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
+MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131
+MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC8o321ZcsMnZjRyIRAtfVAJwO5jTYu2EjFRtHJJZ4ckLDlRVwyACgiJf7
-a9zzQzLsVYMMRrZ5Z0Q+ERU=
-=ZZTH
------END PGP SIGNATURE-----
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5-r1
deleted file mode 100644
index 949eeeadf7db..000000000000
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b50fe116305b7f56b2105d464110228d firefox-1.0.5-source.tar.bz2 32786987
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild
deleted file mode 100644
index 9d12200960c2..000000000000
--- a/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.5-r1.ebuild,v 1.3 2005/08/04 21:51:22 azarah Exp $
-
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
-
-S=${WORKDIR}/mozilla
-
-DESCRIPTION="The Mozilla Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_rc/rc}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.3-ia64.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
-
-LICENSE="MPL-1.1 NPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="gnome java mozdevelop mozsvg mozcalendar"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	>=media-libs/libmng-1.0.0
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	>=www-client/mozilla-launcher-1.35"
-
-DEPEND="${RDEPEND}
-	java? ( >=dev-java/java-config-0.2.0 )"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export MOZ_PHOENIX=1
-
-src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
-	cd ${S} || die "cd failed"
-
-	# alpha stubs patch from lfs project.
-	# <taviso@gentoo.org> (26 Jun 2003)
-	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
-
-	# hppa patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# patch to fix separate character on euro keyboards, bug 68995
-	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
-
-	# some patches from Debian to set default preferences:
-	# - inherit LANG from env
-	# - shut off SSLv2 and 40-bit ciphers by default
-	# - disable application auto-updating
-	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
-
-	# patch to solve segfaults on ia64, from Debian, originally from David
-	# Mosberger
-	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/mozilla-firefox-1.0.4-gcc4.patch
-}
-
-src_compile() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other ff-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
-	mozconfig_annotate '' --prefix=/usr/$(get_libdir)/MozillaFirefox
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# firefox.
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build Firefox
-	#
-	####################################
-
-	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
-	econf
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake MOZ_PHOENIX=1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die
-}
-
-src_install() {
-	# Plugin path creation
-	PLUGIN_DIR="/usr/$(get_libdir)/nsbrowser/plugins"
-	dodir ${PLUGIN_DIR}
-
-	dodir /usr/$(get_libdir)/MozillaFirefox
-	cp -RL ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	einfo "Installing includes and idl files..."
-	# Copy the include and idl files
-	dodir /usr/$(get_libdir)/MozillaFirefox/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}/usr/$(get_libdir)/MozillaFirefox/include
-	cp -LfR idl/* ${D}/usr/$(get_libdir)/MozillaFirefox/include/idl
-	dosym /usr/$(get_libdir)/MozillaFirefox/include /usr/include/MozillaFirefox
-
-	# Dirty hack to get some applications using this header running
-	dosym /usr/$(get_libdir)/MozillaFirefox/include/necko/nsIURI.h /usr/lib/MozillaFirefox/include/nsIURI.h
-
-	cd ${S}/build/unix
-	# Fix firefox-config and install it
-	sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" firefox-config
-	sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" firefox-config
-	exeinto /usr/$(get_libdir)/MozillaFirefox
-	doexe firefox-config
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in *.pc; do
-			if [[ -f ${x} ]]; then
-					sed -i -e "s:/lib/firefox-${MY_PV}:/$(get_libdir)/MozillaFirefox:g" ${x}
-					sed -i -e "s:/firefox-${MY_PV}:/MozillaFirefox:g" ${x}
-					doins ${x}
-			fi
-	done
-	cd ${S}
-
-
-	#fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/MozillaFirefox
-
-	# Plugin path setup (rescuing the existent plugins)
-	src_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Install /usr/bin/firefox
-	install_mozilla_launcher_stub firefox /usr/$(get_libdir)/MozillaFirefox
-
-	# Install env.d snippet, which isn't necessary for running firefox, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10MozillaFirefox
-
-	# Set correct libdir in env.d file
-	dosed "s:/usr/lib:/usr/$(get_libdir):" /etc/env.d/10MozillaFirefox
-
-	# Fix icons to look the same everywhere
-	insinto /usr/$(get_libdir)/MozillaFirefox/icons
-	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
-	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/firefox-icon.png
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillafirefox.desktop
-
-	# Normally firefox-0.9 must be run as root once before it can be
-	# run as a normal user.  Drop in some initialized files to avoid
-	# this.
-	einfo "Extracting firefox-${PV} initialization files"
-	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/usr/$(get_libdir)/MozillaFirefox
-
-	# Remove the old plugins dir
-	pkg_mv_plugins /usr/$(get_libdir)/MozillaFirefox/plugins
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/MozillaFirefox"
-
-	# Needed to update the run time bindings for REGXPCOM
-	# (do not remove next line!)
-	env-update
-
-	# Register Components and Chrome
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome
-
-	# Fix permissions of component registry
-	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
-
-	# Fix directory permissions
-	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
-
-	# Fix permissions on chrome files
-	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}