Fix license; ModemManager had switched from LGPL to GPL in 2009. Drop old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 28 insertions, 178 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index bdab1b6942c5..246fe15541cf 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.45 2013/01/27 13:54:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.46 2013/01/28 05:11:32 tetromino Exp $
+
+  28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -modemmanager-0.4.ebuild, -modemmanager-0.5.2.0-r2.ebuild,
+  modemmanager-0.5.2.0-r3.ebuild, modemmanager-0.6.0.0.ebuild:
+  Fix license; ModemManager had switched from LGPL to GPL in 2009. Drop old.
 
   27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> modemmanager-0.6.0.0.ebuild:
   Stable for ppc, wrt bug #448006
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 5f81df80a13c..39a8ef583e85 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 01-org.freedesktop.ModemManager.pkla 285 SHA256 c4eeb956c5bfa0dfe30efe1ae1c88e60674425dcc786c080da0d17f245c0e5f5 SHA512 e1b1e6a0cbfea979782141fc477381ea72a9e3bf75152b393aa322ebae520dbaf2b5907e817ee29f0744fc79f3217fe6a0994ebc1873e83e9d747df65ebea533 WHIRLPOOL 3fac122700eb0f643e64ac05edbe41abf48d88cbc6227619faaf567fde8df7981f38d523b183bf0deaa2b90fbd1617fb97ebdfefe615b12cb44dc36eaedaa4e4
 AUX 01-org.freedesktop.ModemManager.rules 286 SHA256 a47b769279c128633d150899e10f6a3795523212d56603c4396500b15e04ebfe SHA512 184897bbee83f852e91d66d6a4ec4eabbe40f72f6a32573f59e19d9d86d9d12ae07e4386c7427e64ea5edfa73b5fa8e37acc785daca9a3565b8bd1fc8c5ee909 WHIRLPOOL 6016d01ea05feb85c249257a0b3a7e4154a1abcfc830d54eb70de090cb58253c478d5bd77db951ecb93ca2a3f35f188b7b0c11bc5303faab9c6843475e8fa94b
 AUX modemmanager-0.5-glib-2.31.patch 2648 SHA256 7a59df7d4db579ca5b794410956733002ea509b67f0180353a92573a9b9e8671 SHA512 1946608c48e9ea9de5d3343d5a5a20292aa9bfd4a214018e1073648b6edb894cac8d0cdf4879b71f4b803c62df8eb17c3cb2c076e0276115c54e8db820c53d3d WHIRLPOOL ed2e9626e6d782ee1f903fcf142a81302ae37495d5781b92c728723819f3342e9067738d5d15d485271608dc934549a85a05b128febcfed3c606f96ecd3be955
-DIST ModemManager-0.4.tar.bz2 444746 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f SHA512 921af89ddbe6b4001e35bd9a231dd214da6a956033bc1375d5d7714a6cb2b09d65aa34b3c147aa83c90fcfaf64a220f987577e4542cd6027883b5aba7ac281a5 WHIRLPOOL 86c8431f1b38d4dbeabc0da31a5411d5d780c53b7f69e3d860045f23ea516ac3e6bb9ef4af54984334b4c0ae4f3538dc61603603eb5d5834d7612f82bf67a970
 DIST ModemManager-0.5.2.0.tar.xz 492728 SHA256 7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8 SHA512 4c304c08c3740171148f9d5c8102ec18fa128589a5dac0f8bcb172e49d5e236a36b2167fa2e6ab6f592dd54cda24740309618c39b5afa8d020b66e9639e05fc4 WHIRLPOOL faf8db858c6e833a1e7475e626f247838f1f863e18e813eb39b1231fe138d1ade12e6f8f73a3e1768cc00442e313a9717e06b8263dec1198810ece6e2f67ed3e
 DIST ModemManager-0.6.0.0.tar.xz 531136 SHA256 d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2 SHA512 c4c823a422ee458b70ad5c78feb61de4007507050e8c4789e4397b7bd476ea14b68f9a6b1c95820ec437b97310e34c0396912ea936474638651d868d3828eb4a WHIRLPOOL 2434b39c53f5233c0e03a6b27afa00f0d46927bf29794a643f42b7b797f8c018f69019769903f08398a49093f788f26d2882a735b46be374f903d50752228225
-EBUILD modemmanager-0.4.ebuild 1999 SHA256 415bf08f19c6d9eab91b0f89586f436fe229187e158a64adaff4ebd5f26590c4 SHA512 92b7e9fca8e21a685e36652b3357a9d7052524464acc7857b8b1b7d48721b862bdd89fc9921db3a868c61912419cb17d4e4c28df1c6927c3b157297a100d954d WHIRLPOOL 73c684c41463598cee50dec6b71a054b247784ceb67a90e26edec20cf068fcee89268df93c781765bcf3bf0ae50bf306bb2892565bf55286bc94f65aebae90ef
-EBUILD modemmanager-0.5.2.0-r2.ebuild 2963 SHA256 d705f3074f29b4f27bfc700a7b69a3ed2383662664d38114003095f278b01760 SHA512 fc101254c02878355b65cc0927d0940d65f5a7fe4acbcf79ffe5a13918d2336dd3702bc879276dc580accff2c013c3b3a23e514ff19b3631a0dd7af52126c5b8 WHIRLPOOL 4b7c940741e1b6cfec41002e9e691796745bfe3db640349ea2c0ee4b4f2486f7e5ec0f5547d2b5ed65c1e9a9dd71401a2825ff781fa2a9fcf24fa90d547f83bd
-EBUILD modemmanager-0.5.2.0-r3.ebuild 2974 SHA256 ce9233a6df44c7337912f80d1380f166bf9326d07153e2289fb93e032595c6f6 SHA512 c6be299ad09a379971c56db65320f430e8de0dd851805d135accdfc4977fd3c138cdf3b915ee6f52d9e366d306ae745886feae2a5287d10ec23d3809715f07df WHIRLPOOL 47a0faaf0562c93417cd9b72d879b1c35192429900e42446e4c056c6675f75a8641b1776f607664558fbb9346f6d3720770d0f4623d8678be44552c24f12cfe2
-EBUILD modemmanager-0.6.0.0.ebuild 2987 SHA256 5c2bf0ebc3d96499b4ab1540289e5e17387f708db652a57c8894fdf05add56b6 SHA512 bff470d1777d739be6a2912cc3dc77ac780e0d7d9c40c33fc4f6a65beb5e0beaf5f33f715e471248ea95637dbc21f24c398788b38afb59f1b24d80752ab5bbab WHIRLPOOL e8498313a026f3d0d7a6d3882e8fd4b250102232c940aca87f3b42939863c23ac0c0fb258f2b28f272757c19a9c0cf3cf9de68704dcd8244524b5c0b1ca09be4
-MISC ChangeLog 8050 SHA256 6ee9c6505004150c6a44be7fc302efee92cbdc653af2024e01cafc6271026a98 SHA512 28927d1636c7f55c282efbcc12e96f700032dd27efc49cb586cd335a0bc2e38965b7b3bff89aebb51661766f5a70fd85c0cd2ea418cfd1d7ae43f730fb2a6fc8 WHIRLPOOL 1a972d229acbb58fc0184e704f91d3847e847778f29f3b9a075fc7eb47eae9c566953ed2fa9b6ed406a079c4929eb631bf24459c10c496143504f9bc3e846a47
+EBUILD modemmanager-0.5.2.0-r3.ebuild 2972 SHA256 9da52719998532753d0127dd65295299ce27bd3b7a2fb7901268f92e633cc2c8 SHA512 bc8ee700934db94fbc323a4cfaad1ae84d5ab8c707b0f7769ecf1cf9ef4971045f664f38a1f1293319384acebfb9b2c8b198c99812f835ded0009a75dc043ba6 WHIRLPOOL ba4de79b473da0806759748df83a66870ba0a60bf188ea2759f2d1b32f3541e93e908b5f1663db4993a8ac3344d086309940aedd857a48560a3dbd28743b2448
+EBUILD modemmanager-0.6.0.0.ebuild 2991 SHA256 5b9c113a5c069d11318fd3ad519cf9ac41e51120baa8a98db7bdafb258b206bd SHA512 ba0d01aa65ccd8b50d9e5a00cfe07f5204342bfbec7156553d1e1eb0ca5f768d1b078d42211e6a4ff8b9924d8735bfd1821561c999c1b6b2b2ac40764828a983 WHIRLPOOL 1179d9cdb8ea4eb3283fe7b4db8dd3c24dbb8d879fa2b82d86c21d2033fcc32e89c70518dbaf9c7c5fbfd8fdba74687bbcec0a2b0f7fbe6005d90eea8c70e6d9
+MISC ChangeLog 8317 SHA256 31b1b9e85d00bd23a74fb6f5f60cc5183ebaac04a0357fe16c51144a0c5588f7 SHA512 065bb8b10de2662a55f063ed6f59c02565226416451ac6e5c74d5c6cb0f8af3fdd04b72ff34a182e7f621e0e07df42094f93ba637c0a6ec3c175958d5c1ed304 WHIRLPOOL 8b922299718eae7eef4eb1d681bff03cacfd3fed9f549a28f2a28d6fee2c316a065956b68d30f2c4f80787fb30e6b32b70852ca155f424d9150378f7903233a3
 MISC metadata.xml 340 SHA256 9478f7a1074e999d4d3d8215fab4457f45957ca79f36e8b6ade7f3a0e24ef0ed SHA512 a6e9e199cb520af411a5f4694264a679d8a7fa09dd37ba85dfcf45719d747cec79b0848a0849b13eb71f1c48390c5be376dc1d7b33fae34b697c8fd11aa19071 WHIRLPOOL c666ee27dcdc9575e713377d25277a6deeb0a6637e0af930ca65073df8586fa1421a50bf15e80a2d9348e257b1210bca7d5705c7a36ee9030f7d407ec3f5f04f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBgiFAAoJEJ0WA1zPCt1hCRwH/AnE0+iZkx+9QHq/EVLbJTMR
+7pbLlFp7UyPYw7mcZOCLHzm4eGidZx8yt4ttTfgx74YkmZgfAxzk9nwJeTZlK8O5
+XReO2D0aFv0Ght++fVEx5CAxXUmxE/BbiemtBDFy1Ff5qooR1FyvjkLdkmKwMcfQ
+aokQtjoKqMAwAcb810/lIiurdWoKFROZcopYJBORsauNkR7Beuc3YVd4jJItVQn7
+2jtqGKdNfIXZKMPoOlAOveqMH0ISejUsY7TgJPfbHqSkRpw1Ir1X8iuArYANNUpW
+JR0VqpNU5S5+NtFQV5a731JNCs9sJQ5EH8J36ycNzVaVWGwfZ7H/7PY0klgP1iE=
+=ID5V
+-----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/modemmanager-0.4.ebuild b/net-misc/modemmanager/modemmanager-0.4.ebuild
deleted file mode 100644
index 83f40fb93160..000000000000
--- a/net-misc/modemmanager/modemmanager-0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.4.ebuild,v 1.10 2012/12/02 22:46:07 ssuominen Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils multilib udev
-
-# ModemManager likes itself with capital letters
-MY_PN="${PN/modemmanager/ModemManager}"
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc policykit test"
-
-RDEPEND=">=dev-libs/glib-2.18
-	virtual/udev[gudev]
-	>=dev-libs/dbus-glib-0.86
-	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.95 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# fix building against glib-2.31 headers
-	epatch "${FILESDIR}/${PN}-0.5-glib-2.31.patch"
-}
-
-src_configure() {
-	# ppp-2.4.5 will change the plugin directory (not added to portage yet)
-	if has_version '=net-dialup/ppp-2.4.4*'; then
-		pppd_plugin_dir="pppd/2.4.4"
-	elif has_version '=net-dialup/ppp-2.4.5*'; then
-		pppd_plugin_dir="pppd/2.4.5"
-	fi
-
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(udev_get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
-		$(use_with doc docs) \
-		$(use_with policykit polkit) \
-		$(use_with test tests)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	# Remove useless .la files
-	rm -vf "${D}"/usr/$(get_libdir)/{${MY_PN},${pppd_plugin_dir}}/*.la
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild b/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild
deleted file mode 100644
index 89d935116070..000000000000
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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-r2.ebuild,v 1.2 2012/12/02 22:46:07 ssuominen Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="ModemManager"
-
-inherit gnome.org user multilib udev
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc policykit test"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	virtual/udev[gudev]
-	>=dev-libs/dbus-glib-0.86
-	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.99 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt )
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# ppp-2.4.5 changes the plugin directory
-	if has_version '=net-dialup/ppp-2.4.4*'; then
-		pppd_plugin_dir="pppd/2.4.4"
-	elif has_version '=net-dialup/ppp-2.4.5*'; then
-		pppd_plugin_dir="pppd/2.4.5"
-	fi
-
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir="$(udev_get_udevdir)" \
-		--disable-static \
-		--with-dist-version=${PVR} \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
-		$(use_with doc docs) \
-		$(use_with policykit polkit) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/spec.html
-
-	# 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.ModemManager.rules
-		if has_version '<sys-auth/polkit-0.106'; then
-			insinto /etc/polkit-1/localauthority/10-vendor.d
-			doins "${FILESDIR}/01-org.freedesktop.ModemManager.pkla"
-		fi
-	fi
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use policykit; then
-		enewgroup plugdev
-		elog "To control your modem without needing to enter the root password,"
-		elog "add your user account to the 'plugdev' group."
-		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."
-}
diff --git a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild b/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
index 3920daeb1dee..d1ed335d720c 100644
--- a/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r3.ebuild,v 1.6 2012/12/02 22:46:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.2.0-r3.ebuild,v 1.7 2013/01/28 05:11:32 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@@ -10,7 +10,7 @@ inherit gnome.org user multilib toolchain-funcs udev
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc policykit test"
diff --git a/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild b/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild
index b887782e5ff5..b6b077a87108 100644
--- a/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild,v 1.8 2013/01/27 13:54:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.6.0.0.ebuild,v 1.9 2013/01/28 05:11:32 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@@ -10,7 +10,7 @@ inherit gnome.org user multilib toolchain-funcs udev
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="doc policykit test"