Version bump, drop old. Also remove 9999 ebuild as nobody is really maintaining it.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 39 insertions, 174 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index c696f42a93fc..af71f901ea48 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2013/06/10 18:45:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.54 2013/07/20 19:26:36 pacho Exp $
+
+*modemmanager-1.0.0 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +modemmanager-1.0.0.ebuild,
+  -modemmanager-0.7.990.ebuild, -modemmanager-9999.ebuild:
+  Version bump, drop old. Also remove 9999 ebuild as nobody is really
+  maintaining it.
 
   10 Jun 2013; Pacho Ramos <pacho@gentoo.org> modemmanager-0.7.991.ebuild:
   Use just released tarball as before, not one generated from git snapshot.
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 472eef1bee2b..758f48119797 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -5,19 +5,18 @@ AUX 01-org.freedesktop.ModemManager.pkla 285 SHA256 c4eeb956c5bfa0dfe30efe1ae1c8
 AUX 01-org.freedesktop.ModemManager.rules 286 SHA256 a47b769279c128633d150899e10f6a3795523212d56603c4396500b15e04ebfe SHA512 184897bbee83f852e91d66d6a4ec4eabbe40f72f6a32573f59e19d9d86d9d12ae07e4386c7427e64ea5edfa73b5fa8e37acc785daca9a3565b8bd1fc8c5ee909 WHIRLPOOL 6016d01ea05feb85c249257a0b3a7e4154a1abcfc830d54eb70de090cb58253c478d5bd77db951ecb93ca2a3f35f188b7b0c11bc5303faab9c6843475e8fa94b
 AUX modemmanager-0.6.0.0-multi-plugin-probing.patch 1490 SHA256 ba0d64f488c01ec7e73230082e0e8d537884d6684440328cac4e8c9d36e64775 SHA512 6fb5a44784d9d4a14c12d1de2704eaebc76c65ae2805232472a4efbb9b6bd23f1ceea56bafde94c629c4f782f7ecd44bdf7b8a35261bc4496599bdca81cfe73b WHIRLPOOL ec0321424a69a94c028485ab9efc33200fe23498308f9cbba846e93445f9570227b3ed709497a04be54e34fd5bf156c446b205fb0b1f6c81104353a72a107dc7
 DIST ModemManager-0.6.0.0.tar.xz 531136 SHA256 d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2 SHA512 c4c823a422ee458b70ad5c78feb61de4007507050e8c4789e4397b7bd476ea14b68f9a6b1c95820ec437b97310e34c0396912ea936474638651d868d3828eb4a WHIRLPOOL 2434b39c53f5233c0e03a6b27afa00f0d46927bf29794a643f42b7b797f8c018f69019769903f08398a49093f788f26d2882a735b46be374f903d50752228225
-DIST ModemManager-0.7.990.tar.xz 1101016 SHA256 36547db99fccd7eac1f1dd75178232a61306c6b11e8926b83bcfc3a12c4222ca SHA512 bb0b3527b62d4cb6d1b8faeeab00b026965475e06cfc4109256d5dde4708d5f6b99f8ba4dd2bb82157671cc0026ad7cfed96b0d68ee63e2cfe361149dffe720d WHIRLPOOL 7d9a175af915b5058e2890f7a39aecd66bdf2b4e9524de96b6d5481708df5c1119e744f7ffb1755ad8ec20198521f8a843a90eedc7a28e75006f98326ca96afe
 DIST ModemManager-0.7.991.tar.xz 1188704 SHA256 9e58d33444259eccfd93a1ee60455f8c183065a75e147d6afc4adbb734861a5d SHA512 55c81906352438e741c837bf9daec2d4245c93989775009001c6f52fde24568646860a7770fb825340a7778da1e00513b16351fad09289ceed36a4207fc8dcac WHIRLPOOL 5032c89a2f65c24b5756c012256a4582c160b668d558a4d829026ab93e24cc814a1e18feedd9c90b4dab01bab7d1e55637a7a10f047ec93e420d9332e0f31343
+DIST ModemManager-1.0.0.tar.xz 1141504 SHA256 e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563 SHA512 bb5230914f00b90d34ecc96d738a56b841ccd5d8d05662388a1c3623cfdea64c7e18344cd91bd9e71aa93aad1994d94a66ff6e411fcaed361f55c9868b51e2a5 WHIRLPOOL c4bc9fadf720a3143b5a221b2659eb99e994fa03cefc448a34787b5896130e18e8653e72d4daa0b7aab006d5798683d04055f0ba54eb5ef6c83babf9c8513101
 EBUILD modemmanager-0.6.0.0-r1.ebuild 3076 SHA256 b0c0b0f1ad8a0650514936076f36b46f4f69901135ce6db37a89b9b4eed9e364 SHA512 ff92664c96dd6754048409c9560fe4489ca4d1d3e513d9fb53b6fd31fb51c42dadefa23ee8434bc96899de9de12d501a12922592fcb1bef9b2bf03f8b2d6d48c WHIRLPOOL c50af489885811c4c7c925b29d6dccc439960680facd36f8df79126b61c47d343fe0b4d414016ed7d5e08312d7873a6bcbc31d5f547a82ab8f14cc185d42170a
 EBUILD modemmanager-0.6.0.0.ebuild 2984 SHA256 97648ee02d5fc25049a0b259013e591ce15d46a0d632d1b8f6e9ff2d645771ff SHA512 5b99d00098f472dc7234bb6889ee53155b064c588e30a3bb7e19e8370b3b713eca55b47aa6232498a0d9302759c6550420d1a30752087e797b3da939591b9842 WHIRLPOOL 58e92639fa8637fcb0ef8c48cad887f4e59d571bdf1f766336c1ff578512cd268fab05564e2e60c7c9a6851e09d83298112e3ff716add5f1aecbedb60701bbe5
