net-libs/libpri-1.4: version bump, added ~amd64, ~x86 keywords

svn path=/trunk/; revision=703

5 files changed, 80 insertions, 60 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index ec5e63e..72dc423 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jul 2008; Rambaldi <rambaldi@xs4all.nl>
+  +files/libpri-1.4.5-gentoo.diff, ++, -libpri-1.4.3-r1.ebuild:
+  net-libs/libpri-1.4: version bump, added ~amd64, ~x86 keywords
+
   27 Mar 2008; Rambaldi <rambaldi@xs4all.nl> +libpri-1.2.5-r2.ebuild,
   -libpri-1.4.0.ebuild, -libpri-1.4.1.ebuild, +libpri-1.4.3-r1.ebuild,
   +libpri-1.6.0_beta1-r1.ebuild, +metadata.xml:
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index c4ec903..9c4b3c1 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -4,13 +4,14 @@ AUX libpri-1.2.5-multilib.patch 2703 RMD160 a390cd241bb7bea56a6f78c91415826f00ab
 AUX libpri-1.4.0-gentoo.diff 1832 RMD160 de0085863cbf7a6a806c28267c44a2d12b990d2f SHA1 cb6af07c0ea49a9cf4d4320968f002d868a3a631 SHA256 d03e1611ae4a835322ebb2c2ab320211ecdea860ef5bdd789ced0f6730c181bd
 AUX libpri-1.4.1-gentoo.diff 1895 RMD160 34e45c6a8c10c7d5d160b65618634bfe4b715686 SHA1 c0c32f90408c2663a6f6f88452572f9857e277e8 SHA256 20e10cf8867892a4fd488afd8b5626377225ba26403935878473ca9b3d1af578
 AUX libpri-1.4.3-gentoo.diff 1849 RMD160 2f00b1b475fe109adbc9aa4742b3207a9c724ba0 SHA1 2279a97660a5bd4659275832f61fa937eacc1234 SHA256 354994426d8f716341eb86fc278fdf554f9caef4d0f310b12261542c171bf5e9
+AUX libpri-1.4.5-gentoo.diff 1810 RMD160 e03e23bd682ce937d5b770ed5e594ff19655c740 SHA1 485218db6417ada935a9379eb06d68a4b8494f3f SHA256 5d4a1de7f6a836b689c249892af7736ccbedff0cce6b488e1d7281f7c57d8bd3
 AUX libpri-1.6.0_beta1-gentoo.diff 1849 RMD160 2f00b1b475fe109adbc9aa4742b3207a9c724ba0 SHA1 2279a97660a5bd4659275832f61fa937eacc1234 SHA256 354994426d8f716341eb86fc278fdf554f9caef4d0f310b12261542c171bf5e9
 DIST bristuff-0.3.0-PRE-1y-h.tar.gz 286224 RMD160 bf0b9fce76c68565837b56676262fdd055240653 SHA1 cefd78476b6e394672de27849ca4a02b81a7ef1d SHA256 5657e2a50cfe35a64d9aa8caea4c3306539ed81a4ac955a9792a5d58c471a03f
 DIST libpri-1.2.5.tar.gz 77446 RMD160 6069449a39493d789f764e106f5c136714dff1d6 SHA1 ece4973c2cce493ba99c503dc6b6638e6b1b780f SHA256 02ab16e9ba02f57f745e6f260e08b1bc2ff442329db5345e7f42d70ad9ab7904
-DIST libpri-1.4.3.tar.gz 81741 RMD160 d9197b80e4100dbaf4e90e4e43558440703103cb SHA1 e56426b94dd66c5f8cd30be165196080b7275808 SHA256 aec293708e3f70e0dc6352ac33a6680249c0795a9eb8f31972a95d5e2f41bd69
+DIST libpri-1.4.5.tar.gz 92979 RMD160 0bc9b9eda0e910a42462748312823cc3b38bfd93 SHA1 f5406e48d6fba78da6e942c8fc66a0c4945f6304 SHA256 e346786945bada9ab857da70d1e8b01db49d16d0f7720f24d9920723126a1ed5
 DIST libpri-1.6.0-beta1.tar.gz 88417 RMD160 d210bad51cdefd78d7900ac84e9770450868d140 SHA1 b1816b9a2d88a5dfa727efdd04b18fff5371c906 SHA256 d42bd8c70a4f76cb2ec1795497976e4908a3ec39373570284b183344f4456265
 EBUILD libpri-1.2.5-r2.ebuild 1336 RMD160 d03860e38ebf212d7fc0d03dbada66dbbebc3818 SHA1 e181d26c14978ff390ae6ead0b7e251d1e97beb7 SHA256 cecc5e8e709a91a64967db8d7d09f20b4c118af7e43fede11f837001e8d3494d
