remove old

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
author: Alexis Ballier <aballier@gentoo.org> 2013-08-09 15:10:05 +0000
committer: Alexis Ballier <aballier@gentoo.org> 2013-08-09 15:10:05 +0000
commit: d882d55e6122a1106e3652d21715673a55973e52 (patch)
tree: db4d5615da27c3fd75211ea20cbe800dd71b7f96 /sys-freebsd
parent: Version bump (bug #480364). (diff)
download: historical-d882d55e6122a1106e3652d21715673a55973e52.tar.gz
historical-d882d55e6122a1106e3652d21715673a55973e52.tar.bz2
historical-d882d55e6122a1106e3652d21715673a55973e52.zip
55 files changed, 125 insertions, 2903 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 38fd277e5633..f8b581bba839 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.42 2013/06/18 23:18:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.43 2013/08/09 15:09:58 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -boot0-9.0.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -boot0-7.2.ebuild,
   -boot0-8.0.ebuild, -files/boot0-7.0-gentoo.patch:
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 789c61315b1d..1567962d2c99 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -2,22 +2,18 @@
 Hash: SHA256
 
 AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 EBUILD boot0-8.2.ebuild 1289 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce SHA512 79785ee0f577f744dd4087f69333bc76d9624046526d4f9a36f2be9d27e8b68e3d3bb488147996cd95a034ab288274c43bee8ac444776f40c2e9f2f3ed3edb91 WHIRLPOOL b9c59ec699020212e0ce439bde6b3d4acf899e2b6620ce3261f537e1ce05108989b8cff38abd1ab4afc1586e1ba564d1221e420d83c6509ad24f260e1a803d15
-EBUILD boot0-9.0.ebuild 1276 SHA256 dd1631c8ba442dd89331bd2694030d0df5401ab08127392fcc3fdd09acc5d4f8 SHA512 52e6e887a4fa4579a960d86bc14463c13d0fcbfbba52c5bebcf9490ec03928554e9bdf507949eeba8f0c57675adc4cb1dce13b19dff67d4f6bfb7d7f48e38129 WHIRLPOOL 663950457a9f489f5e8e5cf6d457d6cd67dbebbedccb97e6a9e52734b06514d645b64861e3265a9396e9917e5f3a33304a238756e2394a4a1d334ae52128b267
 EBUILD boot0-9.1.ebuild 1495 SHA256 140d29c0ec90d5d790c85f8ace671d56190ce979b0924238c3f4aec8c0dd2849 SHA512 26a8b9c0c649866fb2a08f87a5f1a48fdefcabe3450c0addc65fc1d86860c8352986736de02db67bc477453acd04aed71346b9938fc898b69dfafce61ebdfeab WHIRLPOOL 0715d6f4d749f1ce435e65b619c1034cf7dc40114f16eef1c6424a19c8705ab7c9a8ba4e8278466466c2a8cf95c3f5acf90255ba7956f96232da3c08e20b0ef3
-MISC ChangeLog 6058 SHA256 38cd619346ff2a681e4592beed930b122a3c77f47bfc2cf250ee08b6d327b2db SHA512 2908b0c3e857dfff44cb07701774e803fa36b3a59dadf5f0b8c5755c3725ff78bfa3635f6c0c5cb0f6eb26afe4c5783bcba76cc8c901362e0d89a29315fb5d6e WHIRLPOOL e8f9030c75251b6b4fd34a18b26b2684dd18f358285ab574d1d903f034003ec7cf91c7c1328a1f7b7f5a1e99bdc6867325c4fce4c2bf255237e497e7cefac9d5
+MISC ChangeLog 6143 SHA256 2f03a27e46025a869dfa452337485736a9b1650c5c3cf563a984d9f39c970ec5 SHA512 64826fac35cae8ff1e6faa7e38ced1b34eba637b079dda6f8bf33c38c9192b4b529f06aa7630dfacbac03b8004661fd7197f9485ee0bf61ece7384bc221be5f3 WHIRLPOOL 022e3f82b4caf6de313afdc8580b9654be21c19b8582e35e5ce5f6f3daef3105789cc2d6a36b657c85e19358144d64edbf4c8e7815fd7e8b342b1572ff362bd1
 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA6roACgkQvFcC4BYPU0qkYQCggnmFv9KZK9qxcHENAmvBY4bn
-wfAAoLHr/pzExwX74gJRLElwqkPwJp7t
-=9kuc
+iEYEAREIAAYFAlIFBkcACgkQvFcC4BYPU0qqIQCfQ93hlzDubczcwxlOWOelBaXa
+PcUAnj6LsWpn3fd5WTlEzRDB7O33FSlG
+=PFWH
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-9.0.ebuild b/sys-freebsd/boot0/boot0-9.0.ebuild
deleted file mode 100644
index 388bdf0143bb..000000000000
--- a/sys-freebsd/boot0/boot0-9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.0.ebuild,v 1.4 2012/05/17 14:36:08 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-fno-strict-aliasing"
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 7c373e536b45..d9645b2cd5e1 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.50 2013/06/18 23:21:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.51 2013/08/09 15:09:15 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-bin-9.0.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-bin-7.2.ebuild,
   -freebsd-bin-8.0.ebuild, -files/freebsd-bin-6.0-flex-2.5.31.patch:
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index cd949fb8bfc8..c81b4e561355 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -2,25 +2,20 @@
 Hash: SHA256
 
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
-DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 EBUILD freebsd-bin-8.2.ebuild 886 SHA256 fb3219d6a63a7a69e0e6ced7701d07484862b68e9364907b03b0e44a14c02b26 SHA512 689cff7bd0e5f8eec8d614a75f292043132019614a8103f42c527299507073184f0329272fa47687bb81f75fc63b1ac76b5cba13a5f5d555fa18a9ad99272c14 WHIRLPOOL 5b774aea9cbb43842931b5dcf2d293f3df0601e5024edf9f1bdf847b8be7e5a89ec94e33d849efea0bfaea85277406b0c1c60aa7d4ac955527972a380199e0c1
-EBUILD freebsd-bin-9.0.ebuild 950 SHA256 638aa53d5215b920d21d793a87e90bbff693b11c3e330bd454465127f5dddd26 SHA512 85b441802a50e4f0a5c556c40b6ec84c906fe4e89eaae0f6583b76fb76bffb42ede3d461f646a6285d4b49d802b63a426983f2e55eb0b11c923ee526de7565dd WHIRLPOOL 738a3abf4d8d248d749c45d7b401bbd782e339b44a3ec37e1df61166429b37bab98964dcf835c72e8f5dcee64bda22c201f04703f55b82d697cb0f8d79d32714
 EBUILD freebsd-bin-9.1.ebuild 950 SHA256 641094e8b64f265c521ead9394e377e8532ba90b1ad352de56cc5e2697f2f597 SHA512 1306fb8d5f0ed56b0178ae8666dc10bfe4c248a07d303a945e4eaa882ceed2c005e9c634e9b342934c2f53e3d892c966000405b84fbc26f1d6bbe93cfc56be0c WHIRLPOOL 0f6c423657f3590553c6984d4f762f4a6eec2f3de142dceab8ff36042f7035928aa860307d2846843b84783bffd8818b028c7f0638cf1bcdb8e3c766b7d897ca
-MISC ChangeLog 8735 SHA256 ea05d1b16223fa2d79436b95c31b7057da2c5fd39816d20a8009f8dd5a0d7532 SHA512 456ab0330e3f006d9fee9cda77036e7aa8f4f65bd8da5bbb05a21448535b7f43767d1b88b946d55a92a71b0358d6d5a0a6181cfd796f05558cd19cc2d4614046 WHIRLPOOL 55d0f63a7e512b4903cfa1f89ce3ab2c847c1b43dce8893ff5fd8f1f8fa586b276f1285d5f3591542fddff53c280092e52a47ef6427568452095c975d043b13e
+MISC ChangeLog 8826 SHA256 5e288aa20b04aec1c1ea0cf77ac58dbf84e4254999c7e01e9ce5819cc52870a3 SHA512 4243a1e889ebc16428d695a3e523768daba873c2ee91e519251638a202840ac5914be0a99a18726f7ddd76b4d58366b2b28617d3b0c5989f77e0e5533e016403 WHIRLPOOL 994581123018a37821e466a979b3be6cf2b805ce18eaa7a546c9ee621ac6f7c0af3b2b3cfacc30c51c81c4466c1c8edd34630d254da7c6d5d59967bd867c4a28
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA620ACgkQvFcC4BYPU0pj+QCdF2eohpk8eQ6uy3lt/WzVT5iB
-kZQAnj7UUfurjQgxH0naMq+BgyxzSy8I
-=u4wW
+iEYEAREIAAYFAlIFBhwACgkQvFcC4BYPU0pvWQCbBHTZgAa19r9k5rZaIN4vzT7P
+mQEAoK26Yvg/EsHC6kV6DMG3FdcoCxDy
+=WZNQ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.0.ebuild
deleted file mode 100644
index 682a73103d4f..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-9.0.ebuild,v 1.3 2012/04/26 13:18:24 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 226d8c57e8b5..a94bdb37ad51 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.32 2013/06/18 23:19:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.33 2013/08/09 15:08:56 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-cddl-9.0.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-cddl-7.2.ebuild,
   -freebsd-cddl-8.0.ebuild, -files/freebsd-cddl-7.1-libpaths.patch,
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 2ccd322d7ad3..123471ef7694 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -10,35 +10,27 @@ AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1
 AUX zvol.initd 955 SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467 SHA512 606f74338087cb08591fdb3ff78a1de4cf0e4ee97af7ee301f7ce0b4028b980edc78601d745ec0a9865360d308b90a52f3603b5043f135be8ffc0f4380e9023c WHIRLPOOL 88e7534ad74518e7684775e202f63dfed3c41aa51314572af412aa87a8a060b4ada918643793ac2333b46b37e469d56227559dcfbadbd0bc023d21a683c6e165
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 DIST freebsd-cddl-8.2.tar.bz2 823706 SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721 WHIRLPOOL 0150d972fc5200efcf22b5baded0bc7d826f03420a8328bc9ce1f53f39d1f3cd07dc367fcb3b0c8bdcc3b33bc9045f262928d76532c91820fd3c6bc8c9ee57c9
-DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
 DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
-DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 EBUILD freebsd-cddl-8.2.ebuild 1298 SHA256 e3cfd2017e57dcca0c8797fc79ad6cc92d7987ec7c1ca39b86ce01a878affe28 SHA512 653f173a3667c56650153620d9984f4ea399459c701428c04bd267386b6fbdda69a0cfd0bf007275975dddb0aa355781e74bfcdb8486baad92d7d1c8c56ab1a2 WHIRLPOOL 5aaecd8026689bda93d79c91f6f1ab1d3892a238a2be9085f4753b540cd41e0485b2f23b243d03373fdad690cbb2611754898562ec31be478ca86d60edf66251
-EBUILD freebsd-cddl-9.0.ebuild 1600 SHA256 2d9a8c664ec85f22ee0fb34987e4b84b3aa8b35aa59d90e8eb3198953d1d13f3 SHA512 3539806a203c4acb16fd052cadcc2a437c730e10218c51092f359f953d4ee0af3c2e8176ecac458da97aa7ae1b000eaa1a5c7cadc6aac9c95af01cba2f7b7d42 WHIRLPOOL 7cd6a45730a6a112e19d65d7cdce6b89729b2c6f2b509592da2c84415e65d14960adeb6530329d2f891121f5705617bb1b8501de0ded6c208275b25612c48a64
 EBUILD freebsd-cddl-9.1.ebuild 1599 SHA256 497cc1e9850d4f973faa772a3cac857e06b339216a680c99aaec567a47357d05 SHA512 dc55ba2ec07e414b8ee86856896a3cee0b3f9011a14487c47c035e5e94ffa60b8fb6baea4ca2a66234d2ec7189d490e0304d49ac2f9455b7ab27c44172fd0662 WHIRLPOOL e1fedbedc25f0b5d3194de0e7f4e4b00bf451b8a22248babdfbb77991b7e05b90511c9ac201541b2837285c5a0ec3406e625ef4a41ec6b1c067d4aa429d7f047
-MISC ChangeLog 5206 SHA256 1abe879354dea993836368552ed5ba2be0cb0a1f210e22ee92b4036008180c62 SHA512 4d32bd9f574b2df138486b3e1ac5d079417dc312dc2f3336e4a6fcecf3ded01e2f4f8a65586ff131fe4046888fc36ed9e754e0b56c869297a520c9c71d0232cf WHIRLPOOL f02bcc0952f537ae3f16569e8a3e934f0558e6d78414f20b43adc0dfa5bf47a88d15850507c60340a4cfa64bd4116f45475ac02c023a30615b771d9dea13836d
+MISC ChangeLog 5298 SHA256 b67576594cb02581fa4b6539060f8ec079cff24950242382c8a2379361f09434 SHA512 aa3a8f19ce8787c5442259a1568e6f9bd0fa6ee517d4902674d00e7f645594e00d47336c3fd7155684ff85ee89b64f2994eb5b7a228481068b0613e84c250a96 WHIRLPOOL b65365f8b0df1ded213604f171d1f0bfe57b8ca09be9db64870fc56f116babead88de7d5ddb210895f0854011c8aad5ed2079cad78c87bcc9f1358944d234265
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA6xsACgkQvFcC4BYPU0p1VQCdF5r7C1eFmV8krZFD40CwT5Ck
-hjAAnAnK9wao5PUFVwHEeoFa4EGgx4cz
-=qfW+
+iEYEAREIAAYFAlIFBgkACgkQvFcC4BYPU0ohOQCgtDuyHJc5HBUPxZOXQgY85d7K
+/4QAoLQYw5BKKb1DNda4vYIC9ejpaLjv
+=dZYE
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
deleted file mode 100644
index 652315e12bd6..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.10 2013/02/07 01:05:36 naota Exp $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libelf"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
-	"${FILESDIR}/${PN}-9.0-underlink.patch"
-	"${FILESDIR}/${PN}-9.0-libpaths.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-	# Link in include headers.
-	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
-	# Install libraries proper place
-	local mylibdir=$(get_libdir)
-	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool
-
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
-	# Install zfs script
-	newinitd "${FILESDIR}"/zfs.initd zfs
-
-	keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 044aab82587d..238075fada67 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.43 2013/06/18 23:20:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.44 2013/08/09 15:08:10 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-contrib-9.0.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-contrib-7.2.ebuild, -freebsd-contrib-8.0.ebuild:
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index b84e43710c5e..61d27a401de2 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -2,20 +2,17 @@
 Hash: SHA256
 
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
 EBUILD freebsd-contrib-8.2.ebuild 1499 SHA256 79a4b0ec6855c7719743168d6296ea96875b5302f6eae9a9d2af249b9da206ff SHA512 28872d852a8ade5ce67bdebcae056c963a7be5f32d861a79cc0396696a00d966638d442f8e2c7795e06909159895f0620a7b979c99baf56092c808616e0bd019 WHIRLPOOL c3888e7e6db3e1fde07479e409c99ce513b03c290531191b2c820f6d31b209fced2ae608a1a5e1ef99da54e96f0115cfd11adfe1ff3b903ad929fd7bbaa68c34
-EBUILD freebsd-contrib-9.0.ebuild 1525 SHA256 7195317894eaf2123e582bfdf4f886cfff100380ed29856aa03b1b2412b38a47 SHA512 6b43f5f80a0607a2486e8ad3c1d7f7b1bee770de059ca6be29209dc408e1825855deb750fe07e495769016c7f9ddfb000e6f486ef416b10656b3b66500592ae4 WHIRLPOOL 17aeb0851dec123f511aefa7fc731dafd754725cf67f585a7d6e1f333e3fc919e4be620e0bfadca66a0198583869939fa37ce46c64f3f581731c70148d363625
 EBUILD freebsd-contrib-9.1.ebuild 1530 SHA256 a984256ccc46ba98cda937c5b0e89988327b7086ad4c5ca3258d013de22c537f SHA512 0ef58860c2f391bf1190c3b5058c8b5bf569b6414365b50d4c72351a89e4661a5b2c64f130bf7ffe2e1dd00ef700e3d4923cc7746fffc6f2a672539cc4fa7239 WHIRLPOOL 2812de8ded2ea17f0dac78d62241907bfc22686c14c4fd7b808e47c41ba8b82eb8f26467ec5b4d45f512d01f84c54d853cfdc439cf1a26b8fc798c04ed69267a
-MISC ChangeLog 8085 SHA256 ddbec8a5b5250a345f7dda14a85dfa47a8650fcebd8f89a2638f97fdb0752c4f SHA512 1d6d31259bd27555af485080ce55ae7e9e9931430733163ba89d0e3cf3fe02ad5ead6cd93c2dca9d48e4c6795f98264990b8c4e35bde148faa4e1a1f815fd896 WHIRLPOOL cae9f7b66652a2873807165339795d0c05996652e707537c54797f10415d03fb2f163226471b707324d28575b112ef4ce1e9dda0be93041f398fc379ad5fc1cb
+MISC ChangeLog 8182 SHA256 36d1cf5029463323aeda9d6fd6ff115ca2fe5d8e2f16a795ed53e47c6abc1428 SHA512 7f00051f36a97d1a8f4842288f9c42bc31fa9fe5475d96082dcb3746e684e49a55ee0c7ec39c27dc272a18ef46e99e41c43cb9295a42857b8f28df70ce248fea WHIRLPOOL 5c4a02096b0847f895ae6688ebcd29f714990ea2e0d4506d0ddf31c5b6df407689242012edbebc85a2a2a68e93dc7f29ec07b1a17ba0a9460b6af663c221f76e
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA60UACgkQvFcC4BYPU0qkMwCgvusfCPbkL9I6JoNj/0lwM/z1
-Dd0An35U5lZtn1dyse+FmxoKDJaEu99k
-=J+56
+iEYEAREIAAYFAlIFBdsACgkQvFcC4BYPU0oSvgCgzfsuBDrWLByDMZEWW4k3NtHD
+NA4An2g98GZNj+8pYQg8OrgRQVvvMCSy
+=GGKp
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild
deleted file mode 100644
index 9615d1b30f04..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild,v 1.4 2013/01/12 10:16:23 ulm Exp $
-
-inherit bsdmk freebsd flag-o-matic multilib
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
-	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog 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/libodialog"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/sort"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/patch"
-	freebsd_src_compile
-}
-
-src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
-	cd "${S}/lib/libodialog"
-	mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
-
-	cd "${S}/usr.bin/sort"
-	mkinstall BINDIR="/bin/" || die "sort install failed"
-
-	cd "${S}/usr.bin/patch"
-	mkinstall BINDIR="/usr/bin/" || die "patch install failed"
-}
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 5705487d28de..f612b5f9a11e 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.193 2013/08/09 14:27:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.194 2013/08/09 15:07:59 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-lib-9.0-r4.ebuild,
+  -files/freebsd-lib-9.0-trylock-adaptive.patch:
+  remove old
 
 *freebsd-lib-9.1-r11 (09 Aug 2013)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 612aae39a03c..aba513cdb853 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -17,7 +17,6 @@ AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 SHA256 a6383bd3b59bb6a8989ba7746f89
 AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a
 AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1
 AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
-AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
@@ -29,45 +28,34 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
 DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-crypto-8.2.tar.bz2 5561428 SHA256 89ddda3dfad2d46abacc27c296d7d58c18463e0fe1ce2fac2c7a8fcafe181890 SHA512 3c8ed329f6ed67d6db622e2713e9a7b65f54f4d99191e00b133c0afb3dec94c5426542719002e9bd2d83a9a1856a5cb29f2117f1db250f3794e1b2234a1e8e08 WHIRLPOOL 4df14a825a888f925e66599b1a0d6a35981e4eea357da03fccfe50426def5da97ead21ffc782b4e3e45aec047549f11b6d5385cfafcc271d0d6293cdce8a9ad3
-DIST freebsd-crypto-9.0.tar.bz2 5669925 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8 SHA512 14eabe62328fa7cec03d43ca47c1f1e62c622906a50dae7ed7d274cbdb656eb9d8abb6a9033bdc466b74f16c7f05e67f2ae7a6af64e17c4bf9d310158f5677f4 WHIRLPOOL 2f3b9b0ba3ce5dae430baf4662afcfb6ff8d73c674aa306ae834c4d1f8f58ca6506922de3c6a4d0455a1283ca8385a2ad426bf7ea89cd58c4f56e96261de15bd
 DIST freebsd-crypto-9.1.tar.bz2 5682828 SHA256 5165156c52f21318634611e8a3965134f3b34c83f9aba23db5a93b37627c5c74 SHA512 40c7a8150fb3ddd93488502a976ce03e992e6f4fb28aa3e5e102d4915f8ff49fe9085995ccfecacefc3b665e23c85cc3a0cdeec20a32c79e04458f7cc88630d9 WHIRLPOOL 72db3b27a6bf3abec47525fa31dd3bd459d4da36b787dbf57ed11b4e676c0c200ec5a549d7e27cb0c66e1feead8fa8257c712fdd5b5568eba2b8ae8323228043
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
 DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
-DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
-DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-lib-8.2-r1.ebuild 15816 SHA256 0d7ffdafe52db8b8c0c13741d15cf5ef32d808179bcfd05915afc4b5557a618a SHA512 2623c08ceb9f09d655d742860ca66f26669fb4ac5674e2b36fbe5a737580a16f404ff5abacaa42dd61a5b104805b29cc83f5c37b17f6c94865772cae169dea3a WHIRLPOOL 9b5780f01ca7980b456449fd8bec36e681ee6fb491839d6b7d7655efe31b57c000214e031c389b58e465349a845846860a1d24e8104ea9692bea37a080d7f8af
-EBUILD freebsd-lib-9.0-r4.ebuild 17066 SHA256 3ee6dd5b4496d557c539778b65686da8bbcf88c34c7725227639254cbfc7152f SHA512 df5b7a8c1c344c4ef4eda924351659b98673bd11d18c33ecacacc467c42278abd88a1226c95b36775a1eb1136d69e4a89d906e9f5a4dd5c528c19cd248ccd35e WHIRLPOOL f5751e23801ac805b14d1f533e58b97711e83b0e18dd73feca2f028a5473d0c3a6161b7f04fb74c858761db44c68c2d9c3ff32688b6407cfd678c69bd3d0e121
 EBUILD freebsd-lib-9.1-r10.ebuild 18642 SHA256 41a975236bb1e408812f34298e7397203df33afc6f0d5094aa0ebe42c7eb145f SHA512 fba0026b631d722c69a7fb8d5effcbee66c81970fa971b79a430b2e6657dfa4eea8407bdbf55f737f93d212daf9298320adb296bc58b9c0de141ecc07a926f27 WHIRLPOOL cb575e984e63b133ea9be545ff510183199104b091b742818af3a7c49801b8307d539a9b26e0253fb1d3dfe774c7f76ec12333ae82672bc5d31506a7d9195dd7
 EBUILD freebsd-lib-9.1-r11.ebuild 18835 SHA256 54fadb822046b0172afd21e33d10f4541d68a72dff03245ca34e55f43b1118f4 SHA512 d8163b6e08921ac2e8635df670068a1ec2c5fce2136bee33327d5b89fd5d062bc5c505c6c71738dd9c080f1c18ce1744bdb7a6a398eee0b549b0cd37f3eef99c WHIRLPOOL 2838eaf36618e0770b630a174e34aa5d7647758e6a0503a27a7f58883f21d277c5fed003526c068cb9d7358ee496bc09a079f533c2f9976c3233da07f1f121df
