commit: 9cc69f0e0c58f850e0362199d833743fbaf4c91b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 04:22:49 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 23 04:45:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc69f0e
net-misc/networkmanager: fix compat. w/ ppp-2.5.0 Closes: https://bugs.gentoo.org/904840 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/networkmanager/Manifest | 1 + net-misc/networkmanager/networkmanager-1.42.2.ebuild | 2 +- net-misc/networkmanager/networkmanager-1.42.4.ebuild | 2 +- ...workmanager-1.42.4.ebuild => networkmanager-1.42.6-r1.ebuild} | 9 ++++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 0d70929b57ca..846754e8128f 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,3 +1,4 @@ DIST NetworkManager-1.42.2.tar.xz 6749184 BLAKE2B cf94f79bad373d1271f406392af595941c78d567cb28a6116b351093858bbce68acf4d115950582087687ea3b3fafad7a977361f6c7f5ce8565bc2eed0e6ab60 SHA512 6142aaa7da2ae0dc3c8c75dbf51619ff969ace61c8a2d4a72aa83c4eff69e8389b262941e1667d71cbb55fb0653b14798a3c169b39dfcfa084109ef9fb3a335a DIST NetworkManager-1.42.4.tar.xz 6659860 BLAKE2B 5f98dba82d2bf932d61dc44b263a0c3263a299cc06bb506a98ec822126edf8dd6dde1618f75943caaf49f85864cadcf1eaf2c12864cde5f7521a7dff9053571d SHA512 af51ce481b8a6c3ee6e8856400a19f3e94c1fb0d5b2750ccf48785374b59110b49aa2a90aae675d322d902ad0e3f6eef6188bb247067448de84272dc6b114acb DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748 +DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243 diff --git a/net-misc/networkmanager/networkmanager-1.42.2.ebuild b/net-misc/networkmanager/networkmanager-1.42.2.ebuild index 3a1f0cb95b0d..e19e6ce11264 100644 --- a/net-misc/networkmanager/networkmanager-1.42.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.42.2.ebuild @@ -57,7 +57,7 @@ COMMON_DEPEND=" gnutls? ( >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= diff --git a/net-misc/networkmanager/networkmanager-1.42.4.ebuild b/net-misc/networkmanager/networkmanager-1.42.4.ebuild index ea8c15c407b0..fb476d87dcba 100644 --- a/net-misc/networkmanager/networkmanager-1.42.4.ebuild +++ b/net-misc/networkmanager/networkmanager-1.42.4.ebuild @@ -57,7 +57,7 @@ COMMON_DEPEND=" gnutls? ( >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= diff --git a/net-misc/networkmanager/networkmanager-1.42.4.ebuild b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild similarity index 97% copy from net-misc/networkmanager/networkmanager-1.42.4.ebuild copy to net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild index ea8c15c407b0..478acfbd2687 100644 --- a/net-misc/networkmanager/networkmanager-1.42.4.ebuild +++ b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild @@ -9,6 +9,9 @@ inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 syste DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"; +# bug #904840 +# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1607 +SRC_URI+=" https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.patch -> ${PN}-ppp-2.5.0.patch" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" @@ -57,7 +60,7 @@ COMMON_DEPEND=" gnutls? ( >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= @@ -120,6 +123,10 @@ BDEPEND=" ) " +PATCHES=( + "${DISTDIR}"/${PN}-ppp-2.5.0.patch +) + python_check_deps() { if use introspection; then python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
