commit: d9cf9e165c0025b84d62e571a3d3ad7377859f94 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 16 08:26:41 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Dec 16 08:27:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9cf9e16
net-misc/asterisk: remove masked IUSE="dahdi" The package behind the USE flag was just tree-cleaned, so remove the USE flag (which was masked, so NOP). Bug: https://bugs.gentoo.org/914477 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> net-misc/asterisk/asterisk-16.30.0.ebuild | 10 ++++------ net-misc/asterisk/asterisk-16.30.1.ebuild | 10 ++++------ net-misc/asterisk/asterisk-18.17.0.ebuild | 10 ++++------ net-misc/asterisk/asterisk-18.18.0.ebuild | 10 ++++------ net-misc/asterisk/asterisk-18.18.1.ebuild | 10 ++++------ net-misc/asterisk/asterisk-20.3.0.ebuild | 10 ++++------ net-misc/asterisk/asterisk-20.3.1.ebuild | 10 ++++------ net-misc/asterisk/metadata.xml | 1 - profiles/base/package.use.mask | 5 ----- 9 files changed, 28 insertions(+), 48 deletions(-) diff --git a/net-misc/asterisk/asterisk-16.30.0.ebuild b/net-misc/asterisk/asterisk-16.30.0.ebuild index a684412a9be4..289cebb6cb7b 100644 --- a/net-misc/asterisk/asterisk-16.30.0.ebuild +++ b/net-misc/asterisk/asterisk-16.30.0.ebuild @@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -55,10 +55,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -231,6 +227,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -238,7 +237,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-16.30.1.ebuild b/net-misc/asterisk/asterisk-16.30.1.ebuild index b2a0d086ac1e..65a83df9721a 100644 --- a/net-misc/asterisk/asterisk-16.30.1.ebuild +++ b/net-misc/asterisk/asterisk-16.30.1.ebuild @@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -55,10 +55,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -232,6 +228,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -239,7 +238,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-18.17.0.ebuild b/net-misc/asterisk/asterisk-18.17.0.ebuild index 015737c8a097..fd8ef65a8cbc 100644 --- a/net-misc/asterisk/asterisk-18.17.0.ebuild +++ b/net-misc/asterisk/asterisk-18.17.0.ebuild @@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -52,10 +52,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -227,6 +223,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -234,7 +233,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-18.18.0.ebuild b/net-misc/asterisk/asterisk-18.18.0.ebuild index b2e2fa41bd6b..8722283e039a 100644 --- a/net-misc/asterisk/asterisk-18.18.0.ebuild +++ b/net-misc/asterisk/asterisk-18.18.0.ebuild @@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -53,10 +53,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -229,6 +225,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -236,7 +235,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-18.18.1.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild index 3f4247463485..0042bf5f8af3 100644 --- a/net-misc/asterisk/asterisk-18.18.1.ebuild +++ b/net-misc/asterisk/asterisk-18.18.1.ebuild @@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -53,10 +53,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -230,6 +226,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -237,7 +236,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-20.3.0.ebuild b/net-misc/asterisk/asterisk-20.3.0.ebuild index e4e12e12fba8..4fd7205c33eb 100644 --- a/net-misc/asterisk/asterisk-20.3.0.ebuild +++ b/net-misc/asterisk/asterisk-20.3.0.ebuild @@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -53,10 +53,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -227,6 +223,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -234,7 +233,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro chan_sip res_monitor _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/asterisk-20.3.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild index 080afa1dc8ea..46875841174f 100644 --- a/net-misc/asterisk/asterisk-20.3.1.ebuild +++ b/net-misc/asterisk/asterisk-20.3.1.ebuild @@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc voicemail_storage_imap ) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) lua? ( ${LUA_REQUIRED_USE} ) @@ -53,10 +53,6 @@ DEPEND="acct-user/asterisk cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) @@ -228,6 +224,9 @@ src_configure() { # Disable conversion tools (which fails to compile in some cases). _menuselect --disable astdb2bdb menuselect.makeopts + # dahdi isn't packaged anymore + _menuselect --disable app_meetme chan_dahdi codec_dahdi res_timing_dahdi + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -235,7 +234,6 @@ src_configure() { _use_select cluster res_corosync _use_select codec2 codec_codec2 _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi _use_select deprecated app_macro chan_sip res_monitor _use_select freetds {cdr,cel}_tds _use_select gtalk chan_motif diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml index a24c794eaae3..7444210cb8ff 100644 --- a/net-misc/asterisk/metadata.xml +++ b/net-misc/asterisk/metadata.xml @@ -13,7 +13,6 @@ <flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag> <flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag> <flag name="codec2">Enable Codec2 support in asterisk</flag> - <flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel)</flag> <flag name="deprecated">Enable deprecated features (eg, app_macro)</flag> <flag name="gtalk">Enable support for Google Talk services</flag> <flag name="http">Enable embedded web server</flag> diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 1ed960067369..daaa1c5089fa 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -57,11 +57,6 @@ dev-haskell/tasty-expected-failure test # 6.6.0 stable to avoid unnecessary rebuilds. ~dev-python/PyQt6-6.5.3 bluetooth -# Jaco Kroon <j...@uls.co.za> (2023-09-19) -# Joonas Niilola <juip...@gentoo.org> (2023-09-21) -# DAHDI is being last-rited. See bug #914477. -net-misc/asterisk dahdi - # Matt Turner <matts...@gentoo.org> (2023-09-14) # Not ported to libsoup:3.0 app-office/abiword collab
