From: Jory Pratt Date: Thu, 17 Nov 2005 23:26:04 +0000 (+0000) Subject: removed most sed lines in favor of patching makefiles X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36d6efdef420a72cda1fd8c7fd009585222c0453;p=gentoo.git removed most sed lines in favor of patching makefiles Package-Manager: portage-2.0.53_rc7 --- diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 0be66a2a16ce..e6cc74ce4ff1 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 ea68b926f0b54e19029708356f1da51b mozilla-firefox-1.5_rc2-r3.ebuild 9024 +MD5 e3e11ce1d1bf9b74687b952dc0706f43 mozilla-firefox-1.5_rc2-r3.ebuild 8843 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 cfea981edb42..a9865957e1b9 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.2 2005/11/17 23:20:04 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild,v 1.3 2005/11/17 23:26: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 @@ -221,10 +221,7 @@ src_install() { /usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h # Fix firefox-config and install it - sed -i -e "s|/usr/lib/firefox-${MY_PV}|${MOZILLA_FIVE_HOME}|g - s|/usr/include/firefox-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g - s|/usr/share/idl/firefox-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g - s|\(echo -L.*\)\($\)|\1 -Wl,-R${MOZILLA_FIVE_HOME}\2|" \ + sed -i -e "s|\(echo -L.*\)\($\)|\1 -Wl,-R${MOZILLA_FIVE_HOME}\2|" \ ${S}/build/unix/firefox-config exeinto ${MOZILLA_FIVE_HOME} doexe ${S}/build/unix/firefox-config