diff options
| -rw-r--r-- | net-misc/modemmanager/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild (renamed from net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild) | 32 | ||||
| -rw-r--r-- | net-misc/networkmanager/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild (renamed from net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild) | 37 |
4 files changed, 46 insertions, 27 deletions
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index f2b09ab3..98348490 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1 +1 @@ -DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd +DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5 diff --git a/net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild index 15074afc..66015faa 100644 --- a/net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild +++ b/net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,32 +8,32 @@ VALA_USE_DEPEND="vapigen" inherit gnome2 user readme.gentoo-r1 systemd udev vala DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="+introspection mbim policykit +qmi systemd vala" +IUSE="+introspection mbim policykit +qmi systemd +udev vala" REQUIRED_USE=" vala? ( introspection ) " RDEPEND=" >=dev-libs/glib-2.36.0:2 - >=virtual/libgudev-230:= + udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.14.0 ) + mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.16.0:= ) + qmi? ( >=net-libs/libqmi-1.20.0:= ) systemd? ( >=sys-apps/systemd-209 ) " DEPEND="${RDEPEND} dev-util/gdbus-codegen + dev-util/glib-utils >=dev-util/gtk-doc-am-1 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.19.3 + >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( $(vala_depend) ) " @@ -41,8 +41,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/ModemManager-${PV}" src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically switch it over to USB modem mode whenever you plug it in.\n" if use policykit; then @@ -57,13 +58,15 @@ src_prepare() { src_configure() { gnome2_src_configure \ --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ --disable-static \ --with-dist-version=${PVR} \ + --with-udev-base-dir="$(get_udevdir)" \ + $(use_with udev) \ $(use_enable introspection) \ $(use_with mbim) \ $(use_with policykit polkit) \ - $(usex systemd --with-suspend-resume=systemd --with-suspend-resume=no) \ + $(use_with systemd systemd-suspend-resume) \ + $(use_with systemd systemd-journal) \ $(use_with qmi) \ $(use_enable vala) } @@ -107,6 +110,11 @@ pkg_postinst() { esac fi + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + systemd_reenable ModemManager.service readme.gentoo_print_elog diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index d3cadc79..8954a381 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1 +1 @@ -DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645 +DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7 diff --git a/net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild index 4c6417e0..f23ac591 100644 --- a/net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME_ORG_MODULE="NetworkManager" GNOME2_LA_PUNT="yes" VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal + user readme.gentoo-r1 vala virtualx udev multilib-minimal DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" @@ -16,9 +16,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+" SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version -IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" REQUIRED_USE=" + iwd? ( wifi ) modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) @@ -26,15 +27,14 @@ REQUIRED_USE=" ?? ( consolekit elogind systemd ) " -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 COMMON_DEPEND=" >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] - >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[${MULTILIB_USEDEP}] >=net-misc/curl-7.24 @@ -55,7 +55,7 @@ COMMON_DEPEND=" dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( dev-libs/jansson[${MULTILIB_USEDEP}] ) + json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) @@ -75,10 +75,14 @@ RDEPEND="${COMMON_DEPEND} net-misc/iputils[arping(+)] net-analyzer/arping ) - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) " DEPEND="${COMMON_DEPEND} dev-util/gdbus-codegen + dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 @@ -159,14 +163,11 @@ multilib_src_configure() { --localstatedir=/var --disable-lto --disable-config-plugin-ibft - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - --disable-ifnet --disable-qt --without-netconfig --with-dbus-sys-dir=/etc/dbus-1/system.d # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are - # still not ready for removing that lib + # still not ready for removing that lib, bug #665338 --with-libnm-glib --with-nmcli=yes --with-udev-dir="$(get_udevdir)" @@ -195,6 +196,7 @@ multilib_src_configure() { $(multilib_native_use_enable test tests) $(multilib_native_use_enable vala) --without-valgrind + $(multilib_native_use_with wifi iwd) $(multilib_native_use_with wext) $(multilib_native_use_enable wifi) ) @@ -270,6 +272,7 @@ multilib_src_install() { } multilib_src_install_all() { + einstalldocs ! use systemd && readme.gentoo_create_doc newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager @@ -291,6 +294,14 @@ multilib_src_install_all() { insinto /usr/share/polkit-1/rules.d/ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + # Empty rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die } |