--- ekiga-3.0.0.ebuild	2008-10-09 13:27:03.000000000 -0400
+++ ekiga-3.0.0-eapi2.ebuild	2008-10-09 17:56:00.000000000 -0400
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit eutils gnome2
 
 DESCRIPTION="H.323 and SIP VoIP softphone"
@@ -12,8 +14,8 @@
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="avahi dbus debug doc eds gconf gnome ldap libnotify xv"
 
-RDEPEND=">=dev-libs/ptlib-2.4.1
-	>=net-libs/opal-3.4.1
+RDEPEND=">=dev-libs/ptlib-2.4.1[debug=]
+	>=net-libs/opal-3.4.1[debug=]
 	>=x11-libs/gtk+-2.12.0
 	>=dev-libs/glib-2.8.0
 	>=dev-libs/libsigc++-2.0.0
@@ -38,23 +40,6 @@
 DOCS="AUTHORS ChangeLog FAQ NEWS README"
 
 pkg_setup() {
-	# ekiga has to be built like opal and ptlib but as opal has to be built
-	# like ptlib, it should be possible to check only opal but as ekiga is
-	# linking to both, we are cheking both
-	if use debug && (! built_with_use dev-libs/ptlib debug ||
-		! built_with_use net-libs/opal debug); then
-		eerror "You need to build dev-libs/ptlib and net-libs/opal with\
- USE=debug enabled."
-		die "dev-libs/ptlib and net-libs/opal have to be built with USE=debug"
-	fi
-
-	if ! use debug && (built_with_use dev-libs/ptlib debug ||
-		built_with_use net-libs/opal debug); then
-		eerror "You need to build dev-libs/ptlib and net-libs/opal without\
- USE=debug."
-		die "dev-libs/ptlib and net-libs/opal has not to be built with USE=debug"
-	fi
-
 	# dbus-service is always enable if dbus is enable, no reason to disable it
 	G2CONF="${G2CONF}
 		$(use_enable avahi)
@@ -81,11 +66,15 @@
 		src/components/org.ekiga.Helper.service.in
 }
 
+src_configure() {
+	false # gnome2.eclass doesn't like EAPI2
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 
 	if ! use gnome; then
-		ewarn "USE=-gnome is experimental, some weirdness with the UI and \
-config keys should appear."
+		ewarn "USE=-gnome is experimental, some weirdness with the UI and config keys"
+		ewarn "should appear."
 	fi
 }