Fixed gcc-4.3 build failure, bug #205468, thank Evil Compile Person for report and Chi-Thanh Christopher Nguyen for the fix. Small cleanup of ebuild to shut up repoman.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

4 files changed, 30 insertions, 13 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index 39536d2af0a3..74215598edca 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpri
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.69 2008/08/16 15:56:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.70 2008/12/08 13:27:14 pva Exp $
+
+  08 Dec 2008; Peter Volkov <pva@gentoo.org>
+  +files/libpri-1.2.5-gcc42.patch, libpri-1.2.5.ebuild:
+  Fixed gcc-4.3 build failure, bug #205468, thank Evil Compile Person for
+  report and Chi-Thanh Christopher Nguyen for the fix. Small cleanup of
+  ebuild to shut up repoman.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove stkn from metadata.xml (#27693)
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 069cae43e322..4d4cbbef0536 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,5 +1,6 @@
 AUX libpri-1.2.2-gentoo.diff 1921 RMD160 99d9a641900d2661332ac09758d33c9138d392de SHA1 34dbd6b2d19d7827ba88a70e2d4720fa956ad320 SHA256 6c228db1a279413f4f94834fbea318ea953b23bde386033521e03ce1dbb6bf69
 AUX libpri-1.2.3-gentoo.diff 1832 RMD160 de0085863cbf7a6a806c28267c44a2d12b990d2f SHA1 cb6af07c0ea49a9cf4d4320968f002d868a3a631 SHA256 d03e1611ae4a835322ebb2c2ab320211ecdea860ef5bdd789ced0f6730c181bd
+AUX libpri-1.2.5-gcc42.patch 292 RMD160 60c6926771a962af681b4aabb7992ee324ca13d6 SHA1 74f12b2cabed9fed73186a12a0b28d4987be2e90 SHA256 28cb8f9c5079632a51dac7ab5f0ac143a5e3513149aab869bcde256aa1c37401
 AUX libpri-1.2.5-gentoo.diff 1244 RMD160 38821ad5d9fc89ddf2d207ddd0e2d818b7174acb SHA1 9142d76c73d2e908437b69d22da5b40df6926457 SHA256 a8bd018ccbf6670dff74daa568bacc1c5772caafc2ef4e8779d9d89ba99bf098
 AUX libpri-1.2.5-multilib.patch 2703 RMD160 a390cd241bb7bea56a6f78c91415826f00ab3fc2 SHA1 371a859d75b759b995410af1c377a8d80dc0f45f SHA256 7e045f6499c54d0242b421e2d71f0ccb7a6b20c30a0f82dd7cf8281ac9dded89
 DIST bristuff-0.2.0-RC8g.tar.gz 139013 RMD160 c0a037e0819b8985be2df60a010309335527f203 SHA1 d4289553e12260a24814b045c26a77c087e39daf SHA256 19a0a7fdbb192fed4ea086251d5653abbe8525232dd5b613f9366400c97b213b
@@ -30,6 +31,6 @@ EBUILD libpri-1.2.3.ebuild 1380 RMD160 55abb892fb4278587bf808b091332a86eba349b9
 EBUILD libpri-1.2.4-r1.ebuild 1316 RMD160 882a7d6f7f0c3badc65ef5184c37db1792868dcb SHA1 b1a0f87c97311e420d04ef992181debbe8571e7f SHA256 09fdc1fd3c0168a90f0e25fdf33928f0c6fadf13fc681ec47dbae8f39266088f
 EBUILD libpri-1.2.4-r2.ebuild 1320 RMD160 69f2ba252752474b2ac2fca54342331a02a607f9 SHA1 0bf32fc9737b9e68c16ad7dc4785a9ea64961df1 SHA256 0e10e1e2eb9ccfe1c52fc64e565c722e3db0967ba3da26c59e79eea4aba60dd5
 EBUILD libpri-1.2.4.ebuild 1318 RMD160 ebd4f377dc64683dcd704f2de41ededc79fdcd6f SHA1 f03439324aa33ad5976f04dea1899077d97316bb SHA256 c021253bcde49bb57d1df30bf1f95544bc99487c8b3b2fd91693757059442bf8
-EBUILD libpri-1.2.5.ebuild 1388 RMD160 5dcee450d974e492c2ee9b54f1f7eb65c34a35f5 SHA1 42a15fb4ee42b8998bc982b3df074107336d869b SHA256 a673c35686d79d82090f66948175fa282d9aa42f0545c5cd59d65f67ac685e45
-MISC ChangeLog 9073 RMD160 c18f517f69a9630f9099b7c828bf7bdbbcb47949 SHA1 11d0c2d36b0577e07670073b80f2a966351a4ab1 SHA256 0a11aa147a7052e091ab837a247dd3b1caed48f6bee633a0a6bced2c2158e952
+EBUILD libpri-1.2.5.ebuild 1409 RMD160 9533cfaf3cb7ba0c4e5f7122d11dae7f7cc91de3 SHA1 4cb9cf5248921e0cf6a9386545660d78ff29c297 SHA256 480b0c0cab4767eb005b439485355b101e8c536e26513937633c4c3087238f27
+MISC ChangeLog 9349 RMD160 c91ed8ec67998a97af21f65f70add07db601911f SHA1 8eba4ac6fd6657576366dca2c8ae3bf2492861f9 SHA256 ae923d9815a3e60d73696136deaa802eee2f7cda2c7ee3885b03c455ce6f91e2
 MISC metadata.xml 239 RMD160 7e093a1fb5fd58611f0357a94a8c0a2b00e8a0e8 SHA1 07852f566e47938d6c03a87c597ad652db6aa927 SHA256 e7205896384d0cc163aa0e96324f6edcd58ec8a1a6589346eaa8130ca9bc6e0e
diff --git a/net-libs/libpri/files/libpri-1.2.5-gcc42.patch b/net-libs/libpri/files/libpri-1.2.5-gcc42.patch
new file mode 100644
index 000000000000..a7b9b0e8a3b9
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.5-gcc42.patch
@@ -0,0 +1,11 @@
+diff -u a/pri_internal.h b/pri_internal.h
+--- a/pri_internal.h	2005-11-29 19:39:18.000000000 +0100
++++ b/pri_internal.h	2008-01-18 16:12:05.200685051 +0100
+@@ -25,6 +25,7 @@
+ #ifndef _PRI_INTERNAL_H
+ #define _PRI_INTERNAL_H
+ 
++#include <stddef.h>
+ #include <sys/time.h>
+ 
+ struct pri_sched {
diff --git a/net-libs/libpri/libpri-1.2.5.ebuild b/net-libs/libpri/libpri-1.2.5.ebuild
index b857ae538c1f..c401f35e4cd3 100644
--- a/net-libs/libpri/libpri-1.2.5.ebuild
+++ b/net-libs/libpri/libpri-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.4 2007/08/06 20:20:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.5 2008/12/08 13:27:14 pva Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ BRI_VERSION="0.3.0-PRE-1y-h"
 
 DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.gz
+SRC_URI="http://ftp.digium.com/pub/libpri/releases/${MY_P}.tar.gz
 	bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 #	bri? ( http://www.netdomination.org/pub/asterisk/libpri-${PV}-bristuff-${BRI_VERSION}.diff.gz )"
 
@@ -24,14 +24,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.5-gentoo.diff
-	epatch ${FILESDIR}/${P}-multilib.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.5-gentoo.diff"
+	epatch "${FILESDIR}/${P}-multilib.patch"
+	epatch "${FILESDIR}/${P}-gcc42.patch"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
@@ -51,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} LIBDIR="${D}/usr/$(get_libdir)" install || die
+	make INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }