remove old

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 12 insertions, 547 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 73dd46159dfe..3f4c5de1ccd4 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2013/01/27 22:19:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.52 2013/06/18 23:38:04 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  -freebsd-mk-defs-7.2.ebuild, -freebsd-mk-defs-8.0.ebuild,
+  -files/freebsd-mk-defs-7.1-gentoo.patch,
+  -files/freebsd-mk-defs-7.1-gnu.patch:
+  remove old
 
   27 Jan 2013; Alexis Ballier <aballier@gentoo.org>
   -freebsd-mk-defs-9.1_rc1.ebuild, -freebsd-mk-defs-9.1_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 6d1418aaeeea..c9fa50bed1fd 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX freebsd-mk-defs-7.1-gentoo.patch 11056 SHA256 975c1dcd3bfd4a40410caf3ffa70bdf9707c843c07e9a6fb9281158e0595f336 SHA512 189d6ab66c5478f1ec2dfaf5b0dd34347128c5930b20cf9460d37fa5dd2d40cd86810096421a99fbd350e1a359b92e7f0713169b50cf834532bd1b65cbaa12a2 WHIRLPOOL c3d189b1b049f9cf16428fa398a45cd722c8b51ceb9e17647dc16510ad5413e48640fdd6fd424e07a09a1acfab2c620a63ecb16659968897ff5a605454295844
-AUX freebsd-mk-defs-7.1-gnu.patch 4022 SHA256 d10ac0750d533d42ca792584f393d0c2327e62aaf0fa2bf83636aebb68dc47ea SHA512 9d81d9dc6ce57117e7aae24bc4971c4af1e690444745bdb8e40e5a55078e28f72f9d95ae146676dee6d2436b1d887845c1127510335161357e111b494c54ece6 WHIRLPOOL 5dd1d814ea211720ed6f6d4b98e4fad444d6cca3d31d39a5eb7671312e53976ca7282768cc92357ef5ede2ebecfdcbd698665c57fa44524c15f1c5d90cac6295
 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-7.2.tar.bz2 3878366 SHA256 15f28ba51609d319d3edc930cf6fc20850bb493707df907fdeace23d35118bf2 SHA512 9508dd8f80545fcd2fd959dfd64a2dc993539f10a5fc5303a953151e9e49c88b9ebd74990b3734618cacdb6c1c59e7e65ede55780eda8f1b5268491906bc5f11 WHIRLPOOL dab210db2f6daa2d94019d06b34c8980c1842239fcc42e14dc74cbd5625101bb52fba7964354f6505a862b3d39fc6e4366210394f4adb8e84fbd31e0bddebdb5
-DIST freebsd-share-8.0.tar.bz2 3754795 SHA256 4cbb577bb7e76f87a27d3974459d0e146736d5e8002c49f5661f95f68c2939d1 SHA512 a9a9601aedee4d3e0ff151949f7aa62f3f00efd66345493068e5db93d00066264ad656623e031a08614b36d5115ca1a93789d7b58f00d7355f5db1106739da2e WHIRLPOOL 2dd7087d3fa7ea77e459e51024d0c12a0748a919f9bc327facf17db9bcea765e33f91525fa1075822b116e425a8b2c7e6bd64732a97432b2253d96052b442126
 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-7.2.ebuild 879 SHA256 b7c8e54694e55c59bc11be97039aa67dd098cabe6acf4a2befdef0887133fc04 SHA512 9628c826840bc5d2da6a911362f118e715f5a3a0fa851b35900582f3cff09ec8d7039627d06201e97145d1e5177b1179d0adc50d59c3c7c90c49ecc8f1d8e030 WHIRLPOOL edcf9c1d7a13cc724a4d5158ca08e6fd0b8d6fcc09b7ee8f791dda0c7b975c1b4c186917f3de9f0e8517d6054f1ac378c341434434fce8bed2550ce9db84bca7
