Incorporate USE="static-libs" functionality and bump to EAPI 4 as suggested by Agostino "ago" Sarubbo in bug #377603. Remove old ebuilds & patches.

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

14 files changed, 29 insertions, 346 deletions

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index c220fd6eb6d2..1d387dfb4468 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,21 @@
 # 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.94 2011/08/07 15:25:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.95 2011/08/17 10:27:06 chainsaw Exp $
+
+*libpri-1.4.12-r2 (17 Aug 2011)
+
+  17 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
+  -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, -libpri-1.4.11.4.ebuild,
+  -libpri-1.4.11.5.ebuild, -libpri-1.4.12_beta2.ebuild,
+  -libpri-1.4.12_beta3.ebuild, -libpri-1.4.12.ebuild, +libpri-1.4.12-r2.ebuild,
+  -files/libpri-1.4.12-released-respect-cflags.patch,
+  -files/libpri-1.4.12-respect-cflags.patch,
+  -files/libpri-1.4.12-respect-ldflags.patch:
+  Incorporate USE="static-libs" functionality and bump to EAPI 4 as suggested
+  by Agostino "ago" Sarubbo in bug #377603. Remove old ebuilds & patches.
 
   07 Aug 2011; Markus Meier <maekke@gentoo.org> libpri-1.4.12-r1.ebuild:
   x86 stable, bug #376573
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 83c251e05e0d..5d47204f34e6 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,32 +1,17 @@
 -----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-released-respect-cflags.patch 1380 RMD160 ba669e0feb90be9cc4cb829fbfe1e176e6e3b3e7 SHA1 ee9e86be6dadd3d1e90635750f50b08cebdbc144 SHA256 0d27aeb033f47309ba38bc494664294da2227043c3983d0fabc390b69769154e
-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
 AUX libpri-1.4.12-respect-user-flags.patch 1694 RMD160 364cb3e1de959f3d38b707a38799f446632e66e3 SHA1 98cf49d5521e7353d8e81fe3876c4998d78f829e SHA256 a34e0fd4bef4e6fa28ef76f67edf83586197b8a41660b5594a2ab1a62f4ae9f0
-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
 DIST libpri-1.4.12.tar.gz 339669 RMD160 0cfd14463c58c02e30c25e0a42ef2c7e07cd2164 SHA1 20db95cbc358ab5ca83f32f8275d59e60e03d7af SHA256 c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
-EBUILD libpri-1.4.11.4.ebuild 874 RMD160 42abadd7ad2014958170cec4e27a5b4c27ca27fd SHA1 da4f67ba663a745aff7e7cc05141789b44404cde SHA256 c9723470a2314d0dc9324c2f297dbda49cd84dd9e19b4bd011e580f767aa8c91
-EBUILD libpri-1.4.11.5.ebuild 866 RMD160 c1d3aff641cc6a7dfbae14791bc361818bf308dd SHA1 fc5ca614c977aba009a5adfb25deedf4789d9156 SHA256 9e0db284fe7331872a5242850add6ed6bbfeaf860bc2fb7e45e3db3bf89e968a
 EBUILD libpri-1.4.12-r1.ebuild 797 RMD160 b48b5592e78f9b3afd60e688a8788e02fe7b792d SHA1 6e697ad6a3db1d2fe6d3f214b42b81c15cb7a968 SHA256 c93ecb37ae9d9ab2da6d01ed1657d1dbfbde77aafc489af1660c6df747f504fa
