diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-05 02:53:40 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-05 02:53:40 +0000 |
| commit | 37bf202045cf99727d7858d9326ae7554cff5815 (patch) | |
| tree | 4a11ce3b043755078664e8ed24abffc11d99faa2 /net-misc/modemmanager | |
| parent | Change manifest to new hashes. (diff) | |
| download | gentoo-2-37bf202045cf99727d7858d9326ae7554cff5815.tar.gz gentoo-2-37bf202045cf99727d7858d9326ae7554cff5815.tar.bz2 gentoo-2-37bf202045cf99727d7858d9326ae7554cff5815.zip | |
Move polkit rules.d file to /usr/share (bug #421577 comment #12, thanks to Dennis Lissov).
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/modemmanager')
| -rw-r--r-- | net-misc/modemmanager/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild (renamed from net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild) | 23 |
2 files changed, 29 insertions, 3 deletions
diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog index 76fbc92c9f00..315d6befaea7 100644 --- a/net-misc/modemmanager/ChangeLog +++ b/net-misc/modemmanager/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/modemmanager # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.30 2012/07/04 06:58:03 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.31 2012/07/05 02:53:40 tetromino Exp $ + +*modemmanager-0.5.2.0-r2 (05 Jul 2012) + + 05 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -modemmanager-0.5.2.0-r1.ebuild, +modemmanager-0.5.2.0-r2.ebuild: + Move polkit rules.d file to /usr/share (bug #421577 comment #12, thanks to + Dennis Lissov). 04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> files/01-org.freedesktop.ModemManager.rules: diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild b/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild index 840f3b92bf65..6249d66c277c 100644 --- a/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild +++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r1.ebuild,v 1.1 2012/07/04 06:53:25 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild,v 1.1 2012/07/05 02:53:40 tetromino Exp $ EAPI="4" GNOME_ORG_MODULE="ModemManager" @@ -53,7 +53,7 @@ src_install() { # Allow users in plugdev group full control over their modem if use policykit; then - insinto /etc/polkit-1/rules.d + insinto /usr/share/polkit-1/rules.d/ doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules if has_version '<sys-auth/polkit-0.106'; then insinto /etc/polkit-1/localauthority/10-vendor.d @@ -73,6 +73,25 @@ pkg_postinst() { elog fi + # 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 + elog "If your USB modem shows up as a Flash drive when you plug it in," elog "You should install sys-apps/usb_modeswitch which will automatically" elog "switch it over to USB modem mode whenever you plug it in." |