Update to 6.1-RELEASE.

Package-Manager: portage-2.1_pre10-r5

3 files changed, 23 insertions, 115 deletions

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index d30c044ffc9a..1fa3ad7ffe9b 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -14,35 +14,35 @@ MD5 5b3ed8d353ad16881f8786815724678a files/freebsd-share-6.0-links.patch 539
 RMD160 272e428e61ceb22e204bf82bce94bc808c67f4b3 files/freebsd-share-6.0-links.patch 539
 SHA256 4858d5ba24d64ff41111142eeeecdb226703501b7a637b03baa3a7f5d0af9261 files/freebsd-share-6.0-links.patch 539
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
+DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 size 405680
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
+DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 size 867244
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-share-6.0.tar.bz2 3719732 RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 size 3719732
-DIST freebsd-share-6.1_rc2.tar.bz2 3746442 RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 size 3746442
+DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 size 3745745
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
+DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 size 1763218
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-share-6.0-r1.ebuild 1734 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 SHA1 e889315c5f7830b88b929a533af530683dea4e1a SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 size 1734
 MD5 81b5b0be188ed81fd608e066a07b5d93 freebsd-share-6.0-r1.ebuild 1734
 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 freebsd-share-6.0-r1.ebuild 1734
 SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 freebsd-share-6.0-r1.ebuild 1734
-EBUILD freebsd-share-6.1_rc2.ebuild 1764 RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 SHA1 dd588d22d878cf8b4569e0b1338a01ce6c7ea532 SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 size 1764
-MD5 08fdacf329f91cc7246042a24d9068df freebsd-share-6.1_rc2.ebuild 1764
-RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 freebsd-share-6.1_rc2.ebuild 1764
-SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 freebsd-share-6.1_rc2.ebuild 1764
-MISC ChangeLog 2962 RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a SHA1 8b54d8476fd7ce97a8b4f01b202498b3f406c1d0 SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a size 2962
-MD5 5903a932e7bbab06c2516f7634d1b08a ChangeLog 2962
-RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a ChangeLog 2962
-SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a ChangeLog 2962
+EBUILD freebsd-share-6.1.ebuild 1760 RMD160 6e118e18dc3cf300fe3c38c53ab11578b418914e SHA1 e8c6dcc72bce2a6716279782718e3f38d31cbbf8 SHA256 b850e304a49da5fc91c5484bd89df995639d5e9e2bd5f15adb4096fa1dff62d9 size 1760
+MD5 311d235fbb4e5f49e2d4cea81f77e2aa freebsd-share-6.1.ebuild 1760
+RMD160 6e118e18dc3cf300fe3c38c53ab11578b418914e freebsd-share-6.1.ebuild 1760
+SHA256 b850e304a49da5fc91c5484bd89df995639d5e9e2bd5f15adb4096fa1dff62d9 freebsd-share-6.1.ebuild 1760
+MISC ChangeLog 3135 RMD160 cdfe898699161c1cb54726ad366a38acb6d87fea SHA1 ac7e6ba2ded7861e4072314fe821c9dffb48a5af SHA256 14c596863579d7de01bf0d618c3a8ed0d88d2880f25547e1a7bcb5dca4f4ca4f size 3135
+MD5 1a3dfc67060ac7d647e1c85aa8f44234 ChangeLog 3135
+RMD160 cdfe898699161c1cb54726ad366a38acb6d87fea ChangeLog 3135
+SHA256 14c596863579d7de01bf0d618c3a8ed0d88d2880f25547e1a7bcb5dca4f4ca4f ChangeLog 3135
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -50,13 +50,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 19fcc8bd1bce9e9f8789a41a4dc2bb42 files/digest-freebsd-share-6.0-r1 2301
 RMD160 051abc7348b55916a5cdc3a2d7182938839a7c4a files/digest-freebsd-share-6.0-r1 2301
 SHA256 1ce361c768542499214da47548a18e3482adb79ee88aef42d5e8fd3fb5db32d1 files/digest-freebsd-share-6.0-r1 2301
-MD5 e459de41faab371c8d0b753c6354d7cf files/digest-freebsd-share-6.1_rc2 2409
-RMD160 b3ee33fe7a963fccfe85b54f12355d05af0edef7 files/digest-freebsd-share-6.1_rc2 2409
-SHA256 1ac1d267be3824b025e2bccc635a7d2001d886a196c10edd1642ac197c9db9ea files/digest-freebsd-share-6.1_rc2 2409
+MD5 9dd683f10a3c5bfcf614a90900b43e57 files/digest-freebsd-share-6.1 2301
+RMD160 1af09cac4e39812f0124e38b0c8142c9e9184127 files/digest-freebsd-share-6.1 2301
+SHA256 3306e2a404841662bed25ff0b656ca44560a631103ca04ce3c351dce6900229a files/digest-freebsd-share-6.1 2301
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9aWAiZjviIA2XgRAo2kAKDYfa+AqfIomFHSf2EMh1yTI889ngCgnm+F
-tLUIJuO96qXIcT99TnJZJCs=
-=txbR
+iD8DBQFEYEf2AiZjviIA2XgRAuGuAKCVJpHhdhLLN9IxtjBqrVkpuvGvPACgyLjd
+ao1+83k9aVej8zuMH2HCSBo=
+=Ee+c
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2
deleted file mode 100644
index 2e1d640786e5..000000000000
--- a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 0e02e2ac409d7048189b2afebe178f42 freebsd-bin-6.1_rc2.tar.bz2 405452
-RMD160 8eee2799407c09dfc9a114860a48b490c5393504 freebsd-bin-6.1_rc2.tar.bz2 405452
-SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 freebsd-bin-6.1_rc2.tar.bz2 405452
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 876061a056183fda4a8c6fd71b875dff freebsd-gnu-6.1_rc2.tar.bz2 867149
-RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc freebsd-gnu-6.1_rc2.tar.bz2 867149
-SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 freebsd-gnu-6.1_rc2.tar.bz2 867149
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 1420562cb87b900f9e2237242f51ae58 freebsd-share-6.1_rc2.tar.bz2 3746442
-RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 freebsd-share-6.1_rc2.tar.bz2 3746442
-SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 freebsd-share-6.1_rc2.tar.bz2 3746442
-MD5 3d35f39660e85c2e9dce5e0edd2e13a5 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-RMD160 fa35447815178e306792f5f2a60376c0903827a0 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild
deleted file mode 100644
index 42e9b914d025..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild,v 1.1 2006/05/02 22:00:44 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
-	${FILESDIR}/${PN}-5.4-gentoo-skel.patch
-	${FILESDIR}/${PN}-6.0-links.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' ${S}/man/man5/Makefile
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' ${S}/man/man4/man4.{alpha,i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf ${S}/mk/*.mk
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# This is a groff problem and not a -shared problem.
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
-	mkmake || die "emake failed"
-}
-
-src_install() {
-	mkmake DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}