Learn from kde-meta, extract just the part of code we need, cuts the time needed to build freebsd-contrib to about an half.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 48 insertions, 23 deletions

diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 2a8f7e91fd1f..0bbc1e4ced56 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.19 2006/11/22 00:21:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.20 2006/11/22 12:10:46 flameeyes Exp $
+
+  22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-contrib-6.2_rc1.ebuild:
+  Learn from kde-meta, extract just the part of code we need, cuts the time
+  needed to build freebsd-contrib to about an half.
 
 *freebsd-contrib-6.1-r1 (22 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 24d7e264ddce..8f1122048e3f 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -9,14 +9,14 @@ EBUILD freebsd-contrib-6.1-r1.ebuild 1149 RMD160 84b05e7775edf36c88cf4570aa280f4
 MD5 139803cd13db6fa2219b47289fa96f52 freebsd-contrib-6.1-r1.ebuild 1149
 RMD160 84b05e7775edf36c88cf4570aa280f4307522604 freebsd-contrib-6.1-r1.ebuild 1149
 SHA256 da565cd507776a0126b8300a4930fd8926d906b7e8d35916a2638c800c0152bb freebsd-contrib-6.1-r1.ebuild 1149
-EBUILD freebsd-contrib-6.2_rc1.ebuild 1162 RMD160 72b035f6c608f97ef89d8ba59d99a00dc581a188 SHA1 a21ca7932f77c7f67bdfc06c8eb668aa1eede16e SHA256 aa4482701afb3d880c8853a18ee957424b0e8ad5fa1a6077d297295b4e808635
-MD5 847aa1706d2f2ede0ddc5e71a8025506 freebsd-contrib-6.2_rc1.ebuild 1162
-RMD160 72b035f6c608f97ef89d8ba59d99a00dc581a188 freebsd-contrib-6.2_rc1.ebuild 1162
-SHA256 aa4482701afb3d880c8853a18ee957424b0e8ad5fa1a6077d297295b4e808635 freebsd-contrib-6.2_rc1.ebuild 1162
-MISC ChangeLog 4337 RMD160 73c4369ec1f8e51f87d13d0aa734527c90fcdfa7 SHA1 4e2a7853474b6f9957a0a21d0ec84ac02ad7e89b SHA256 12bf09057383caa675ae19db7fa3295f8f7e9d63d248bb5195998177422402a5
-MD5 352190a3cf80452aa925b94f135468c0 ChangeLog 4337
-RMD160 73c4369ec1f8e51f87d13d0aa734527c90fcdfa7 ChangeLog 4337
-SHA256 12bf09057383caa675ae19db7fa3295f8f7e9d63d248bb5195998177422402a5 ChangeLog 4337
+EBUILD freebsd-contrib-6.2_rc1.ebuild 1496 RMD160 d2e9a7ca1aeaed06c8f80b75ef5d337447110f89 SHA1 a1c1e15a34d2680c6688ae827c6901ba0d9f93f5 SHA256 cd1bae9e6bf0a1713042fb7951451d89756dc7673d39c791b822151def96c3bd
+MD5 e1f44a69f082fd851a5200d6856017d5 freebsd-contrib-6.2_rc1.ebuild 1496
+RMD160 d2e9a7ca1aeaed06c8f80b75ef5d337447110f89 freebsd-contrib-6.2_rc1.ebuild 1496
+SHA256 cd1bae9e6bf0a1713042fb7951451d89756dc7673d39c791b822151def96c3bd freebsd-contrib-6.2_rc1.ebuild 1496
+MISC ChangeLog 4553 RMD160 0a5be70cc61dedca4e93ab2078f929c95bf638ef SHA1 cb38d3defaf2d12cf00456edff0f69933fe3c5cd SHA256 9c6128bc5444784511b6cc9fe2f5db337644721c711bf90ac996383de7724945
+MD5 41ae887324952e452645407a1aee9943 ChangeLog 4553
+RMD160 0a5be70cc61dedca4e93ab2078f929c95bf638ef ChangeLog 4553
+SHA256 9c6128bc5444784511b6cc9fe2f5db337644721c711bf90ac996383de7724945 ChangeLog 4553
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -30,7 +30,7 @@ SHA256 ecb45d9f084ac05b839d2645fcfe1092f68c33ea64cc5e51e6087cb93cff55c5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFY5gyAiZjviIA2XgRAhv5AKDpfOf96/n0UA8Jb7HU3q57+aDdfACg8yan
-HxujlVq5dhdCw2t8+K6UD4A=
-=k6ve
+iD8DBQFFZD5QAiZjviIA2XgRAkqlAKCNGO3qSVbA+XIf12Y4l3UXlgwOQwCfacUE
+UowhHqfxOwiBK+IGX5fTM3A=
+=zC6S
 -----END PGP SIGNATURE-----
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 45475a4d0691..52725cab6f0e 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.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-contrib/freebsd-contrib-6.2_rc1.ebuild,v 1.2 2006/11/22 00:21:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.2_rc1.ebuild,v 1.3 2006/11/22 12:10:46 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -20,17 +20,37 @@ DEPEND="=sys-freebsd/freebsd-sources-${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_unpack() {
+	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
+	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
+	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
+
+	freebsd_do_patches
+	freebsd_rename_libraries
+}
+
+src_compile() {
+	cd "${S}/lib/libdialog"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/sort"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/patch"
+	freebsd_src_compile
+}
 
 src_install() {
-	freebsd_src_install
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+
+	cd "${S}/lib/libdialog"
+	mkinstall || die "libdialog install failed"
+
+	cd "${S}/usr.bin/sort"
+	mkinstall DESTDIR="${D}/bin/" || die "libdialog install failed"
 
-	# Move these to /bin for boot access
-	dodir /bin
-	mv "${D}/usr/bin/sort" "${D}/bin/" || die "mv failed"
+	cd "${S}/usr.bin/patch"
+	mkinstall DESTDIR="${D}/usr/bin/" || die "libdialog install failed"
 }