Don't install rcorder as baselayout has it's own variant.

Package-Manager: portage-2.1.2_pre3-r7

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index d9fbf9d5f4902af1e59e3815d4d07c30e2402b47..df0369416ad23bf8c11792b338e52d7956870b9a 100644 (file)
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.23 2006/10/19 04:38:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.24 2006/10/24 09:13:24 uberlord Exp $
+
+  24 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  freebsd-sbin-6.2_beta2.ebuild:
+  Don't install rcorder as baselayout has it's own variant.
 
   19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Remove 6.2_beta1 ebuild.

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index e56dbf3bf48d270ac8e1fd0c1bb247c1202bc4b0..d671e84fc397ee1146a3287783efb6500d9e0ae2 100644 (file)
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX adjkerntz-crontab 184 RMD160 c9abca80479ee47cfec7cbab70adad2018770785 SHA1 2f4785974574ca6d92aafd4d5238d265a8201aa8 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc
 MD5 982df5a3b23730ce6fe0428d1efead09 files/adjkerntz-crontab 184
 RMD160 c9abca80479ee47cfec7cbab70adad2018770785 files/adjkerntz-crontab 184
@@ -55,14 +52,14 @@ EBUILD freebsd-sbin-6.1.ebuild 2673 RMD160 ff6934b0f02fbde2a2e3ca9e77e758793eaa5
 MD5 0c177715215b3168023c7fc7a5dc2f59 freebsd-sbin-6.1.ebuild 2673
 RMD160 ff6934b0f02fbde2a2e3ca9e77e758793eaa5e01 freebsd-sbin-6.1.ebuild 2673
 SHA256 61536f4ef783f61921b94a50fded892c63be26d600769904cb82d686e01e6509 freebsd-sbin-6.1.ebuild 2673
-EBUILD freebsd-sbin-6.2_beta2.ebuild 2695 RMD160 a662ae8e7352ce7a1e5a18780bdaa4d288dd3b74 SHA1 259febb28908d57c3432de7f54dfdf03511f3afc SHA256 94fbd99175d84f9de25d31ef83d559d22a7a43f7ccfcdc82ad572ae3b6eafa8b
-MD5 8f53c4e0e560c4f0daa19282b1c6f30b freebsd-sbin-6.2_beta2.ebuild 2695
-RMD160 a662ae8e7352ce7a1e5a18780bdaa4d288dd3b74 freebsd-sbin-6.2_beta2.ebuild 2695
-SHA256 94fbd99175d84f9de25d31ef83d559d22a7a43f7ccfcdc82ad572ae3b6eafa8b freebsd-sbin-6.2_beta2.ebuild 2695
-MISC ChangeLog 6718 RMD160 c97e4464a1000bf6c41ae6efea708c8e6d4a5030 SHA1 23f0d67239431a35e5e11b758f4466010e6c35d4 SHA256 2a6f5ac32303f9075f7fb0ff26c268e7d8ad8093d69e83655fdfe8f7bce13abb
-MD5 40c83b5c3ff86e7f9d94f075b522e0d2 ChangeLog 6718
-RMD160 c97e4464a1000bf6c41ae6efea708c8e6d4a5030 ChangeLog 6718
-SHA256 2a6f5ac32303f9075f7fb0ff26c268e7d8ad8093d69e83655fdfe8f7bce13abb ChangeLog 6718
+EBUILD freebsd-sbin-6.2_beta2.ebuild 2703 RMD160 d928ba1ef727509fe7ad218d98751e36f3a5fdc9 SHA1 5e7db5a7d2e206b7789f2d99db74e821255ac29d SHA256 952dcb958f0b77922a7f79da65aa70b0f66cf9c753dd18f29ce62cea235b68c9
+MD5 f259f11f5cc25fc5fc97d1e0d9bc1ec7 freebsd-sbin-6.2_beta2.ebuild 2703
+RMD160 d928ba1ef727509fe7ad218d98751e36f3a5fdc9 freebsd-sbin-6.2_beta2.ebuild 2703
+SHA256 952dcb958f0b77922a7f79da65aa70b0f66cf9c753dd18f29ce62cea235b68c9 freebsd-sbin-6.2_beta2.ebuild 2703
+MISC ChangeLog 6860 RMD160 1543234022dd702d3a2bf0daaf1fcdd15b41dc88 SHA1 7f15f776508f8225b04c7269c066a9bc1192cf45 SHA256 096af161d47160bc3413ac9bcc14bacdcdf10aadb72b53f5150e0bcdea310b13
+MD5 40018a27fe6850ef8d5b426b8324b341 ChangeLog 6860
+RMD160 1543234022dd702d3a2bf0daaf1fcdd15b41dc88 ChangeLog 6860
+SHA256 096af161d47160bc3413ac9bcc14bacdcdf10aadb72b53f5150e0bcdea310b13 ChangeLog 6860
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -73,10 +70,3 @@ SHA256 2d3fc4557f330600c1d772ea2f8d811c73c7000a42db804ff7dbd89be9238d9e files/di
 MD5 8651285f9f8ec352a13f8f8c072fadfe files/digest-freebsd-sbin-6.2_beta2 1930
 RMD160 4220c50f2bf8fbfeb74d6b8f624c803a38a2aa18 files/digest-freebsd-sbin-6.2_beta2 1930
 SHA256 09524f3e2dfca06969589228889b1f719c59fc73f64602289b6d83d5a7b2ec07 files/digest-freebsd-sbin-6.2_beta2 1930
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNwFwAiZjviIA2XgRAufMAJ9nxqeh21uCHXMBDGFDt89j/5Qu6wCeMw7E
-YWpv5YOJwgX1Ht82C9eJhac=
-=J/Ew
------END PGP SIGNATURE-----

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild
index 30b36d677c2008f2110bfd914a6d49980fddfc6b..c5731b177aefef1bba19138178569b504b7d9e32 100644 (file)
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.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-sbin/freebsd-sbin-6.2_beta2.ebuild,v 1.3 2006/10/17 10:24:29 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild,v 1.4 2006/10/24 09:13:24 uberlord Exp $
 
 inherit flag-o-matic bsdmk freebsd
 
@@ -42,7 +42,7 @@ pkg_setup() {
        replace-flags -O3 -O2
 }
 
-REMOVE_SUBDIRS="dhclient pfctl pflogd"
+REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
 
 PATCHES="${FILESDIR}/${PN}-setXid.patch
        ${FILESDIR}/${PN}-zlib.patch