New beta; patchset rediffed by Stefan Knoblich in bug #346573. Consolidated Werror removal and CFLAGS patches; remove -O2 and -g as per Agostino "ago" Sarubbo in bug #360139. Contains important PTP fixes with regard to downing/restarting links.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

6 files changed, 159 insertions, 2 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index 6000f9e44c2e..81102de68cba 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/libpri
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.88 2011/05/13 21:47:41 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.89 2011/05/17 08:11:22 chainsaw Exp $
+
+*libpri-1.4.12_beta3 (17 May 2011)
+
+  17 May 2011; Tony Vroon <chainsaw@gentoo.org> +libpri-1.4.12_beta3.ebuild,
+  +files/libpri-1.4.12-multilib.patch,
+  +files/libpri-1.4.12-respect-cflags.patch,
+  +files/libpri-1.4.12-respect-ldflags.patch:
+  New beta; patchset rediffed by Stefan Knoblich in bug #346573. Consolidated
+  Werror removal and CFLAGS patches; remove -O2 and -g as per Agostino "ago"
+  Sarubbo in bug #360139. Contains important PTP fixes with regard to
+  downing/restarting links.
 
   13 May 2011; Tony Vroon <chainsaw@gentoo.org> metadata.xml:
   Maintainer tag was missing in metadata.xml; fixing.
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index c6566dcc35d7..a76c73a5bb63 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,12 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libpri-1.4.11.1-multilib.patch 2503 RMD160 6d007d94fb6066993acdf1d8d90fa1333b9015c6 SHA1 cedd9e2036d691903c880faf974bc5e7fc4f3360 SHA256 5d13bfec3301b699f936a9a8727c6191d9f1e65ecebe7ddebbab5b1eb5de3880
 AUX libpri-1.4.11.1-respect-cflags.patch 1139 RMD160 8acb09b58d5c124ca86269a7ef3b047e0450df17 SHA1 5a81fab8fd294e1b74b476011348fe68f6ae3847 SHA256 29d89457ce283cd59aa09e7b11fc0e0fd9ea95623702e8b94eac8a3afbccd2b6
 AUX libpri-1.4.11.1-respect-ldflags.patch 462 RMD160 3b3f47cf93f51caf927216404647fce8f4387b93 SHA1 31e1f1773b7429bd1126ba40c24fbce5a2c3dd41 SHA256 75a042548af7913f7b7a20017036a55769d38dc62b3000d499f7d4d9c28db48e
 AUX libpri-1.4.11.1-werror-is-ill-advised.patch 595 RMD160 feb91b86aff7e686ddf3d45807dc7df4df854905 SHA1 2baca55d16b8c9905b83c4e68fc7a41b025d96e2 SHA256 5037ab5454363daf77d485508b351e38df95eb05cae57d9588fcc927976ebc0f
+AUX libpri-1.4.12-multilib.patch 2592 RMD160 10309e09d30d930f74befc6308f515670196ad0b SHA1 baf9c25ec2d960b317f2d08c6e7b590631a33d59 SHA256 b2764a9905941fa186cec9da87dd31d75a881eb1588fbec71b1b7433581b56a7
+AUX libpri-1.4.12-respect-cflags.patch 1427 RMD160 5b9a7fe0b0b0eb72d89ff054b71f08c62e3873e6 SHA1 10ac792147701021d5a23d0ef620be29c6013646 SHA256 1f053ecece913a00b93d7a508ac4d3e94cd21de45f5eb13937a39dcbf7ac23c0
+AUX libpri-1.4.12-respect-ldflags.patch 397 RMD160 a968b57c0712512d8e728637d3560a6e6e04ed9a SHA1 79d23fce6f343cacdf1f83715a249c55f1aaa7cf SHA256 22c9336e30a323e1fc77121f419de10e5cf55d081fa7d9d550714d5cae8c9da5
 DIST libpri-1.4.11.4.tar.gz 230748 RMD160 82d2709277a03c569d1f8153f3baedea45d1b5f9 SHA1 5cdb7342d799ea3bda863f0ce680203ccec93ecd SHA256 93332cda6f5eacb18efde21bf3a5e67fcfef79d0f62333239c428ffb8ecbdcca
 DIST libpri-1.4.11.5.tar.gz 235367 RMD160 96673fbb52d93d269bf51306631e93e453071409 SHA1 43dc4037706fb9792be0344c600c18b66fd6578a SHA256 f72f0bbf9115be939ccf24ebd83a3a1482603743dff91952d8afacb16b954e6f
 DIST libpri-1.4.12-beta2.tar.gz 312648 RMD160 c953c66c94695e80d50e9e620d652af985323cbb SHA1 ede623b4ea14c1fd28c8cf29f87b2c56ad356236 SHA256 a2436cb8e4dcfa08edae1b8f54783e79d1201b5fdf84d4e7da631140706c25e6