-EBUILD libpri-1.4.3-r1.ebuild 1235 RMD160 3f5c945100df6f0454fb89a47a4c4e5b87beb6dd SHA1 dd2e4363f79c9cebd4b24d84d0842542c15e24d8 SHA256 99105d4ac01e2ad90fb6e1fceaac70382fca9c47686b4d552a2c7b1827c38219
+EBUILD libpri-1.4.5.ebuild 615 RMD160 488fd775cd0c79a6a0bdc56799ae3c0ea632fbd4 SHA1 da45132ebed60d71e9eade3fa2573f111606f39b SHA256 51aa6923d42e49407e60a86fc532b0f020b2364cf1b43ddd17f64aefc4a08018
 EBUILD libpri-1.6.0_beta1-r1.ebuild 624 RMD160 b64fb9cc825f81fbfa1d5be44d464aa206780802 SHA1 5682be6aa9c955a16d988d2c0e59ff782123c0a9 SHA256 d1e4e107965bdd39f792d4d845b11942461a21c5b850eeafb57880a1aec7a90b
-MISC ChangeLog 1128 RMD160 3b4a928da358fc0a6f00c0a3b4f87c728b4be9c7 SHA1 b29fef9a332d1cc7e3b1bd90bb7168907d342084 SHA256 5e6cb9d3421cc49542c94ce663768975437e513191741cc12dd9855e688bc766
+MISC ChangeLog 1303 RMD160 56cf42d9e2436f0c9961da1cb4395c35b4bfb3a4 SHA1 6593590b2565c85da7e53cfb9be30a65a10e19fc SHA256 5030f82e51ac111975f5df14dfe2e49146645da9942fcf0e4045bba585e02f4c
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
diff --git a/net-libs/libpri/files/libpri-1.4.5-gentoo.diff b/net-libs/libpri/files/libpri-1.4.5-gentoo.diff
new file mode 100644
index 0000000..9dded6a
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.5-gentoo.diff
@@ -0,0 +1,34 @@
+--- libpri-1.4.5/Makefile.org	2008-07-12 15:46:07.000000000 +0200
++++ libpri-1.4.5/Makefile	2008-07-12 15:48:23.000000000 +0200
+@@ -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
+ SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+@@ -68,14 +68,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: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ 
+ update:
+@@ -101,7 +93,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 /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+ 	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.$(SONAME) libpri.so)
+ 	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.4.3-r1.ebuild b/net-libs/libpri/libpri-1.4.3-r1.ebuild
deleted file mode 100644
index b9e1e8f..0000000
--- a/net-libs/libpri/libpri-1.4.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-#IUSE="bri"
-IUSE=""
-
-MY_P="${P/_/-}"
-
-#BRI_VERSION="0.3.0-PRE-1v"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-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
-#
-#		epatch "${S_BRI}"/patches/libpri.patch
-##		epatch "${WORKDIR}"/libpri-${PV}-bristuff-${BRI_VERSION}.diff
-#	fi
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make INSTALL_PREFIX="${D}" install || die
-
-	dodoc ChangeLog README TODO LICENSE
-}
diff --git a/net-libs/libpri/libpri-1.4.5.ebuild b/net-libs/libpri/libpri-1.4.5.ebuild
new file mode 100644
index 0000000..a2e9344
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+IUSE=""
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://ftp.digium.com/pub/libpri/releases/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make INSTALL_PREFIX="${D}" install || die
+
+	dodoc ChangeLog README TODO
+}