Bump to 0.5, from gnome overlay, bug 378729

(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)

4 files changed, 19 insertions, 121 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/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() {