Bump to 1.12 (proxy commit)

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

4 files changed, 119 insertions, 19 deletions

diff --git a/net-misc/ofono/ChangeLog b/net-misc/ofono/ChangeLog
index 27179ae9cd16..add6f0fc1771 100644
--- a/net-misc/ofono/ChangeLog
+++ b/net-misc/ofono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ofono
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.45 2013/02/19 13:49:02 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.46 2013/02/22 13:56:27 tomka Exp $
+
+*ofono-1.12 (22 Feb 2013)
+
+  22 Feb 2013; Thomas Kahle <tomka@gentoo.org>
+  +files/ofono-1.12-sys-types.patch, +ofono-1.12.ebuild, metadata.xml:
+  Bump to 1.12 (proxy commit)
 
   19 Feb 2013; Thomas Kahle <tomka@gentoo.org> metadata.xml:
   Pick up for proxy maintainership
diff --git a/net-misc/ofono/files/ofono-1.12-sys-types.patch b/net-misc/ofono/files/ofono-1.12-sys-types.patch
new file mode 100644
index 000000000000..15f94abe99a7
--- /dev/null
+++ b/net-misc/ofono/files/ofono-1.12-sys-types.patch
@@ -0,0 +1,21 @@
+commit e1d5dfe3aebcb0d2669ec1534cb6eba25f07dbb7
+Author: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Date:   Wed Jan 16 19:11:24 2013 -0200
+
+    storage: Include sys/types.h for ssize_t
+    
+    src/storage.h:32:1: error: unknown type name 'ssize_t'
+    src/storage.h:36:1: error: unknown type name 'ssize_t'
+
+diff --git a/src/storage.h b/src/storage.h
+index c455bae..70446ad 100644
+--- a/src/storage.h
++++ b/src/storage.h
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include <fcntl.h>
++#include <sys/types.h>
+ 
+ int create_dirs(const char *filename, const mode_t mode);
+ 
diff --git a/net-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
index a5dcc4c83449..8bc47bbcdda4 100644
--- a/net-misc/ofono/metadata.xml
+++ b/net-misc/ofono/metadata.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>dennis.yxun@gmail.com</email>
-    <name>Dennis (dlan) Lan</name>
-    <description>maintainer, assign bugs</description>
-  </maintainer>
-  <maintainer>
-    <email>tomka@gentoo.org</email>
-    <name>Thomas Kahle</name>
-    <description>proxy maintainer, CC on bugs</description>
-  </maintainer>
-  <use>
-    <flag name="atmodem">ETSI AT modem support.</flag>
-    <flag name="isimodem">Enable PhoNet/ISI modem support.</flag>
-    <flag name="cdmamodem">Enable CDMA modem support.</flag>
-    <flag name="bluetooth">Enable Bluetooth modem support using <pkg>net-wireless/bluez</pkg>.</flag>
-    <flag name="phonesim">Enable phone Simulator support</flag>
-    <flag name="tools">Enable testing tools</flag>
-  </use>        
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="atmodem">ETSI AT modem support.</flag>
+		<flag name="isimodem">Enable PhoNet/ISI modem support.</flag>
+		<flag name="cdmamodem">Enable CDMA modem support.</flag>
+		<flag name="datafiles">Enable install configuration and data files.</flag>
+		<flag name="dundee">Enable BlueTooth DUN deamon support.</flag>
+		<flag name="bluetooth">Enable Bluetooth modem support using <pkg>net-wireless/bluez</pkg>.</flag>
+		<flag name="phonesim">Enable phone Simulator support</flag>
+		<flag name="provision">Enable GPRS provisioning support</flag>
+		<flag name="qmimodem">Enable Qualcomm QMI modem support</flag>
+		<flag name="tools">Enable testing tools</flag>
+	</use>        
 </pkgmetadata>
 
diff --git a/net-misc/ofono/ofono-1.12.ebuild b/net-misc/ofono/ofono-1.12.ebuild
new file mode 100644
index 000000000000..36c194b986a9
--- /dev/null
+++ b/net-misc/ofono/ofono-1.12.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-1.12.ebuild,v 1.1 2013/02/22 13:56:27 tomka Exp $
+
+EAPI=5
+
+inherit eutils 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="~amd64 ~arm ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads test tools +udev"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.28
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_prepare() {
+	default
+	# backport upstream patches
+	epatch "${FILESDIR}"/${P}-sys-types.patch
+
+	# 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 threads) \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable test) \
+		--disable-maintainer-mode \
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_unitdir)"
+}
+
+src_install() {
+	default
+
+	if ! use examples ; then
+		rm -rf "${D}/usr/$(get_libdir)/ofono/test" || die
+	fi
+
+	if use tools ; then
+		dobin tools/{auto-enable,huawei-audio}
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}