Remove obsolete sed tweak for FreeBSD, it no longer applies to the file.

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

4 files changed, 13 insertions, 19 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 544316d614b7..67480c4ddfd5 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.41 2011/01/19 21:15:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.42 2011/01/25 23:24:53 ulm Exp $
+
+  25 Jan 2011; Ulrich Mueller <ulm@gentoo.org>
+  emacs-vcs-24.0.50_pre20110116.ebuild, emacs-vcs-24.0.9999.ebuild:
+  Remove obsolete sed tweak for FreeBSD, it no longer applies to the file.
 
   19 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
   Call eautoreconf with AT_M4DIR=m4 in order to fix a failure in configure.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 06c1cf8db9df..016e551ceced 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -9,14 +9,14 @@ EBUILD emacs-vcs-23.2.90.ebuild 9960 RMD160 f914b71040a56aaea04c59981bcc03dce42a
 EBUILD emacs-vcs-23.2.91.ebuild 9960 RMD160 6f2beed920ecb92b4aa461ba2f49eea27d1f9272 SHA1 93cdda06d827cbe3ef6deec8b07c792646170638 SHA256 80ba753e42e81130616200ea09f9f54c1f4372a216d65529b4fcc25a99f7b1d6
 EBUILD emacs-vcs-23.2.92.ebuild 9960 RMD160 8d40053abe474160a6800d822028360ae6a1958c SHA1 e9d7169ecdb75ed38f4bd5f1c5a891e70cd8af43 SHA256 1bf59c7aa25a7cc25f1a1827d18a60ea02f08ddcb6f34c548792739542ba848c
 EBUILD emacs-vcs-23.2.9999.ebuild 9951 RMD160 71b2cda9f85acd8ab4cc66e9098503fe974fc5a7 SHA1 b554fcdbb08b859dc833e4a7cfd53cd9cd0fa103 SHA256 2c7ae627151ef5c797f3af15789d09aa8c903d3f711a9a24e607d43eb1da178f
-EBUILD emacs-vcs-24.0.50_pre20110116.ebuild 10286 RMD160 027bd949e6d1f7f5b8cfe54511d2d0792a2dbd2c SHA1 82e216045da5dae26d06581d623a185549a227e2 SHA256 b2114a302eab5a582f0658d9cb664e11270107e45cb3dbf6f20972830d677c16
-EBUILD emacs-vcs-24.0.9999.ebuild 10597 RMD160 412b9c95f15cc611246d3ca2d8e1219914484b1d SHA1 f6a09f5e055bbcf8fd728c1e868e7ce3178bfebc SHA256 aa022a8d6f8a2ba6a7e511a5f218b64d588d0da5a2315bb553c3e10e3260e492
-MISC ChangeLog 55850 RMD160 bd32346e4f67564088845ede5dd08048a4dff60e SHA1 e1d2da543532f6afee03dd5389083f4194ee7149 SHA256 eed90b3a42e42241ddee2adb439d3a6c2e0e69ecc0758c233708a7f6abd9784b
+EBUILD emacs-vcs-24.0.50_pre20110116.ebuild 10062 RMD160 a6d68742b1fda29253adeb5ca10d24fab5bade5e SHA1 53ec2d9e2aa70478d54af78f4de30ff62306ec43 SHA256 4bc6cb77e32fdc44eb00b186e43622cd737bb98ed8acabdaed5852aafa935cb2
+EBUILD emacs-vcs-24.0.9999.ebuild 10373 RMD160 bf03c3e625cc8a4ec2ffd8ebac2b900cddaf4f01 SHA1 7503a0253204aaab83075d241c3c4274a88bd041 SHA256 d9f48046513c5d8b3a9ffe203e581b21ab83423601c5867baacbd0a82a23f98c
+MISC ChangeLog 56041 RMD160 f44c80f8fb35814dbe34b4d2c7bc07d11b3edc54 SHA1 a42ba8e59a6dc9e4d8858f85a061bf50004171d9 SHA256 7e17051b331b6da37e477324fd7d7c24d2d396a7cf8c79c526180a5273b4d57e
 MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk03VbEACgkQOeoy/oIi7uyOsQCdG5nCOY27tGaM9JjWC/BoUzsX
-VVQAniQ3lxshCjWh8Lt0opirCOCBLACW
-=hQtn
+iEYEARECAAYFAk0/XQwACgkQOeoy/oIi7uzLCgCfTu2uNElmYe3cyKpjomBV4cAP
+qKkAnie2nE+c3rG8J7BmV4NXOXIfIt5f
+=dzxX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild
index f95f604d505a..6098fd929906 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild,v 1.1 2011/01/19 18:04:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.50_pre20110116.ebuild,v 1.2 2011/01/25 23:24:53 ulm Exp $
 
 EAPI=2
 
@@ -94,11 +94,6 @@ src_prepare() {
 	#	EPATCH_SUFFIX=patch epatch
 	fi
 
-	sed -i \
-		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
index 716501e43ddd..05acebeccece 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.22 2011/01/19 21:15:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.23 2011/01/25 23:24:53 ulm Exp $
 
 EAPI=2
 
@@ -104,11 +104,6 @@ src_prepare() {
 	#	EPATCH_SUFFIX=patch epatch
 	fi
 
-	sed -i \
-		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
 		# Suppress it by supplying pkg-config with a wrong library name.