Migrate to EAPI 2 in order to remove built_with_use usage. Don't allow libsyncml-0.5.0 to satisfy dependencies in order to fix bug #269187.

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

3 files changed, 19 insertions, 30 deletions

diff --git a/app-pda/libopensync-plugin-syncml/ChangeLog b/app-pda/libopensync-plugin-syncml/ChangeLog
index 6d76ccf08d87..aee0cb47d8d9 100644
--- a/app-pda/libopensync-plugin-syncml/ChangeLog
+++ b/app-pda/libopensync-plugin-syncml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libopensync-plugin-syncml
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/ChangeLog,v 1.11 2008/08/03 12:54:06 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/ChangeLog,v 1.12 2009/09/19 16:06:06 betelgeuse Exp $
+
+  19 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  libopensync-plugin-syncml-0.36.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use usage. Don't allow
+  libsyncml-0.5.0 to satisfy dependencies in order to fix bug #269187.
 
   03 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-pda/libopensync-plugin-syncml/Manifest b/app-pda/libopensync-plugin-syncml/Manifest
index 349a93047b62..727f2f27b546 100644
--- a/app-pda/libopensync-plugin-syncml/Manifest
+++ b/app-pda/libopensync-plugin-syncml/Manifest
@@ -8,14 +8,14 @@ DIST libopensync-plugin-syncml-0.36.tar.bz2 51021 RMD160 8e0f5de8e29f56dd0c011d0
 EBUILD libopensync-plugin-syncml-0.21.ebuild 1783 RMD160 c61059d24cf9f0431e0bca7e30c5e36a2eed80d2 SHA1 bac66fc6ecb6b37ab03f3b72831efdcf4f503efd SHA256 97e38f2bfc9401a8094fb18912c84393402c9485770545a4082730bf85fd800b
 EBUILD libopensync-plugin-syncml-0.22.ebuild 1782 RMD160 647a7d156bb1e651f97be5c997db58589d06d5bd SHA1 8321df577da6d094d1d3e2c99917e1488274dbc6 SHA256 2d5b1c7bf926fb8ffe777bcafd337af563484694cd9180a98b89a4613cf2b27c
 EBUILD libopensync-plugin-syncml-0.35.ebuild 1715 RMD160 c375562e9a25c800affc6bf9550fd9b6592e5cbb SHA1 cc781cf2f8e3cce31167f98c4a31786c72823d1c SHA256 0a1285702bb82a7165a6289dcb02b4d270dc67225c6e98807fed4037c3ef14af
-EBUILD libopensync-plugin-syncml-0.36.ebuild 1721 RMD160 2e56edcf88fb06045df15d59cc7060356d976bf4 SHA1 98746e7d12975de04d3abe329bbb9cbff8b87f2d SHA256 47f235a4f0e6136269eda3eac9f5a57db99ee573f2bbf3a303a6ec6974a16da4
+EBUILD libopensync-plugin-syncml-0.36.ebuild 1009 RMD160 d321c4e3cc3b0357ca33b29baf932cffeef279a8 SHA1 e8f6cd66848757cfeaeb0a0543e924db73ba3b45 SHA256 2c510d42b5a9bf73a3373d63c80055c754d8e6813c355b54e3c19a97b90d6a9e
 EBUILD libopensync-plugin-syncml-9999.ebuild 1722 RMD160 b62be17f2104a32106dd3ae74656a6dd76845f24 SHA1 a1acc465b0f53853e9f84fd009f0cc4f2bc50d14 SHA256 7c51966ec21d3ff8490dee44fd7bac3f85251fa1a866bb8a67b4a28f95b158ad
-MISC ChangeLog 1852 RMD160 651c46bb7af7cf7867977c4c60c7d86a61fbaec7 SHA1 91f0ea5eb45cddbc92575d15c1bc57834262926b SHA256 7749aebf4873e9c0371910e556cdcd1d5529706863cb15b732c65a94d8b45964
+MISC ChangeLog 2098 RMD160 9a9ee3a895bc5af42487d941afdf19a610a00007 SHA1 781d6e010a0772ea7dea81fedf3929815ad63310 SHA256 f16d7d6483769c6b913e5e7b8b687ec6ffab53d52239fbcaa7ed215c2a99cc21
 MISC metadata.xml 364 RMD160 408b0b30de7d795baa419ced6e65315501ce6fdd SHA1 aa168c9eb3f715e5c07d77322a312da061d0b0d0 SHA256 790d641de2c481d0df4d90df39d003ab8c28806d0300b7833c2f1cb22b3242b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkiVqnsACgkQOeoy/oIi7uxf5QCgjzEX4UjSb8aWs+SlUI+av/cM
-dXAAnjUpyAP+/h+FdGyk7TS7FoQM1md7
-=wMhg
+iEYEARECAAYFAkq1AesACgkQcxLzpIGCsLQxYACfU4KrCtAT24yk7uilm/PfYfcv
+8LAAnR/hKRfjmBExlHeXXq13xeQ64daF
+=ItAf
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild
index fbd7e06fa956..c629826ae883 100644
--- a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild
+++ b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild
@@ -1,8 +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-syncml/libopensync-plugin-syncml-0.36.ebuild,v 1.2 2008/07/13 07:45:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.36.ebuild,v 1.3 2009/09/19 16:06:06 betelgeuse Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils cmake-utils
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
 IUSE="http +obex"
 
 DEPEND="=app-pda/libopensync-${PV}*
-	>=app-pda/libsyncml-0.4.6"
+	~app-pda/libsyncml-0.4.6[obex?,http?]"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -25,28 +25,12 @@ pkg_setup() {
 		eerror "Please enable \"obex\" or/and \"http\" USE flags."
 		die "Please enable \"obex\" or/and \"http\" USE flags."
 	fi
-
-	if use obex && ! built_with_use app-pda/libsyncml obex; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"obex\""
-		eerror "USE flags, but app-pda/libsyncml was built without"
-		eerror "the \"obex\" USE flag."
-		eerror "Please rebuild app-pda/libsyncml with \"obex\" USE flag."
-		die "Please rebuild app-pda/libsyncml with \"obex\" USE flag."
-	fi
-
-	if use http && ! built_with_use app-pda/libsyncml http; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"http\""
-		eerror "USE flags, but app-pda/libsyncml was built without"
-		eerror "the \"http\" USE flag."
-		eerror "Please rebuild app-pda/libsyncml with \"http\" USE flag."
-		die "Please rebuild app-pda/libsyncml with \"http\" USE flag."
-	fi
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs="
 		$(cmake-utils_use_enable http HTTP)
 		$(cmake-utils_use_enable obex OBEX)"
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }