Don't build csu directory, as that is code coming from GCC and GCC will take care of building it; this way the sparc64 patch is unneeded and the GCC sources have no more reason to be keeped here. Also remove kerberos and ssl useflags as they were referring to cvs, and users are using dev-util/cvs. Remove all the patches as they are not needed anymore now.

(Portage version: 2.1.2_rc2-r1)

5 files changed, 61 insertions, 25 deletions

diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 9a62ae7fba3a..2a8f7e91fd1f 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.18 2006/11/19 01:35:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.19 2006/11/22 00:21:44 flameeyes Exp $
+
+*freebsd-contrib-6.1-r1 (22 Nov 2006)
+
+  22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/freebsd-contrib-5.3-lib_csu-makefile.patch,
+  -files/freebsd-contrib-6.2-sparc64.patch, -freebsd-contrib-6.1.ebuild,
+  +freebsd-contrib-6.1-r1.ebuild, -freebsd-contrib-6.2_beta3.ebuild,
+  freebsd-contrib-6.2_rc1.ebuild:
+  Don't build csu directory, as that is code coming from GCC and GCC will take
+  care of building it; this way the sparc64 patch is unneeded and the GCC
+  sources have no more reason to be keeped here. Also remove kerberos and ssl
+  useflags as they were referring to cvs, and users are using dev-util/cvs.
+  Remove all the patches as they are not needed anymore now.
 
 *freebsd-contrib-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1
new file mode 100644
index 000000000000..9659f078390f
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1-r1
@@ -0,0 +1,6 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
+RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
+SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc1
index 8cb150e8a9c9..6fca8eff9bf2 100644
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc1
+++ b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.2_rc1
@@ -1,9 +1,6 @@
 MD5 f92c93808d6d9c597483355b7866ad6a freebsd-contrib-6.2_rc1.tar.bz2 36554713
 RMD160 e8a915fff9a2210bba5bfa33f1618b74f8f4317d freebsd-contrib-6.2_rc1.tar.bz2 36554713
 SHA256 93748e95efc4d09f70225b58855e167ec21cae610c4ba2a1d7b2c5f84aa4f661 freebsd-contrib-6.2_rc1.tar.bz2 36554713
-MD5 4873a3aede8a8c121cab7b37c28487b5 freebsd-gcc-3.4.2.tar.bz2 8447406
-RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 freebsd-gcc-3.4.2.tar.bz2 8447406
-SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f freebsd-gcc-3.4.2.tar.bz2 8447406
 MD5 356823581ffd81c395eb80886bfbde68 freebsd-gnu-6.2_rc1.tar.bz2 874705
 RMD160 10464dbc228b754f7b036f375bae1d4e3d216d22 freebsd-gnu-6.2_rc1.tar.bz2 874705
 SHA256 5f3bbf2f398efe6cba057649a1808a0bd467740eaf18c74b87ddc534fe55a958 freebsd-gnu-6.2_rc1.tar.bz2 874705
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild
new file mode 100644
index 000000000000..dd64fdc2d434
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1-r1.ebuild,v 1.1 2006/11/22 00:21:44 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="Contributed sources for FreeBSD."
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+LICENSE="BSD GPL-2 as-is"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/gnu"
+
+REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty lib/csu
+	lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc
+	usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog
+	usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff
+	usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr
+	usr.bin/tar usr.bin/texinfo"
+
+src_install() {
+	freebsd_src_install
+
+	# Move these to /bin for boot access
+	dodir /bin
+	mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed"
+}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild
index fe72542857e2..45475a4d0691 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild
@@ -1,48 +1,32 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild,v 1.1 2006/11/19 01:35:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild,v 1.2 2006/11/22 00:21:44 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
-GCC="freebsd-gcc-3.4.2"
-
 DESCRIPTION="Contributed sources for FreeBSD."
 SLOT="0"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
 LICENSE="BSD GPL-2 as-is"
 
-IUSE="ssl kerberos"
+IUSE=""
 
 SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${GCC}.tar.bz2
 	mirror://gentoo/${P}.tar.bz2"
 
-RDEPEND="kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
 
 S="${WORKDIR}/gnu"
 
-pkg_setup() {
-	if use kerberos && ! use ssl; then
-		error "You can't install with kerberos support and no ssl support"
-	fi
-
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-}
-
-REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty
+REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty lib/csu
 	lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc
 	usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog
 	usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff
 	usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr
 	usr.bin/tar usr.bin/texinfo"
 
-PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch"
-
 src_install() {
 	freebsd_src_install