Don't build ed from here, but use sys-apps/ed that's mostly compatible.

(Portage version: 2.1_pre7-r5)

5 files changed, 28 insertions, 28 deletions

diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index f87a7d028e4d..6b16eba2e3d8 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.4 2006/04/20 20:05:15 flameeyes Exp $
+
+*freebsd-bin-6.0-r1 (20 Apr 2006)
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-bin-6.0.ebuild, +freebsd-bin-6.0-r1.ebuild:
+  Don't build ed from here, but use sys-apps/ed that's mostly compatible.
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/freebsd-bin-flex.patch:
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 108c68691b33..eb85af9a1423 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6c48aeef0e7ba2a4948be1aa19493ed2 ChangeLog 1975
 RMD160 557ce1717dcbc8ba44f4ef9b5c28d1d327c2de86 ChangeLog 1975
 SHA256 6b36b2b718194112232afa72260fc99eeae7cac7eea467e648e1389489923572 ChangeLog 1975
-MD5 d9463faad21b375992f5b1e538b43331 files/digest-freebsd-bin-6.0 207
-RMD160 320ee96616a891fb3942cf8ed7bdfe11706ee935 files/digest-freebsd-bin-6.0 207
-SHA256 32ff1eba68625517dd716b71364e2ac2a81c7907809ecca0d7b08c49ca75b397 files/digest-freebsd-bin-6.0 207
+MD5 a146e77501dcf32e53101304b328ebfe files/digest-freebsd-bin-6.0-r1 759
+RMD160 e55fbe974b7e035199a3477c8be74d5f5164a3c5 files/digest-freebsd-bin-6.0-r1 759
+SHA256 d43d7560b5802c3596fcaddac156f16f3d5af3f926fd4fe6129099fa7aceaf57 files/digest-freebsd-bin-6.0-r1 759
 MD5 88b10ffe4168218251cdaee3994b36e2 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 SHA256 4c60ee85f4ec7dfb86eab1536eb0d6aae65c955c756362cd2b7f2b5a024dfb17 files/freebsd-bin-6.0-flex-2.5.31.patch 277
-MD5 6811b16646e89b5fb7c5219ceecbbfe4 freebsd-bin-6.0.ebuild 1085
-RMD160 f8211443e92279221350541484db0b5ace0ce4cc freebsd-bin-6.0.ebuild 1085
-SHA256 82a59057373d8773ce7753be80c5c3569a638dc82acb9fcd2befecb648488e19 freebsd-bin-6.0.ebuild 1085
+MD5 b285a7f7dab636f0743a7384d79ff7a6 freebsd-bin-6.0-r1.ebuild 951
+RMD160 d6269136715d6ef524771d5d63aa1834a2b1c96a freebsd-bin-6.0-r1.ebuild 951
+SHA256 84fdcfcc84cf5151e46682c341517d46d489279dbcb999e2f34f0f78d766be93 freebsd-bin-6.0-r1.ebuild 951
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEME+SAiZjviIA2XgRAoaLAKCWybl96DuB/LFeL5RzUCu15RRKvQCfcxFK
-lqik9kpZvv2DTzGQ9tGwZas=
-=Y4Fx
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0
deleted file mode 100644
index 5be481464a14..000000000000
--- a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 344c333bda07c4d345e9fc7a3edf81b2 freebsd-bin-6.0.tar.bz2 403680
-MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
-MD5 961eeb893125bfaa47a7d2f2fee9f2c2 freebsd-sbin-6.0.tar.bz2 1132085
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0-r1 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0-r1
new file mode 100644
index 000000000000..7ac47494db0e
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.0-r1
@@ -0,0 +1,9 @@
+MD5 344c333bda07c4d345e9fc7a3edf81b2 freebsd-bin-6.0.tar.bz2 403680
+RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d freebsd-bin-6.0.tar.bz2 403680
+SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c freebsd-bin-6.0.tar.bz2 403680
+MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
+RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
+SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
+MD5 961eeb893125bfaa47a7d2f2fee9f2c2 freebsd-sbin-6.0.tar.bz2 1132085
+RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 freebsd-sbin-6.0.tar.bz2 1132085
+SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f freebsd-sbin-6.0.tar.bz2 1132085
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.0-r1.ebuild
index 2e5d63854c05..2bbce9af6f9c 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-6.0.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.0.ebuild,v 1.1 2006/04/01 16:43:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.0-r1.ebuild,v 1.1 2006/04/20 20:05:17 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -8,15 +8,15 @@ DESCRIPTION="FreeBSD /bin tools"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
 
-IUSE="rcp nls ssl"
+IUSE="rcp nls"
 
 SRC_URI="mirror://gentoo/${BIN}.tar.bz2
 		mirror://gentoo/${SBIN}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	ssl? ( dev-libs/openssl )
-	sys-libs/ncurses"
+	sys-libs/ncurses
+	sys-apps/ed"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	>=sys-devel/flex-2.5.31-r2"
@@ -29,10 +29,8 @@ pkg_setup() {
 	use rcp || mymakeopts="${mymakeopts} NO_RCMNDS= "
 	use nls || mymakeopts="${mymakeopts} NO_NLS= "
 
-	# Sounds ridicoulus but ssl is used to enable des support in ed.
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= "
+	mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= "
 }
 
 # csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail"
+REMOVE_SUBDIRS="csh rmail ed"