-EBUILD freebsd-mk-defs-8.0.ebuild 879 SHA256 06619dbe8ff3e746da248c6fd0ef79fd60f7e46cb479d8480f38bb0c4ffe47b8 SHA512 7984d56801d3d3b3238764175154a8e3c02a258fdf11e4eaf99361c416e312d2494c1f0af80420066130ca908e4c3e001d0b0acda21674cfa0998bdd32f5ae44 WHIRLPOOL 66a241f96d4b064b8abb50ef1f3954d9ec17aab58c146e515a727a391613a94e9545aab9a1f3725916db0932e059b55f88eb2a1bc1959333be137eefb36206a0
 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 10874 SHA256 bf54e39e5a6375db385ebb88dde29be1dcc741031c5244c5805d5205adf1d8b8 SHA512 34568cbdb545f2d61f588e946bb05ce535da7ca185440bb52b2ab8213513763f11c1ac8c9c19b418662b129e487a02f60a5c068d5b4249a085ac023efa3888d9 WHIRLPOOL 768e39fa64d0c47e1f34542a8f3a184626cbb1957ead71fb14bce1bdfb561955be021238c9b1ea8a90f95713381ca0a63cf20ecbb30656269056fbcccf214553
+MISC ChangeLog 11083 SHA256 3d1e0f0a903690693379f81794bfd7f4ae3f9d5128f965ab85e19e9b88fe7c0d SHA512 fa6827f7e909a131557275e3ac29db1a11091bb1646dc2b61b8a2588dcdb65a0101305a829d8b9114ff2d7b62e2476e1cf8bfefc15321bf02b7df53ad36402cf WHIRLPOOL 23227e4c2559adec5429a5463fdd8d486b0689e8566e96fc8a6184e557fa9afd174dfa507ca8b6666e44b4887f3b35fa40f7b54f15c6866e7e39e096a49a61ed
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEFp+8ACgkQvFcC4BYPU0rsWACfVi0RGeGROu8iRFGl9ah9Mzgc
-lhoAoInURuWv9/r0rITVWWrLUuHkn37b
-=+cSL
+iEYEAREIAAYFAlHA714ACgkQvFcC4BYPU0oNywCfeVqTw5QCrhQBW2p2SuO0zyf3
+N7kAoJ0np2jcKS3zjEOzQFVHOb4nYLWn
+=KMlq
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch
deleted file mode 100644
index 39f84dea0de4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-Index: share/mk/bsd.doc.mk
-===================================================================
---- share.orig/mk/bsd.doc.mk
-+++ share/mk/bsd.doc.mk
-@@ -137,10 +137,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-Index: share/mk/bsd.files.mk
-===================================================================
---- share.orig/mk/bsd.files.mk
-+++ share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: share/mk/bsd.incs.mk
-===================================================================
---- share.orig/mk/bsd.incs.mk
-+++ share/mk/bsd.incs.mk
-@@ -41,6 +41,10 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -53,9 +57,11 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: share/mk/bsd.info.mk
-===================================================================
---- share.orig/mk/bsd.info.mk
-+++ share/mk/bsd.info.mk
-@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
-Index: share/mk/bsd.lib.mk
-===================================================================
---- share.orig/mk/bsd.lib.mk
-+++ share/mk/bsd.lib.mk
-@@ -37,10 +37,6 @@ NO_WERROR=
- CFLAGS+= ${DEBUG_FLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -236,14 +232,17 @@ realinstall: _libinstall
- .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}
-Index: share/mk/bsd.libnames.mk
-===================================================================
---- share.orig/mk/bsd.libnames.mk
-+++ share/mk/bsd.libnames.mk
-@@ -41,7 +41,7 @@ LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
- LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -68,7 +68,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeyca
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-Index: share/mk/bsd.man.mk
-===================================================================
---- share.orig/mk/bsd.man.mk
-+++ share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-Index: share/mk/bsd.prog.mk
-===================================================================
---- share.orig/mk/bsd.prog.mk
-+++ share/mk/bsd.prog.mk
-@@ -23,10 +23,6 @@ CFLAGS+=${DEBUG_FLAGS}
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -142,9 +138,11 @@ realinstall: _proginstall
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -172,6 +170,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-Index: share/mk/bsd.sys.mk
-===================================================================
---- share.orig/mk/bsd.sys.mk
-+++ share/mk/bsd.sys.mk
-@@ -30,9 +30,6 @@ CFLAGS		+= -std=${CSTD}
- . if defined(WARNS)
- .  if ${WARNS} >= 1
- CWARNFLAGS	+=	-Wsystem-headers
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- .  if ${WARNS} >= 2
- CWARNFLAGS	+=	-Wall -Wno-format-y2k
-@@ -66,9 +63,6 @@ WFORMAT		=	1
- .  if ${WFORMAT} > 0
- #CWARNFLAGS	+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
- CWARNFLAGS	+=	-Wformat=2 -Wno-format-extra-args
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- . endif
- .endif
-Index: share/mk/sys.mk
-===================================================================
---- share.orig/mk/sys.mk
-+++ share/mk/sys.mk
-@@ -34,11 +34,11 @@
- CC		?=	c89
- CFLAGS		?=	-O
- .else
--CC		?=	cc
-+CC		?=	gcc
- .if ${MACHINE_ARCH} == "arm"
--CFLAGS		?=	-O -fno-strict-aliasing -pipe
-+CFLAGS		?=	-pipe
- .else
--CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
-+CFLAGS		?=	-pipe
- .endif
- .endif
- 
-@@ -61,7 +61,7 @@
- .endif
- .endif
- 
--CXX		?=	c++
-+CXX		?=	g++
- CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
- 
- CPP		?=	cpp
-@@ -254,12 +254,6 @@ YFLAGS		?=	-d
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # Default executable format
- # XXX hint for bsd.port.mk
- OBJFORMAT?=	elf
-Index: share/mk/bsd.links.mk
-===================================================================
---- share.orig/mk/bsd.links.mk
-+++ share/mk/bsd.links.mk
-@@ -15,6 +15,8 @@ _installlinks:
- 		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 @@ _installlinks:
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
- 	done; true
- .endif
-Index: share/mk/bsd.own.mk
-===================================================================
---- share.orig/mk/bsd.own.mk
-+++ share/mk/bsd.own.mk
-@@ -166,11 +166,6 @@ DEFAULT_THREAD_LIB?=	libthr
- 
- INCLUDEDIR?=	/usr/include
- 
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
--
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
- 
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch
deleted file mode 100644
index 54747c835809..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: mk/bsd.incs.mk
-===================================================================
---- mk.orig/bsd.incs.mk
-+++ mk/bsd.incs.mk
-@@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header}
- 	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
--	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
-+	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -58,11 +58,11 @@ installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
- 	${INSTALL} -d ${DESTDIR}${${group}DIR}
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
- 	${INSTALL} -d ${DESTDIR}${${group}DIR}
--	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-Index: mk/bsd.lib.mk
-===================================================================
---- mk.orig/bsd.lib.mk
-+++ mk/bsd.lib.mk
-@@ -119,11 +119,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
- 
-@@ -136,11 +132,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
- 
-@@ -195,15 +195,9 @@
- .if defined(SHLIB_LINK)
- 	@ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} -shared -Wl,-x \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} -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}
- .if defined(CTFMERGE)
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -211,13 +197,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}}
-@@ -233,12 +212,12 @@ realinstall: _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
- 	${INSTALL} -d ${DESTDIR}${LIBDIR}
--	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
- 	${INSTALL} -d ${DESTDIR}${LIBDIR}
--	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-Index: mk/bsd.prog.mk
-===================================================================
---- mk.orig/bsd.prog.mk
-+++ mk/bsd.prog.mk
-@@ -120,13 +120,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-7.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.2.ebuild
deleted file mode 100644
index 286e1041425a..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.2.ebuild,v 1.1 2009/05/22 13:37:30 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-7.1-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-7.1-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild
deleted file mode 100644
index 7756143b2430..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 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-8.0.ebuild,v 1.1 2010/03/19 11:50:53 aballier Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-8.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
-}