Migrate to EAPI 2 in order to remove built_with_use usage. Make bluetooth DEPEND satisfied by net-wireless/bluez too. Fixes bug #272737.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 21 insertions, 30 deletions

diff --git a/app-pda/libopensync-plugin-irmc/ChangeLog b/app-pda/libopensync-plugin-irmc/ChangeLog
index aaca4db7c0e1..e260a81491e3 100644
--- a/app-pda/libopensync-plugin-irmc/ChangeLog
+++ b/app-pda/libopensync-plugin-irmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libopensync-plugin-irmc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/ChangeLog,v 1.10 2008/12/04 14:09:03 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/ChangeLog,v 1.11 2009/09/19 16:24:11 betelgeuse Exp $
+
+  19 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  libopensync-plugin-irmc-0.36.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use usage. Make bluetooth
+  DEPEND satisfied by net-wireless/bluez too. Fixes bug #272737.
 
   04 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   libopensync-plugin-irmc-0.21.ebuild, libopensync-plugin-irmc-0.22.ebuild,
diff --git a/app-pda/libopensync-plugin-irmc/Manifest b/app-pda/libopensync-plugin-irmc/Manifest
index a20f1f92a4e5..57618be13fe0 100644
--- a/app-pda/libopensync-plugin-irmc/Manifest
+++ b/app-pda/libopensync-plugin-irmc/Manifest
@@ -8,14 +8,14 @@ DIST libopensync-plugin-irmc-0.36.tar.bz2 50009 RMD160 e180f1de51574495ca84aba86
 EBUILD libopensync-plugin-irmc-0.21.ebuild 1896 RMD160 d5e1988cbaba997691e47a1dc81b5e2d60a4f9b8 SHA1 1b1210a70380d305a304c94560aa5d8e1ad18db3 SHA256 69aa725e898438aec76d0b068dae65b40bde02c2c7ae67808a829535921fd2f7
 EBUILD libopensync-plugin-irmc-0.22.ebuild 1896 RMD160 ae6f8997e1673279bcd9426a3a94e2d809328b6e SHA1 9a9fd1b68c4e17e48a4806cdcbe42b04f07c20f9 SHA256 a4d0da588c0ae0c1aa22be54016a2a5b3b89ebad10dc5d91b8493fcdac416c66
 EBUILD libopensync-plugin-irmc-0.35.ebuild 1801 RMD160 360519367e2bad9e04aaa40de8f1b89ec158ae9c SHA1 e24f1e823b151eb862b468ab88ed0b3141d57c3c SHA256 c63b881ebfa0c5e36f26a015d442ebd50178bd4ebe666b4e88d1723f646a548f
-EBUILD libopensync-plugin-irmc-0.36.ebuild 1801 RMD160 4654bfdf6fd7f19c2eb7162dc8e7ecdfa638db43 SHA1 a931f04eda5d28501b4ea924d114d8c4f655d070 SHA256 895882595beb13a6b8de3bb9b1c53a4254071ae8f100195de7f36c757772ff03
+EBUILD libopensync-plugin-irmc-0.36.ebuild 1100 RMD160 23b47aeaabe3eecd30cce0d019fbebb5bfac6349 SHA1 32bd630ce82b4ac70cf5ce546fed0a807d8da383 SHA256 6b4036a521f523a65bf60cddbbe548f55c0dface58106cc8a53b24e0b3c8fc5b
 EBUILD libopensync-plugin-irmc-9999.ebuild 1811 RMD160 03094ea8cb94451b7ce0bdc1bfad88d6b45683b6 SHA1 7e59cbff5ea2b60fb17e9e067fad9beb36f40ef3 SHA256 dcca2bc206b457d59519c23b93daf9e4e8eee6008a422e0aa0a04d9160235e5a
-MISC ChangeLog 1959 RMD160 6e315309e8a906f263ca3a848bbae4acd8827e4a SHA1 3b9b563adaf9907ffa0f2404b78e0a6b60c4d5fa SHA256 01ece384c686f44dcbc3dcf6d26996d887b80fb44827b866b7acc4faeef0f24f
+MISC ChangeLog 2194 RMD160 a077c748415b7bac8e04cf181d43c653dfb90ef5 SHA1 99786b91afa3242e226462eb92900602d5eab061 SHA256 4cd2149461fc9b8bf5029fcc480675b22cd3823526b239b66feec173077075db
 MISC metadata.xml 311 RMD160 bf833b4a50292e79a7610046734ebffec50d4e04 SHA1 7885b7b08f01559298cbab85667ded2a98d2f8d0 SHA256 4d28d2cd19d82714eb96407193c09e021f2d2d5d2e8a178405cb9e9a64ade8a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkk4jVwACgkQ/ejvha5XGaNTpgCgq8xRzEDBYFCfMaMqsYWZ46/0
-CNQAn3zIwnijdazOOsmYbY15Dp0ISNWB
-=Um0J
+iEYEARECAAYFAkq1Ba0ACgkQcxLzpIGCsLRJYACgg/6aR9Bgk043fNk4eXunL4/0
+0LIAnAnanmjvZnfZMtCirbWFFYyKk6oh
+=ljYo
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild
index 1f9c68186a84..6ae605316756 100644
--- a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild
+++ b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild,v 1.2 2008/12/04 14:09:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild,v 1.3 2009/09/19 16:24:11 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils cmake-utils
 
@@ -14,8 +16,8 @@ LICENSE="GPL-2"
 IUSE="bluetooth irda"
 
 DEPEND="=app-pda/libopensync-${PV}*
-	>=dev-libs/openobex-1.0
-	bluetooth? ( net-wireless/bluez-libs )"
+	>=dev-libs/openobex-1.0[bluetooth?,irda?]
+	bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )"
 
 RDEPEND="${DEPEND}"
 
@@ -25,28 +27,12 @@ pkg_setup() {
 		eerror "Please enable \"bluetooth\" or/and \"irda\" USE flags."
 		die "Please enable \"bluetooth\" or/and \"irda\" USE flags."
 	fi
-
-	if use bluetooth && ! built_with_use dev-libs/openobex bluetooth; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-		eerror "USE flag, but dev-libs/openobex was built without"
-		eerror "the \"bluetooth\" USE flag."
-		eerror "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-		die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-	fi
-
-	if use irda && ! built_with_use dev-libs/openobex irda; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"irda\""
-		eerror "USE flag, but dev-libs/openobex was built without"
-		eerror "the \"irda\" USE flag."
-		eerror "Please rebuild dev-libs/openobex with \"irda\" USE flag."
-		die "Please rebuild dev-libs/openobex with \"irda\" USE flag."
-	fi
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="
 		$(cmake-utils_use_enable bluetooth BLUETOOTH)
 		$(cmake-utils_use_enable irda IRDA)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }