remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

14 files changed, 24 insertions, 938 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 31846bd69cf4..665bbcc7a2d2 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.36 2010/01/10 23:04:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.37 2010/03/11 11:24:34 aballier Exp $
+
+  11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-libexec-7.2.ebuild, -freebsd-libexec-7.2-r1.ebuild:
+  remove old
 
 *freebsd-libexec-7.2-r2 (10 Jan 2010)
 
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 622b42acc611..06d7bafb1f32 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -3,8 +3,6 @@ Hash: SHA1
 
 AUX bootpd.confd 183 RMD160 0de8f93cbc604b11dee01a8d8d3898acd2f2dc93 SHA1 c58536760a43904a2dadeb749f2fa7d715152624 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c
 AUX bootpd.initd 553 RMD160 15e4cd00d83d969ed3dbeb8c3cd1a6bbfb05c999 SHA1 9ca5dc11b74d65c753d6614f8b22a5fc2f0902a0 SHA256 1fdc8470fda0acca9213c11e1e380110d36e992754709f754bec6ab04b77e7fa
-AUX freebsd-libexec-6.1-libfallback.patch 4230 RMD160 ec9a2d6b85945932f3d2c463c55730663961e9e5 SHA1 f67aab56a84a14c38aab467572d68d3be622cdc9 SHA256 a9db8a93a973be10c9c9f7044f9d40ed4a58a16906b3da089db9873aa7597380
-AUX freebsd-libexec-6.2-dl_iterate_phdr.patch 8194 RMD160 8670b61fe0cfdb9cf9d5515254496e58d0eb1a84 SHA1 1134db8a9ff9dfe9bd8d9199bd807ff0fb32558b SHA256 9a79cd621086f91a1959adbfabdb1834e6d4cd83c0f4c517c35d3d4c706ba96a
 AUX freebsd-libexec-7.0-libfallback.patch 3955 RMD160 1ba757f14a96b70f8864880d3da7aceeb923226a SHA1 b2f120ed69c45b494f3a2bab80465e38de24018e SHA256 5850a3b9bc5c25fca8c70547926423b44a9123878d37e40a0fc6323ebc8a843c
 AUX freebsd-libexec-7.2-pic.patch 348 RMD160 59f8d21553276a36e6299d400659333d0e58ab7e SHA1 6ca0a8e94a726b59bcf4a0b75e611621d56d3b1b SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f
 AUX freebsd-libexec-7.2-rtld7.patch 855 RMD160 bc1a1ab1089f0bce0d2958e53bad8cbbcfe2cd67 SHA1 20dd7d590018668eb7653aea474edf6c565242d7 SHA256 d31c269fec13a65267053b527909b2912158aa82da3d04dd576dc6a00f1e8557
@@ -17,38 +15,20 @@ AUX rstatd.xinetd 218 RMD160 d023d79caf4fb8b309be4ce7d6de0492b63db11d SHA1 7344e
 AUX rusersd.xinetd 220 RMD160 448f13ef61420ca08f6d457e9ddc8c7ea1b0e9c4 SHA1 3552bb20b976c800c9d7363cf3672c6887f398ed SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3
 AUX sprayd.xinetd 216 RMD160 3988be6b92672f7522213d924b912703248eb829 SHA1 7a0414f5111bd15ca51ff187f4ea78125db3c5f7 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e
 AUX walld.xinetd 215 RMD160 79137d1e075178ac22c099e7dd484caa5db5db11 SHA1 f092f7bb6087391d367f4d9968ae9ca56c1cf2da SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0
-DIST freebsd-bin-6.2.tar.bz2 406748 RMD160 d687c8ee46fdcc6ea441367a50aad03b695ee616 SHA1 c4ea24e987c9e613b3400d83671688b22648f967 SHA256 202c2024d9a5326ddfd07cae49e2f663118a8ae2f8c79a40c92d513acece3935
-DIST freebsd-bin-7.1.tar.bz2 406073 RMD160 f059ce0051b07914122a0ac5f18925f09c06839d SHA1 8c37c23703eeb8dff3403c53a5fa5f6f0d640cef SHA256 56a57cea99c8ee4315374d8522cca9468d307ec6a6fe489e95f582f30d9f0937
 DIST freebsd-bin-7.2.tar.bz2 406772 RMD160 5cb15516cfc080c7ddf4b5b6e7eb880b2e1012bd SHA1 b4d936ffe4f6bad5909e334decff6ac5f2b4451d SHA256 4d182bfcce5c906982a77301e9fac059d89890a1495ea42819682409d5d70885
