| 1 |
commit: e20d38124bff67a1e750ddaaad6fca603e0b89c2 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 26 20:14:46 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 26 20:34:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20d3812 |
| 7 |
|
| 8 |
sys-freebsd/freebsd-lib: Remove support for non-existent deps |
| 9 |
|
| 10 |
profiles/base/package.use.mask | 4 ---- |
| 11 |
sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild | 5 ++--- |
| 12 |
sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild | 5 ++--- |
| 13 |
sys-freebsd/freebsd-lib/metadata.xml | 1 - |
| 14 |
4 files changed, 4 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 17 |
index d9d75893144..4ca9fdf3fee 100644 |
| 18 |
--- a/profiles/base/package.use.mask |
| 19 |
+++ b/profiles/base/package.use.mask |
| 20 |
@@ -68,10 +68,6 @@ dev-lang/rust extended |
| 21 |
# dev-python/visual will be removed (#630252) |
| 22 |
net-analyzer/scapy visual |
| 23 |
|
| 24 |
-# Pacho Ramos <pacho@g.o> (18 Mar 2018) |
| 25 |
-# net-dns/hesiod will be removed (#606652) |
| 26 |
-sys-freebsd/freebsd-lib hesiod |
| 27 |
- |
| 28 |
# Lars Wendler <polynomial-c@g.o> (14 Mar 2018) |
| 29 |
# Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having |
| 30 |
# no active upstream anymore. |
| 31 |
|
| 32 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild |
| 33 |
index 6e8b27343dc..cd66d1e6bd9 100644 |
| 34 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild |
| 35 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild |
| 36 |
@@ -36,7 +36,6 @@ EXTRACTONLY=" |
| 37 |
|
| 38 |
if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
| 39 |
RDEPEND="ssl? ( dev-libs/openssl:0= ) |
| 40 |
- hesiod? ( net-dns/hesiod ) |
| 41 |
kerberos? ( app-crypt/heimdal ) |
| 42 |
pam? ( virtual/pam ) |
| 43 |
usb? ( !dev-libs/libusb ) |
| 44 |
@@ -71,7 +70,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then |
| 45 |
export CTARGET=${CATEGORY/cross-} |
| 46 |
fi |
| 47 |
|
| 48 |
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware |
| 49 |
+IUSE="atm bluetooth ssl ipv6 kerberos usb netware |
| 50 |
build headers-only zfs pam xinetd |
| 51 |
userland_GNU userland_BSD" |
| 52 |
|
| 53 |
@@ -91,7 +90,7 @@ pkg_setup() { |
| 54 |
|
| 55 |
use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 56 |
use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
| 57 |
- use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
| 58 |
+ mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
| 59 |
use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " |
| 60 |
use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " |
| 61 |
use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 62 |
|
| 63 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild |
| 64 |
index 59b3798a45f..500ae3dcf0a 100644 |
| 65 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild |
| 66 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild |
| 67 |
@@ -27,7 +27,6 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2 |
| 68 |
|
| 69 |
if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
| 70 |
RDEPEND="ssl? ( dev-libs/openssl ) |
| 71 |
- hesiod? ( net-dns/hesiod ) |
| 72 |
kerberos? ( app-crypt/heimdal ) |
| 73 |
usb? ( !dev-libs/libusb ) |
| 74 |
zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
| 75 |
@@ -53,7 +52,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then |
| 76 |
export CTARGET=${CATEGORY/cross-} |
| 77 |
fi |
| 78 |
|
| 79 |
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware |
| 80 |
+IUSE="atm bluetooth ssl ipv6 kerberos usb netware |
| 81 |
build headers-only zfs |
| 82 |
userland_GNU userland_BSD" |
| 83 |
|
| 84 |
@@ -69,7 +68,7 @@ pkg_setup() { |
| 85 |
|
| 86 |
use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
| 87 |
use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
| 88 |
- use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
| 89 |
+ mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
| 90 |
use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " |
| 91 |
use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " |
| 92 |
use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
| 93 |
|
| 94 |
diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml |
| 95 |
index 24ca54034a3..4fa69d85349 100644 |
| 96 |
--- a/sys-freebsd/freebsd-lib/metadata.xml |
| 97 |
+++ b/sys-freebsd/freebsd-lib/metadata.xml |
| 98 |
@@ -6,7 +6,6 @@ |
| 99 |
<name>BSD Project</name> |
| 100 |
</maintainer> |
| 101 |
<use> |
| 102 |
- <flag name="hesiod">Enable support for net-dns/hesiod</flag> |
| 103 |
<flag name="netware"> |
| 104 |
Build libraries and tools to work with NetWare protocols (IPX |
| 105 |
and NCP). |
Archives