Version bump to 1.4 branch, for use with Asterisk 1.6 which is masked. Patches rebased. BRIstuff failed to build/patch correctly after repeated attempts, so dropped for now.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

15 files changed, 208 insertions, 118 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index 74215598edca..b2f8a90a93d9 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,22 @@
 # 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.70 2008/12/08 13:27:14 pva Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.71 2009/03/10 18:51:15 chainsaw Exp $
+
+  10 Mar 2009; <chainsaw@gentoo.org> +files/libpri-1.4.9-multilib.patch,
+  +files/libpri-1.4.9-respect-cflags.patch, libpri-1.0.7-r1.ebuild,
+  libpri-1.0.8.ebuild, libpri-1.0.9-r2.ebuild, libpri-1.2.2-r1.ebuild,
+  libpri-1.2.2-r2.ebuild, libpri-1.2.3.ebuild, libpri-1.2.3-r1.ebuild,
+  libpri-1.2.4.ebuild, libpri-1.2.4-r1.ebuild, libpri-1.2.4-r2.ebuild,
+  +libpri-1.4.9.ebuild:
+  Made repoman a lot happier about the state of this ebuild collection.
+
+*libpri-1.4.9 (10 Mar 2009)
+
+  10 Mar 2009; <chainsaw@gentoo.org> +files/libpri-1.4.9-multilib.patch,
+  +files/libpri-1.4.9-respect-cflags.patch, +libpri-1.4.9.ebuild:
+  Version bump to 1.4 branch, for use with Asterisk 1.6 which is masked.
+  Patches rebased. BRIstuff failed to build/patch correctly after repeated
+  attempts, so dropped for now.
 
   08 Dec 2008; Peter Volkov <pva@gentoo.org>
   +files/libpri-1.2.5-gcc42.patch, libpri-1.2.5.ebuild:
diff --git a/net-libs/libpri/files/libpri-1.4.9-multilib.patch b/net-libs/libpri/files/libpri-1.4.9-multilib.patch
new file mode 100644
index 000000000000..4185701f20fb
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.9-multilib.patch
@@ -0,0 +1,52 @@
+diff -uNr libpri-1.4.9.ORIG/Makefile libpri-1.4.9/Makefile
+--- libpri-1.4.9.ORIG/Makefile	2009-03-10 18:08:07.000000000 +0000
++++ libpri-1.4.9/Makefile	2009-03-10 18:11:24.000000000 +0000
+@@ -46,7 +46,7 @@
+ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
+@@ -89,27 +89,27 @@
+ 	fi
+ 
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+-	mkdir -p $(INSTALL_PREFIX)$(libdir)
++	mkdir -p $(LIBDIR)
+ 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+ 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+-	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+-	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+-	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
++	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
++	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
++	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
++	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+-	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+-	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+-	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
++	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+ 
+ uninstall:
+ 	@echo "Removing Libpri"
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+-	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
++	rm -f $(LIBDIR)/libpri.so.$(SONAME)
++	rm -f $(LIBDIR)/libpri.so
++	rm -f $(LIBDIR)/libpri.a
+ 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+ 
+ pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch
new file mode 100644
index 000000000000..c7c5386eeec6
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.9-respect-cflags.patch
@@ -0,0 +1,27 @@
+diff -uNr libpri-1.4.9.ORIG/Makefile libpri-1.4.9/Makefile
+--- libpri-1.4.9.ORIG/Makefile	2009-03-10 17:43:45.000000000 +0000
++++ libpri-1.4.9/Makefile	2009-03-10 17:44:00.000000000 +0000
+@@ -43,7 +43,7 @@
+ DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ libdir?=$(INSTALL_BASE)/lib
+@@ -69,14 +69,6 @@
+ 
+ PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
+ 
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-endif
+-
+ all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ 
+ update:
diff --git a/net-libs/libpri/libpri-1.0.7-r1.ebuild b/net-libs/libpri/libpri-1.0.7-r1.ebuild
index e321b13615b2..bf32dc692967 100644
--- a/net-libs/libpri/libpri-1.0.7-r1.ebuild
+++ b/net-libs/libpri/libpri-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.7-r1.ebuild,v 1.9 2005/09/15 02:45:15 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.7-r1.ebuild,v 1.10 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -17,15 +17,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
-		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch
+		epatch "${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch"
 	fi
 
 	# use system CFLAGS
