Drop catman subdir. #244517

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

3 files changed, 202 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index b06d17092f64..a09693165916 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.99 2014/01/05 00:56:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.100 2014/01/05 01:27:10 naota Exp $
+
+*freebsd-ubin-9.1-r3 (05 Jan 2014)
+
+  05 Jan 2014; Naohiro Aota <naota@gentoo.org> +freebsd-ubin-9.1-r3.ebuild:
+  Drop catman subdir. #244517
 
   05 Jan 2014; Naohiro Aota <naota@gentoo.org> files/locate-updatedb-cron,
   freebsd-ubin-9.1-r2.ebuild, freebsd-ubin-9.2.ebuild:
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 36b4eb2c99bc..fd828dd52b71 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -72,26 +72,27 @@ DIST freebsd-ubin-9.2_rc2.tar.bz2 1917605 SHA256 183afe564f5f318ea85ef82f6ea8878
 DIST freebsd-ubin-9.2_rc3.tar.bz2 1917528 SHA256 87521a64750974d83de97936aac4f03d45699a2d8b85661177c687f2c738b05b SHA512 f90049306da53c98f4da6153b387de40b8ee98e288c0923dfb41099e784b9e492e897b83621750e3a9d28695a7f5eee1485d0b60aff3ecaf526ca9c583bb2105 WHIRLPOOL 76dee7531cbe15cbad3c13cb3ab50dbcdc8e2e85cf2deb675fa40664c5d1b10efaa76a77ff88cf209606e0c928bfa52b8918b38c83f83f70d557e41da31d9651
 EBUILD freebsd-ubin-8.2-r1.ebuild 4645 SHA256 aab17d095a0dfde25111ecceb6486e74d4ee71c0288d68b17f4b38f2019ec257 SHA512 6c28bec854a0e11e95664d2f57367a6e252920733f146832af4cf95674b4c8c34426dbaeeac1b87234da4ab1dc67b4d5bdc8b91c5c9787b03d6b6981f28efc43 WHIRLPOOL 95cf5e8a7342cbb216958898a7900087ae455bdd8ee9f58b7a0563b512cf7104b595b29211fe63d09ee4f60d0f324fa058a245f0f211ae66261caa5ec90e7dfb
 EBUILD freebsd-ubin-9.1-r2.ebuild 5572 SHA256 30ec2f63e03cb8056e0a6a0fa3db871645346217d8d3c96aa7f420b52ba3b5e8 SHA512 727231a1ff44c5e41500354857f4b3c50d6e43b6011bbb2a8d7161c7a8843085a5410092c87f46e7bb6a51f7101d2656278c438b3f83c04822e6c3d13db4d940 WHIRLPOOL ea873f009cbfec41d3d287a2a427d5d486eb7bc91b1e1ca09670d5f76b0f75f58e26a51a38e92ec389803346282e5be4735c99d352ce337fcc11e24eed574b74
