Add version 1.10

(Portage version: 2.1.11.9/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 22 insertions, 66 deletions

diff --git a/net-misc/ofono/ChangeLog b/net-misc/ofono/ChangeLog
index 50ad8485122d..1b384c482504 100644
--- a/net-misc/ofono/ChangeLog
+++ b/net-misc/ofono/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/ofono
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.41 2012/05/22 16:11:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.42 2012/10/11 09:33:40 dagger Exp $
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> ofono-0.50.ebuild,
   ofono-0.51.ebuild, ofono-1.0.ebuild:
@@ -25,6 +25,11 @@
   Bump to 1.0, with permission from dagger. Fix glib single-includes bug in a
   hacky patchless way.
 
+*ofono-0.52 (21 Jul 2011)
+
+  21 Jul 2011; Robert Piasek <dagger@gentoo.org> +ofono-0.52.ebuild:
+  Add version 0.52
+
 *ofono-0.51 (01 Jul 2011)
 
   01 Jul 2011; Robert Piasek <dagger@gentoo.org> -ofono-0.47.ebuild,
diff --git a/net-misc/ofono/ofono-0.51.ebuild b/net-misc/ofono/ofono-0.51.ebuild
deleted file mode 100644
index dbb34ecb5377..000000000000
--- a/net-misc/ofono/ofono-0.51.ebuild
+++ /dev/null
@@ -1,57 +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/ofono/ofono-0.51.ebuild,v 1.3 2012/05/22 16:11:36 ssuominen Exp $
-
-EAPI="2"
-
-inherit multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon."
-HOMEPAGE="http://ofono.org/"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="+atmodem bluetooth +caps +cdmamodem examples +isimodem +phonesim threads tools +udev"
-
-RDEPEND=">=sys-apps/dbus-1.2.24
-	>=dev-libs/glib-2.16
-	bluetooth? ( >=net-wireless/bluez-4.61 )
-	caps? ( sys-libs/libcap-ng )
-	udev? ( >=sys-fs/udev-143 )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable caps capng) \
-		$(use_enable threads) \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable tools) \
-		--enable-test \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use examples ; then
-		rm -rf "${D}/usr/$(get_libdir)/ofono/test"
-	fi
-
-	if use tools ; then
-		dobin tools/{auto-enable,huawei-audio} || die
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	dodoc ChangeLog AUTHORS doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-0.50.ebuild b/net-misc/ofono/ofono-1.10.ebuild
index 20823c4c7a99..125acadd38d9 100644
--- a/net-misc/ofono/ofono-0.50.ebuild
+++ b/net-misc/ofono/ofono-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-0.50.ebuild,v 1.3 2012/05/22 16:11:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-1.10.ebuild,v 1.1 2012/10/11 09:33:40 dagger Exp $
 
 EAPI="2"
 
@@ -12,22 +12,30 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~amd64 ~x86"
-IUSE="+atmodem bluetooth +caps +cdmamodem examples +isimodem +phonesim threads tools +udev"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+atmodem bluetooth +cdmamodem examples +isimodem +phonesim threads tools +udev"
 
-RDEPEND=">=sys-apps/dbus-1.2.24
-	>=dev-libs/glib-2.16
-	bluetooth? ( >=net-wireless/bluez-4.61 )
-	caps? ( sys-libs/libcap-ng )
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.28
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
 	udev? ( >=sys-fs/udev-143 )
 	examples? ( dev-python/dbus-python )
 	tools? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	# Fix build with newer glib due to G_DISABLE_SINGLE_INCLUDES
+	grep -lre '<glib/gtypes.h>' "${S}" | while read i; do
+		sed -ie 's:glib/gtypes.h:glib.h:' "${i}" || die "Unable to sed \"$i\""
+	done
+}
+
 src_configure() {
 	econf \
-		$(use_enable caps capng) \
 		$(use_enable threads) \
 		$(use_enable udev) \
 		$(use_enable isimodem) \