Version bump, much of the patching rebased by Oliver Jaksch. Closes bug #321625.

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

7 files changed, 159 insertions, 7 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index b84690d75702..34a183e996f0 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/libpri
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.77 2009/12/08 22:58:57 chainsaw Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.78 2010/06/07 10:02:59 chainsaw Exp $
+
+*libpri-1.4.11.1 (07 Jun 2010)
+
+  07 Jun 2010; <chainsaw@gentoo.org> +libpri-1.4.11.1.ebuild,
+  +files/libpri-1.4.11.1-multilib.patch,
+  +files/libpri-1.4.11.1-respect-cflags.patch,
+  +files/libpri-1.4.11.1-respect-ldflags.patch,
+  +files/libpri-1.4.11.1-werror-is-ill-advised.patch:
+  Version bump, much of the patching rebased by Oliver Jaksch. Closes bug
+  #321625.
 
 *libpri-1.4.10.2 (08 Dec 2009)
 
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 442638d66135..bc13284fb90f 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -5,23 +5,29 @@ AUX libpri-1.2.5-gcc42.patch 292 RMD160 60c6926771a962af681b4aabb7992ee324ca13d6
 AUX libpri-1.2.5-gentoo.diff 1244 RMD160 38821ad5d9fc89ddf2d207ddd0e2d818b7174acb SHA1 9142d76c73d2e908437b69d22da5b40df6926457 SHA256 a8bd018ccbf6670dff74daa568bacc1c5772caafc2ef4e8779d9d89ba99bf098
 AUX libpri-1.2.5-multilib.patch 2703 RMD160 a390cd241bb7bea56a6f78c91415826f00ab3fc2 SHA1 371a859d75b759b995410af1c377a8d80dc0f45f SHA256 7e045f6499c54d0242b421e2d71f0ccb7a6b20c30a0f82dd7cf8281ac9dded89
 AUX libpri-1.4.10.2-respect-ldflags.patch 470 RMD160 2d72db3bbd5e763017e1c1ff21cefe29611f1c7c SHA1 beec2d09ceb824713cb02d5abe5aa2d2edb2bcaf SHA256 105c5304cb8d62c4d4a8e9df32c20426b169442c17f3a0269df67bce4164beef
+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.9-multilib.patch 2477 RMD160 52a83969e92aa045af64c977ac46e9298fc598b2 SHA1 6e6865b6be945e30ff871c316820008bcafc389a SHA256 8ab7b92298a5dba8e20b1f8571634f3b8e0b149d745080367e9b19c0aa7e23fc
 AUX libpri-1.4.9-respect-cflags.patch 1229 RMD160 73173c7b7610fe3f994581728f71de07a62a21a1 SHA1 191687fd894d56cc28de849b0cca7bebc4639d0d SHA256 fda8dd3d7ac962b8d27598b7ff169a60018e1738b89e89a61dcd6c08742f60c1
 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.10.1.tar.gz 97607 RMD160 7a8ffadf4ccd3691cf493524f9f102c4d31614f7 SHA1 dae9961f27f15a9680fe6f98dc89bbdd56931e92 SHA256 ac500e0e0b4f150c8741e939d289fcbcaa653dfff67cdec11f18417b92f76d21
 DIST libpri-1.4.10.2.tar.gz 96019 RMD160 91816e5e47bda63845cc0a68350b7b68de167e5b SHA1 301e13f731e1d12db0b83779791108a5ad07b89e SHA256 d2fcf66cb45fe0358936e14977ab5b9276c67fe6efb3ccbb5d70cbc303c86ce9
+DIST libpri-1.4.11.1.tar.gz 224784 RMD160 dcb2a75b578ba1e0dfb4d92ecc6831aa679aeffd SHA1 984fd3185bda0d513cd9f0da87075c23a7df23f7 SHA256 38cf25da9c46dea7d89f470c5e319ede2355a3ecdd9b01a135ff7dd4e70bf8b4
 DIST libpri-1.4.9.tar.gz 94075 RMD160 c4de221810b815402a5a4a599750116b65c1ac29 SHA1 67f5001f37452ca851c312510732b9fef8135520 SHA256 0dae5db3f46614330e756a2b7e29143f10132ca4eda2a71869fd89df62d522b7
 EBUILD libpri-1.2.5.ebuild 1507 RMD160 3a391b79b35b833277d608320589b5b094c1289d SHA1 927e57bea2d543c8da14208c62778dd608eb638c SHA256 fd51bcaadb50661fe358fd8ea149ef6761069ff3f392a85284460247047d40a7
 EBUILD libpri-1.4.10.1.ebuild 855 RMD160 132afa38f432304f2e013c24d5b0aba0029400c2 SHA1 ef9279406b46a9faafdd7ea766672c43a182bd2c SHA256 004bd42a93563fcb0d60fa1ebf3dcc9e188771043bfa5cd9cada37e9bf17ace6
 EBUILD libpri-1.4.10.2.ebuild 917 RMD160 4fb8e2d506468071efcc9f34816911df978ed59d SHA1 33b03d18367b233f700a4ffcc226da6f0ceeb777 SHA256 0d7ee49585fa94e0a9fbd4a1db074260bda5ecaa2732775b3a63e08873e8f0f4
+EBUILD libpri-1.4.11.1.ebuild 839 RMD160 caf5a484fa769071fc1270727e2ce69e6e40bc37 SHA1 d83f1d9cc72b88791ffc0f6a69b72dabfea6e23d SHA256 6429562ae6e1a3e85c86dc29138e0f776ccf260a6a6710f6059a55afc476da72
 EBUILD libpri-1.4.9.ebuild 829 RMD160 cc6854aa3d1c1523d88de75064407565b83cbb9f SHA1 ec614e202b5c570cd893183106bf7ae38a4dc002 SHA256 4f7664287174ebd3343e38f51936fc7200011ea243ef75cfd210f41b9b1dc080
-MISC ChangeLog 11447 RMD160 c9828bb7938a8d27dd5c4181e18adc9dcfa4bdb0 SHA1 6743412088d82dce56fbf89caf2fc5278637a038 SHA256 87f2bf0184c7a9d9321ff93071f15ec86ef92d196baa09cd48e2cbd04960f293
+MISC ChangeLog 11817 RMD160 9c634485fed20fc1c7c7b4136626b61f1ecd615b SHA1 bbd851c9c10b62377c016ffd52420bd6d9281a45 SHA256 e8741a39ab48d931a77ee5bcd3ef3154eac282a9bdd0e127be4c051957e1d6d9
 MISC metadata.xml 239 RMD160 7e093a1fb5fd58611f0357a94a8c0a2b00e8a0e8 SHA1 07852f566e47938d6c03a87c597ad652db6aa927 SHA256 e7205896384d0cc163aa0e96324f6edcd58ec8a1a6589346eaa8130ca9bc6e0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkse2ksACgkQp5vW4rUFj5oKPgCfQZrgkpzdYNVE+uWmoAM0gSvI
-J2AAoKPmAMs0axKS1d9cYYAjf1E4opL9
-=aTWd
+iEYEARECAAYFAkwMw90ACgkQp5vW4rUFj5oI/wCfavwOuyaDy0SQYi5e9B3CPcDZ
+aJUAn0yE3erB7kTgFvmVee6mfBGvcQ2E
+=Jfc2
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
new file mode 100644
index 000000000000..b95b9702d9f8
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
@@ -0,0 +1,52 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-03-10 18:08:07.000000000 +0000
++++ libpri-1.4.11/Makefile	2009-03-10 18:11:24.000000000 +0000
+@@ -86,7 +86,7 @@
+ CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ 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 XGNUX))
+@@ -135,27 +135,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.11.1-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
new file mode 100644
index 000000000000..b6a4db487747
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
@@ -0,0 +1,29 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-03-10 17:43:45.000000000 +0000
++++ libpri-1.4.11/Makefile	2009-03-10 17:44:00.000000000 +0000
+@@ -83,7 +83,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)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ libdir?=$(INSTALL_BASE)/lib
+@@ -108,16 +108,7 @@
+ export PRIVERSION
+ 
+ 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
+-else
+ LIBPRI_OPT = -O2
+-endif
+ 
+ ifeq ($(CPUARCH),i686)
+ CFLAGS += -m32
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
new file mode 100644
index 000000000000..778496faef2b
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
+--- libpri-1.4.11.ORIG/Makefile	2009-12-08 22:55:12.729738494 +0000
++++ libpri-1.4.11/Makefile	2009-12-08 22:55:58.645775496 +0000
+@@ -186,7 +186,7 @@
+ 	ranlib $(STATIC_LIBRARY)
+ 
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+-	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++	$(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+ 	ln -sf libpri.so.$(SONAME) libpri.so
+ 
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
new file mode 100644
index 000000000000..c0e2d9893b35
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
@@ -0,0 +1,12 @@
+diff -uNr libpri-1.4.11.1.ORIG//Makefile libpri-1.4.11.1/Makefile
+--- libpri-1.4.11.1.ORIG//Makefile	2010-06-07 10:59:44.000000000 +0100
++++ libpri-1.4.11.1/Makefile	2010-06-07 10:59:52.000000000 +0100
+@@ -83,7 +83,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)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
diff --git a/net-libs/libpri/libpri-1.4.11.1.ebuild b/net-libs/libpri/libpri-1.4.11.1.ebuild
new file mode 100644
index 000000000000..ae372577970a
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.11.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.11.1.ebuild,v 1.1 2010/06/07 10:02:59 chainsaw Exp $
+
+EAPI="3"
+
+EAPI=3
+inherit base
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-multilib.patch"
+	"${FILESDIR}/${P}-respect-cflags.patch"
+	"${FILESDIR}/${P}-respect-ldflags.patch"
+	"${FILESDIR}/${P}-werror-is-ill-advised.patch"
+)
+
+src_install() {
+	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
+		|| die "emake install failed"
+
+	dodoc ChangeLog README TODO || die "dodoc failed"
+}