From c476fd833443514039747b399257ecf6f0c28e96 Mon Sep 17 00:00:00 2001 From: Oleg Vinichenko Date: Tue, 16 Aug 2016 13:11:06 +0000 Subject: [PATCH] unfork modemmanager --- net-misc/modemmanager/Manifest | 3 - .../01-org.freedesktop.ModemManager1.rules | 7 -- .../modemmanager/modemmanager-1.4.2.ebuild | 111 ------------------ .../modemmanager/modemmanager-1.4.8.ebuild | 110 ----------------- 4 files changed, 231 deletions(-) delete mode 100644 net-misc/modemmanager/Manifest delete mode 100644 net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules delete mode 100644 net-misc/modemmanager/modemmanager-1.4.2.ebuild delete mode 100644 net-misc/modemmanager/modemmanager-1.4.8.ebuild diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest deleted file mode 100644 index a8a87d573..000000000 --- a/net-misc/modemmanager/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2 -DIST ModemManager-1.4.6.tar.xz 1396764 SHA256 0cedabf46310f8c56630b116944f54ee64369c76c2f35f5f460ca19a8bb5a5cd SHA512 fb74961df2e3e1604de58838da6e8dd7cf80fee97dbfd71eb7f2df60cc319bf38df8c5706a5933856c500b014d3156066e608bb0820c967ddbd964bd9fc2fdec WHIRLPOOL 4f63ac160a4d4acddd2064a58204e6ba410543aefc936ffb753fbb15e004d089cf874ee2390df174638ae15f26f4cf7c7e720de793e69f0cd0b6a923558b0af1 -DIST ModemManager-1.4.8.tar.xz 1397444 SHA256 d951eaffbe513bcde54f90602c6c423a49593f656d6485ba95f6fcb4bc1e8003 SHA512 6dfbdbf579d1b7dd624836877d6556cdb15eec73c60c329d1d6200563495f8943d90f55e2d4e98b7741c05a19f11ac2de61dcabb4aec16a2ae61db453eafc3b5 WHIRLPOOL 47ff7cc8a1f89996110eb0932274fdeceb940f63b2991cf7a1b96541b30e8c39e52cf7f30b4947c8670ca787e10698093cf4e0401aed3ec2564228e9cfdcb8c8 diff --git a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules b/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules deleted file mode 100644 index 7fca64726..000000000 --- a/net-misc/modemmanager/files/01-org.freedesktop.ModemManager1.rules +++ /dev/null @@ -1,7 +0,0 @@ -// Let users in plugdev group modify ModemManager -polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) && - subject.isInGroup("plugdev") && subject.active) { - return "yes"; - } -}); diff --git a/net-misc/modemmanager/modemmanager-1.4.2.ebuild b/net-misc/modemmanager/modemmanager-1.4.2.ebuild deleted file mode 100644 index 35ce990c7..000000000 --- a/net-misc/modemmanager/modemmanager-1.4.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://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="*" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.6.0:= ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -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 - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_compile() { - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile -} - - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.4.8.ebuild b/net-misc/modemmanager/modemmanager-1.4.8.ebuild deleted file mode 100644 index 765240423..000000000 --- a/net-misc/modemmanager/modemmanager-1.4.8.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="http://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="*" -IUSE="+introspection mbim policykit +qmi qmi-newest vala" -REQUIRED_USE=" - qmi-newest? ( qmi ) - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - virtual/libgudev:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - mbim? ( >=net-libs/libmbim-1.10 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.12.4 ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -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 - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(use_with qmi) \ - $(use_with qmi-newest newest-qmi-commands) \ - $(use_enable vala) -} - -src_compile() { - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - readme.gentoo_print_elog -}