-EBUILD libpri-1.4.12.ebuild 855 RMD160 a59492aa794190db5230929bd01c6741b757832a SHA1 7e56080de5d0af15341962dce5ef05d52b4422d2 SHA256 983c870aeeece7bdb6c57daa4ba12822c377f996d73a0f6a2e769107a098dd29
-EBUILD libpri-1.4.12_beta2.ebuild 916 RMD160 33974ac7f770f6088af48964e530f90b4aa44151 SHA1 026f6feac01a3974ea80e9e6ade58f2619d45281 SHA256 66165e0777ab849d8a0e86a4bbf5a55b798742e261aa2fc815c3891686c14068
-EBUILD libpri-1.4.12_beta3.ebuild 852 RMD160 a6a623e57818f23292ce3fdf403ea3f32f1c7292 SHA1 64ad81c63504204688c789f2100b81ec3a96ae05 SHA256 81979ecd460e5f4e59ac85cb06312f36f706709e26136797d67059da50577b73
-MISC ChangeLog 15565 RMD160 6c3fed05279eefd3b1669a1a9943ad0cef2e5855 SHA1 5800f2c69f6939ba6b60fc396bc0ec2a555f350e SHA256 86fdc94ecd74b151295892940cb1c95aa248fdcbc4bc58fc3f795faa329afb42
+EBUILD libpri-1.4.12-r2.ebuild 807 RMD160 e68cadaccb63616f9ae307dad484edd75401ae59 SHA1 11ca14a982f6a970f66a99f0c14ef82ff226313c SHA256 e8bfe545528dc72caf45e04b2ee7dfdd7311596790a10fc49ca412f1584582c6
+MISC ChangeLog 16297 RMD160 52dec2ffecd0294c28f3dfff40b2e790d2957e06 SHA1 c09ec7190c7e3b9597e12b84d3d96eae6e675938 SHA256 9fb6f8c7e2153d808739d102d4f5a0268aa9d9766d6e66fced776190251d1700
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4+rqkACgkQkKaRLQcq0GI1oACfflsvmrF8IWJSecmQlBmCp8Fw
-LIUAn3E7e1vVLhp2F0f5LspDQmPCPpen
-=5EpX
+iEYEARECAAYFAk5Ll4EACgkQp5vW4rUFj5p1bgCePlRuDOQ3FL2mIRtriPnjGKsZ
+R6oAnRnUVYsH4W1WR0B7YpofAt0VJmqI
+=r8wI
 -----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
deleted file mode 100644
index b95b9702d9f8..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index b6a4db487747..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 778496faef2b..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index c0e2d9893b35..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/libpri-1.4.12-released-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch
deleted file mode 100644
index 560bd34bcff0..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libpri-1.4.12/Makefile.orig	2011-07-07 16:18:34.185504616 +0200
-+++ libpri-1.4.12/Makefile	2011-07-07 16:32:09.095312715 +0200
-@@ -90,7 +90,7 @@
- 	rose_qsig_mwi.lo \
- 	rose_qsig_name.lo \
- 	version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-@@ -124,20 +124,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-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
deleted file mode 100644
index bad39bd62471..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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
deleted file mode 100644
index 14ad22e83191..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.11.4.ebuild b/net-libs/libpri/libpri-1.4.11.4.ebuild
deleted file mode 100644
index 75106ded6c7f..000000000000
--- a/net-libs/libpri/libpri-1.4.11.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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.11.4.ebuild,v 1.4 2011/07/27 09:04:41 xarthisius 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 ~sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-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"
-}
diff --git a/net-libs/libpri/libpri-1.4.11.5.ebuild b/net-libs/libpri/libpri-1.4.11.5.ebuild
deleted file mode 100644
index 2a73156bb09e..000000000000
--- a/net-libs/libpri/libpri-1.4.11.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.11.5.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius Exp $
-
-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 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-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"
-}
diff --git a/net-libs/libpri/libpri-1.4.12_beta3.ebuild b/net-libs/libpri/libpri-1.4.12-r2.ebuild
index 85a4ce59d2aa..4eeb32d6c39e 100644
--- a/net-libs/libpri/libpri-1.4.12_beta3.ebuild
+++ b/net-libs/libpri/libpri-1.4.12-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2011/07/27 09:04:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12-r2.ebuild,v 1.1 2011/08/17 10:27:06 chainsaw Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit base
 
@@ -16,17 +16,15 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="static-libs"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.4.12-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.12-respect-cflags.patch"
-	"${FILESDIR}/${PN}-1.4.12-respect-ldflags.patch"
+	"${FILESDIR}/${PN}-1.4.12-respect-user-flags.patch"
 )
 
 src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
-		|| die "emake install failed"
-
-	dodoc ChangeLog README TODO || die "dodoc failed"
+	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+	use static-libs || find "${D}" -name '*.a' -delete
+	dodoc ChangeLog README TODO
 }
diff --git a/net-libs/libpri/libpri-1.4.12.ebuild b/net-libs/libpri/libpri-1.4.12.ebuild
deleted file mode 100644
index cacb5da7516f..000000000000
--- a/net-libs/libpri/libpri-1.4.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius 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 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.12-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.12-released-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"
-}
diff --git a/net-libs/libpri/libpri-1.4.12_beta2.ebuild b/net-libs/libpri/libpri-1.4.12_beta2.ebuild
deleted file mode 100644
index e5a17225e446..000000000000
--- a/net-libs/libpri/libpri-1.4.12_beta2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_beta2.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius 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 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
-	"${FILESDIR}/${PN}-1.4.11.1-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"
-}