+DIST libpri-1.4.12-beta3.tar.gz 323534 RMD160 89cc8783de78ca2173320ad56c391101752c9028 SHA1 f58e537003ef5e767db9cace8d1ee37c9132edb3 SHA256 3490c6620d4372ced3ab320315069071ee1e3f53c5d32e90a93634006700ab07
 EBUILD libpri-1.4.11.4.ebuild 877 RMD160 1d5718afbe58676d85eebfdceebab4fc0e8a170e SHA1 d042be7869625328538c778a661dca2d6913de0a SHA256 cea4106de47f8d80adcd9b1f42dee0b8ea82aa5e2a45bf8966bc9f91ce8bdcdc
 EBUILD libpri-1.4.11.5.ebuild 869 RMD160 6978517718f84893d252fe3250be0513abc2b96c SHA1 d4e9f4710430a1e67b05cd4814a4ff1679886754 SHA256 736215fda29532d5154ffa797b0d9d741391d42b0a98925e9c8025a4fa9c1e1b
 EBUILD libpri-1.4.12_beta2.ebuild 919 RMD160 5f88b3fc377915d6410fe0b581487d1f725cbb9c SHA1 aecec6515d603c5ec6d470b9e977eda8194606ab SHA256 ef85ceb81d79ed2acf336863d6da1c1bf7eab75252efea2ddf312ff2745cc54f
-MISC ChangeLog 14035 RMD160 105175fded267fd733cacfc9c2fda08dcfe6b600 SHA1 cbf218d10f418ab48b56c13b990eb07ffc751317 SHA256 6433ffea2292a5f0a629af0e6eb3d36e9dba1066e7f170c22d155333326f8dc3
+EBUILD libpri-1.4.12_beta3.ebuild 855 RMD160 16fc92ec645a18ae7ea6bd00b410ccaa4d9562b6 SHA1 f5145a4d7f5eeb6bcb319b185333e35402d03550 SHA256 3733ab889b476d1b953ee3cefecf2111636152454a5ba9b005059239568c8d22
+MISC ChangeLog 14532 RMD160 e3364f00d14d84da96f82038a5dea431fc361853 SHA1 aa448edfe42759f612319e2cfa12ad9a0ede629c SHA256 0b1bf0712db3da2d864251d4404c4c0f5ff7652600981aca3908a43d820d7096
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3SLacACgkQp5vW4rUFj5og8QCeIPHLfG2ICbshUkGptn2mE6HN
+YZgAmQHFFqxZDJgq+iqr+296t0vDNuhy
+=QYyC
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libpri/files/libpri-1.4.12-multilib.patch b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
new file mode 100644
index 000000000000..bb30900a0ca5
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
@@ -0,0 +1,51 @@
+--- libpri-1.4.12-beta3/Makefile.orig	2010-10-07 06:00:04.000000000 +0200
++++ libpri-1.4.12-beta3/Makefile	2010-11-23 22:04:59.884448930 +0100
+@@ -96,7 +96,7 @@
+ CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ ifneq ($(findstring Darwin,$(OSARCH)),)
+   SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+@@ -168,27 +168,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.12-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
new file mode 100644
index 000000000000..bad39bd62471
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
@@ -0,0 +1,37 @@
+--- libpri-1.4.12-beta3/Makefile.orig	2010-11-23 22:06:06.768618707 +0100
++++ libpri-1.4.12-beta3/Makefile	2010-11-23 22:07:41.328444833 +0100
+@@ -93,7 +93,7 @@
+ 	rose_qsig_mwi.lo \
+ 	rose_qsig_name.lo \
+ 	version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+@@ -127,20 +127,12 @@
+ 
+ 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
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++ifneq ($(CODE_COVERAGE),)
++  LIBPRI_OPT=
++  COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
++  COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+ else
+-  ifneq ($(CODE_COVERAGE),)
+-    LIBPRI_OPT=
+-    COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+-    COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+-  else
+-    LIBPRI_OPT=-O2
+-  endif
++  LIBPRI_OPT=
+ endif
+ 
+ ifeq ($(CPUARCH),i686)
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch
new file mode 100644
index 000000000000..14ad22e83191
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- libpri-1.4.12-beta3/Makefile.orig	2010-11-23 22:08:35.749769167 +0100
++++ libpri-1.4.12-beta3/Makefile	2010-11-23 22:10:01.036710213 +0100
+@@ -211,7 +211,7 @@
+ 	ranlib $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+-	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+ 	ln -sf libpri.so.$(SONAME) libpri.so
+ 
diff --git a/net-libs/libpri/libpri-1.4.12_beta3.ebuild b/net-libs/libpri/libpri-1.4.12_beta3.ebuild
new file mode 100644
index 000000000000..70b430879b5c
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.12_beta3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12_beta3.ebuild,v 1.1 2011/05/17 08:11:22 chainsaw Exp $
+
+EAPI="3"
+
+inherit base
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.12-multilib.patch"
+	"${FILESDIR}/${PN}-1.4.12-respect-cflags.patch"
+	"${FILESDIR}/${PN}-1.4.12-respect-ldflags.patch"
+)
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
+		|| die "emake install failed"
+
+	dodoc ChangeLog README TODO || die "dodoc failed"
+}