1.10: QA and EAPI=5, 1.12: QA

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC!

4 files changed, 79 insertions, 24 deletions

diff --git a/net-misc/ofono/ChangeLog b/net-misc/ofono/ChangeLog
index 197c62de0926..1d6f33058730 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.49 2013/03/16 08:31:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.50 2013/03/17 12:31:06 tomka Exp $
+
+*ofono-1.10-r1 (17 Mar 2013)
+
+  17 Mar 2013; Thomas Kahle <tomka@gentoo.org> +ofono-1.10-r1.ebuild,
+  ofono-1.12.ebuild:
+  1.10: QA and EAPI=5, 1.12: QA
 
   16 Mar 2013; Agostino Sarubbo <ago@gentoo.org> ofono-1.10.ebuild:
   Stable for x86, wrt bug #461802
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 28878db7f090..d992f437b4d7 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ofono-1.12-sys-types.patch 561 SHA256 8ccc6eac9f1b3e4b141cb08f636b97414fe527fef97d2a72c3ea26a546f9ccfa SHA512 5b754272245f9ab2097f8e93b42a6dcfd0c5173f333ab15de83a914e23bf6ab2742fafdff4862b4eab92dfb46aad99946133e804ed425dfb396a51e2c6a053c3 WHIRLPOOL 7d05ef3067244bb7912828caa4dd69c2c6eda195d1934602fa4a3e88fef7676f39a7e2f959af7d449f90445740b0e3458cf2892d935a9e5fe870fc8ce24f4406
 AUX ofono.initd 525 SHA256 4832d4017e48702919085e26c841859b3c25cb5ddeb12c3187ca0e4485f81e79 SHA512 f2773a20705b78b7c309d27afea419fdacb513f2f776eb1d6df86b433bf1f8aecf1f64aa85633bc0bba192287b1ea80523ae75a673916512468558003c34319e WHIRLPOOL 549a8ac6d876414d2ce351ab7e0e42370ef3d280e43f6998d56cced2b31025c9e5a89d9a7281af5789cc2caff26e6c8b77b7e69c8327dacd707fd34a776e52d1
@@ -7,24 +7,15 @@ DIST ofono-1.0.tar.bz2 834592 SHA256 7733e1628fac6ef4d8aa3e536a5c284c3ba8e76277f
 DIST ofono-1.10.tar.bz2 898916 SHA256 e7931ac0dbe165eb0e16a38b7cb4acca59b704f356ec13583d58027135e3efa5 SHA512 02bd35ca218c731c087abe1f208fe39650b7a6075807246aee076e194d41ae2d66db7c12d263729d663b26c7634869986352f5ca8ea6f3286b8115a7e8c43295 WHIRLPOOL 62042871a107fa1c8d3f8e865a3d47baf9cc87f82775f7dced72ddf362de262d71174531ccd0bac6accc79f8ff94666029937be6d4fa2ea785d850b810d4b2b9
 DIST ofono-1.12.tar.bz2 931080 SHA256 6f3fcf2b0fccb282ee050184a80451c62fe680f6e9c5e2c0915312108b1c6c29 SHA512 11980519d827d7b99e41336f9f8a8b7142ec9d8f758516598813764097fb1b25be7aec0bc56e2ca4a0cb1a932f575d74e178365d682bc013e0330b86f4e8d751 WHIRLPOOL 1f2b6490d71813f64b16b995c8fd218f5d00c33c807606df03905546a7b4c517c306042f1a5e18ec3d9105972c898ee0c7f20cfaa0cbb73f852d9e50515cab84
 EBUILD ofono-1.0.ebuild 1703 SHA256 bd73dc4dccf6a114fea9333b6b0aca90d803f71256f1991f6162abc7fa6e6478 SHA512 d6e5439e093713afc7636359a837692af74f91cb093aef0ff09c63d760d16730e391d60570dc480f1ca340faef0a90c26ee35b8879b4e26f39b3c443c6fe08d0 WHIRLPOOL b0ca9bcc08e31f8fbc33d3810f03560871fee1d09e626fcbb900f56102928daccdbdb10e2db4af3a078f70528d6792b150c075f2996ed985604d1cb0e64c126f
+EBUILD ofono-1.10-r1.ebuild 1506 SHA256 44483a13aa10c7e99e1c6bc4bfe6608c19e8a865cfa99859b941c2389b18958d SHA512 0e9e7d81c4ca642fc0df3009e0f04430c8c800f56652c7f8619c650509140a00cbf5d4e1f0467d29e48ecd940f2e78f854b688b6b45df0e9c5d0ae32ecb5cb8c WHIRLPOOL 2867a1561312207e95a0c4dc218f934f35c182ed04a3d8e5c8157d2e9e4c5492217af45f1d3b17cf7801de9d9ac9b54b95577b5efb8f95de5c1380e342875401
 EBUILD ofono-1.10.ebuild 1672 SHA256 0b83b71a6b0deefc8daa7c9d46603c1653a92f52128d4d8f27b6c46457c1a393 SHA512 2b9bd918df1fc65a2f643a60db02c844db8b3820d3402e2fed349542b8172109712a1d7171adfabd51ab31789edbaaf9b0cd4765c24f531deb0c69d2de965ad4 WHIRLPOOL ab01a7c522f8879464c1a61ec2968aa9d2bc915c7aaf4279d4d3a6c910f233fbf0215cf3aab74d159d4c85805194807706811e163b1fcad67b8e892af5b13df4
-EBUILD ofono-1.12.ebuild 1945 SHA256 9fa4dcc926b58faa9cb3b96e7bdaef4829f087b4eb0cf4ed873fca75fbb39a5e SHA512 d5647adef00ce07745a4c06cb1d42a12a1be51d03111bc2c83c4865e7118fcc18477223e78a3f06f771433ba1732933dfdec9f18b2f2a1cf77cf5338118c03d2 WHIRLPOOL 1126478d2f42c9aad6200eaf46db549c148d560c49be4ff4121027d8503c055b765fadc377382292c5306ede8dc6cbe49e5b0beb9ba25a10de1530b1cd1c1ba7
-MISC ChangeLog 7218 SHA256 aa1fd690a0578f39108354d0167e42e278095c405ac6d0469475e65da453fc12 SHA512 eec37f7035248215638cc68ba14269f9f0f3d218582749f6575d3bae61c18255ef23278ba960efe75d9d09986c03a099f93196e04a8695ee94287becc0ffcf3b WHIRLPOOL ec99f94844ebc16fa0bf449c0684cb44b249f889236e6c3f846ef46b6419ff35dcec92198b9b85e07e53db2426717540df58c30157101c882c2e2c0a88557bbf
+EBUILD ofono-1.12.ebuild 1720 SHA256 104b0acb9ae233c0bc09149ef6a93523a9dc103fed8bf03e3884a9954d648e30 SHA512 3c85c018c2899d5c6f356b141755615853e72948720745feb22319e6359991aa5716c4d5a243ff33ae6231de20971682950fd879c4bccdba92c6410931c10e96 WHIRLPOOL b2cedc42dcb6848a44745976fdf0ac36b50e5b0dfab65e215bdde99c2296dff69972292084b8d42075fef2c498c7f67d6174b41e6bcaf6a75c822b85d3ba81b3
+MISC ChangeLog 7374 SHA256 537887f9f454a3dcbe9972031854a3b4d682f4d96cc6bc9d65abd40efe009401 SHA512 ddac261209b5ab951bb70a46d1920711f0e6a4f104f311fd75998bbb130686b99e3231797b50bed07556b8cdaa9f57fee6474a509936c467cd04cc9dc0775316 WHIRLPOOL 8560c81b2f007bc977bb6ad6fe44b7c64f06313db93c21a6a9de1acbb78f86e00d1c98a658e582edc607672952cdd08901c0142dd65b5c96b208a9a8ad7fe30b
 MISC metadata.xml 1164 SHA256 ded9b8752c69c81bdce8421d97e6a91d22cab2c43b94cb3dced58f1c5fce4672 SHA512 4870011dac4bab4a25b09cfb49f3805443d63b136a52552b53e371794b1e1162e07cd3f3dd0041730ea69b97029d82b13a933f9575074c187cd13589fb1a90d2 WHIRLPOOL a6b32b35e921a21c1e71f188f7c253fdf6b136709dbe6b690ed0b408cc06488880868e3151a41b895fc5f40173a39696ce649f9e858bc2b6e73eb637c2977858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRRC3TAAoJELp701BxlEWfl80P/1WCKNvA6xykMnpobFkvo5Ja
-X2zd1n4PDbPuJlFCYtupMvtAIk4FqKcb/uop8FlQlqTtsMC1lXWYV48w/EPnxvNE
-MO6DvHP/+P5TeIqGP7ZqBWhpaBTdX0dXtbF810hgulJWwpC5ZXNObvqoL08d/o6E
-BhlvFSRzC4UEl4nxC6CB42oUr/Ero1MFINjyv+/Urw/05RaMLL44x0doTgeHp+vB
-/oE1nDXtVkyV7SdDdJuKGAOZaSTb3GbVl2TqmHl+0YPBwDXxgyCWer1g2RSFO+LX
-uh81exUP1exQoADnFGVtXzAQ+EXb6QPJSO0c/lWoEZ2Lpsvgr3zEQDpUAu+K30Tm
-XDTE5tS2rPW+/YUhYjokKui0Q8OFkpQn9zyh1+MWB3is7GybzBeO4Ob8FcK0eepY
-H8es69NgWiEsBHMO+Hd0Z7Jy3S3QWBXUW3/bRkwen5j7dVqO0L+Kx7YhvIKHzer6
-YyEBROR2jfMyUrDwIgFX1NiUwUkrF9S8Jk7SvdB9QelqfYX7Zc6616qD5XiqdEaV
-kJc5c9qVVbE9NECsfew7hUW7D4+JgIrrSATN32XCZCCCeqwNuUKFOV9ZAN+m16HT
-Uav9NpF8dZepKzEJzIqEExL3t+D4QfLa543JXgScxqMJHZYKFoybtoDXqxO6z0w7
-Xl8NIXM7wvu1bMTlzfCj
-=dKWe
+iF4EAREIAAYFAlFFt5sACgkQid6yGVZcMrydvAD/SUYth30HdFnWLMXiH7G61Nol
+Cn4rdE+BwzUtrfrMitIA/jS0kWM2BTfJPxJjcpv6nom7G49cIVO2g7WG/SBDNTVv
+=J++e
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ofono/ofono-1.10-r1.ebuild b/net-misc/ofono/ofono-1.10-r1.ebuild
new file mode 100644
index 000000000000..6fae3295139a
--- /dev/null
+++ b/net-misc/ofono/ofono-1.10-r1.ebuild
@@ -0,0 +1,63 @@
+# 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.10-r1.ebuild,v 1.1 2013/03/17 12:31:06 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 doc examples +isimodem +phonesim threads tools +udev"
+
+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
+	epatch  "${FILESDIR}/${PN}-1.12-sys-types.patch"
+}
+
+src_configure() {
+	econf \
+		$(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() {
+	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
+}
diff --git a/net-misc/ofono/ofono-1.12.ebuild b/net-misc/ofono/ofono-1.12.ebuild
index 36c194b986a9..6fe370bd5657 100644
--- a/net-misc/ofono/ofono-1.12.ebuild
+++ b/net-misc/ofono/ofono-1.12.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-1.12.ebuild,v 1.2 2013/03/17 12:31:06 tomka Exp $
 
 EAPI=5
 
@@ -31,13 +31,8 @@ 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
+	epatch "${FILESDIR}"/${P}-sys-types.patch
 }
 
 src_configure() {