Bump to 0.5, from gnome overlay, bug 378729

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

5 files changed, 36 insertions, 131 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 03dfa517410a..06e8211ccd1c 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.20 2011/07/06 16:12:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.21 2011/08/14 15:41:54 nirbheek Exp $
+
+*modemmanager-0.5 (14 Aug 2011)
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -modemmanager-0.3.ebuild,
+  -modemmanager-0.4_p20101211.ebuild, -modemmanager-0.4_p20110205.ebuild,
+  +modemmanager-0.5.ebuild:
+  Bump to 0.5, from gnome overlay, bug 378729
 
 *modemmanager-0.4_p20110205-r1 (06 Jul 2011)
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 3de5cd2265cf..fa0fcb8bc1e6 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST ModemManager-0.3.tar.bz2 363848 RMD160 e23ef4492df4f292531b588f99853c6ede078433 SHA1 d4adf26da3ef015d7cc4e25d2ebbc692b6c566f8 SHA256 6bcfce70a26ed9c3162ba23fd0591029441c57e146d7ff4b2fd8036eb50945da
 DIST ModemManager-0.4.tar.bz2 444746 RMD160 c2d82f746bc3611e11b7f0c4504fa4cc14fa0788 SHA1 786231841cfa3824ff69ad2c9a6a40b881689012 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f
-DIST ModemManager-0.4_p20101211.tar.bz2 486733 RMD160 f9880d3316ba412178fd9c057eb317bf062fddd1 SHA1 59b75af0632b633fc6fb5b51633122401e726925 SHA256 fa62056609bd8aa23f7e66b46a05b5518bd509d7eb77d1b45ec3f073f235dbd4
 DIST ModemManager-0.4_p20110205.tar.bz2 482484 RMD160 7ef84838751685c2d731285b9ea78c0cadcdd684 SHA1 26a624c4a1a133a6b0817ed81fe1fa3e207647bc SHA256 fe3e9ab797e60bf4ead90c40ea88c33c81d36e991408f62276cb30111f66d051
-EBUILD modemmanager-0.3.ebuild 1076 RMD160 0703353e7b53564ab133690fd43d6bb72e7a5822 SHA1 9062bcb55b32440ea8d8cd58ea8947888e2e4f25 SHA256 4651e7b2b93dedecab3a7e2b7df27c55957c77af213bbbeb2c047a0d91ab13b3
+DIST ModemManager-0.5.tar.xz 461608 RMD160 093321c2ac43e00117ade3bd9cdd9dca5790d47f SHA1 550959ca02af9970a0bdd19a72810ed9f065b9dd SHA256 e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f
 EBUILD modemmanager-0.4.ebuild 1899 RMD160 1f0197e22816ab58b3d3747c2edc07e7a09b762a SHA1 2438445cbe2a15a896529f710ca5ea96bcad7d47 SHA256 0a15d6aa26ee6a3be3448cbf6fe07a1dc11abf5ab184da8ac6c62fedf053617a
-EBUILD modemmanager-0.4_p20101211.ebuild 1983 RMD160 b94066b74fed8faa8bee77c2f100fbc9e7920a49 SHA1 2405dc7f2799ce71f488c0c43e03f0f679c6690d SHA256 abd24c7bac98f010316957c25c8ff63318c67256133c09ca1e32f431f20e801b
 EBUILD modemmanager-0.4_p20110205-r1.ebuild 1990 RMD160 bdb70825ca579e841ef5b713313a8479c14f687f SHA1 8a649530845a9c4c9714ff5535ab01c69fb2e195 SHA256 7baabbe2fce61015816058c9275809510b54a5d6f4870472170ded34a4ba29da
-EBUILD modemmanager-0.4_p20110205.ebuild 1983 RMD160 7d0ba25b99b6c6ab543af3c9c7570a5cdb38e772 SHA1 ef76449f7dcd15ae75a18685315b87a131c77af5 SHA256 69c708a9b923d82a8039697ebdee994bca424cb69668d452331950b0bd150d09
-MISC ChangeLog 3675 RMD160 d9e870da7cd5a990238bfa3af9162ad5e7897c50 SHA1 1be246952aa5be1559e8bb173e7f8c8c1c2660f3 SHA256 86577337e5ad51cbc637e50b60d96d1c88b76c16e2365f8b4f9c7fbfcdd8eaf2
+EBUILD modemmanager-0.5.ebuild 1656 RMD160 65bc375f79969e6d54bafcce5452402e9e0b5db6 SHA1 e0c750305a96471c072b0eba98149e0ce2850d0d SHA256 4776c556d59f3480cbc72cecdf336dffafe5cd905ff29ba0948e04e9c68811dd
+MISC ChangeLog 3936 RMD160 ae12bdbc8407b1fb88c5c4f126f6034e5c619986 SHA1 485444134d60406ce2903b53ebc1f549b58f5028 SHA256 3fe1de5ad0c61549933ef4a75127902d27f35d21efe01aa447df602c6243c1e9
 MISC metadata.xml 352 RMD160 9f952eb61b72059009703562b751c2523db8d769 SHA1 3e56456d5906a68f5f14fd0d97c22ef43f4f6a2e SHA256 1a8953fc88dcb46dd2a6a566027f69e792f03d7f86581546d8069cbe1768e53a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4UiTYACgkQXkR9YqOcLPFeRwEAnRONlHfyWe7JUn1i5c/9Adji
