Re-enabled bri support.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 24 insertions, 13 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index fc522b3bd747..daafd3becbbd 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libpri
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.41 2005/11/18 16:24:14 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.42 2005/11/20 21:33:56 stkn Exp $
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.2.0.ebuild:
+  Re-enabled bri support.
 
 *libpri-1.2.0 (18 Nov 2005)
 
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 004c9cfcdd7f..96131f070a35 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,11 +1,11 @@
 MD5 d988d508ed6a6b40c542b1af643e2446 libpri-1.0.7-r1.ebuild 1002
 MD5 d4eea14fb867c7510353cd463eae8442 libpri-1.0.8.ebuild 998
-MD5 e3fbbfe6c60e8c31fe3f184fd7870835 libpri-1.2.0.ebuild 1051
+MD5 a513d4137902f80673d22bf86dcccc61 libpri-1.2.0.ebuild 1160
 MD5 a5d65ff8326161e7845e26b721f4d6dd libpri-1.0.9.ebuild 996
 MD5 290ac8efa69f6a6cdcccddac3c963388 libpri-1.0.6.ebuild 1000
 MD5 20a5cc1d89bd50c1ebe632b199707b9f libpri-1.0.7.ebuild 1000
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 d7cef760192021efa1a2ee54f93838e3 ChangeLog 5220
+MD5 b534d3be5b516402c62444526bc2b023 ChangeLog 5317
 MD5 46619e05129738f3b85e97fc2e76d958 libpri-1.0.4.ebuild 598
 MD5 57a84bfa8a8a1dae9eff85b7e259fda4 libpri-1.0.9-r1.ebuild 999
 MD5 3a2b30f73ce69b5676222b6050648531 files/libpri-1.2.0-gentoo.diff 2007
@@ -15,5 +15,5 @@ MD5 434c5302587dc0457610cdb0fa7b3627 files/digest-libpri-1.0.8 134
 MD5 4077c9b011632414cb2cdb36e1b24c27 files/digest-libpri-1.0.6 134
 MD5 460b3c5461f842545b60d6c3f716631b files/digest-libpri-1.0.7 134
 MD5 287da2d882869ddba4be296407e0632f files/digest-libpri-1.0.7-r1 134
-MD5 7b7227dc45fedd6d746680da010475ff files/digest-libpri-1.2.0 63
+MD5 04841b1acd89fb3086a38ea577643160 files/digest-libpri-1.2.0 135
 MD5 4794bc9f4c11421a31a1d665ee5adef2 files/digest-libpri-1.0.9-r1 134
diff --git a/net-libs/libpri/files/digest-libpri-1.2.0 b/net-libs/libpri/files/digest-libpri-1.2.0
index a46c2681f835..acbf972751f0 100644
--- a/net-libs/libpri/files/digest-libpri-1.2.0
+++ b/net-libs/libpri/files/digest-libpri-1.2.0
@@ -1 +1,2 @@
+MD5 884979fbfb75e6cdf7d8bdb66841e728 bristuff-0.3.0-PRE-1.tar.gz 159742
 MD5 e22af697ff4002944436449c1803fc57 libpri-1.2.0.tar.gz 75899
diff --git a/net-libs/libpri/libpri-1.2.0.ebuild b/net-libs/libpri/libpri-1.2.0.ebuild
index 6b617b023f69..31792c7d87df 100644
--- a/net-libs/libpri/libpri-1.2.0.ebuild
+++ b/net-libs/libpri/libpri-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0.ebuild,v 1.1 2005/11/18 16:24:14 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0.ebuild,v 1.2 2005/11/20 21:33:56 stkn Exp $
 
 inherit eutils
 
@@ -9,19 +9,21 @@ inherit eutils
 # - bristuff (waiting for next upstream release...)
 #
 
-IUSE=""
+IUSE="bri"
 
 MY_P="${P/_/-}"
 
-#BRI_VERSION="0.2.0-RC8h"
+BRI_VERSION="0.3.0-PRE-1"
 
 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/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+SRC_URI="http://ftp.digium.com/pub/libpri/${MY_P}.tar.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"
@@ -34,10 +36,15 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.2.0-gentoo.diff
 
-#	if use bri; then
-#		einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"
-#		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/libpri.patch
-#	fi
+	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
+
+		epatch ${S_BRI}/patches/libpri.patch
+	fi
 }
 
 src_compile() {