-MISC ChangeLog 39794 SHA256 0ff173b9b9771a02ff91db280b627333ff46d75e701d313b7cb36f8bc0f0f3ce SHA512 3da062a4ce28f76c9fea96d9be8ab4f97d0dc2225031a383307f1208b11a614d0b59e5ddc4af48ff1319d83d2b3d53c0ef08369df9cfd84df8d4cb016fd18b53 WHIRLPOOL 47b54fb78a2b81b99eb4ddfd9b0e3efcc0bd6f0da408b8b41d31e0de73cfa300cdbe4be60e5bc79b875a9ee7bcbb9c564c93f616ee7e7d347f4a4938319fdfcb
+MISC ChangeLog 39937 SHA256 60d713057e168d4edfb791af0493ece1b4fa48f5b54855f240fbaf29db4f957a SHA512 70f7a245ee9e4d09e63f812626b69ff8578142b6f2343c99f97c048de007ff1cca3296711a7e036306180ec908705acfde9d1888fb276082db3eceed6d0657e5 WHIRLPOOL b0e137cca68982b015fa91093d662e995e1ba8706cacac3750f5c3a3ad60082c819dc3d61bcf3ad7a9aa3e9cfb7bb77aeb21c277de2f0bfc8a232d44e6fa21df
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIE/FEACgkQvFcC4BYPU0roBgCgvUehq3SNCbKzR9xET9DeZc7K
-muUAoJ6oa+x9HKT+I8p22zzs6EbG+6OB
-=iflC
+iEYEAREIAAYFAlIFBdEACgkQvFcC4BYPU0qmqwCfc0zcNWKqRLTRtDx2zye7hpm3
+TXwAoMxDhqjhKriaEWgvBmYZdBZfrWE2
+=gBqu
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
deleted file mode 100644
index e72b171569a4..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
-
-Index: lib/libthr/thread/thr_mutex.c
-===================================================================
---- lib/libthr/thread/thr_mutex.c	(revision 235924)
-+++ lib/libthr/thread/thr_mutex.c	(working copy)
-@@ -538,6 +538,7 @@
- 	switch (PMUTEX_TYPE(m->m_flags)) {
- 	case PTHREAD_MUTEX_ERRORCHECK:
- 	case PTHREAD_MUTEX_NORMAL:
-+	case PTHREAD_MUTEX_ADAPTIVE_NP:
- 		ret = EBUSY; 
- 		break;
- 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r4.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r4.ebuild
deleted file mode 100644
index 82c6a8ef4869..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r4.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r4.ebuild,v 1.1 2013/03/10 14:01:51 naota Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
-		zfs? (
-			mirror://gentoo/${CDDL}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb !dev-libs/libusbx )
-		userland_GNU? ( sys-apps/mtree )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		!sys-libs/libutempter
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-trylock-adaptive.patch"
-	"${FILESDIR}/${PN}-9.0-netware.patch"
-	"${FILESDIR}/${PN}-9.0-cve-2010-2632.patch" 
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch" )
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - Clang (compiler_rt and blocksruntime)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libcompiler_rt libblocksruntime \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-	export LDADD="-lssp_nonshared"
-}
-
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	elif use build ; then
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Only build the csu parts and core libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-		# Finally, with a non-native ABI without USE=build, we build everything
-		# too.
-		#ret="${NATIVE_SUBDIRS}"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		for ABI in $(get_all_abis) ; do
-			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				export ${i}_SAVE="${!i}"
-			done
-
-			multilib_toolchain_setup ${ABI}
-
-			local target="$(tc-arch-kernel ${CHOST})"
-			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
-			CFLAGADD=""
-			if ! is_native_abi ; then
-				mymakeopts="${mymakeopts} COMPAT_32BIT="
-			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
-			fi
-
-			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
-
-			CTARGET="${CHOST}" do_compile
-
-			# Restore the variables now.
-			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
-				ii="${i}_SAVE"
-				export ${i}="${!ii}"
-			done
-		done
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-do_install() {
-	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
-	for i in $(get_subdirs) ; do
-		einfo "Installing in ${i}..."
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	use crosscompile_opts_headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if is_crosscompile ; then
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-	else
-		if ! use multilib ; then
-			# Set SHLIBDIR and LIBDIR for multilib
-			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-			do_install
-		else
-			for ABI in $(get_all_abis) ; do
-				mymakeopts_SAVE="${mymakeopts}"
-				multilib_toolchain_setup ${ABI}
-				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-				do_install
-				mymakeopts="${mymakeopts_SAVE}"
-			done
-		fi
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if is_crosscompile ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
-		export CHOST=${CTARGET}
-		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		return 0
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}
diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 461108cc3256..23ceaeae6ae7 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.56 2013/08/09 14:28:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.57 2013/08/09 15:05:40 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-libexec-9.0.ebuild, -freebsd-libexec-9.1.ebuild,
+  -freebsd-libexec-9.1-r1.ebuild:
+  remove old
 
 *freebsd-libexec-9.1-r2 (09 Aug 2013)
 
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 881159baa480..251a556245f4 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -12,38 +12,28 @@ AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991
 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
 AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
-DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
-DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-libexec-8.2-r1.ebuild 1897 SHA256 443ba96b4277fa49589ba7ac15f9eff5675e551a7dee504253a19be01d4691a4 SHA512 418d66a9c398184bc17ee5a5764528c344e54a6340c13a48727d252840756f59100395b5bcc5c294abb81aa40cbd00d2f9b267ffe583c3435bfeaa3bacb46bb4 WHIRLPOOL 61989135b4c26d13f29103947bcbb63672c2b0332371d81ecdd6541136f8505f2a68f30505ae66194ac8959b036eb2630cf7ad6a6afa54a445b93f840ad7796a
 EBUILD freebsd-libexec-8.2.ebuild 1857 SHA256 df286327a737425ab4d190dca16008bb2d26bd24e021c7f7a4303e7221db4f84 SHA512 44d1641912bcdebbebdcd5204a3b52b82aa1c01f8a23facc9b35b7295a99463afade56cc5a2302b90d74e513ac0751dfeafedb93fe072c3febeb6a03fb69f80a WHIRLPOOL 61519980582d1c215244a8a06938c3331c9eee1ac2de50def4f5d3294b582f8f8a175a8638e6baed9f2197b51704de64067342b8015a7335fa6a6737dd75cd3e
-EBUILD freebsd-libexec-9.0.ebuild 1823 SHA256 8c5a2d4c95db48e06f60bce0e0159cca8d80d227a450c5c0846659694c14af37 SHA512 7066b6f3e5337c07da17147be936e4c1699b79a940eef14b0df5d170b391acfbb100d5fc4476012604203afa044e1514cdadfb10d94795b912b642aefdedc9f6 WHIRLPOOL f908176fd8d9e0827a2847bb4270f0f1d3c293972637a8579a328e05eece145fcaf4d335ebb13be606902ea4760fedf6ef53cd40e9bb2031559be758a31714f4
-EBUILD freebsd-libexec-9.1-r1.ebuild 2359 SHA256 9f478d126789a8b9ee79fb3906348ce253c01aa9189ee2a1bc917016557ba7bb SHA512 f6853ec2e5dff30717e291d79eba876b763edf8f5c8f50507490d71c371411dd7d686b928c2ee816856eafad290e2b4a18ecf28c6540855ac73e036b07d45086 WHIRLPOOL 45d29c2dabc72abede363ae7500afb561a75b2bf7b670daee674569aa155a8b3e938e04b84c1072ca7c33bf3151344654f85828e2d7029a020265d1e645056ae
 EBUILD freebsd-libexec-9.1-r2.ebuild 2430 SHA256 5de9072d6b316f50a089b249dbd02152e9de4d866972f13c21f1e3a3969c4582 SHA512 140ee3949ee749d37d187f54725fdbadc38d9d153cf7108fd687b2c8f8ea1a5fb31131e92aad9c863cf77e740205a38e06fbcef922c22e2c89b3d88b737d17ca WHIRLPOOL 9d349aeb4a2d4c59bb9b3f0aef2003f4d19209f8fe7a5e97f0749e643b9e28e30f5fd3923182fbe1998d169ce13ff18fb9a544df26a29d5f781b1af25a5a5e3f
-EBUILD freebsd-libexec-9.1.ebuild 1823 SHA256 22c0e4c38be22f20fbec7b07ddeca126e2644df9c4dae0505ccd8e563425c99e SHA512 b142b6ed1968d7064ccee20987772c467fa56da64074cf44cf355cff789d5e999e5db5ac779763d04dd3fddd73353df129e09545e6911fb65e35a10e9f0cdab3 WHIRLPOOL fee0149a95c0e849bd90f4d310ebc2c1b7a2df32a22bae0f868da55e7e24702039231cb451abbf6035927bd50babe38137c69c58e94d835b60c36a4f278f6279
-MISC ChangeLog 12028 SHA256 e3a493a0cdfed099e025a5fef6c297957ea4be2084486a6d23761e739fb3c978 SHA512 5756730ed7c1e035a60a36e260c0886fa30ad49a4122fa04958377d9d6c498a4c8694a2160dd9f8c49a0a2ff7a3010db89f747a44eea5312ef37a96b7cea8e36 WHIRLPOOL 4d422a78c1b3ed6ada253726c323f5f2f9cf77c6784c6df0e0075532d6fad014eb22bbf5d0e8ecf143cb4860e556ab1b7b92fc3fc6ffea8390bf03f0e67441bd
+MISC ChangeLog 12188 SHA256 9642687b7bdcec80a2bb6712bae52c11a3baf0ef32aedb5303ffa91c77246704 SHA512 1f1dff0e46a2f6c3d9c79f2c9eb489c3c6baf5f874a8b107db998dbbada1a126556c3be0fb844914b450e6e457b03be39862eec6e8efe2e058bb2e1d6927538d WHIRLPOOL c022a073fd33e2c8d98bd9a2f4f9632340c7a1cc546514f0dcd961b6c5770ca1266e655b7c2033f0b8aadf16dae57050720da450c454d71745d8d6e6a83be8ec
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIE/JgACgkQvFcC4BYPU0pecgCgoQxhXhjef+s66zDMtXB7ETxV
-YsMAn0K+zAdiiqyrBj0+Df/TH36Wlj38
-=6Vi5
+iEYEAREIAAYFAlIFBUUACgkQvFcC4BYPU0r+CwCcDKxAM5aEGq+rLG6VkThEwrRm
+O84An1xcRPC0k6U8y0BcEXG3sX37ND6U
+=qMEF
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0.ebuild
deleted file mode 100644
index 9b6aad81ff68..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.0.ebuild,v 1.2 2012/04/26 14:20:07 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r1.ebuild
deleted file mode 100644
index 423d845e2fe9..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r1.ebuild,v 1.1 2013/06/18 17:06:33 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r6[multilib?]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 multilib nis xinetd"
-
-MULTIBUILD_VARIANTS=( $(get_all_abis) )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-setup_multilib_vars() {
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.ebuild
deleted file mode 100644
index f1faf1f3d426..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.ebuild,v 1.1 2013/01/27 21:25:16 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 3f4c5de1ccd4..5876f26b8f67 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.52 2013/06/18 23:38:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.53 2013/08/09 15:04:07 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-mk-defs-9.0-r1.ebuild, -files/freebsd-mk-defs-9.0-gentoo.patch,
+  -files/freebsd-mk-defs-9.0-gnu.patch:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-mk-defs-7.2.ebuild, -freebsd-mk-defs-8.0.ebuild,
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index c9fa50bed1fd..1a5d93a219c5 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,22 +3,18 @@ Hash: SHA256
 
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973
 AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70
-AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a5796282dff28e8b48d728905eaba343dd1d9232 SHA512 c5ff71797f771c334560364270d9e01fa35c1368e713057c559d86b05992d2ca3a19bc65beec240cae2f5ca07391e32c127211a3b577bc9e573104843c34942e WHIRLPOOL a22613d188c27d28de8ebbea9440d4a6333a4c19fa1bcdf6061cc468e150556f5cbe472dc3f6c3f29947827817ba6dd5af933a8a117793293118bcc9bb0f5362
-AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
-DIST freebsd-share-9.0.tar.bz2 6741764 SHA256 6bfe0fffbeb9cb737335bdf5dcdfd2f84a8dfcb3970e41e7bc860fd16906131e SHA512 830a9ccb5a34048ee17a884cda3d4f0e5afba6dcd58dc91faa024f802b951eca6b4dbe28ebef9476ea2eee5bd8095cff496af3f6ae4eaa0bfa3c71bcb4e3e18c WHIRLPOOL ffe05f77a1bbac818d8673116528d874245cff2cf660ef8db6af51f17611a56470228e82ace45954eba2261269719a943fc0f1dc7884bdbe5f9d24d5bcd56f7c
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
 EBUILD freebsd-mk-defs-8.2.ebuild 879 SHA256 212cea22f0e963889075dba7cbdf47a3a4509991c2112965b59bf61a71833bdc SHA512 6303888496e432c17462bd04cc9d42dc10078154aafead4157009214f5e97249601a73d9b3aa6020ba0beeb72ec509f6db260649b3cb35c44edf78030a8545a9 WHIRLPOOL e26d964bf9180115ca6c55097fb520e81f3e1bd493ce20784484dd51768c412a9ad17f3ef8d532da4d21728547de525905da6ba34ebb4adc9b07742149f0f5bd
-EBUILD freebsd-mk-defs-9.0-r1.ebuild 851 SHA256 1b2d3fc817e14b179d5c7e9e6b089fae96c62978fb0fd93026fa26edb9d28564 SHA512 6351cdd0b61ae26273ac42d5f0ff87944ecddf99446b72a5daf43c0a8318940a08d8f1f9854c00305d69976f1af7db9e06937dc75a385dcc265d171ba22082dd WHIRLPOOL b487e931c77bc839bd0c5970bea9c75b05b3f9fdafcde520a5ecf26c099d1626ac2f162ef922fcbffa39ade13ddac9868a95b51eb87e17302ce1f2be640fbe31
 EBUILD freebsd-mk-defs-9.1.ebuild 852 SHA256 15ef61bd11d3ccbb39399f58c5d919cf59c3b81938b934c4e3e97cefc154cd17 SHA512 676bd6b00b416fbc9dcf66e584e15d9b5d2916b7bbfc35439de8433572b53410ad654dc3f89819a729cf5f9f15ce7d302e3bb52cca70844ffe8093185aac4a5f WHIRLPOOL 35e347fbb570a58f1a86f65d57a53dd90fac96597e50792d319354a958a1a1eb0a5985b1105c26c68b0910c7c5390081a1a65ea1abc0faab2e553007763d45a8
-MISC ChangeLog 11083 SHA256 3d1e0f0a903690693379f81794bfd7f4ae3f9d5128f965ab85e19e9b88fe7c0d SHA512 fa6827f7e909a131557275e3ac29db1a11091bb1646dc2b61b8a2588dcdb65a0101305a829d8b9114ff2d7b62e2476e1cf8bfefc15321bf02b7df53ad36402cf WHIRLPOOL 23227e4c2559adec5429a5463fdd8d486b0689e8566e96fc8a6184e557fa9afd174dfa507ca8b6666e44b4887f3b35fa40f7b54f15c6866e7e39e096a49a61ed
+MISC ChangeLog 11264 SHA256 09c46d8ed3a082afbfc21a84c1c063dd5b945b2786e192f90671177db930f7ca SHA512 b0f98cf420d6e3496b71a5f653e6f04f0351a88cd95934e757e817ecb25cee99b781850f59a873e74dc28ffb30629ffbf4e7f5f9d720673514f08d99e6b476a0 WHIRLPOOL e250f53f6b5a7e8e73c105ab345410a1fc654768931eb38443b371c406bef7be2751e003d5cf4f5a213085107504b2c46927a620e9844af8d584faf730c24fb9
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA714ACgkQvFcC4BYPU0oNywCfeVqTw5QCrhQBW2p2SuO0zyf3
-N7kAoJ0np2jcKS3zjEOzQFVHOb4nYLWn
-=KMlq
+iEYEAREIAAYFAlIFBOkACgkQvFcC4BYPU0o8WgCfZlilnHfC+24c99UCuwd2wZlJ
+sywAoMGkJIUCXBFOY10ineJBkpzfC0sV
+=NYVH
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
deleted file mode 100644
index f5e6568290cb..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -ur share/mk.old/bsd.doc.mk share/mk/bsd.doc.mk
---- share/mk.old/bsd.doc.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.doc.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -135,10 +135,12 @@
- 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
-diff -ur share/mk.old/bsd.files.mk share/mk/bsd.files.mk
---- share/mk.old/bsd.files.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.files.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@
- 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
-diff -ur share/mk.old/bsd.incs.mk share/mk/bsd.incs.mk
---- share/mk.old/bsd.incs.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.incs.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -41,7 +41,10 @@
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		 -g ${${group}GRP_${.ALLSRC:T}} \
-+		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
-	${INSTALL} -C -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}}
-@@ -53,10 +56,14 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
-	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
-	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-diff -ur share/mk.old/bsd.info.mk share/mk/bsd.info.mk
---- share/mk.old/bsd.info.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.info.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -83,6 +83,7 @@
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff -ur share/mk.old/bsd.lib.mk share/mk/bsd.lib.mk
---- share/mk.old/bsd.lib.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.lib.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -46,10 +46,6 @@
- .endif
- .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
-@@ -270,14 +266,17 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && 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}
-@@ -295,10 +294,12 @@
- .endif
- .endif
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff -ur share/mk.old/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share/mk.old/bsd.libnames.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.libnames.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -46,7 +46,7 @@
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -77,7 +77,7 @@
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff -ur share/mk.old/bsd.links.mk share/mk/bsd.links.mk
---- share/mk.old/bsd.links.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.links.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -15,6 +15,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -f $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
- 	done; true
- .endif
-diff -ur share/mk.old/bsd.man.mk share/mk/bsd.man.mk
---- share/mk.old/bsd.man.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.man.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -165,9 +165,11 @@
- .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 @@
- 		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 @@
- .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
-diff -ur share/mk.old/bsd.nls.mk share/mk/bsd.nls.mk
---- share/mk.old/bsd.nls.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.nls.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -62,7 +62,8 @@
- # installation rules
- #
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- NLSLINKS+=	${file:R}
- .endif
-diff -ur share/mk.old/bsd.own.mk share/mk/bsd.own.mk
---- share/mk.old/bsd.own.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.own.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -182,9 +182,6 @@
- INCLUDEDIR?=	/usr/include
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff -ur share/mk.old/bsd.prog.mk share/mk/bsd.prog.mk
---- share/mk.old/bsd.prog.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.prog.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- 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} \
-diff -ur share/mk.old/bsd.sys.mk share/mk/bsd.sys.mk
---- share/mk.old/bsd.sys.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.sys.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -28,9 +28,6 @@
- . 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
-@@ -66,9 +63,6 @@
- .  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
- . if defined(NO_WFORMAT)
-diff -ur share/mk.old/sys.mk share/mk/sys.mk
---- share/mk.old/sys.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/sys.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -349,12 +349,6 @@
- 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
- 
--# 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
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL=	${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
deleted file mode 100644
index bd7d7e6116c3..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: work/share/mk/bsd.lib.mk
-===================================================================
---- work.orig/share/mk/bsd.lib.mk
-+++ work/share/mk/bsd.lib.mk
-@@ -146,11 +146,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -163,11 +159,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS}
- .if defined(SHLIB_LINK)
- 	@ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -245,13 +231,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}}
-Index: work/share/mk/bsd.prog.mk
-===================================================================
---- work.orig/share/mk/bsd.prog.mk
-+++ work/share/mk/bsd.prog.mk
-@@ -134,13 +134,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/freebsd-mk-defs-9.0-r1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0-r1.ebuild
deleted file mode 100644
index 4a2839798e30..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 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-9.0-r1.ebuild,v 1.1 2012/05/22 18:52:20 ryao Exp $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="userland_GNU"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-9.0-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-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index 3bd3e8bb279f..564e7af84925 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-pam-modules
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.41 2013/06/27 20:54:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.42 2013/08/09 15:03:41 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-pam-modules-9.0.ebuild, -freebsd-pam-modules-9.1.ebuild:
+  remove old
 
 *freebsd-pam-modules-9.1-r1 (27 Jun 2013)
 
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 34f7f99bc780..4d73e6595c2e 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -5,18 +5,15 @@ AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bd
 AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 EBUILD freebsd-pam-modules-8.2.ebuild 1262 SHA256 1fb9768a2dc73a444f7e21bab93d310a806cbf69884765d0791b5f6b346e2341 SHA512 717c04304f260e590d89d8e5e18eeff0844825309a9ed5d34b991d05c218bdff7eb5f8523021e0c18f9299d256f5b0af4aa5e446ed06ef68b29fb55564bf7f51 WHIRLPOOL 7df51eec5d7e53daeec05161afd2c0c67266bbe1e7051c3fd3ec4ac312a709ba802f017ef8c06b959847dd9aff3efd976fe50b491288ce358dd925f23c44c369
-EBUILD freebsd-pam-modules-9.0.ebuild 1274 SHA256 457163ad03917789d2e782aa3282d8a88d77a7786f08111bdff61d41f5683d58 SHA512 2f95e850e5f3404541ac9df8fc7a6145a01cfb045b14c2bf0828351a31b7d18c94d95a50e34a27edd39102a70660f8029d9511d4ea38e281ba66b5e3a22e6acf WHIRLPOOL 50760d453e24ae411dac7d8a3151403251b89fd63b4071350630260694e9aedfe67ea1388e42340bb89610dc1c33a89298baadb709e5c87fbd05f369546a9807
 EBUILD freebsd-pam-modules-9.1-r1.ebuild 1214 SHA256 69d6b9cc3ff70c594c8cb2b554fd1cd1eb177fb5a4dca75062e5ba783ba3b5f7 SHA512 e18358fa2f49de80885b1e7aec83b1527c67e48e7bab2b70729a1cf79dd139ee80a243afaabafaff77bf149218f4f33311e7ead80f2e095a46c923ec367134b0 WHIRLPOOL 8cf273d0abd8d0059e799b98857ae8863456b8cd72d9b241ae857cec7e05839358d7952288cb44852acb233d65ea1466c4860759cae2125684f88cbf83c414c8
-EBUILD freebsd-pam-modules-9.1.ebuild 1202 SHA256 8ff2c418370cad4438b753ef002701ca353a2a719f1b42d0a4748e2575073878 SHA512 e7e7562cfeb72ab2be6eef49a50348514a451963e4f4d34d19860a0a327cf5644a1af1506c33c1c016dec319666dad831a3ede68fa69d03759c8ce640420b879 WHIRLPOOL 84698adec127dbc3bb1d5a27e90918ab9629cb7a9937b2f255ee44f1b84c32eaa269e64edca7e705198c1c0f943366fcfecd33e4416b9f33b070d24294926238
-MISC ChangeLog 8433 SHA256 96689049a9a997a29f7a11f1a7b86b64520d32e6c84aab57f7c9649d51e0b658 SHA512 2b56c28aabea09b4a3dacf80698f341ff7902875a24d921038126d27e6bac39d38fb0179f724e10b14453f5bb26877995e1e0c67bc4c61d0449640a1fec2cc54 WHIRLPOOL 7e0a3e735a652efc33c66b45c9e38b4d3500b6879fc716c157bf3283b84fa215d586b807f72d1d8f129ee3ef1fffe26c7ec7195a73b518c5028dbeed49fa61c9
+MISC ChangeLog 8567 SHA256 b3aeb6904b4776e1ccf32d2f4a59eb1f7fb7aca3ae1e2852c2922e4261d1c80c SHA512 1f0361905809351173832c4781178ff51f2a4c1701121c8976de432686fce6448f135685138dd94f75d31e8e0d241f0677c26c9e1d49fb3dfb8fe34e93a47ccb WHIRLPOOL 01da140ae2e34facf889404328cbdd37a25426358f61391633785686a726a6747bf8ae0287d30580844ea1fe69a7b8768a2572e8546526196c23f7b78bb70a22
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMpmoACgkQvFcC4BYPU0qtxgCglvcCVVJJzXXAuDdQnhDFFTJk
-MZ4AoKH1VVq4EJ02eMM4S4DLmo4yTWDw
-=r7sv
+iEYEAREIAAYFAlIFBM8ACgkQvFcC4BYPU0qRCwCglGVpotGhEQXcUptj0funNasj
+VOYAnRsyLp1Ebt5hL5Zk4djVIONX3SrW
+=Wr0Q
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0.ebuild
deleted file mode 100644
index a07480cc1f6a..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.0.ebuild,v 1.2 2012/04/26 13:46:44 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch "${FILESDIR}"/${PN}-9.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.ebuild
deleted file mode 100644
index 69d77d93ba52..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.ebuild,v 1.1 2013/01/27 21:26:27 aballier Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	freebsd_src_unpack
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index 1673bed655e1..df4627ab69c1 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.36 2013/06/18 23:35:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.37 2013/08/09 15:02:25 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-rescue-9.0.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-rescue-7.2.ebuild,
   -freebsd-rescue-8.0.ebuild, -files/freebsd-rescue-5.4-gentoo.patch:
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 7f9ed52556df..1ad89d5ef65d 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -8,47 +8,35 @@ AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589
 AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347
 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
-DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-cddl-8.2.tar.bz2 823706 SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721 WHIRLPOOL 0150d972fc5200efcf22b5baded0bc7d826f03420a8328bc9ce1f53f39d1f3cd07dc367fcb3b0c8bdcc3b33bc9045f262928d76532c91820fd3c6bc8c9ee57c9
-DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
 DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
-DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-rescue-8.2.tar.bz2 5041 SHA256 82f05e98c977771c87f416be80e3634df231c0a2cd26059fd7276ca3a4284031 SHA512 3311e1ee1d2fc1de0ecc9c5351bfbe007a4651e89a3f3f86ce6cf0fea83a65692fc7a709ccf3a4e9a3179ce51a87b36256481d91819a7621db4045394aa51c29 WHIRLPOOL ffb36c14c7bf5263a1fc8c3f2fe01ee912a476c3053db4b7a0f237bb3c0494a4d9500906eea22ef81052c5f2955fbfb6489f9494ce6897d44f0aeebf95daa631
-DIST freebsd-rescue-9.0.tar.bz2 3956 SHA256 debd5cf69c06065045418a055e3368a24717c7524112e49d361f0f0f256241c5 SHA512 cb2f29c4c7fb0be5e267f099c1912c41e1604866fdc3926723def3b0221b2b93cc37d18f4e669a1290e9dda297ae9619ace17822a954b1d332e4bb8dd96bb7b6 WHIRLPOOL 383006c4a6b0bede78156592dfba6940e8f9f5aecd0f290d7ffd78018119249913791925d8c50a1118ab51fd60c9170eaa336a3af30f88cbf67fb7bfe53edf11
 DIST freebsd-rescue-9.1.tar.bz2 3939 SHA256 15794c65e2977a2623f0a09090f835c67e6ec49e13996b2d69a018ff4185be4e SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb WHIRLPOOL c303a26b2594e87ea9f9c5a05b1f46cdf9712aa521d21a210e5b452c883fd7e2d36b1ece7d6c9988860a909d00e77825367b0a6f33e5938a8fa23e02e58aeec2
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-rescue-8.2.ebuild 1615 SHA256 222b7904ee6d11390316a209bec3e4570be1dd9ad294c873172afa45e9f91717 SHA512 fc10fca82e5acdc8de726b90b531d4ee66122a3cf1e0e1ec848bf031fa3ec2cbfbef8ccc337c4958bbfa0bb806e9ebcab14f5ec210b79044c7ebf41014828868 WHIRLPOOL 0b1ce5d772cfa2d8c7bad8bb7921a52b8c5f793b2f33c635355a72cf21ed95fa4e8d357201149811ba2568c99f3a0e8abe4e83774fb46f7e5e7623f0d04a49ac
-EBUILD freebsd-rescue-9.0.ebuild 1820 SHA256 c44a3c437d37b9966c5c46ad28f13841084b3a960f319e0345ee3686a45468ff SHA512 a099a3c458b90569af678113acb93086f27fe20db4f238f314f519b84c6e598ff69c65bb1d5fdcd678944abacc82ecac0f462a91cf40c4dc1a4fe0f33a71c36a WHIRLPOOL 7c81b3cae5623054dbb869688907bc5cb8848e4695fa840251e8fb524c6f0dece6f9114f8c63edad9c8aacdf7a4229759331b4ad5f5ff382b9ac045e9484a8be
 EBUILD freebsd-rescue-9.1.ebuild 1909 SHA256 64321df05fe5b5988aa2979b39236e3564a24eb04bda97f4907a249bc8527bf6 SHA512 d0fe566624661d68ed05a89604eed12667c2f3911b216ea4fe460bac42e5477ba18454feafa5d093384021a97baa6b45c4781e4d0d02f2e64025655f7a6ebd13 WHIRLPOOL 75f2d523ca29eba216a994f5439a6b58ef450fa75068f332c09d2270e36a2de57334c43c773c89257080c804bda36054f00ecc300b054b61721182913484cb6b
-MISC ChangeLog 6591 SHA256 144c147e0738ae97e9305cfcbae1c310fa33348aab9d4536a9e4edff9b81df59 SHA512 05e2a1b4aec90713661a6f5bcf2433bd2a85288f9204ebb13572eb19ae13aac7c7e451b92d7b006b69692a2d2d0239b8c8a719037069ee0babfb17f957ca4aeb WHIRLPOOL 4cea4acea0c3e8057dc03473509a4fee42c555387dbbd9fa3e563f5e763e239087fb5e574960152236c8cb8c12f9fbc968274acd8c8a0655011cee5655a95492
+MISC ChangeLog 6685 SHA256 ddb82d1a5f0463f917eeccc6036be76277c16e8878d2d0211560d909a428baf9 SHA512 074f36be5ec69091897b722b96841a9ad5f90b9f7ebe9fc58733bac87b3f1539d9135497f8d6220ea703f9c208058b0ca2b5c9387620249c2f1386fef074e33e WHIRLPOOL c96e028e81c9b3ff2d5aaf70ae570cf7ab8af41e4ec0f87ffe25b67bdf0247c237b3ea0172ececcd31d033b92ed3ed1a72b3e4f5fa6388acea1845d9c87bd9c4
 MISC metadata.xml 312 SHA256 957f4b12031fc0ad63ba3709a92dc8440874022d1c917e0c788583add1eacc48 SHA512 c0580fc77c25021bf7cf5284d6f40c0b5a254be8ab5294fc7d2259a4d85ed68a78a29f1f6b1ed4308646b471236ed0dd194a4449d46ccb4322fc27eea2108129 WHIRLPOOL 0e5713d6a650cbfe595f121286aead777a842178dc74d6f3557ccbad1fbe520933cafd46c9a002a15b102a3e556db5da26cfadccd89407c49d14c0900d130c30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA7s0ACgkQvFcC4BYPU0qG7QCgq+k0+jW8+myoKWqtbNo5YzuT
