--- kiax-0.8.51.ebuild	2009-02-13 19:40:25.000000000 -0500
+++ kiax-0.8.51-r1.ebuild	2009-02-13 19:42:31.000000000 -0500
@@ -2,48 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/kiax-0.8.51.ebuild,v 1.2 2008/07/27 22:16:26 carlo Exp $
 
-EAPI=1
+EAPI="2"
 
 inherit eutils kde-functions
 
-IUSE=""
-
 DESCRIPTION="QT based IAX (Inter Asterisk eXchange) client"
 HOMEPAGE="http://kiax.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kiax/${P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-DEPEND="x11-libs/qt:3"
+DEPEND="x11-libs/libXpm
+	>=x11-libs/qt-3.2:3"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}-src"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/configure.patch
 
+	# fix compile with glibc-2.8, see bug #246131
+	epatch "${FILESDIR}"/${P}-h_addr_list.patch
+
 	# add prefix for make install
 	sed -i -e "s:\(\$(DEST_PATH)\):\${INSTALL_ROOT}\1:" \
-		bin/Makefile
+		bin/Makefile || die "patching bin/Makefile failed"
 
 	# fix icon/i18n prefix (bug #123839)
 	sed -i -e "s:/usr/local:/usr:g" \
-		src/src.pro.or
+		src/src.pro.or || die "patching src/src.pro.or failed"
 }
 
-src_compile() {
+src_configure() {
 	./configure --prefix=/usr || die "configure failed"
-	emake -j1 || die "make failed"
 }
 
 src_install() {
+	# throw a sandbox error otherwise
+	sed -ie "s:../../../../../../../../share:usr/share:g" \
+		src/Makefile || die "patching src/Makefile failed"
+
 	dodir /usr/bin
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
 
 	domenu kiax.desktop
-	dodoc README README.* CHANGELOG COPYING INSTALL INSTALL.*
+	dodoc README README.* CHANGELOG || die "dodoc failed"
 }