(non maintainer commit) fix many QA issues - biggest is fails to compile with glibc-2.8, remove old version. Patch by Mounir Lamouri, bug 246131

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 90 insertions, 51 deletions

diff --git a/net-misc/kiax/ChangeLog b/net-misc/kiax/ChangeLog
index 6d6f67c0bbd4..dfe4c8ed6a09 100644
--- a/net-misc/kiax/ChangeLog
+++ b/net-misc/kiax/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/kiax
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/ChangeLog,v 1.13 2008/07/27 22:16:26 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/ChangeLog,v 1.14 2009/02/16 19:11:17 darkside Exp $
+
+*kiax-0.8.51-r1 (16 Feb 2009)
+
+  16 Feb 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/kiax-0.8.51-h_addr_list.patch, -kiax-0.8.51.ebuild,
+  +kiax-0.8.51-r1.ebuild:
+  (non maintainer commit) fix many QA issues - biggest is fails to compile
+  with glibc-2.8, remove old version. Patch by Mounir Lamouri, bug 246131
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> kiax-0.8.5_p1.ebuild,
   kiax-0.8.51.ebuild:
diff --git a/net-misc/kiax/files/kiax-0.8.51-h_addr_list.patch b/net-misc/kiax/files/kiax-0.8.51-h_addr_list.patch
new file mode 100644
index 000000000000..0167ac176585
--- /dev/null
+++ b/net-misc/kiax/files/kiax-0.8.51-h_addr_list.patch
@@ -0,0 +1,21 @@
+diff -r -u lib/libiax2/src/iaxORIG.c lib/libiax2/src/iax.c
+--- lib/libiax2/src/iaxORIG.c	2008-11-09 00:59:40.000000000 -0600
++++ lib/libiax2/src/iax.c	2008-11-09 00:56:03.000000000 -0600
+@@ -1553,7 +1553,7 @@
+ 		snprintf(iax_errstr, sizeof(iax_errstr), "Invalid hostname: %s", tmp);
+ 		return -1;
+ 	}
+-	memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr));
++	memcpy(&session->peeraddr.sin_addr, hp->h_addr_list[0], sizeof(session->peeraddr.sin_addr));
+ 	session->peeraddr.sin_port = htons(portno);
+ 	session->peeraddr.sin_family = AF_INET;
+ 	strncpy(session->username, peer, sizeof(session->username) - 1);
+@@ -1946,7 +1946,7 @@
+ 		snprintf(iax_errstr, sizeof(iax_errstr), "Invalid hostname: %s", hostname);
+ 		return -1;
+ 	}
+-	memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr));
++	memcpy(&session->peeraddr.sin_addr, hp->h_addr_list[0], sizeof(session->peeraddr.sin_addr));
+ 	session->peeraddr.sin_port = htons(portno);
+ 	session->peeraddr.sin_family = AF_INET;
+ 	res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_NEW, 0, ied.buf, ied.pos, -1);
diff --git a/net-misc/kiax/kiax-0.8.51-r1.ebuild b/net-misc/kiax/kiax-0.8.51-r1.ebuild
new file mode 100644
index 000000000000..b1750adb3346
--- /dev/null
+++ b/net-misc/kiax/kiax-0.8.51-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/kiax-0.8.51-r1.ebuild,v 1.1 2009/02/16 19:11:17 darkside Exp $
+
+EAPI="2"
+
+inherit qt3 eutils
+
+DESCRIPTION="QT based IAX (Inter Asterisk eXchange) client"
+HOMEPAGE="http://kiax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXpm
+	>=x11-libs/qt-3.2:3"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+src_prepare() {
+	# 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 || die "patching bin/Makefile failed"
+
+	# fix icon/i18n prefix (bug #123839)
+	sed -i -e "s:/usr/local:/usr:g" \
+		src/src.pro.or || die "patching src/src.pro.or failed"
+
+	# src/src.pro.or has to be used instead of src/src.pro
+	cp src/src.pro.or src/src.pro \
+		|| die "copying src/src.pro.or to src/src.pro failed"
+}
+
+src_configure() {
+	# don't use ./configure script
+	./repath.pl --prefix=/usr || die "repath script failed"
+
+	eqmake3 qkiax.pro -o Makefile
+	eqmake3 src/src.pro -o src/Makefile
+	# lib/lib.pro doesn't exist
+	# don't use qmake for bin/ and i18n/, Makefiles already exist
+	# and generated ones are not good
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+
+	dodoc README README.* CHANGELOG || die "dodoc failed"
+
+	domenu kiax.desktop || die "domenu failed"
+}
diff --git a/net-misc/kiax/kiax-0.8.51.ebuild b/net-misc/kiax/kiax-0.8.51.ebuild
deleted file mode 100644
index c8ac84f5ac7f..000000000000
--- a/net-misc/kiax/kiax-0.8.51.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# 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
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="x11-libs/qt:3"
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/configure.patch
-
-	# add prefix for make install
-	sed -i -e "s:\(\$(DEST_PATH)\):\${INSTALL_ROOT}\1:" \
-		bin/Makefile
-
-	# fix icon/i18n prefix (bug #123839)
-	sed -i -e "s:/usr/local:/usr:g" \
-		src/src.pro.or
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-
-	domenu kiax.desktop
-	dodoc README README.* CHANGELOG COPYING INSTALL INSTALL.*
-}