-DIST freebsd-contrib-6.2.tar.bz2 36594160 RMD160 8b89f1ac72ba0054efe1aec2d747ecd33789fde3 SHA1 02493b8d90b0e1bb4304ce6466203135bf5709b1 SHA256 dbbd9198597e176242806329242d0e12181820a921e5da42aadefaacda1b6277
-DIST freebsd-contrib-7.1.tar.bz2 41014879 RMD160 c604f44a1d41190c984ebca298e9777be56fcaab SHA1 9ee16db2c60f3412b72e214e8bd0b11f92748796 SHA256 ff273f6b2ea3cdd743632e591928563e73221aa1ba77e874009daffbad8c78e5
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
-DIST freebsd-etc-6.2.tar.bz2 190297 RMD160 1540601566ece689b3fc2935329a2eca62a24314 SHA1 e8337672d0a0d207a9e9674c9f516d8ed94af0cf SHA256 ff5970db1d7842d2933589203ae0c3907dee427b2ea99de68fce678582bf1804
-DIST freebsd-etc-7.1.tar.bz2 197584 RMD160 c9404684b8abeb89d4490cb366232b9ddc02c8fe SHA1 93edd3acb45c8c8fd4b1bd520d5f40ab23a03dc3 SHA256 01943b5d17af8a4f99a15ee5636016d7ec55d85d58e260e95507c5ac3218cd3b
 DIST freebsd-etc-7.2.tar.bz2 199580 RMD160 f8954a1c590c918861b39cb414a079a960af9969 SHA1 a2fee43a6a6fffd864776eceab134002fc9292d2 SHA256 9a6ebd6877191e7ff5d734a77da16090123c5223cfe873177b9fe1ca4f12d653
-DIST freebsd-lib-6.2.tar.bz2 2670374 RMD160 95bbce7862fc7a406b8629914f281d5e01e5ea71 SHA1 3cd061f83ef6672d98599dd3a294ead6832a1b14 SHA256 8e0c909a79a9ed18841f8a5a6e25fc770f76de1a5dc20cbd6bc591bed52d1033
-DIST freebsd-lib-7.1.tar.bz2 2960439 RMD160 9a6ade2a84b6f5d49aff4c64a07ddb9cee916511 SHA1 5b632bc3dbf72dbf76691cdf20e03667affaece2 SHA256 9891c9887aa33a7fa17c4893c50db1ac3ecae5a76c3f31ee0294344a47b62db1
 DIST freebsd-lib-7.2.tar.bz2 2970356 RMD160 d676e9bfd3a32293ac1190ff3c42861fb987394e SHA1 15749e43f5ed16316c5311bfa40f42ed546b69e9 SHA256 80b54a23068b806aede48700884a5ed2aa33f5d813309ef7497a7b951d62aab0
-DIST freebsd-libexec-6.2.tar.bz2 277231 RMD160 423490cb7c888bfce7edcf473d77868c65c21fe2 SHA1 86f58d8f6e4eff022720a6ada60f2d9c5549c861 SHA256 546821f50ff3e69cebd59e1415798233050259de33a4b37acfcbd56b8d92782b
-DIST freebsd-libexec-7.1.tar.bz2 276019 RMD160 1484fbe1fda4be2cdbefecef46312241bcae39e4 SHA1 8d468b54986e49bda44c1d860d71da967bafd700 SHA256 add412192d8b829d75d66f73f3ae9ac76707fd341f36df4b88346567781d859b
 DIST freebsd-libexec-7.2.tar.bz2 275993 RMD160 e3cfab5b89c304eeff76d92eaadaaadb6322c90e SHA1 747aa2365565fabb97aa910c01c06b340ddf3ea2 SHA256 375627cd871a4fbed4b7ec79d788bb5e62bc6cc818e971c613b3acd89b2db453
-DIST freebsd-ubin-6.2.tar.bz2 1772844 RMD160 8101bc3e98fa485e31ecf0d5529136ddeb4be5b9 SHA1 34debd5e3142cbde5e603ce6c89e358d0039e68f SHA256 446c1a8c7031defda8b184ccf4535cacf651928f324db6ce0aaec3b87b04d9ae
-DIST freebsd-ubin-7.1.tar.bz2 1850676 RMD160 17f80c122f0ba4f76b61cb50d6a6a0aa192be19e SHA1 8329c7e8f4b9c2c35bd6fb9a7dc768bd9922670b SHA256 c5a3d3b5aeb75e84b5a1d3871c8714c64c190ec044811c3fd05a86c0e3c1ca56
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
-DIST freebsd-usbin-6.2.tar.bz2 2695872 RMD160 ea6104fcfbf6c0be511a80d0475e5a8f716292be SHA1 4772ed5fdc591273887fc7a2e97bddf7a1669b5d SHA256 6195301d39e7bc7fa00f6dec71479b1800ea5c3dc9d3ea375dafe4e71e6485f0
-DIST freebsd-usbin-7.1.tar.bz2 2584691 RMD160 cf6adf2f1cc60e667417f647cb99bbc3107c85f6 SHA1 7120dd7e7abed78954889ad4e18e5f8775411621 SHA256 e14cd80187a161153ea5eb6e5441171bf1ca1a8b8e8bdeea7306187c77c52af8
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
-EBUILD freebsd-libexec-6.2-r2.ebuild 1812 RMD160 d13830b604bb7b3d47f02003f72a0d150a5a1130 SHA1 7a888657a8488267650f7a3da6babbb8b8b68060 SHA256 eb1faec030f8872e8c79110eba6baba658797664bed2cec1fa007742c4fd921e
-EBUILD freebsd-libexec-7.1-r1.ebuild 2063 RMD160 ae843df1662c8b7aaf830306a546b286e8503f85 SHA1 407a9edd44d371c492949b63239af67cfd87b262 SHA256 412bb592c35c7d6f5c1e2bdd1093fcc2a1e9714babc22abab8b979321980533a
-EBUILD freebsd-libexec-7.2-r1.ebuild 2134 RMD160 5e3b6249da86634304e8a7023fe1b1472524d506 SHA1 1bd64829e55183d7b69c8ee7936cc53af013f2ab SHA256 6a89e8833845f10bf24f5e3b79b9112b906e30c855eafe0336719be00ec292a5
 EBUILD freebsd-libexec-7.2-r2.ebuild 2204 RMD160 000315fbf6820b0c9bd5dca9c2c716968729a7fb SHA1 597df60c2d645de578427f35e173bf3be62db09d SHA256 c2e529d205f269cc7c5f1f6534b84ee9e71281fd5822b2c7d090d4a2e45939d2
-EBUILD freebsd-libexec-7.2.ebuild 2068 RMD160 2c8d572f7041cfad8802bdaa2aabe0ffca5ff528 SHA1 b99d9e1c56394c376309b0d68e4e1cc8dc173d3b SHA256 f6089efadcf3a5ab59fabf06511c1287561c2ba3e9193fe9741484256c044d71
-MISC ChangeLog 8668 RMD160 61e5a2357504c32203dd3b4589236f6f779379c6 SHA1 fedbeeb8bc19b1ab78bea941e27aaff2ba7286c3 SHA256 95d58863edfa747e7a5635ab6fc5619fcc4f5989e8831d8d3495204027435c9f
+MISC ChangeLog 9031 RMD160 8b4059530c2b7fe8f7e2c69bd75268ebb6d15998 SHA1 77f86d1466b0fc2bdef069337da45a2edd44c12d SHA256 b29b56f24afd34dd8be82ac350f775d01d12727ff4ea12b89abba1af361b197d
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktKXRoACgkQvFcC4BYPU0reqwCePJeyeiFCfTIzTdNdRaLZTyRR
-8YUAn1zfvJH+Hil0iptX9bUUdurnbRoK
-=KePt
+iEYEARECAAYFAkuY03MACgkQvFcC4BYPU0pHHACgrwY9roFXEgH+kKNDP4wzyvug
+0QYAoKtmZxntcmcrOxF3fVWDpDK996jY
+=J2ew
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index a5c028d9de37..231c9ae2dfc6 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.33 2009/05/22 13:37:30 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.34 2010/03/11 11:22:52 aballier Exp $
+
+  11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+  -files/freebsd-mk-defs-6.0-gnu.patch, -freebsd-mk-defs-6.2.ebuild,
+  -files/freebsd-mk-defs-6.2-2-gentoo.patch, -freebsd-mk-defs-7.1.ebuild:
+  remove old
 
 *freebsd-mk-defs-7.2 (22 May 2009)
 
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch
deleted file mode 100644
index 76c94e1b5934..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: mk/bsd.incs.mk
-===================================================================
---- mk.orig/bsd.incs.mk
-+++ mk/bsd.incs.mk
-@@ -43,7 +43,7 @@ _${group}INS_${header:T}: ${header}
- 	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
--	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
-+	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -56,11 +56,11 @@ installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
- 	${INSTALL} -d ${DESTDIR}${${group}DIR}
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
- 	${INSTALL} -d ${DESTDIR}${${group}DIR}
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-Index: mk/bsd.lib.mk
-===================================================================
---- mk.orig/bsd.lib.mk
-+++ mk/bsd.lib.mk
-@@ -105,7 +105,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -118,7 +118,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -138,7 +138,7 @@ ${SHLIB_NAME}: ${SOBJS}
- .endif
- 	@${CC} ${LDFLAGS} -shared -Wl,-x \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .endif
- 
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
-@@ -183,13 +183,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-@@ -205,12 +198,12 @@ realinstall: _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
- 	${INSTALL} -d ${DESTDIR}${LIBDIR}
--	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
- 	${INSTALL} -d ${DESTDIR}${LIBDIR}
--	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-Index: mk/bsd.prog.mk
-===================================================================
---- mk.orig/bsd.prog.mk
-+++ mk/bsd.prog.mk
-@@ -111,13 +111,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
deleted file mode 100644
index c09633b575b0..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-Index: fbsd-6.2b3/share/mk/bsd.doc.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.doc.mk
-+++ fbsd-6.2b3/share/mk/bsd.doc.mk
-@@ -137,10 +137,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-Index: fbsd-6.2b3/share/mk/bsd.files.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.files.mk
-+++ fbsd-6.2b3/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.incs.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.incs.mk
-+++ fbsd-6.2b3/share/mk/bsd.incs.mk
-@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,9 +55,11 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.info.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.info.mk
-+++ fbsd-6.2b3/share/mk/bsd.info.mk
-@@ -85,6 +85,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -146,12 +147,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
-Index: fbsd-6.2b3/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.lib.mk
-+++ fbsd-6.2b3/share/mk/bsd.lib.mk
-@@ -32,10 +32,6 @@ CFLAGS+=	${CRUNCH_CFLAGS}
- CFLAGS+= ${DEBUG_FLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -208,14 +204,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-Index: fbsd-6.2b3/share/mk/bsd.man.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.man.mk
-+++ fbsd-6.2b3/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.prog.mk
-+++ fbsd-6.2b3/share/mk/bsd.prog.mk
-@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS}
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -133,9 +129,11 @@ realinstall: _proginstall
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-Index: fbsd-6.2b3/share/mk/sys.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/sys.mk
-+++ fbsd-6.2b3/share/mk/sys.mk
-@@ -34,13 +34,13 @@ AFLAGS		?=
- 
- .if defined(%POSIX)
- CC		?=	c89
--CFLAGS		?=	-O
-+CFLAGS		?=	
- .else
--CC		?=	cc
--CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
-+CC		?=	gcc
-+CFLAGS		?=	-pipe
- .endif
- 
--CXX		?=	c++
-+CXX		?=	g++
- CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes}
- 
- CPP		?=	cpp
-@@ -252,12 +252,6 @@ YFLAGS		?=	-d
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # Default executable format
- # XXX hint for bsd.port.mk
- OBJFORMAT?=	elf
-Index: fbsd-6.2b3/share/mk/bsd.libnames.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.libnames.mk
-+++ fbsd-6.2b3/share/mk/bsd.libnames.mk
-@@ -41,7 +41,7 @@ LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
- LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -66,7 +66,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeyca
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if !defined(NO_BIND)
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-Index: fbsd-6.2b3/share/mk/bsd.sys.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.sys.mk
-+++ fbsd-6.2b3/share/mk/bsd.sys.mk
-@@ -27,9 +27,6 @@ CFLAGS		+= -std=${CSTD}
- . if defined(WARNS)
- .  if ${WARNS} >= 1
- CWARNFLAGS	+=	-Wsystem-headers
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- .  if ${WARNS} >= 2
- CWARNFLAGS	+=	-Wall -Wno-format-y2k
-@@ -60,9 +57,6 @@ WFORMAT		=	1
- .  if ${WFORMAT} > 0
- #CWARNFLAGS	+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
- CWARNFLAGS	+=	-Wformat=2 -Wno-format-extra-args
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- . endif
- .endif
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild
deleted file mode 100644
index 35adfd3785f4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild,v 1.2 2007/07/02 15:31:54 peper Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/share
-	epatch "${FILESDIR}/${PN}-6.2-2-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk
-}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild
deleted file mode 100644
index 550cdd2ca9d4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild,v 1.2 2009/01/23 02:18:16 mr_bones_ Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-7.1-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-7.1-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index caad468ee3d5..95ca56b5b9c4 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.53 2009/05/24 22:44:55 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.54 2010/03/11 11:20:03 aballier Exp $
+
+  11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-sbin-6.2-r2.ebuild, -files/freebsd-sbin-6.2-ipfilter.patch,
+  -freebsd-sbin-7.1.ebuild, -freebsd-sbin-7.1-r1.ebuild,
+  -files/freebsd-sbin-zlib.patch, metadata.xml:
+  remove old
 
   24 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   freebsd-sbin-7.1-r1.ebuild, freebsd-sbin-7.2.ebuild:
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch
deleted file mode 100644
index 83681b70f28f..000000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ipfilter.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- sbin.orig/ipf/ipf/Makefile	2007-08-06 15:57:49 +0100
-+++ sbin/ipf/ipf/Makefile	2007-08-06 16:02:33 +0100
-@@ -1,15 +1,15 @@
- # $FreeBSD: src/sbin/ipf/ipf/Makefile,v 1.3.2.1 2006/08/24 07:37:10 guido Exp $
- 
- PROG=		ipf
--SRCS=		ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
-+SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
- MAN=		ipf.8 ipf.4 ipf.5 ipl.4
- MLINKS=		ipl.4 ipfilter.4 ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
- CFLAGS+=	-I. -DIPFILTER_BPF
- 
--DPSRCS+=	ipf_l.h ipf_y.h
-+GENHDRS=	ipf_l.h ipf_y.h
-+DPSRCS+=	${GENHDRS}
- 
--CLEANFILES+=	ipf_y.c ipf_y.h
--CLEANFILES+=	ipf_l.c ipf_l.h
-+CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
- 
- ipf_y.c: ipf_y.y
- 	${YACC} -d ${.ALLSRC}
---- sbin.orig/ipf/ipftest/Makefile	2007-08-06 16:07:39 +0100
-+++ sbin/ipf/ipftest/Makefile	2007-08-06 16:13:23 +0100
-@@ -1,7 +1,7 @@
- #	$FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.3 2005/04/28 16:26:34 darrenr Exp $
- 
- PROG=		ipftest
--SRCS=		ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
-+SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
- 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
- 		ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
- 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
-@@ -13,16 +13,15 @@
- 
- .PATH:		${.CURDIR}/../../../sys/contrib/ipfilter/netinet
- 
--DPSRCS+=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-+GENHDRS=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-+DPSRCS+=	${GENHDRS}
- 
--CLEANFILES+=	ipf_y.c ipf_y.h
--CLEANFILES+=	ipf_l.c ipf_l.h
-+CLEANFILES+=	${GENHDRS} 
-+CLEANFILES+=	ipf_y.c ipf_l.c
- CLEANFILES+=	ipf.tab.c ipf.tab.h
--CLEANFILES+=	ipnat_y.c ipnat_y.h
--CLEANFILES+=	ipnat_l.c ipnat_l.h
-+CLEANFILES+=	ipnat_y.c ipnat_l.c
- CLEANFILES+=	ipnat.tab.c ipnat.tab.h
--CLEANFILES+=	ippool_y.c ippool_y.h
--CLEANFILES+=	ippool_l.c ippool_l.h
-+CLEANFILES+=	ippool_y.c ippool_l.c
- CLEANFILES+=	ippool.tab.c ippool.tab.h
- 
- ipnat_y.c: ipnat_y.y
---- sbin.orig/ipf/ipmon/Makefile	2007-08-06 16:19:32 +0100
-+++ sbin/ipf/ipmon/Makefile	2007-08-06 16:21:44 +0100
-@@ -1,15 +1,15 @@
- #	$FreeBSD: src/sbin/ipf/ipmon/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
- 
- PROG=		ipmon
--SRCS=		ipmon.c ipmon_y.c ipmon_l.c
-+SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
- MAN=		ipmon.8
- 
- CFLAGS+=	-DLOGFAC=LOG_LOCAL0 -I.
- 
--DPSRCS+=	ipmon_l.h ipmon_y.h
-+GENHDRS+=	ipmon_l.h ipmon_y.h
-+DPSRCS+=	${GENHDRS}
- 
--CLEANFILES+=	ipmon_y.c ipmon_y.h
--CLEANFILES+=	ipmon_l.c ipmon_l.h
-+CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
- 
- ipmon_y.c: ipmon_y.y
- 	${YACC} -d ${.ALLSRC}
---- sbin.orig/ipf/ipnat/Makefile	2005-04-28 17:26:34 +0100
-+++ sbin/ipf/ipnat/Makefile	2007-08-06 16:24:42 +0100
-@@ -1,15 +1,15 @@
- #	$FreeBSD: src/sbin/ipf/ipnat/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
- 
- PROG=		ipnat
--SRCS=		ipnat.c ipnat_y.c ipnat_l.c
-+SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
- MAN=		ipnat.8 ipnat.4 ipnat.5
- MLINKS=		ipnat.5 ipnat.conf.5
- CFLAGS+=	-I.
- 
--DPSRCS+=	ipnat_l.h ipnat_y.h
-+GENHDRS=	ipnat_l.h ipnat_y.h
-+DPSRCS+=	${GENHDRS}
- 
--CLEANFILES+=	ipnat_y.c ipnat_y.h
--CLEANFILES+=	ipnat_l.c ipnat_l.h
-+CLEANFILES+=	${GENHDRS} ipnat_y.c ipnat_l.c
- 
- ipnat_y.c: ipnat_y.y
- 	${YACC} -d ${.ALLSRC}
---- sbin.orig/ipf/ippool/Makefile	2005-04-28 17:26:34 +0100
-+++ sbin/ipf/ippool/Makefile	2007-08-06 16:25:20 +0100
-@@ -1,14 +1,14 @@
- #	$FreeBSD: src/sbin/ipf/ippool/Makefile,v 1.2 2005/04/28 16:26:34 darrenr Exp $
- 
- PROG=		ippool
--SRCS=		ippool_y.c ippool_l.c kmem.c ippool.c
-+SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
- MAN=		ippool.5 ippool.8
- CFLAGS+=	-I.
- 
--DPSRCS+=	ippool_l.h ippool_y.h
-+GENHDRS=	ippool_l.h ippool_y.h
-+DPSRCS+=	${GENHDRS}
- 
--CLEANFILES+=	ippool_y.c ippool_y.h
--CLEANFILES+=	ippool_l.c ippool_l.h
-+CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
- 
- ippool_y.c: ippool_y.y
- 	${YACC} -d ${.ALLSRC}
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-zlib.patch
deleted file mode 100644
index b8a0437840d2..000000000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
---- sbin/savecore/savecore.c	2005-02-26 01:21:50 +0000
-+++ sbin-zlib/savecore/savecore.c	2005-05-06 12:00:06 +0000
-@@ -95,7 +95,7 @@
- static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static void
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
-@@ -387,7 +387,7 @@
- 	oumask = umask(S_IRWXG|S_IRWXO); /* Restrict access to the core file.*/
- 	if (compress) {
- 		sprintf(buf, "vmcore.%d.gz", bounds);
--		fp = zopen(buf, "w");
-+		fp = gzopen(buf, "w");
- 	} else {
- 		sprintf(buf, "vmcore.%d", bounds);
- 		fp = fopen(buf, "w");
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
deleted file mode 100644
index f09b90daafff..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.3 2009/01/08 20:02:49 aballier Exp $
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	dev-libs/libedit
-	sys-libs/readline
-	sys-process/vixie-cron"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter ipv6 vinum suid ssl build"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
-
-PATCHES="${FILESDIR}/${PN}-6.2-ldconfig.patch
-	${FILESDIR}/${PN}-6.2-ipfilter.patch
-	${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-zlib.patch
-	${FILESDIR}/${PN}-6.1-pr102701.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-
-	# Allow users to use ping and other commands
-	dodir /bin
-	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
-
-	# ext2fs can mount ext3, you just don't get the journalling
-	dosym mount_ext2fs sbin/mount_ext3
-
-	# Do we need pccard.conf if we have devd?
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins defaults/pccard.conf minfree sysctl.conf
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-
-}
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild
deleted file mode 100644
index 0dd67f8d5038..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1-r1.ebuild,v 1.2 2009/05/24 22:44:55 flameeyes Exp $
-
-EAPI=2
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	dev-libs/libedit
-	sys-libs/readline
-	sys-process/vixie-cron
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
-	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-7.1-zlib.patch
-	${FILESDIR}/${PN}-6.2-ldconfig.patch
-	${FILESDIR}/${PN}-6.1-pr102701.patch"
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Allow users to use ping and other commands
-	dodir /bin
-	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
-
-	# ext2fs can mount ext3, you just don't get the journalling
-	dosym mount_ext2fs sbin/mount_ext3
-
-	# Do we need pccard.conf if we have devd?
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins defaults/pccard.conf minfree sysctl.conf
-
-	# initd script for idmapd
-	newinitd "${FILESDIR}/idmapd.initd" idmapd
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-}
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1.ebuild
deleted file mode 100644
index 529cbbc813d6..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-7.1.ebuild,v 1.1 2009/01/22 21:04:48 the_paya Exp $
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	dev-libs/libedit
-	sys-libs/readline
-	sys-process/vixie-cron"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter ipv6 vinum suid ssl build"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-7.1-zlib.patch
-	${FILESDIR}/${PN}-6.2-ldconfig.patch
-	${FILESDIR}/${PN}-6.1-pr102701.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Allow users to use ping and other commands
-	dodir /bin
-	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
-
-	# ext2fs can mount ext3, you just don't get the journalling
-	dosym mount_ext2fs sbin/mount_ext3
-
-	# Do we need pccard.conf if we have devd?
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins defaults/pccard.conf minfree sysctl.conf
-
-	# initd script for idmapd
-	newinitd "${FILESDIR}/idmapd.initd" idmapd
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-}
diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
index e05b621c037c..f0b8ec2a77b4 100644
--- a/sys-freebsd/freebsd-sbin/metadata.xml
+++ b/sys-freebsd/freebsd-sbin/metadata.xml
@@ -9,7 +9,6 @@
     <flag name='pf'>
       Build tools to administer the PF firewall.
     </flag>
-    <flag name='vinum'>Enable vinum support (TODO improve description)</flag>
     <flag name='netware'>
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).