-EBUILD modemmanager-0.7.990.ebuild 3352 SHA256 7db193ff1635313eba972dce19e09fed1a422b04410fd37051c5e9791d7200e6 SHA512 ebe588bed39bd0c3ad07de70442dcc8c40c8006e3712eadd33fa494e5a8e19c07deb7e3a3d0c7587af10b10402a2b7abf38ab7a06995aba305f6fde7857d4cbb WHIRLPOOL 4f9f2972a39b32fc817e79f6c25d6a2e065fb7a4685612ff5e2d4487e5bc7a32410fcbe2c4c7f81c450aac3cf6b2b5f11e3892cc03e75ac894dc7466dbd68352
 EBUILD modemmanager-0.7.991.ebuild 3317 SHA256 07290285955a0ae007419c1e4add3fcce8be76a7f3d10c9b1f454bf7d9e0696f SHA512 62c7ff6f77269ec5341da7e3c4ae007ef00e00fd9bcb64ea955f9f1ab12bc9b51d4af3a2ca9182289c51eabd333ce61ee4951de58ca440c44794e52794f8eab2 WHIRLPOOL 8eb48033d765ab9bac657720935085958524f925133be8fc0261dffe8e54428a760d9d9b5d9accf3c73191bc3e249bf9c1cd0850a94be178808edd1055ea6019
-EBUILD modemmanager-9999.ebuild 3478 SHA256 e122d88c7229fab336af65f6cbefec2583d0d5d10d9068958d9a5e89a1b786cd SHA512 9d8f5d917a3c9c4e192fc98214f8db27db80606b490e1ae4d2340174abe6453b296f1d580854957c3a929cfd8f6411b33ed2095f8e1391456c7fe7fc18046b47 WHIRLPOOL 3fd05742762215caaf3a5d7458ba90ce525bc746d9983229b5079c6e74e5da2fd0cd6885ac125740a17a8599e470c503907429acdc12e811f6c4a6161962654c
-MISC ChangeLog 9845 SHA256 3f6c560083c27c87be5b84fb956132b2218e7c31867e58b184fc22b18aaa1bde SHA512 d71bf82b659342e9f19ad656ea58476ce22979b275ae7945d17af29a4e9d972731972fb4f65f9f1ec3a5e866fe9b10be339e711ccd335bafa1a4045dfd5ee39d WHIRLPOOL 048de7868fdfb525097d382701073934d390b39f27e54ae2ff5bc7d04522ac0c547f07dee55d15f6d33ff243e8e29ca1ea6d6cefd160c56ee198a4a20f3033e9
+EBUILD modemmanager-1.0.0.ebuild 2857 SHA256 953c6fc0714de33e9c681623e1f8d0dbb14ed3aac2f809a231e60dfb4679e3e6 SHA512 f6d6f6b6beaf34453fa381ef55cc2b24784852e37b6e9936f99b4ece4899a0af05df68173cf026a87278eb5b8e377b701560e5895597107f5ef658a1b524ed09 WHIRLPOOL 2dd369a59e12277062816069fbc288464832a7ae405e6a77d12551eea2befc122746efbc391eb8c47be9e7dae63278261a3ad11fe68c6e93120494d306630653
+MISC ChangeLog 10102 SHA256 cb035c7757f92026a98d82120555952bd06b61158f63b5eb0d2a600fd0bde1a3 SHA512 2ff13388aadbb00f700dd7f68caa0428283920eabf5f4a1a24abb9145224885a7281a83dde585cd61daeeb58bc8e41a4697beec640c5892522d83fbeb230dcbd WHIRLPOOL 497ca90fd45fa5c0761d6f5bf8dee48c8f77aa18d68c4827556ae400335268bd9982b24253bd8592a4cbdb1fb08f362e79c47ce228983b3c47c234c9f218661f
 MISC metadata.xml 587 SHA256 3eff4190df97408f06b36550998acdcb88d5e67a0c5273e96f096f8d465000de SHA512 c3d354b45ddd5642678a3e3ad2f3e458e24e1b437b6b38a3c8471f29c15e4587c14ee9877bcdf6eacffe5051adb8f46090da91061eab7576ec26b034bb5826ff WHIRLPOOL b786fb60690516c72f2b320b2be17818ab5daea3c34b568d7e7ab4c7b0c98b9a9612f420faa1f69cafe427589de84055ff1ce30d1e5333d290b52c121d5525c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG2HuYACgkQCaWpQKGI+9QuDQCeKTwa6xrpUoeVGfYlvdzNEegP