+EBUILD freebsd-ubin-9.1-r3.ebuild 5579 SHA256 d342ec4329a960b07636c55b4d9350f93592574a58d8612bb77019af514d98c1 SHA512 69dc9af63da2ac71c9cd81fdb2e75368e97ad7efc44a4edd65f8a0faca6704b111d98280670b0b53f6548e961501b8eddda01a34ae3209c21b3a146b3bb63dc2 WHIRLPOOL 828e50b0309684852664b2d5ad579252027febaccd9ecfabb1f5b6b9303191e6549ca74f402288b0bc83508ee4571267dcb68f134bce1fe2b38abb9a22d9ab86
 EBUILD freebsd-ubin-9.2.ebuild 5601 SHA256 1a9c8ee2154215b34f0885778dba068cce359ab3cf51756b61ff76289768c6ee SHA512 1df84044a617fad127a47f59f4b0aceacca923a1b9bcc7fbb9e8e2cf5e8f39fe4f908cd30c0e0b5b11a1e9e571408aa0bdb58fecb868f64146ed947e4ed09038 WHIRLPOOL e427ffaeb7e5a9615568d821d53125a13f861409159d3e6cba6beb5775f0cfa226e4a4bfc0b4a658a2870f06dc606a7788517f1e7dfd0432c6a0081648a9efc7
 EBUILD freebsd-ubin-9.2_rc1.ebuild 5462 SHA256 e258f2478b63a9f2b4ca6a085e22f5c00abfde4add030da7064c64e22629fd94 SHA512 cf2b928ae9f0202327aa81b8ad7263e596082430f08467e100d773600d34e5ef8a2e3f9b5fe8859cc919ffeee93a25d1206725f2eaa9896ee79ec0f9e240aaae WHIRLPOOL 059be113f1326f84ab864cee57fa7086c07a27f642e75c40a6ea2b963d03c43be09456b9652ca23192e8c981918ed3711a3a4e2fb7acc581922dd62e53f76dd9
 EBUILD freebsd-ubin-9.2_rc2.ebuild 5462 SHA256 2ddc15b58569e83acea255ff39c800decd66710a05f106bcfbe47ff6c415c5fb SHA512 b9ba570a14f0447b8fb3406adb0865ce88464c36377fec2a1e1a3da464c717851d7a6c7c6ee425d074cd89e477712cd26306b24c7ab2a1b8c98d7d8cc5323463 WHIRLPOOL 5087eb54e3074febc198599989694472239182f1459a64fedf80a03feed79e8586e3885dfca04ecb2a214dc1a829dfb49e67b4fe46219be42ed21dc314fb8eb2
 EBUILD freebsd-ubin-9.2_rc3.ebuild 5457 SHA256 0c4b5d897b7ec606e9990b78bc1412c88293ac341e15cfa4d8f9e8d0380de712 SHA512 09f41699111f60a3eb14b6d25a2cda417ce4108ee15b6ad06711dcbf4adea6a9217ee20f0db01613b1b82acf40fb580b5691e4a95ff463bbc58755c6b4d12208 WHIRLPOOL 9626b7d52ddefcb97e28c05b93ab12d88c18614c08fca0412541efb535bb30f326488d13769e8ecbe696e434d9f91066630221be5729d92c32b842899cc614a8
-MISC ChangeLog 19816 SHA256 123b279ba5a2af7428583a8b0a6135a3fb6dd60a382b7edce45a9c3f4555868c SHA512 e4a63059e0cdb7511ec7d1a9e681248ad47272886384adcd0ca4ffabc5406779b1161809521525d2d63eadaba54aa7ef958daf9bdc79e7c26008abc111dc9cdd WHIRLPOOL 393fcbb95af1466f6a4d87bb1c78bd4ac9a55f677a5d906797fbbb0e2609bde9f24ed7d2ea675496a26507599872e5aceb8fee8b5fdd09f2643d39e9d63743e1
+MISC ChangeLog 19960 SHA256 9af8921f90e612c1d267d4801916aaea0e7e1c82bff1c2a28228bbe55c9a635d SHA512 a6232e31eac374b425c0566c3edf8dc786d6275f63ceedcc11b89078c45831021b229657f6f11c7421f2c2871aa10c5af3c246de6d6484e32362274570832c76 WHIRLPOOL ce3897818ea72ef497a13ce6cb5b67270bb1d6df6736ba1de8f3309525d327fabd0aa9ae6c4d089d414d9db8f1c2830a5cd2dbbf9add1141456b7bd00c609b01
 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyK3ZAAoJEDYO1FT4VRUURKkP/084mPJIGrDCH1wkkBk6RpcR
-37udc7b3JzEvYdxc1l6b/1JjQpmw36lUULgZbtXFbsINMvrcuXVmDPQWthHMZM+I
-hzcuNfl/FO4rZOgucmYHuhBdUM120LQ2pdZKsuwPXRudlCE/OUIpKh6DRYwg0wMz
-1fGMsD1QvVUPZD/6ZZrMbRrxFZv0qUVr7jLJ+BB6vSCaq7+5mGOUG4chvgPgohM1
-kUlJtqYQX9P/WC14zUQMknmNsuHcB7SKXInI9IuKgaPDhpjN2yMza19atITjUGlP
-sjQvpMczJwDGkQk0NM65HNeWnsCNvrZJj/f5/oYN8skSN74HPRSAsg5zPlKezx//
-Vm8ntp7XHxQYTjw1rblmED1Dbcd5YpytZs3/9q566XTWsR06xptVKrGd8sgACUwJ
-OtMS/OtpyIzNvLjrCmwP7K7KUcTGUtCIVLYLq7kauMQDFtmpWoifjFbWSo73P8vR
-c/iPUROUPx48AW9s1fB+av8YzT330Q0jlyuqpIYpXjYl3iYWl/2tnBbsp4Wi1kd/
-ujJdCaWY4k/UhCDqfFziHpw0iFJWwipYHpYTgxk17op4xUitNoSCUcVCnaqD1kRH
-MQfGPY1Ymi1WcSB4fQlx03vx01uGBGT8PK8gWDa6za3jb6LI1cNcj083X0oydhzl
-sd9enru3QNYWk2A3eYoL
-=wJWO
+iQIcBAEBCAAGBQJSyLTwAAoJEDYO1FT4VRUUkbkP/31CH2V6GI89Jfg+FbiuXpDN
+SJNmcGtIC19AFUflwBUUw76oSOcj3V0HpyXTfO3Xe3aBGtp2BTYT46eSSiSkGdwc
+GMT1m/x4zLxEStSEKqexhb5YVp+rPK4Di3JD8svZlhpvdqAko0H/AB+b3IUVSHJb
+6nhTmdmuJWYINSOPOtVS8T6WuIJG7oo4aF8Mg0Rn5WwolkaMHzQb/6OPlOiArXdB
+2aTvtIRWaZtRgtGmYa1B2Ye+CT6LMEvBFBIJAwu9hoXYfZxHCj2B4QuMgmjlAlt9
+0146tAbBaFtS3OUkn4uurCJ2vq4mgS1NFUxDVqLFeGL5hF9gmTOF8k2CrwV+EyIz
+YDbNysOzHtXLPuaY6z8mwIfep/gd9pJhGwfKWH1e6ud6mmHM95APPa8HVNRydSgU
+EBpndY1kcIVXatsMc0z9FiKxHPUYbAK/CIFawIuuXdGOJUDHH+yigQO/r8ctEhdN
+niFHlafeSHqjiIxNov0ftbpLC5QhEC0cTB/RC/N77cYlPQ4feH+hp9lAm6a1KrFz
+gpAaA6IJO8qvhjBXVTLguPqqubV7EHRlmBWS4rjyRx9UVEj9dRGftdoBGg4nv/tL
+/b3lDU80wpPGQMFt2KkgbmtnldHpLjuFc7Q+ONAeNwZK1hjyNppBkaRrEp/kb3g9
+wgCWahSdk86s3uuBR10o
+=mos6
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
new file mode 100644
index 000000000000..53372dbb67fd
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/01/05 01:27:10 naota Exp $
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
+
+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?,${MULTILIB_USEDEP}]
+	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 catman"
+
+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 ! multilib_is_native_abi ; then
+		cd "${WORKDIR}/usr.bin/ldd" || die
+		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
+	else
+		cd "${S}"
+	fi
+	"$@"
+}
+
+src_compile() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
+}
+
+src_install() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+	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
+
+	# create locate database #472468
+	local f=/var/db/locate.database
+	mkdir "${ED}${f%/*}" || die
+	touch "${ED}${f}" || die
+	fowners nobody:nobody ${f}
+}
+
+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
+}