Drop deprecated make options and its USE flags

Package-Manager: portage-2.2.0_alpha72/cvs/FreeBSD i386

3 files changed, 12 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index e4536c2bf792..c2a9ad73bf67 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.70 2011/11/07 12:42:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.71 2011/11/08 11:11:59 naota Exp $
+
+  08 Nov 2011; Naohiro Aota <naota@gentoo.org> freebsd-usbin-8.2-r2.ebuild:
+  Drop deprecated make options and its USE flags
 
 *freebsd-usbin-9.0_rc1 (07 Nov 2011)
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index f644644072e7..f6817987473f 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -66,14 +66,14 @@ DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db66
 EBUILD freebsd-usbin-7.2-r1.ebuild 5278 RMD160 fe22f027d29f6a435b4ec8355933c9348f08be95 SHA1 530fffda2a82bab7d6ab93673df9daa1e0daae1d SHA256 3e635b2b34749e224185e10ca87f7644cf0b1688093ec4974d0e5cf9bd786aa6
 EBUILD freebsd-usbin-8.0-r1.ebuild 5346 RMD160 b485010627c843313b3c5d9be70d2626154eea18 SHA1 7558779bbbb1b498da9a803f5e00ebc16a4a3d42 SHA256 2c1d1b55b9dfa4f7c85de5b8e64f56c4fc1b546ee23f9de598a3715b209935cd
 EBUILD freebsd-usbin-8.2-r1.ebuild 5424 RMD160 e6ffd721787ff01b334f8bd5c823de2faf175a49 SHA1 9b2449c9c8fb2a7740d7d01351de3082f0d26714 SHA256 ac6fc00c1b08f5a96945fd40acae3a1a648de7a39ea4a28ff8fc120b9be9e3e2
-EBUILD freebsd-usbin-8.2-r2.ebuild 5465 RMD160 322c086d8f7c54d8ac1173f3c780fa87435a484d SHA1 aaabe3d6288fd3c00d6a2a7406c9d1b80e58643a SHA256 c49accbce29a6c7120ce65513950bae84f54d4100d2be274a3ef1ec50e8ce77e
+EBUILD freebsd-usbin-8.2-r2.ebuild 5220 RMD160 a0c790a15cd41297905bbebad4dbfd7cc3339210 SHA1 e0a0edb791c9a5f322b60753c71f58a3ea91826b SHA256 b293c8d3eb62a9a0cbe365c4f022f9dd4bbbdeebb98784dbb0c02564439b49c6
 EBUILD freebsd-usbin-9.0_rc1.ebuild 5419 RMD160 82c1b3805e1aeec9d92dd6479ef913ca447ec377 SHA1 fedb22989af58ebb945e8b9115a4276a0bc66ace SHA256 351668ed35dc6a14231e11bf6f2024b231f44c282fff855cb8d0c2908cd3d48f
-MISC ChangeLog 18929 RMD160 4b607b06e722e013d609dc69753f3296696c9cbe SHA1 50ab4e141d86e223af8e0b1372e1ce44a1f1e522 SHA256 aa56ee88b45f0513057391b0da3bb7d1b6a0fdf489225364e38cdf42168d5f9e
+MISC ChangeLog 19052 RMD160 609e8b60fced762581234c7a3bd9060a9657ce4b SHA1 f15381e27967b0fa0424bc584c17fc2c8a983764 SHA256 37b38e53891d2f9e986a7e0cb6ddc1d7520ea405cceb9b145bfcdfefa73260f2
 MISC metadata.xml 511 RMD160 159e8a06a03c2b27a64a3ca54de4373a5aae5c6a SHA1 1d4f7993fe8c31a4f7478c91df9103b69b29148e SHA256 ad3d3afca8e209c42d1767c5d1dab12eef47c9016c0ce9aaa3490942bd185bac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (FreeBSD)
 
-iEYEARECAAYFAk630lMACgkQvFcC4BYPU0qlgACfR2BE5//Nslcc1+PtmncRFYry
-aLEAnjMNqz9bYN4pC7WmtEueiW/ZQG/S
-=DF+a
+iEYEARECAAYFAk65DpQACgkQGpDnPLSHuMA6BACeL1bY0iTMyPyN4uoNW40FijOW
+VdwAoL1TZd4VpAqtauLBx0J5yaGY20gK
+=aliQ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
index e8cfcb76d9ac..78780299d109 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild,v 1.1 2011/09/05 14:53:54 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild,v 1.2 2011/11/08 11:11:59 naota Exp $
 
 EAPI=2
 
@@ -26,7 +26,6 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
 	acpi? ( sys-power/iasl )
 	build? ( sys-apps/baselayout )
 	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
 	dev-libs/libelf
 	dev-libs/libedit
 	net-libs/libpcap"
@@ -39,7 +38,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/usr.sbin"
 
-IUSE="acpi atm audit bluetooth floppy ipv6 isdn minimal netware nis pam ssl tcpd usb build"
+IUSE="acpi atm audit bluetooth floppy ipv6 minimal netware nis pam ssl usb build"
 
 pkg_setup() {
 	# Release crunch is something like minimal. It seems to remove everything
@@ -51,14 +50,12 @@ pkg_setup() {
 	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= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP="
 
 	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
 
@@ -132,12 +129,6 @@ EOS
 	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