-/7MNKLHUCv2o8Ame0IYA/0rGz2GYTqiMMefxBGMBsRpr44H5QxZP3KI2E+gTlUmT
-=b2Km
+iQIcBAEBAgAGBQJOR+zKAAoJEO/kOhxWD91kpP0P/jESOMe0xXMAjDUAjKRvvqXU
+LclDUTabQyJ2uSR1KjM9kM7ywoe5dO4831Gbk9gpA5hap04T1uDnXK9ObN+lGcz3
+Amw/zpWnwabxIgVXnrFE6fkRpZ0pPtpsgu0neznj8owUGCD419ZIldZeogFji0DI
+ht+C6Ad1KjxfXMvOHLNgVo3KXRVmHz6BK/JgEzMY5zY8x0FTFwvkPbM9zJEKz6Hv
+dpzvc06RLyVshdd+i6lBbGjD1g0qyxPXtDPt1CKhloxk6C+VVSFaJVAemJgN85b7
+W8Yptl+OV8enVBRbQ7rYpRi8HYOjWV2/qyB8Dt2ECd2GY16GP0QgzLwsF7SqkksG
+4+GQNcO39GXoGqKXu2gQziRlUEEQOLV6gBDRv2EVc4mimb7Wp3Yo2MBIW2ZVUrs3
+ImB/bVGrmyzXAtDQQaO8dMJdiQycGa69P2ewq0B+wCdt/Qsy3V16WsfE6feCntyh
+olXbM8xChUJzZ44vRe4aok1dTfAX0QfqQtH6TepR3rhGdGvyI1FAvl7QFoIEG/qD
+5IQ1tYnkiix9IepCUkHwm+3BJRvIYx0WPa4i/AZKkM7QjiGQRmdrn+6CFnHe7jlv
+J3pFPlKw++54lBgKKjYJseertvmK72AqYqoDe8UFg5jhglDHxHM5Sad1rIMBQyIZ
+SUn8SXFv8BzcFbwJUsQF
+=zuvz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/modemmanager/modemmanager-0.3.ebuild b/net-misc/modemmanager/modemmanager-0.3.ebuild
deleted file mode 100644
index 682e6cc00c1e..000000000000
--- a/net-misc/modemmanager/modemmanager-0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.3.ebuild,v 1.3 2011/06/09 02:02:42 sping Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils
-
-# 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 test"
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=dev-libs/dbus-glib-0.75
-	net-dialup/ppp"
-DEPEND="|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--with-udev-base-dir=/etc/udev/ \
-		$(use_with doc docs) \
-		$(use_with test tests)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild b/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild
deleted file mode 100644
index 10f31b0a9a6d..000000000000
--- a/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4_p20110205.ebuild,v 1.2 2011/06/09 02:02:42 sping Exp $
-
-EAPI="2"
-
-inherit gnome.org eutils
-
-# 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}}"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc policykit test"
-
-RDEPEND=">=dev-libs/glib-2.18
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
-	>=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
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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=/etc/udev/ \
-		--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.4_p20101211.ebuild b/net-misc/modemmanager/modemmanager-0.5.ebuild
index 6a868a00d88e..be26a2460837 100644
--- a/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4_p20101211.ebuild,v 1.2 2011/06/09 02:02:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.ebuild,v 1.1 2011/08/14 15:41:54 nirbheek Exp $
 
-EAPI="2"
+EAPI="4"
+GNOME_ORG_MODULE="ModemManager"
 
 inherit gnome.org eutils
 
-# 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}}"
-SRC_URI="http://dev.gentoo.org/~dagger/files/${MY_PN}-${PV}.tar.bz2"
+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
+RDEPEND=">=dev-libs/glib-2.18:2
 	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	>=dev-libs/dbus-glib-0.86
 	net-dialup/ppp
-	policykit? ( >=sys-auth/polkit-0.95 )"
+	policykit? ( >=sys-auth/polkit-0.99 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_configure() {
-	# ppp-2.4.5 will change the plugin directory (not added to portage yet)
+	# 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
@@ -41,7 +37,7 @@ src_configure() {
 
 	econf \
 		--disable-more-warnings \
-		--with-udev-base-dir=/etc/udev/ \
+		--with-udev-base-dir=/lib/udev/ \
 		--disable-static \
 		--with-dist-version=${PVR} \
 		--with-pppd-plugin-dir="/usr/$(get_libdir)/${pppd_plugin_dir}" \
@@ -51,10 +47,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 	# Remove useless .la files
-	rm -vf "${D}"/usr/$(get_libdir)/{${MY_PN},${pppd_plugin_dir}}/*.la
+	find "${D}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {