(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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 93 insertions, 53 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/Manifest b/net-misc/kiax/Manifest
index 69ae9ab8b2c6..79348617465b 100644
--- a/net-misc/kiax/Manifest
+++ b/net-misc/kiax/Manifest
@@ -1,6 +1,7 @@
 AUX configure.patch 261 RMD160 4b63d6522192b7890577d4dcbfee138ce4a63d23 SHA1 0e39f5c9ef061845d928fcfe1056a840a4450c18 SHA256 63bcadf389f998ef135f5292480da2e49653b97fd162cc0290fb2b45ed5b90ba
+AUX kiax-0.8.51-h_addr_list.patch 1115 RMD160 558dbf176ee9f6223863285036432d26df8d8c5a SHA1 880b4510d2556f1d165f1dab45b536ac08969b26 SHA256 3be52c7f64ab305ae2e70373242ff573337a40d6d0acd513641cd3945d4839f4
 DIST kiax-0.8.51-src.tar.gz 1493268 RMD160 8019d742867d0af339210363c42f1c46df422dd2 SHA1 5a67df17d478f4f1f5d802e126e6c38fb0834a6b SHA256 63babcf21cc69d88b78e1769594c69eb06bfb2866a4c7b3a7ba367c8b68632f8
-EBUILD kiax-0.8.51.ebuild 1069 RMD160 f8a1697100849ed6bf97f83eec3b416ae8455598 SHA1 3bba551e9c73586952ce251eb4730832e886856e SHA256 a4f8e12918b1eda87239bbc6c360773c28c5866d3002bb0f538b7e9b6534a18c
+EBUILD kiax-0.8.51-r1.ebuild 1587 RMD160 b45ae19e2c803cde011b41c1ef322331aef83b14 SHA1 e4b3ac7da767bbc163bbf274ea8c994392f05944 SHA256 55e2bde93ee4ab4804e0289a3eab3fc26d3b3a4b0a2ac02ef9410fa88e0121dc
 EBUILD kiax-0.8.5_p1.ebuild 1092 RMD160 83cedd08488965c72a56d26a3113739fc6f2a325 SHA1 618488bc60df2772d99addeba51f44eb97318bf5 SHA256 540262fef3e61c173c491b11cd0c6a643c1ac67d43e83e3f09d4c42d5e5c5f62
-MISC ChangeLog 2103 RMD160 d5b3359a671fca51afaa9c424da21740cbba2bd7 SHA1 6744f98986515406b37db07326f978d177add7c9 SHA256 d0dffc659174a9b9db189f5029882ffe3e738e690548941d87830800db7d12e4
+MISC ChangeLog 2424 RMD160 1f787ef6577fecbb2477be00884571dfec490127 SHA1 241fa9cc5bbf68d536c8d243649898b60ec8a31f SHA256 09cf72ac392fea7789ebacd6e74f792def4df567e49c1234d8744dabe37b3023
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
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.*
-}