--- opal-3.4.1.ebuild	2008-10-09 19:47:27.000000000 -0400
+++ opal-3.4.1-eapi2.ebuild	2008-10-09 20:06:51.000000000 -0400
@@ -4,6 +4,8 @@
 
 inherit eutils
 
+EAPI="2"
+
 DESCRIPTION="C++ class library normalising numerous telephony protocols"
 HOMEPAGE="http://www.ekiga.org"
 SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
@@ -13,33 +15,16 @@
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc java"
 
-RDEPEND="~dev-libs/ptlib-2.4.1
+RDEPEND="~dev-libs/ptlib-2.4.1[debug=]
 	>=media-video/ffmpeg-0.4.7
 	media-libs/speex
 	java? ( virtual/jdk )"
 
-pkg_setup() {
-	if use debug && ! built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
-		die "dev-libs/ptlib has to be built with USE=debug"
-	fi
-
-	if ! use debug && built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib without USE=debug."
-		die "dev-libs/ptlib has not to be built with USE=debug"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-lpcini.patch
 }
 
-src_compile() {
-	local makeopts
-
+src_configure() {
 	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
 	# http://zfoneproject.com/ that is not in portage
 	econf \
@@ -49,6 +34,10 @@
 		--disable-localspeex \
 		--disable-zrtp \
 		|| die "econf failed"
+}
+
+src_compile() {
+	local makeopts
 
 	if use debug; then
 		makeopts="debug"