@@ -38,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.0.8.ebuild b/net-libs/libpri/libpri-1.0.8.ebuild
index e21fbab66510..1d84c61bcb05 100644
--- a/net-libs/libpri/libpri-1.0.8.ebuild
+++ b/net-libs/libpri/libpri-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.8.ebuild,v 1.6 2005/09/15 02:45:15 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.8.ebuild,v 1.7 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -17,15 +17,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc ~amd64"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
-		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch
+		epatch "${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch"
 	fi
 
 	# use system CFLAGS
@@ -38,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.0.9-r2.ebuild b/net-libs/libpri/libpri-1.0.9-r2.ebuild
index 5a7b957ce0c8..6fa817ad43b7 100644
--- a/net-libs/libpri/libpri-1.0.9-r2.ebuild
+++ b/net-libs/libpri/libpri-1.0.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.9-r2.ebuild,v 1.3 2006/06/12 12:51:27 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.0.9-r2.ebuild,v 1.4 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -17,15 +17,13 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc ~amd64"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
-		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch
+		epatch "${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch"
 	fi
 
 	# use system CFLAGS
@@ -38,7 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.2-r1.ebuild b/net-libs/libpri/libpri-1.2.2-r1.ebuild
index 78eb020a22d2..4fe7ccbd83c6 100644
--- a/net-libs/libpri/libpri-1.2.2-r1.ebuild
+++ b/net-libs/libpri/libpri-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.2-r1.ebuild,v 1.2 2007/06/26 02:26:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.2-r1.ebuild,v 1.3 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -27,13 +27,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.2-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
@@ -53,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.2-r2.ebuild b/net-libs/libpri/libpri-1.2.2-r2.ebuild
index 2efd66373d40..9131c91ea284 100644
--- a/net-libs/libpri/libpri-1.2.2-r2.ebuild
+++ b/net-libs/libpri/libpri-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.2-r2.ebuild,v 1.2 2006/05/06 14:41:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.2-r2.ebuild,v 1.3 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -19,7 +19,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${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 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -29,24 +28,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.2-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${S_BRI}/patches/libpri.patch
-#			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+			"${S_BRI}/patches/libpri.patch"
 
-		epatch ${S_BRI}/patches/libpri.patch
-#		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+		epatch "${S_BRI}/patches/libpri.patch"
 	fi
 }
 
@@ -55,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.3-r1.ebuild b/net-libs/libpri/libpri-1.2.3-r1.ebuild
index 65dd7ea28f6c..e3de78fcf412 100644
--- a/net-libs/libpri/libpri-1.2.3-r1.ebuild
+++ b/net-libs/libpri/libpri-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.3-r1.ebuild,v 1.3 2006/10/06 22:53:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.3-r1.ebuild,v 1.4 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -14,7 +14,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${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 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -24,24 +23,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${S_BRI}/patches/libpri.patch
-#			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+			"${S_BRI}/patches/libpri.patch"
 
-		epatch ${S_BRI}/patches/libpri.patch
-#		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+		epatch "${S_BRI}/patches/libpri.patch"
 	fi
 }
 
@@ -50,7 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README TODO LICENSE
+	make INSTALL_PREFIX="${D}" install || die
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.3.ebuild b/net-libs/libpri/libpri-1.2.3.ebuild
index 1b3409175212..b40314f4f6e1 100644
--- a/net-libs/libpri/libpri-1.2.3.ebuild
+++ b/net-libs/libpri/libpri-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.3.ebuild,v 1.1 2006/06/07 17:52:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.3.ebuild,v 1.2 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -19,7 +19,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.gz
 	bri? ( http://www.netdomination.org/pub/asterisk/libpri-${PV}-bristuff-${BRI_VERSION}.diff.gz )"
-#	bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -29,24 +28,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
-#			${S_BRI}/patches/libpri.patch
+			"${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff"
 
-		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
-#		epatch ${S_BRI}/patches/libpri.patch
+		epatch "${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff"
 	fi
 }
 
@@ -55,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
+	make INSTALL_PREFIX="${D}" install || die
 
-	dodoc ChangeLog README TODO LICENSE
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.4-r1.ebuild b/net-libs/libpri/libpri-1.2.4-r1.ebuild
index c4f5507d5870..b6b2279bcd8e 100644
--- a/net-libs/libpri/libpri-1.2.4-r1.ebuild
+++ b/net-libs/libpri/libpri-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4-r1.ebuild,v 1.3 2007/03/13 19:56:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4-r1.ebuild,v 1.4 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -14,7 +14,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${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 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -24,24 +23,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${S_BRI}/patches/libpri.patch
-#			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+			"${S_BRI}/patches/libpri.patch"
 
-		epatch ${S_BRI}/patches/libpri.patch
-#		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+		epatch "${S_BRI}/patches/libpri.patch"
 	fi
 }
 
@@ -50,7 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README TODO LICENSE
+	make INSTALL_PREFIX="${D}" install || die
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.4-r2.ebuild b/net-libs/libpri/libpri-1.2.4-r2.ebuild
index 9e1036cacd3e..d712dbff6169 100644
--- a/net-libs/libpri/libpri-1.2.4-r2.ebuild
+++ b/net-libs/libpri/libpri-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4-r2.ebuild,v 1.3 2007/05/01 09:17:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4-r2.ebuild,v 1.4 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -14,7 +14,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${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 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -24,24 +23,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${S_BRI}/patches/libpri.patch
-#			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+			"${S_BRI}/patches/libpri.patch"
 
-		epatch ${S_BRI}/patches/libpri.patch
-#		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+		epatch "${S_BRI}/patches/libpri.patch"
 	fi
 }
 
@@ -50,7 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README TODO LICENSE
+	make INSTALL_PREFIX="${D}" install || die
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.4.ebuild b/net-libs/libpri/libpri-1.2.4.ebuild
index 0fa9aff1c350..39e111a26f2c 100644
--- a/net-libs/libpri/libpri-1.2.4.ebuild
+++ b/net-libs/libpri/libpri-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4.ebuild,v 1.1 2006/11/27 14:50:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.4.ebuild,v 1.2 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
@@ -14,7 +14,6 @@ DESCRIPTION="Primary Rate ISDN (PRI) library"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/libpri/${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 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -24,24 +23,20 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.3-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.2.3-gentoo.diff"
 
 	if use bri; then
 		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
 
 		# fix a small clash in patches
 		sed -i -e "s:CFLAGS=:CFLAGS+=:" \
-			${S_BRI}/patches/libpri.patch
-#			${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+			"${S_BRI}/patches/libpri.patch"
 
-		epatch ${S_BRI}/patches/libpri.patch
-#		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+		epatch "${S_BRI}/patches/libpri.patch"
 	fi
 }
 
@@ -50,7 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_PREFIX=${D} install || die
-
-	dodoc ChangeLog README TODO LICENSE
+	make INSTALL_PREFIX="${D}" install || die
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.2.5.ebuild b/net-libs/libpri/libpri-1.2.5.ebuild
index c401f35e4cd3..2a2fe4bc141b 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.5 2008/12/08 13:27:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.6 2009/03/10 18:51:15 chainsaw Exp $
 
 inherit eutils
 
diff --git a/net-libs/libpri/libpri-1.4.9.ebuild b/net-libs/libpri/libpri-1.4.9.ebuild
new file mode 100644
index 000000000000..7dea409cebfc
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.9.ebuild,v 1.1 2009/03/10 18:51:15 chainsaw Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.digium.com/pub/libpri/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-respect-cflags.patch"
+	epatch "${FILESDIR}/${P}-multilib.patch"
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die
+
+	dodoc ChangeLog README TODO
+}