-eRIAoIMyTyldaHcrIP+KMy7V/sfLDkX7
-=aWcv
+iEYEAREIAAYFAlIFBIMACgkQvFcC4BYPU0o6gQCfX3ZG31WpkEsl7HKJe0dVHWnl
+fEsAniBuc2/yZw0qHGENyKu/anAwEERc
+=vSkz
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0.ebuild
deleted file mode 100644
index 95b6a7cf289b..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.0.ebuild,v 1.3 2012/05/02 21:41:15 jdhore Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${RESCUE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	>=app-arch/libarchive-2.7.1[static-libs]
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	dev-libs/expat[static-libs]
-	app-arch/bzip2[static-libs]
-	dev-libs/libxml2:2[static-libs]
-	dev-libs/openssl[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	virtual/pkgconfig
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
-	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-	epatch "${FILESDIR}/${PN}"-8.2-libzcleverlink.patch
-	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 35cb11ea92d5..cdd30b763107 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.75 2013/06/18 23:35:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.76 2013/08/09 15:01:57 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-sbin-9.0-r1.ebuild:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-sbin-7.2.ebuild,
   -freebsd-sbin-8.0.ebuild:
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 9185468afb48..3f5bed8225b8 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -15,35 +15,27 @@ AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8
 AUX ipfw.initd 2911 SHA256 45789a2e51c8eb164247d08c58d47ab52798bfbd19b4ddb6cc87acb5684e4eb5 SHA512 56776597170cf3549d7560fbb13ebb81cf608eb6f16d5ea440d38d4f3edbd06d56bc3fe104f9114e099d622cff1cd8e1a65529ebb4a7ecbf75ee6759e7bdc190 WHIRLPOOL f82edd7d971946637451519a78bcd0da73344944e2002fddca2b1fe22012d9a74dabec644937833e3f9250ea6d81fbd002569dc64b11db04c83e57c18ec508fe
 AUX sysctl.initd 671 SHA256 fde293d294c8985663c3a3685cd27ede3b1cdedbd042102546dd844b93456e69 SHA512 0a0fe7b4e9a07c537a498a1cec17e76f191aeef8ab12795df77eaf92d9273569aa981674f1ff35122be3bcef51f96ea20f860138bd0241b4695b31ebc5fba79a WHIRLPOOL a3ba842f4cf2522dd7e0a6a0e6e7b1d12ed54a4a02d5c39362f8c8cb97a4eeb3058d0c6d8e102cb11c5af0186bd1fbb1eb2c5990ae14abad0441d2293018a1b5
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
-DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-sbin-8.2-r1.ebuild 2651 SHA256 dd6a81493a4513b65f4e77a3fa74d4df67869d012dd3aaa1e9ce3543e4dbf084 SHA512 c841a53d4e13d98b24014d27a080334497dadc668a6e4dddcd55151493f31f2486ec32f5ce6f86739ed6514747fa13bdb6c73a4b5d08099d781a33b39db8cc7c WHIRLPOOL a20898d36d7afdd9e99f1d33678e71fa49e8e81da6da95313f8f911ec8d148f991d2da32cf4d874e5625908b8441126cb85da352e3dfe00d0442d88932150aed
-EBUILD freebsd-sbin-9.0-r1.ebuild 2765 SHA256 e3d51a3d66df5b983100bf92d235987f61f15a4eab4d3a6a09097b77729c11a6 SHA512 84255b5ea75be376ad73718977c290788e13a91799f72cf59e10cb6c53b651c6c2d0f13223aff96541cb981e2b95eb5c81c7cb9d189c9718959898466eb6e2b3 WHIRLPOOL a566f213a7b78998c50361f66fc5922b6ca12386b44b897648327b6b599a724e635d7422fac38d3e0b3d9e1b32a8fffcb26ffbd5dcab56bf74203553c52fd897
 EBUILD freebsd-sbin-9.1.ebuild 2762 SHA256 db4460a003344ccac864f4a886906c6c57dd73a978f2423ceb1ad9b3eb890f90 SHA512 b4ca4d2677190c8ba69d89ab8242ccedd9d6663c135e8eb02b4daf99779f24c6f7d9df41399555e46368593bab251c2605fb15aee89706c09b09c0275eaf48f1 WHIRLPOOL c9ef0e898cb48fdfa88172db5521b36c9782477167850daf15c765fbe0be9e38129cdc643f630cdf4af9f63aedae3cd31d8e843dc03628c9d5712a13cab8debd
-MISC ChangeLog 14563 SHA256 dbfce83f2f32e95b574ed067fc445c2024a507b2b82e6f02ae0195d65a31c977 SHA512 493692ece71825ba32d3743348af1e05b93ec27ff08cf4bc947401d029685270fc3c954de6b4fcd05cc904592fe021e2c47e2713f2d46b2b41ba2691cc85019b WHIRLPOOL 323ec1373a34c89c679291b41b564c78e005975d901b12e4c7d4f9136d426d9a8aa6509681c6f41ca8bf4bc6fd6c0495bb046a688fdf5fd2e4771c4102d7843c
+MISC ChangeLog 14660 SHA256 d9931df90fa45fb5ba14cfe93fb1a7e3b18099f756fa47918d37e7de7408371f SHA512 7652b797e58bf151f11b405cef77f4eb8e7d4ae96e5629969d88a952288506d4cd744f9da6ac0e48c1516cc126dc3be9ae052f8b5b43d789b3840e27ff24b8bf WHIRLPOOL 40cc60cc24cb7f82846e90e760cd642b1a1e5a0c121fcdf75eff66fd929cd437f4db512a11111d7aafafca21db698a7eb90026e6ae3f16da63efd0f9cc71c364
 MISC metadata.xml 473 SHA256 b13f1868fdc53bc53952bb41f6b68a5f320d36c493329ddf1b940f0fd5bafa8e SHA512 bf69dfade6ba52de900634d131d0aacfd36f9bb94a11f81c7256b144b2a90daa9b5f5bfa1a6c028314c8bb763fc59a4c0a9e8332a24d6732995fdebb3964b6dc WHIRLPOOL 32e9ac1cbaac74edd43d97d8d8069f61f29179f93904d126c32e4cb3504683f118c5027e1a42b1b456bb31dd68ffbdb0ce23c7b84806edcd03b80af9a34db96a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA7r4ACgkQvFcC4BYPU0ogFACeNZnyKcTV/KbzQDoqH9G0+ezo
-BbAAoK6zic0vwMe9PjTUaHFrXPozh1VP
-=hC8k
+iEYEAREIAAYFAlIFBGYACgkQvFcC4BYPU0qGWgCguvB4sALZwixySb5GTVRUA2U2
+J0AAnielUzRH9ygOZtdM28kKbyKIOEJt
+=dQKd
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0-r1.ebuild
deleted file mode 100644
index 3b75110dc0a0..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-9.0-r1.ebuild,v 1.1 2012/05/12 14:26:41 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~amd64-fbsd ~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}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl )
-	>=dev-libs/libedit-20120311.3.0-r1
-	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}*"
-
-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="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-7.1-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# 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/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index aa5fb7860c3a..6d948779b88c 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.52 2013/06/18 23:32:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.53 2013/08/09 15:00:22 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-share-9.0.ebuild,
+  -files/freebsd-share-9.0-gentoowaydir.patch:
+  remove old
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-share-7.2-r1.ebuild, -freebsd-share-8.0.ebuild,
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 975b6cd0e971..6274bec00d8e 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -4,43 +4,32 @@ Hash: SHA256
 AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6 WHIRLPOOL bac15f5c439ffa81b83dfac5dce981e346e2815b6a035e9b9791db16df77d7f2e9fb6706f7b5315c65d18f209176866b23a34b311c56847f543f1257fa5e9634
 AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af WHIRLPOOL 8fabb340e4fcb1a174e3870a2ebe737f89b892586fed61a239e96bb34fb508daaef1e8e80811634e2075dbf6a161a236bca10a589340fbc609382f685b0697a9
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a
-AUX freebsd-share-9.0-gentoowaydir.patch 314 SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512 ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd WHIRLPOOL 10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
-DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
-DIST freebsd-share-9.0.tar.bz2 6741764 SHA256 6bfe0fffbeb9cb737335bdf5dcdfd2f84a8dfcb3970e41e7bc860fd16906131e SHA512 830a9ccb5a34048ee17a884cda3d4f0e5afba6dcd58dc91faa024f802b951eca6b4dbe28ebef9476ea2eee5bd8095cff496af3f6ae4eaa0bfa3c71bcb4e3e18c WHIRLPOOL ffe05f77a1bbac818d8673116528d874245cff2cf660ef8db6af51f17611a56470228e82ace45954eba2261269719a943fc0f1dc7884bdbe5f9d24d5bcd56f7c
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-share-8.2.ebuild 2572 SHA256 2bc35560179ed40e461861655e650562470318b8c50aac28174c2a706aa7502b SHA512 2129eaef48263d87fdfc7a1d9b4566e739fce96a48f7d658fa113caf99f9ece48f8b39e7506d67d9d3c9ad764f3c28f42c4afafcd11c79d6f4ba5e2af2320574 WHIRLPOOL ebe88ab898f046252098843c0a964f344e53a4fa64a8967817dab808c79f59580b27fb7f149c2389618d09777c05cc1d6a451c6df1381e7245959471ab9779a0
-EBUILD freebsd-share-9.0.ebuild 2839 SHA256 e1728804c29b7e24fc131a5824afb8925447fe5a1a7f5ef062aa2bacf2b41a73 SHA512 e1fe9f0253f500c16fdf1dce0202440544bc2ceededac2e515abe0935c1fe5f7a6faf3a54e4d0059b075fc524a118654b5b8f488f76a4d42e2e8fa2b1ee5bb47 WHIRLPOOL bb47dee9c86a074b9529ed632adc215a3af74cb99371ad7142c1f6b40904773666fcf6e51f56cb36e82f70c0846dbb02e17708c2895db3ffce4d56e2f531d7a6
 EBUILD freebsd-share-9.1.ebuild 2701 SHA256 2e6e0947b7f61f55855c4b727a1dc8f8de67e9232b75b667ba1e495b4be53332 SHA512 c7928dcd43b152e3fc3ed663132030055558487f03e9c6baabab2716c16289c44d78ad34dbff795ffe49fb987025a667502200b1c04764221c76293c6853158d WHIRLPOOL a9ed290a0f1c7fd93b82e429b068f0c17d7224264d42f1238f09ce2c25626542e5781f6b1f9833245510e94d123d7a475189ad476ec715bf2f7d6aa38edd1cc5
-MISC ChangeLog 9691 SHA256 757f1f7bd8f0fa9264a637e16b9f4a1eb226d3404e2e6eb3de0769d3342b8574 SHA512 e71149260dc56886928ef63fb2d8f3d39beec1a5016dad8c51af507640ce842475a87a2b6c45aac054882bec9982d5df21d7d5242b734de75e697582426c9d45 WHIRLPOOL 9ff835a940c63148ab1ad055e5c3a6125cf0b5cbac324d5397b652d4585c71d25e06ef4a5804e2b79fc19e8075acbe00a3d7e5ae838149ce922ec1df4efb1ae7
+MISC ChangeLog 9831 SHA256 6f313280c8454283077a0656def8f445d69c7f8a09543feee91c41f2fcf5983a SHA512 a297b456b9b179a7d5117fd204a46d709198badfab693ef62b401f181ade99b41da85c18b3ef89cfffeaee0d485962e9eb65f93b04d681876e0483c71a53eda5 WHIRLPOOL a234ecaa523a7430bf13215bdb87f3354c4885ed53e11bd9add3bcf6863578cdbc28271afc31f93cbe45f4727ec6f3bdf4e70f35979c760314b4ac54ab406c22
 MISC metadata.xml 215 SHA256 909a0b7e60bd9597411228070c56a35f20420d97bbd55197797c5844bc7bfe98 SHA512 d8cb6fea1212f0976a2f35ad913018ca77a8fce0ed3cb8d63aa96ad279ae4c925bcf6e39ce684bdc14b2288b9c245569875f4339185170848d657aaf84d885bd WHIRLPOOL 15bc094837a6203cedd90e8d4672672fdc78b33e7e16709181aeafec6848f07f3a120e7f32c9d0cc4f6aaa80f514f70dad82a243b4c377c2af3fd06f5f7b6779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA7hsACgkQvFcC4BYPU0qxHACgnhQtmcPDUque0+T5QPnr6pmo
-bvQAn09aHtzf3jkZJxbGoef/JfEzqUt3
-=3yN3
+iEYEAREIAAYFAlIFBAcACgkQvFcC4BYPU0ptNACgmzCDilpvjGfDNxNEzol57cFr
+fhwAoLB4W+WCCTpyknNZ5KnMP5Zr6/Kx
+=XZRn
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
deleted file mode 100644
index f29905144c4c..000000000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur etc.orig/mtree/BSD.usr.dist etc/mtree/BSD.usr.dist
---- etc.orig/mtree/BSD.usr.dist	2012-01-03 12:26:10.000000000 +0900
-+++ etc/mtree/BSD.usr.dist	2012-01-27 21:50:47.941466067 +0900
-@@ -25,12 +25,6 @@
- 	i18n
- 	..
-     ..
--    lib32
--	dtrace
--	..
--	i18n
--	..
--    ..
-     libdata
-         gcc
-         ..
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
deleted file mode 100644
index b78341967a38..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild,v 1.4 2012/06/16 00:12:39 naota Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~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}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-8.0-gnu-miscfiles.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"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
-
-	# see Bug 408595
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-9.0-gentoowaydir.patch
-}
-
-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 -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index b1a4640ef5c3..bdacc91a55cd 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.88 2013/08/09 14:50:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.89 2013/08/09 14:53:41 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-sources-9.0-r5.ebuild, -files/freebsd-sources-9.0-gentoo.patch,
+  -files/freebsd-sources-cve-2012-4576.patch:
+  remove old
 
   09 Aug 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-sources-9.1-r1.ebuild, -freebsd-sources-9.1-r2.ebuild:
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 82715efe744a..f48f03baf672 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,7 +12,6 @@ AUX freebsd-sources-8.0-gentoo.patch 1138 SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c
 AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae
 AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61 SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b WHIRLPOOL 5152dca64e3799cc9b6ffd97019c542f93082631489b9c0e03128a09a3d0c667da4220cfc67039c24d13a2cb527dd325db501029478d528c688c0c35cf2373c7
 AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c
-AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22 SHA512 0c06b2e18ee8e97c8cc17eeaa50bd77a8a4fed0982cdc2f5cf3446b6020436bb91da256e8765a72ba4d384ebcb494f0b14c5302c4b956f540ff7374b6f55eea6 WHIRLPOOL 77a8bb44b6a18927eb21876672ece0bbfb79a57e29ea56df0eb484e5de37780156652330f03acfa7b8311b836d16ace56d52466a975cc036c3143c2994b14986
 AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX freebsd-sources-9.1-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9
@@ -20,19 +19,16 @@ AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee4
 AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becbaac2bc5e89511f61260e85a914235e SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b WHIRLPOOL a31b32fb6fe8d7ca4464abae9c444e62d6ff00b4d53beed7c81c89bf0e85e61cf1eed7e70c7861a3559432086a923926737c4f6a727d2e389745de045e6f30cb
 AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
-AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
-EBUILD freebsd-sources-9.0-r5.ebuild 3500 SHA256 9c08ac66025fd0dff16233546f408581e92f0c9c77fd9d803668cd451d86b4a5 SHA512 90e7cef893c4e096e916eceff6b4263330c20cc11ac0f7469e9f190c4e0aea0f781ed604cee9b3956b774389b7c4ae5776fadbb4400e8efb4aa8416ac528d3ff WHIRLPOOL 0e11564b0bd7e6978a03e96600d4ab32b7d07f197c7ba98374c1785dd1e7e65b60061770505d208b59472696a80b107b5f2e73612897ca8d94330e9b4a40ffaa
 EBUILD freebsd-sources-9.1-r3.ebuild 2652 SHA256 f7a8bcc18639d32bb82a7aa13b87bf69366b9f945d183f6a6f4fcca1fc140c19 SHA512 92f0b9fa7231138be75af20cfda00514f549fc7cb5bd2f7b1773b30ece21b4ec8ba19bcd68bdf77186018aa1da861fa2d9453448e100b0fcf73021dc70b626b8 WHIRLPOOL c75ccfdc7bf8b13f109b6b742119e1c8887902830196b0a28c37f79db78d13c61eb0a2e3d6c4f122e4d6dc01159c383844ca7be584a6448bb423f3b73f1a6de9
-MISC ChangeLog 23054 SHA256 caa8dff262326977a62c253cf95d852cb281a9e26f94e479bf85c7ac312ef598 SHA512 38b164ecfeace85117031b598fd8169d83240dfc47d025b85aaa906a26bfac8b841c39e920cb28b7547997ca73ba8bb9cbe8d1f02a9ccd180df279ec0d1b6624 WHIRLPOOL 87c749227eb04d5b04d5916a5c318d806a9dfca63e229dad44d3883d1cd9a24ace4eab2dce9bb1ebe10b08e4383dfd9aacbee25f5a8e1385c154567284d979cc
+MISC ChangeLog 23241 SHA256 ee54ea52e6ba130f966b230b80571b698976db67b20779cea67e30a45682cb86 SHA512 62ba2dfd748a17c0f57744b43b854f4dbc714610c075001520477588fa842de3fead78dca6690364b0383bbb541a16e94cecf9509e2aea756e54b4845b6ba9a1 WHIRLPOOL e6712da837d6523dcbeea2f3e89ce018a3084d316bffc77ce30fe77a86cce935dcd1b2f2233f860a27cbb2cfa14f64c0361a2e9e039ea44a2fd73158caa8f3a5
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIFAbwACgkQvFcC4BYPU0qwZwCfaqdViRlZwJiO6Vm8VibXrA2H
-FaAAnAwAhjMsN6GQ8It8vVRB0LUhfDz3
-=h1Jr
+iEYEAREIAAYFAlIFAnYACgkQvFcC4BYPU0qhCACfZwwSR5rabwkaaTQIsGu+6BqX
+nRoAoMkk4qGTUlwTKysdDtp+G8ioX/kh
+=686g
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
deleted file mode 100644
index 840af81736a9..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uNr sys.old/conf/kern.mk sys/conf/kern.mk
---- sys.old/conf/kern.mk	2011-11-02 13:02:13.000000000 +0000
-+++ sys/conf/kern.mk	2011-11-02 13:05:53.000000000 +0000
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option
- #
- # The following flags are next up for working on:
-@@ -32,7 +32,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${CC:T:Mclang} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
-+CFLAGS+=	-mpreferred-stack-boundary=2 -mno-sse
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif
-diff -uNr sys.old/dev/aic7xxx/aicasm/Makefile sys/dev/aic7xxx/aicasm/Makefile
---- sys.old/dev/aic7xxx/aicasm/Makefile	2011-11-02 13:02:11.000000000 +0000
-+++ sys/dev/aic7xxx/aicasm/Makefile	2011-11-02 13:06:24.000000000 +0000
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- WARNS?=	5
- 
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
deleted file mode 100644
index 08110d60fa02..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/compat/linux/linux_ioctl.c
-===================================================================
---- sys/compat/linux/linux_ioctl.c	(revision 242578)
-+++ sys/compat/linux/linux_ioctl.c	(working copy)
-@@ -2260,8 +2260,9 @@ again:
- 
- 	ifc.ifc_len = valid_len; 
- 	sbuf_finish(sb);
--	memcpy(PTRIN(ifc.ifc_buf), sbuf_data(sb), ifc.ifc_len);
--	error = copyout(&ifc, uifc, sizeof(ifc));
-+	error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len);
-+	if (error == 0)
-+		error = copyout(&ifc, uifc, sizeof(ifc));
- 	sbuf_delete(sb);
- 	CURVNET_RESTORE();
- 
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
deleted file mode 100644
index 5e956edb72bb..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild,v 1.1 2012/12/03 11:31:31 naota Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# workaround a kernel panic for amd64-fbsd, bug #408019
-	epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 9.0-RELEASE it's 900001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
-	epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
-	epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index b93662ddbc35..197bb8f4350d 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.91 2013/08/09 14:57:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.92 2013/08/09 15:00:00 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-ubin-9.0.ebuild,
+  -freebsd-ubin-9.0-r1.ebuild:
+  remove old
 
   09 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-ubin-9.1-r2.ebuild:
   no need to set MULTIBUILD_VARIANTS anymore
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 0bfe418b3465..3f6184e3f2d3 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -23,39 +23,29 @@ AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012
 AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07
 AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1
 DIST freebsd-bin-8.2.tar.bz2 415900 SHA256 fb31b7fab259bda8396e615246f85dc99c3c9f7e98f4e4a613e20b6a394c4921 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3 WHIRLPOOL 49e70b1c09c4b72b3f23850e8c9873556571ec02d70ade8f18f683eff6fa92dc8f6d02d58473fe7b4d8d1f3de96c63df41150b2091caafbc9a0e92e6055b43fd
-DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
 DIST freebsd-bin-9.1.tar.bz2 385664 SHA256 0a9524d75a8cb4c9c2654f2f9843087b09e8599bba97b9b59f00bc2e92b87e00 SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8 WHIRLPOOL 6f2bfe17604339e8260c49582bc941d255932b5c0a7b604e58187626a3a38766cd1e4aed9fc93a737ec9b4fa661f88aac23769b3542f35eb20da8b260216e985
 DIST freebsd-cddl-8.2.tar.bz2 823706 SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721 WHIRLPOOL 0150d972fc5200efcf22b5baded0bc7d826f03420a8328bc9ce1f53f39d1f3cd07dc367fcb3b0c8bdcc3b33bc9045f262928d76532c91820fd3c6bc8c9ee57c9
-DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
 DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
-DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 EBUILD freebsd-ubin-8.2-r1.ebuild 4645 SHA256 aab17d095a0dfde25111ecceb6486e74d4ee71c0288d68b17f4b38f2019ec257 SHA512 6c28bec854a0e11e95664d2f57367a6e252920733f146832af4cf95674b4c8c34426dbaeeac1b87234da4ab1dc67b4d5bdc8b91c5c9787b03d6b6981f28efc43 WHIRLPOOL 95cf5e8a7342cbb216958898a7900087ae455bdd8ee9f58b7a0563b512cf7104b595b29211fe63d09ee4f60d0f324fa058a245f0f211ae66261caa5ec90e7dfb
-EBUILD freebsd-ubin-9.0-r1.ebuild 4730 SHA256 4891e1b52963fd316b9f0a85f9744f9b3a4e1bc31dadad1e8b82a86396219935 SHA512 4dc01e77598030d5fb79e672f49f9f383a791c2ec6962b931023965a0833b7e89f3d6664fcf277f1094beaf1ff3909de8a658cd927916dbc33d6a1b166d89fa9 WHIRLPOOL 7cd1609ddec984c3c05309a684fd09d4bd499a65761ada52ca4b68b3290ff7124d46f55b701da4845633f50dc0c7f2e49ba24f566f8047650cbb15b1324dfc3a
-EBUILD freebsd-ubin-9.0.ebuild 4731 SHA256 410bf07e107e5aa0aa10266e94cd561947fa20b18943f0e814d291b4a8e9c1a6 SHA512 d12d28116abfc3fd575a1286d6c19fd8031f2c58b48aeabe83635471cb2ce75af43d34372804a56ceeee7776fdace0d663728b82ba7f7d7526a78ef4073a641f WHIRLPOOL c76a7bd9b00b1d369c1f27d33ef6866be6eaa75398c5df0a7ece4ccce7fc52deeaa353fb9c3ede8ac2cb676f7e9a8d2ade1a2e94b0b2fb97ad3b630b0e764ef9
 EBUILD freebsd-ubin-9.1-r2.ebuild 5424 SHA256 60c9f496a1fc364ad88843c8a9d4485ca7bf14784582d42044806c08944abdc0 SHA512 0c865ca3ca5084c107712f2a7829e3b067c2ed7d2da21b4427e71af9470484ab641f95c07e19f4cb6f5876254ccb23783d611610f14229fd3af345804b9b7f33 WHIRLPOOL c29ca11984a394bdb342e3bbe24cb12b650ddda233598c09e1e65c54c20fb0de5ad9e9d18f42bd82463dda7564e2e77ea2b4aa1fd980af2b8616550c3ca5e3c0
-MISC ChangeLog 18629 SHA256 d4af927a16534fd51b8dd5d1a2903a2e760db6b89e616f713aa690a006bd509d SHA512 8d6680c4d6e6a542fa31218cb76c2c668a180d42ed7c3e65b9a7368dd377410f10e5820616027080d5c571834f57e3df728130d7754df593fb5df0a74479bc2a WHIRLPOOL 348a7d5848a65e04132e23d4f55fd241fa6f42c83323d2aa6f103493f5c1fc9bef00b2ea7c0c9d392a0c2218460bffcee59ffafdc5110d9e70f87369904c9050
+MISC ChangeLog 18752 SHA256 9309008373fe2f929a11c6b283e8561877a1190a9eca724d9c5e98582b2a38a5 SHA512 785393ec6afb7eb91def0f968ff3c8ddcf5e8bd49e3e5eb5fb60c585617c1b2c3139624cdb2a7df8c6b9cc54aa4ea203c9719cb2aa960eadb86a1b4785fc2a08 WHIRLPOOL a46100ebaafb2109cf49a517ef3e7a937310b4e68f33d9655a8b1ca22e9b37c9adb8a59bd68b26d6b909aa18e0dda2de6654567a6029f2463e3ae1a14d219a0e
 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIFA3cACgkQvFcC4BYPU0r1BQCaAoH5766L++ClRHZ6vBCKM7y8
-Z4kAoK22m2hfoyhGf/O04yRmTvlfvS97
-=Z0kW
+iEYEAREIAAYFAlIFA/EACgkQvFcC4BYPU0oyAQCfbIXKsUvV59KjvYhKrrpi7WGO
+BesAn3d5RB1N60/Hh5IWMxNKpCbx6Zsd
+=zlXo
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild
deleted file mode 100644
index e48bc25bb7c2..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild,v 1.2 2012/04/26 13:55:01 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( app-arch/libarchive )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-8.0-bsdar.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-src_install() {
-	freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild
deleted file mode 100644
index 8b9bb74cd828..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild,v 1.2 2012/04/23 16:01:42 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( app-arch/libarchive )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	>=dev-libs/libedit-20120311.3.0-r1
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-8.0-bsdar.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	whois tftp man"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-src_install() {
-	freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild
deleted file mode 100644
index 4112c7763004..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r1.ebuild,v 1.1 2013/06/18 18:19:57 aballier Exp $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos multilib netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	>=sys-freebsd/freebsd-lib-9.1-r7[multilib?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-9.1-grep.patch"
-	"${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-MULTIBUILD_VARIANTS=( $(get_all_abis) )
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-setup_multilib_vars() {
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild
deleted file mode 100644
index aad536e86c9a..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.ebuild,v 1.2 2013/01/27 22:39:32 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-9.1-grep.patch"
-	"${FILESDIR}/${PN}-9.1-ar-libarchive3.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-}
-
-src_install() {
-	freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf fuser; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index fb3dcf1a7777..cd53a2deb3e7 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.89 2013/06/27 20:43:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.90 2013/08/09 14:55:09 aballier Exp $
+
+  09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -freebsd-usbin-9.0.ebuild:
+  remove old
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-usbin-9.1.ebuild:
   Add kerberos useflag and properly disable it if not requested. Bug #473458 by
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 85a32b2fbea5..c7e66554ee86 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -25,44 +25,33 @@ AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b
 AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
 AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
 DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
-DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c24445195e33a4ac50bf1040ae238 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c WHIRLPOOL 23b658a214f1a64c43420351020e32b1182e9aac3ed5253f49ee86f9cee9166ce32bd556cd2a2b3c0e60a165462a8700f37dea19e57ad5716415e17f61da912e
-DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-gnu-8.2.tar.bz2 815379 SHA256 34be1326b8e188427ea4a59de5dd24049f99adb5e172d61a645db1b7124f7876 SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4 WHIRLPOOL aaf91562f147095e09a9f6aa2d4c33494f430cbe7340377edff1b8a44cc60edfe4af7ef90350018f0c80e82f5518110689cb582bb227d2360488dfbdd7bcb7c8
-DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1.tar.bz2 795778 SHA256 3b99c1fa1087bf69549e0990a0d7997954533ac9d7938c4760ec2b01aa509a5f SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd WHIRLPOOL 4f776b99296c4fcc0d6f4d30a12b0773f6704292e1361826b260ce34dcc8e537ef7eb7c6332c4988e0e03bc84ca07fb18e6b2785fe4c6f175c08865b72d6bb0b
 DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
-DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
-DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
-DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
-DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
-DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
-DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
-DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
 EBUILD freebsd-usbin-8.2-r2.ebuild 5220 SHA256 b293c8d3eb62a9a0cbe365c4f022f9dd4bbbdeebb98784dbb0c02564439b49c6 SHA512 5a6faebce9d21e9b176c1d35c53c6e232c8dce657835b1efaa0954d826fad920629681dd04d49672648e487c29fa1ce92ed86453c0d8b1fdcca9ef055a995b85 WHIRLPOOL e3a3b97f6162321ebfb34103b5b39f86bb57147270f0c50e7ca66d91f1750a8ab6babd33d484c3c5b498875c42cf672d9c5bd8d342a02608341944c7427b1f36
-EBUILD freebsd-usbin-9.0.ebuild 5446 SHA256 f6664ac3467038ad86eda1dc60dd1337eee255c19ac50dafccd7184461988604 SHA512 5713a533f57b80f6342703f5109e6b4a289198ec9ee8a61b5d49a05cfe1a0edfe0b53c3bc425486687366b1f62a022c69d2688f7fda9512cbac4804dfd547de3 WHIRLPOOL eda4ec41b3819f0b2b24caaefce80aa80a9a7913d405810c33787dc252917d7ed4e0dd33cc5718b73bcf85c15537ffc4058a0e1f7c7dcfe8177918f5b3cbe3a1
 EBUILD freebsd-usbin-9.1.ebuild 5439 SHA256 dfb8234dd67405303a82284b87192e6dc962d0e4033774486235778b019d4d81 SHA512 bb2bb956a885bda62c847b2b0f6e6805fc961f2b23cd1d9f6c8cfea8a58652bb44322f7c2c8c1e362d6ac48ab2fc7426c2d48965bd81b82da6379fad34b4f703 WHIRLPOOL 0dca2f8c3f082cb7599971dc8a9b7f054e4d7f053d4ea24ed59156f42b8b97396991444f54e9adc8b57fb16792d0aea497fa53fa3e6ab8a09637586d1887361d
-MISC ChangeLog 21529 SHA256 51d9f78de8467bc8fc475eb3e676f4ac03766a04b9939f304401d537ef7e9643 SHA512 de19461977c4b081c88fe0e53f142f95cdec8c2204110df45834a5e13dfba3532f3a7599a72487c21f12f6d24216a93cbbeb09d8604c9270ff59a9155178b824 WHIRLPOOL b405d74d4457e44f63eb1f699a96978983038a48147f0f48f125618bb50d622853e8a868ace3876fd9a1e885d81785a03e04bdc32615581c18c919e9ce220446
-MISC metadata.xml 511 SHA256 ad3d3afca8e209c42d1767c5d1dab12eef47c9016c0ce9aaa3490942bd185bac SHA512 dd48fe50592cd5b2aa24243830d731523873c3b5ed1e9c02c05aac6a80f063ae24a0b14ce32a7f55343d100cf5fb07874824438d38fb0ed7adad39441b6e02c8 WHIRLPOOL 94f7120ce8e2ba7af8e8840de51a07445cf505122d27379a4580d655b5dd3d55b6208a9bf23e50687bd8ae516ecde427f3f16cf176cfd7c8bb48a1a83fcb1712
+MISC ChangeLog 21622 SHA256 098f8984c9104d24eff192dfeaf3df0fa658da8fcdd935f790910e9d7042fee1 SHA512 a6f5d0aada5732516d1ac9e1da8b6e1e9777a2b1bd2781ce12ae23ee6dbb1a6fe708ee61597c43f57b9f024a0a2acc46a0b580fa46a557d5bd116dc9d7c59c9e WHIRLPOOL 18039cd3eccbea3f045e0f2851a503967b6627d884569c15ec16da8e769fe39418b1ecb83fd17280aa87bde61952bc12e16cc643df0ac1e51428e2b25df1b4e9
+MISC metadata.xml 461 SHA256 fd2d6bce2b50c4fc19752eb8e94b8770f1c94186698c3358b8b906cfde2c5302 SHA512 58cf153c795ea258951d25190723aa5706d48741775a3547b54c35ba67507b652089ceeb2b4da9b9bf8b7e2cdbb9163cbdbe673e5240f30164e10560cbae4e50 WHIRLPOOL 828545f7bc374fd8e22b68d2980fa14b5d8fe92a160582bb7f49f00594e5de91449345eed5dd626b641d77efb3bd45f92f345b9262c080b7649d31e24481e36d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMo+sACgkQvFcC4BYPU0ofYQCgpWaJ0d1UXrv43M1I8QQIAMkl
-DOEAmwTbFNh2+s6REcj6MI6RGozAATYr
-=HrVO
+iEYEAREIAAYFAlIFAs8ACgkQvFcC4BYPU0p0uACgpZ5AJsyfYapcBiH/cp9pOhnr
+MNEAn0FxKxxh50cgEAAqMXK/02mO0b0y
+=rUET
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild
deleted file mode 100644
index 9c75334f7996..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild,v 1.3 2012/04/26 14:33:24 aballier Exp $
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2
-			mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	=sys-freebsd/freebsd-contrib-${RV}*
-	acpi? ( sys-power/iasl )
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	dev-libs/libelf
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl usb build"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	)
-
-REMOVE_SUBDIRS="
-	named named-checkzone named-checkconf rndc rndc-confgen
-	dnssec-keygen dnssec-signzone
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg_install freebsd-update"
-
-src_prepare() {
-	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-		ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in nfs rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/* || die
-		rm -f "${D}"/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
index a142253c1601..77bc580d775b 100644
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ b/sys-freebsd/freebsd-usbin/metadata.xml
@@ -4,7 +4,6 @@
   <herd>bsd</herd>
   <use>
     <flag name='floppy'>Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
-    <flag name='isdn'>Enable ISDN support.</flag>
     <flag name='audit'>
       Build auditing tools.
     </flag>
author	Alexis Ballier <aballier@gentoo.org>	2013-08-09 15:10:05 +0000
committer	Alexis Ballier <aballier@gentoo.org>	2013-08-09 15:10:05 +0000
commit	d882d55e6122a1106e3652d21715673a55973e52 (patch)
tree	db4d5615da27c3fd75211ea20cbe800dd71b7f96 /sys-freebsd
parent	Version bump (bug #480364). (diff)
download	historical-d882d55e6122a1106e3652d21715673a55973e52.tar.gz historical-d882d55e6122a1106e3652d21715673a55973e52.tar.bz2 historical-d882d55e6122a1106e3652d21715673a55973e52.zip