summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/modemmanager/Manifest4
-rw-r--r--net-misc/modemmanager/modemmanager-0.2.ebuild (renamed from net-misc/modemmanager/modemmanager-0.1.ebuild)12
-rw-r--r--net-misc/networkmanager/Manifest5
-rw-r--r--net-misc/networkmanager/metadata.xml1
-rw-r--r--net-misc/networkmanager/networkmanager-0.7.0-r2.ebuild (renamed from net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild)14
5 files changed, 23 insertions, 13 deletions
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index c4c9199..057d93b 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,2 +1,2 @@
-DIST ModemManager-0.1.tar.gz 353841 RMD160 b3c7dc68b748d44bea599da1c8e9c17df11728dd SHA1 33f951d6c5672202f3ceeea35427f1635cee72f5 SHA256 e734288b8a6538c9ada8c3a78072dac0cc64f0543bcfc76ff7dea8585cba6b69
-EBUILD modemmanager-0.1.ebuild 879 RMD160 3c4097af25501664fc8656dc0e9dbe275b87a3b1 SHA1 6cebccb06abf47e69cf9855b0617a8a10140db20 SHA256 fdff6bbf842e38d0d136defce81bb08489c0ded13d19ed37cbd95ea2b01e52af
+DIST ModemManager-0.2.tar.gz 366121 RMD160 4eefd52c9a38edb2d5927113b707f2316f0431a0 SHA1 03704167b76db5903626fa86d95a69748d986e64 SHA256 090731de09b3042ed0e53a932dd29d3ba556418378b99dfa4621e4544a806bc6
+EBUILD modemmanager-0.2.ebuild 880 RMD160 ca3f8c2f9e6e19019397e13d7f642ba8f044500f SHA1 435e07242de5cf56d40238ea52be0ed2ed6575cc SHA256 f8f99c091edb1aaac2edb67208a5f3e63424ff5baba9da9db7fe9d4199f9e8b5
diff --git a/net-misc/modemmanager/modemmanager-0.1.ebuild b/net-misc/modemmanager/modemmanager-0.2.ebuild
index 1840f7f..170ff24 100644
--- a/net-misc/modemmanager/modemmanager-0.1.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -9,7 +9,7 @@ MY_P=${P/modemmanager/ModemManager}
DESCRIPTION="Modem and mobile broadband management for NetworkManager-0.7."
HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html"
-SRC_URI="http://patches.piasek.co.uk/${MY_P}.tar.gz"
+SRC_URI="http://people.freedesktop.org/~tambet/ModemManager-0.2.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -19,20 +19,20 @@ IUSE=""
DEPEND="dev-util/pkgconfig
dev-util/intltool
net-dialup/ppp
- >=net-misc/networkmanager-0.7_pre20080916"
+ >=net-misc/networkmanager-0.7.0-r2"
S=${WORKDIR}/${MY_P}
src_unpack () {
unpack ${A}
- cd "${S}"
+ cd "${S}"
}
-
+
src_compile() {
econf || die "econf failed"
emake || die "emake failed"
}
-
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS ChangeLog NEWS README
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c289ef7..b84d8af 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,7 +1,8 @@
AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
+DIST modem-manager-patches.tar.bz2 38126 RMD160 cad4501e43404890079018243fadeb86885a21f3 SHA1 13ee77388d0f510a069f9b68100d328d8e93cc0b SHA256 7d80d18a140ec2927559464bedba3c4e7a5da84a2bfc47dd9472cd15f82b4ca8
DIST networkmanager-patches1.tar.bz2 22756 RMD160 419b330ba9011040254043bb4f66a6b67823ab58 SHA1 168d62bfc0d59f54fae102f71f3bf48f49724ea3 SHA256 598fdf48716f147669f2ff7e30e8a9d8b382abaa0cefc006f0c9d83074ed9f01
-EBUILD networkmanager-0.7.0-r1.ebuild 3765 RMD160 a5eea691c19a986d6882349e80c2cf2beebfb2ec SHA1 c9b0a266c9197f22e2e2d5fba0e6ac006400af43 SHA256 5c1f51cf5a70fb4e770f0658edc36aa54acc11648a2886be6c4321117f8e521a
+EBUILD networkmanager-0.7.0-r2.ebuild 3999 RMD160 f1c74923dc71c2b187e8dedea8f376c7bd3bb704 SHA1 8b111230af016d2e0f6aeabaf9783cb041271f31 SHA256 69f2aed55416eb91aedd38a19f96c895f7bba8f35d3b954aa81e8d9a39c0840b
EBUILD networkmanager-9999.ebuild 3738 RMD160 e572302105ee0468a58a6ebefe7f66a857f583e2 SHA1 d0865a15b6acdafef63852a722fc774b57b08c50 SHA256 8cdc1bbd524e6f0f493d2d0698fee1928ab50536742ba83407cd78ddede61c53
-MISC metadata.xml 848 RMD160 170f8df1ab065ba2bb99fc25285542a6c01b2ab6 SHA1 8b3ebfdaa0864e3b3317e83aea048c0c1f8621bc SHA256 4f9d94121cd05463d66cd25c00026cd9de74f914b04ba293998bb2eba3a12cbd
+MISC metadata.xml 942 RMD160 d7fbb33279cb272b0e362a910b44398a893f6025 SHA1 e94ee026e4fe5701573f12afd0df09d3287c013f SHA256 7d34a1d393ce3d1a52f506abe55c226e5d5d25174198e0c04e2a3e20ce130c07
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index d4b008d..35c500b 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -19,5 +19,6 @@
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag>
<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS informations</flag>
+ <flag name="modemmanager">Use <pkg>net-misc/modemmanager</pkg> for modem connections</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild b/net-misc/networkmanager/networkmanager-0.7.0-r2.ebuild
index 71dfba0..1711690 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0-r2.ebuild
@@ -10,11 +10,13 @@ MY_P=${P/networkmanager/NetworkManager}
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2
- http://patches.piasek.co.uk/networkmanager-patches1.tar.bz2"
+ http://patches.piasek.co.uk/networkmanager-patches1.tar.bz2
+ http://patches.piasek.co.uk/modem-manager-patches.tar.bz2"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="doc nss gnutls dhclient dhcpcd resolvconf"
+IUSE="doc nss gnutls dhclient dhcpcd resolvconf modemmanager"
RDEPEND=">=sys-apps/dbus-1.2
>=dev-libs/dbus-glib-0.75
@@ -45,6 +47,8 @@ DEPEND="${RDEPEND}
net-dialup/ppp
doc? ( >=dev-util/gtk-doc-1.8 )"
+PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 ) "
+
S=${WORKDIR}/${MY_P}
pkg_setup() {
@@ -61,9 +65,13 @@ src_unpack () {
# Fix up the dbus conf file to use plugdev group
epatch "${FILESDIR}/${P}-confchanges.patch"
- EPATCH_SOURCE="${WORKDIR}"/backports-pachset1/
+ EPATCH_SOURCE="${WORKDIR}/backports-pachset1"
EPATCH_SUFFIX="patch"
epatch
+ EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset1"
+ EPATCH_SUFFIX="patch"
+ use modemmanager && epatch
+
}
src_compile() {