-uDUAn3IB+bg6ti/EAA8i43b0kmZ0+t1Q
-=ovnG
+iEYEAREIAAYFAlHq5G0ACgkQCaWpQKGI+9RkvgCfTsx0EOHC3TUf9oAugfOXMMFE
+FgUAnic/vKIt/Vu0V7xlK0KMRWR5+Luk
+=TJ09
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/modemmanager-0.7.990.ebuild b/net-misc/modemmanager/modemmanager-1.0.0.ebuild
index cfdb5f71477a..c2df91e1c41e 100644
--- a/net-misc/modemmanager/modemmanager-0.7.990.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.0.0.ebuild
@@ -1,75 +1,63 @@
 # 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.7.990.ebuild,v 1.2 2013/01/31 06:00:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.0.0.ebuild,v 1.1 2013/07/20 19:26:36 pacho Exp $
 
 EAPI="5"
-GNOME_ORG_MODULE="ModemManager"
-
-inherit eutils gnome.org user multilib toolchain-funcs udev virtualx
+inherit eutils user multilib readme.gentoo toolchain-funcs udev virtualx
 
 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc policykit +qmi qmi-newest test"
+IUSE="policykit +qmi qmi-newest"
 REQUIRED_USE="qmi-newest? ( qmi )"
 
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	net-dialup/ppp
+RDEPEND="
+	>=dev-libs/glib-2.32:2
 	>=virtual/udev-147[gudev]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	qmi? ( net-libs/libqmi )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.4.0 )
 "
 DEPEND="${RDEPEND}
-	doc? (
-		app-office/dia
-		dev-libs/libxslt
-		dev-util/gtk-doc )
-	test? (
-		dev-lang/python:2.7
-		dev-python/dbus-python[python_targets_python2_7]
-		dev-python/pygobject:2[python_targets_python2_7] )
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+S="${WORKDIR}/ModemManager-${PV}"
+
 src_prepare() {
-	# Use python2.7 shebangs for test scripts
-	sed -e 's@\(^#!.*python\)@\12.7@' \
-		-i test/*.py || die
+	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
 
 	epatch_user
-	default
 }
 
 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
-
+	# We don't have mbim in the tree
 	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 qmi) \
 		$(use_with qmi-newest newest-qmi-commands) \
-		$(use_with test tests)
+		--without-mbim
 }
 
 src_install() {
 	default
-	use doc && dohtml docs/spec.html
 
 	# Allow users in plugdev group full control over their modem
 	if use policykit; then
@@ -77,17 +65,13 @@ src_install() {
 		doins "${FILESDIR}"/01-org.freedesktop.ModemManager.rules
 	fi
 
-	# Remove useless .la files
 	prune_libtool_files --modules
+
+	readme.gentoo_create_doc
 }
 
 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
+	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"
@@ -108,7 +92,5 @@ pkg_postinst() {
 		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."
+	readme.gentoo_print_elog
 }
diff --git a/net-misc/modemmanager/modemmanager-9999.ebuild b/net-misc/modemmanager/modemmanager-9999.ebuild
deleted file mode 100644
index 1d8564d7f658..000000000000
--- a/net-misc/modemmanager/modemmanager-9999.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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-9999.ebuild,v 1.2 2013/01/31 06:00:34 tetromino Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="ModemManager"
-
-inherit autotools eutils git-2 gnome.org user multilib toolchain-funcs udev virtualx
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS=
-IUSE="doc policykit +qmi qmi-newest test"
-REQUIRED_USE="qmi-newest? ( qmi )"
-SRC_URI=
-EGIT_REPO_URI="git://anongit.freedesktop.org/ModemManager/ModemManager"
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	net-dialup/ppp
-	>=virtual/udev-147[gudev]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	qmi? ( net-libs/libqmi )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-office/dia
-		dev-libs/libxslt
-		dev-util/gtk-doc )
-	test? (
-		dev-lang/python:2.7
-		dev-python/dbus-python[python_targets_python2_7]
-		dev-python/pygobject:2[python_targets_python2_7] )
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-util/gtk-doc-am
-"
-
-src_unpack() {
-	git-2_src_unpack
-}
-
-src_prepare() {
-	# Use python2.7 shebangs for test scripts
-	sed -e 's@\(^#!.*python\)@\12.7@' \
-		-i test/*.py || die
-
-	epatch_user
-	eautoreconf # for 9999
-	default
-}
-
-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 qmi) \
-		$(use_with qmi-newest newest-qmi-commands) \
-		$(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
-	fi
-
-	# Remove useless .la files
-	prune_libtool_files --modules
-}
-
-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."
-}