Bump to 1.0, with permission from dagger. Fix glib single-includes bug in a hacky patchless way.

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

3 files changed, 92 insertions, 10 deletions

diff --git a/net-misc/ofono/ChangeLog b/net-misc/ofono/ChangeLog
index 28ed2c7ce19d..e1d76cbf25fb 100644
--- a/net-misc/ofono/ChangeLog
+++ b/net-misc/ofono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ofono
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.35 2011/07/01 15:23:08 dagger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.36 2012/02/28 11:27:56 nirbheek Exp $
+
+*ofono-1.0 (28 Feb 2012)
+
+  28 Feb 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +ofono-1.0.ebuild:
+  Bump to 1.0, with permission from dagger. Fix glib single-includes bug in a
+  hacky patchless way.
 
 *ofono-0.51 (01 Jul 2011)
 
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index aa92fe1ee7ff..a9c235a523c9 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ofono.initd 525 RMD160 7b8d389ba73792ee5f695331fadb92e819255b15 SHA1 26ed52530c923bfa8653ac9662d6ffad42227360 SHA256 4832d4017e48702919085e26c841859b3c25cb5ddeb12c3187ca0e4485f81e79
 DIST ofono-0.50.tar.bz2 815007 RMD160 115ecce37fa6594bb89aa4b729aad2221c85410a SHA1 12dbc746feb3be77d04995ffadc41f2d991ecad4 SHA256 f8f8dd917847a007e4d441b949efc4d28dc3644526d5293016844c2536c65ff9
 DIST ofono-0.51.tar.bz2 819103 RMD160 c7e269af76e851ed3d5d33105586a1fde80b2198 SHA1 cc09943ffd301ff9e906af3bbfa404b8721fb9ea SHA256 309c484728fb0d9f9570331b0818c2335bf713aef118b1c679e3e397f2b606ac
+DIST ofono-1.0.tar.bz2 834592 RMD160 3578c43c7dc04d9a25b122a48e1044e046d27ba1 SHA1 15f8c365089728e28ccc46871497c38b2785c909 SHA256 7733e1628fac6ef4d8aa3e536a5c284c3ba8e76277fc7e28b7e146c3c5ddebfa
 EBUILD ofono-0.50.ebuild 1486 RMD160 8ba362d61842cee544827f6673599d8aa7d1e21b SHA1 715cca3e4e6da789e4e6f08ed74978a590678b51 SHA256 cbeff8293b878aa433da5189b6408993031581423ea682f925960ae514ad70c9
 EBUILD ofono-0.51.ebuild 1486 RMD160 5c8e8809ba3a0ce87c8dfb6a084da89e0fe5c329 SHA1 72fbc19b64f652e14973d72bbd44ccb2da1e1c3d SHA256 e8da83cb728e14a087018d3c2aea7c4e042d9bf101657dda7a25825564bf6c9c
-MISC ChangeLog 5464 RMD160 11f009312ccafc05ecfcfc0b3478f2a5e5175da6 SHA1 46465b7f6c27558b0b92efe90dee67a0a76039dd SHA256 58b8d0a89acf06550feba30d252fafedb58eea111a3ae9a945bdc2ec7a43e413
+EBUILD ofono-1.0.ebuild 1712 RMD160 9738f255deff9be6a9bd73720be4b7699d4a5fcf SHA1 c80d7da55bd8f4898a48d2b84e38579faae74068 SHA256 38dd14587aaf308eb12f2a48d2f6fb1460c1c66911d0a71a7e466586910207a9
+MISC ChangeLog 5667 RMD160 64250157708430f5b43b7ba6640a78efd96be89c SHA1 2d9b478d870d646d4729de195776372d3157a507 SHA256 a3802938b8a19e0d3fd8fd22ded563a078dd54bfa63f761e8e0cf7ac4e742792
 MISC metadata.xml 643 RMD160 54ff05785bb98a81a0b71a64a6d4533b7a3654de SHA1 8ca8be28d8ff31bc311035ba9ff95ddae306c532 SHA256 cc865ba92ccb7cd2052b65a67ad7bd8545399d26784b4db0b0b0ce7e3777a0ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rQwACgkQfXuS5UK5QB0nLgP8CUolC+8v6CTC1Bjdsrc76iI6
-F5FpMSRX6KC/u0qipuBgMRFCO7Ar9czsYlrnZJVrWrzz4PL4+g+QpuVuKbX8PCMu
-17wJq5uHQzEWh8aA2vUBhkCeZOzcy3clgwGgpc2BYp4Ot3IRiv7IXHu04T+r58PS
-kw32s+KAYEuFsRZ9Hig=
-=l0S/
+iQIcBAEBAgAGBQJPTLpDAAoJEO/kOhxWD91k294P/0WVmssDDixV9zbrzJbbU4F3
+knU3fkX8zROJXrR4xdILBMtBWA07N+C3eYS3i/3kL3SuajxzbIWOboP2bU3yrJAW
+hANlvKOlZD8+2TjmAE74YbLoulG+ucCgdhrV1OOOzEOdFvJnx0Y2VzM3EUSn9BPh
+eMxdHuHaZtSgT/Ut+R17+debWT/eudzd0OY892K+fEbBfo9Y7MmcqABLY+4WxMhA
+0aRUEUOfORa3P0zKKjciMVD43bNooCfvRpeERZ3N3GBhpusBTYUyVjpo+KQi04NU
+Qpa3sgClMnVvpxmPyuZ1f2icAYr9jHfT5dSfHUEk3n3qd5SVYvusSaAyYLKplSZ9
+97xk6ilchYyIYc7tjMyt/AePWhcLG2MDeBFSiioQeHyyGAww0tXP9AhI2hNDUq13
+pMhNgYtwfJhdZl8qYH64VqfAdY+667EESvqYjeynFGrJRPYoCCz9wz11EzcwfljQ
+lM8UkqM/yh3wxu381fv9ly8HyE1aTJ5Iw6bCO64knPeQSRWwwdjAdQ5LU68ir/Mh
+WMvcXo83XdgyBK7Qo1dGT+P6MoDpag16+aucDca3hB1SFasdDEuxCHM7x1rSBXvg
+K5ja15A4qEuu7kGmEorCm/7NiZfJOXqVXo85/KWnlxl/6pJwsHU394v5UVNbwi22
+nx+S3fMNFv13c8p0AEp6
+=9qVX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ofono/ofono-1.0.ebuild b/net-misc/ofono/ofono-1.0.ebuild
new file mode 100644
index 000000000000..5d57bae86ca0
--- /dev/null
+++ b/net-misc/ofono/ofono-1.0.ebuild
@@ -0,0 +1,66 @@
+# 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-1.0.ebuild,v 1.1 2012/02/28 11:27:56 nirbheek 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? ( dev-libs/libusb:1 )"
+DEPEND="${RDEPEND}
+	dev-util/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) \
+		$(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
+}