commit:     e20d38124bff67a1e750ddaaad6fca603e0b89c2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 20:14:46 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 20:34:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20d3812

sys-freebsd/freebsd-lib: Remove support for non-existent deps

 profiles/base/package.use.mask                     | 4 ----
 sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild | 5 ++---
 sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild | 5 ++---
 sys-freebsd/freebsd-lib/metadata.xml               | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9d75893144..4ca9fdf3fee 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -68,10 +68,6 @@ dev-lang/rust extended
 # dev-python/visual will be removed (#630252)
 net-analyzer/scapy visual
 
-# Pacho Ramos <[email protected]> (18 Mar 2018)
-# net-dns/hesiod will be removed (#606652)
-sys-freebsd/freebsd-lib hesiod
-
 # Lars Wendler <[email protected]> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild 
b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
index 6e8b27343dc..cd66d1e6bd9 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
@@ -36,7 +36,6 @@ EXTRACTONLY="
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
        RDEPEND="ssl? ( dev-libs/openssl:0= )
-               hesiod? ( net-dns/hesiod )
                kerberos? ( app-crypt/heimdal )
                pam? ( virtual/pam )
                usb? ( !dev-libs/libusb )
@@ -71,7 +70,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != 
"${CATEGORY}" ]; then
        export CTARGET=${CATEGORY/cross-}
 fi
 
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+IUSE="atm bluetooth ssl ipv6 kerberos usb netware
        build headers-only zfs pam xinetd
        userland_GNU userland_BSD"
 
@@ -91,7 +90,7 @@ pkg_setup() {
 
        use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
        use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-       use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+       mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
        use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
        use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= 
WITHOUT_GSSAPI= "
        use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= 
WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild 
b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index 59b3798a45f..500ae3dcf0a 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -27,7 +27,6 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
        RDEPEND="ssl? ( dev-libs/openssl )
-               hesiod? ( net-dns/hesiod )
                kerberos? ( app-crypt/heimdal )
                usb? ( !dev-libs/libusb )
                zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
@@ -53,7 +52,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != 
"${CATEGORY}" ]; then
        export CTARGET=${CATEGORY/cross-}
 fi
 
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+IUSE="atm bluetooth ssl ipv6 kerberos usb netware
        build headers-only zfs
        userland_GNU userland_BSD"
 
@@ -69,7 +68,7 @@ pkg_setup() {
 
        use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
        use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-       use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+       mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
        use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
        use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= 
WITHOUT_GSSAPI= "
        use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= 
WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "

diff --git a/sys-freebsd/freebsd-lib/metadata.xml 
b/sys-freebsd/freebsd-lib/metadata.xml
index 24ca54034a3..4fa69d85349 100644
--- a/sys-freebsd/freebsd-lib/metadata.xml
+++ b/sys-freebsd/freebsd-lib/metadata.xml
@@ -6,7 +6,6 @@
     <name>BSD Project</name>
   </maintainer>
   <use>
-    <flag name="hesiod">Enable support for net-dns/hesiod</flag>
     <flag name="netware">
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).

Reply via email to