From: Jory Pratt <anarchy@gentoo.org>
Date: Thu, 17 Nov 2005 23:20:04 +0000 (+0000)
Subject: sed changes
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41d7e3b662c5a92f63d7ad54504600eebf0c838f;p=gentoo.git

sed changes
Package-Manager: portage-2.0.53_rc7
---

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 46a074868880..0be66a2a16ce 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -40,4 +40,4 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
-MD5 cf52f5c7bfd10d8e364fc535ae1b8dc2 mozilla-firefox-1.5_rc2-r3.ebuild 9239
+MD5 ea68b926f0b54e19029708356f1da51b mozilla-firefox-1.5_rc2-r3.ebuild 9024
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild
index 235edc338a2f..cfea981edb42 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.5_rc2-r3.ebuild,v 1.1 2005/11/17 21:17:59 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild,v 1.2 2005/11/17 23:20:04 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -25,8 +25,7 @@ LICENSE="MPL-1.1 NPL-1.1"
 IUSE="java mozdevelop"
 
 RDEPEND="java? ( virtual/jre )
-	>=www-client/mozilla-launcher-1.39
-	=x11-libs/pango-1.10.1"
+	>=www-client/mozilla-launcher-1.39"
 
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
@@ -170,7 +169,6 @@ src_compile() {
 		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
 		${S}/config/rules.mk \
 		${S}/nsprpub/config/rules.mk \
-		${S}/security/coreconf/rules.mk \
 		${S}/security/coreconf/rules.mk
 
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
@@ -234,10 +232,7 @@ src_install() {
 	# Fix pkgconfig files and install them
 	insinto /usr/$(get_libdir)/pkgconfig
 	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
-			s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
-			s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
+		sed -i -e "s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
 		doins ${x}
 	done