Version bump, updated to use bristuff-0.3.0-PRE-1p

(Portage version: 2.1_rc4-r3)

4 files changed, 108 insertions, 1 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index fc795412a352..0890f4dec8d9 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpri
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.52 2006/05/06 14:41:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.53 2006/06/07 17:52:33 stkn Exp $
+
+*libpri-1.2.3 (07 Jun 2006)
+
+  07 Jun 2006; Stefan Knoblich <stkn@gentoo.org>
+  +files/libpri-1.2.3-gentoo.diff, +libpri-1.2.3.ebuild:
+  Version bump, updated to use bristuff-0.3.0-PRE-1p.
 
   06 May 2006; Stefan Knoblich <stkn@gentoo.org> libpri-1.2.2-r2.ebuild:
   Remove RESTRICT from ebuild.
diff --git a/net-libs/libpri/files/digest-libpri-1.2.3 b/net-libs/libpri/files/digest-libpri-1.2.3
new file mode 100644
index 000000000000..3b45107d27d1
--- /dev/null
+++ b/net-libs/libpri/files/digest-libpri-1.2.3
@@ -0,0 +1,6 @@
+MD5 dffc884d05c19afac24e7dc997961adc libpri-1.2.3-bristuff-0.3.0-PRE-1p.diff.gz 45379
+RMD160 49325a45967b6a416919eff2468269d80b9c455f libpri-1.2.3-bristuff-0.3.0-PRE-1p.diff.gz 45379
+SHA256 fbaa63486036e1dad98f614140ed5e39162408586be2a00854931b09ff51dbae libpri-1.2.3-bristuff-0.3.0-PRE-1p.diff.gz 45379
+MD5 f365d9ee29a7253d605729a6d07ebfff libpri-1.2.3.tar.gz 76348
+RMD160 2e113dd213c24499bb61c4caa533173534760061 libpri-1.2.3.tar.gz 76348
+SHA256 f4ca5d72aa4b5e5c99c4e1a9de7235af5ed12b51a20dd757f071f5d7cf9d0fd0 libpri-1.2.3.tar.gz 76348
diff --git a/net-libs/libpri/files/libpri-1.2.3-gentoo.diff b/net-libs/libpri/files/libpri-1.2.3-gentoo.diff
new file mode 100644
index 000000000000..cb8237ceb57f
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.3-gentoo.diff
@@ -0,0 +1,34 @@
+--- libpri-1.2.3/Makefile.orig	2006-04-30 17:17:47.000000000 +0200
++++ libpri-1.2.3/Makefile	2006-06-04 15:08:10.000000000 +0200
+@@ -38,7 +38,7 @@
+ DYNAMIC_LIBRARY=libpri.so.1.0
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ SOFLAGS = -Wl,-hlibpri.so.1.0
+@@ -59,14 +59,6 @@
+ #INSTALL_PREFIX = /opt/asterisk  # Uncomment out to install in standard Solaris location for 3rd party code
+ endif
+ 
+-#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: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ 
+ update:
+@@ -86,7 +78,6 @@
+ ifneq (${OSARCH},SunOS)
+ 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+ 	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+ 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ 	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
diff --git a/net-libs/libpri/libpri-1.2.3.ebuild b/net-libs/libpri/libpri-1.2.3.ebuild
new file mode 100644
index 000000000000..1b3409175212
--- /dev/null
+++ b/net-libs/libpri/libpri-1.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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 $
+
+inherit eutils
+
+## TODO:
+#
+# - bristuff (waiting for next upstream release...)
+#
+
+IUSE="bri"
+
+MY_P="${P/_/-}"
+
+BRI_VERSION="0.3.0-PRE-1p"
+
+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}"
+
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
+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
+
+	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
+
+		epatch ${WORKDIR}/libpri-${PV}-bristuff-${BRI_VERSION}.diff
+#		epatch ${S_BRI}/patches/libpri.patch
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} install || die
+
+	dodoc ChangeLog README TODO LICENSE
+}